Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exam booking invig fix and autoselect office #704

Merged
merged 8 commits into from
Feb 2, 2022
Merged

Exam booking invig fix and autoselect office #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3eebb67
auto select first office
tyu-avo Jan 25, 2022
6e52f7e
service list auto select first
tyu-avo Jan 25, 2022
db70014
exam invig fix
tyu-avo Jan 26, 2022
6847e2b
removing snowplow print statement
tyu-avo Jan 27, 2022
1ac84ad
undo commit
tyu-avo Jan 27, 2022
16e7410
snowplow remove print statements
tyu-avo Jan 27, 2022
db0b310
table values, empty field handling
tyu-avo Jan 27, 2022
6004a86
Merge branch 'appointment_location_autoselect' of https://github.com/…
tyu-avo Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/app/utilities/snowplow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ def get_csr(csr, office, csr_id = 1000001, counter_name = "Counter", role_name="
"role": role_name,
"counter_type": counter_name
})
print('returning snowplow data:')
pprint(vars(agent))
return agent

@staticmethod
Expand Down
1 change: 1 addition & 0 deletions appointment-frontend/src/components/appointment/LocationsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@change="officeSelection"
@input="clickSelection"
@keyup="setKeyPressed"
auto-select-first="true"
hide-details
>
</v-combobox>
Expand Down
1 change: 1 addition & 0 deletions appointment-frontend/src/components/appointment/ServiceSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@change="serviceSelection"
@input="clickSelection"
@keyup="setKeyPressed"
auto-select-first="true"
hide-details
>
<template v-slot:selection="data">
Expand Down
16 changes: 9 additions & 7 deletions frontend/src/components/Booking/booking-modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<div class="ai-modal-title">
Selected:
<strong class="mr-2">{{
invigilatorDetails.invigilator_name
invigilatorDetails.name
}}</strong>
</div>
<div class="info-display-grid-container mt-1">
Expand Down Expand Up @@ -246,12 +246,14 @@ export default class BookingModal extends Vue {
public booking_contact_information: any = ''
public invigilator: any = null
public formStep: any = 1
public fields: any = {
invigilator_name: {
label: 'Name',
thClass: 'd-none'
}
}
public fields: Array<any> = [
{key: 'value'},
{key: 'name'},
{key: 'shadow_count'},
{key: 'contact_phone', thClass: 'd-none', tdClass: 'd-none' },
{key: 'contact_email', thClass: 'd-none', tdClass: 'd-none' },
{key: 'invigilator_notes', thClass: 'd-none', tdClass: 'd-none' },
]

public savedRef: any = 'contact_information'
public selectedOption: any = null
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/store/getters/getters-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ export const commonGetters: any = {
invigilators.push({
value: i.invigilator_id,
name: i.invigilator_name,
shadow_count: i.shadow_count
shadow_count: i.shadow_count,
contact_phone: i.contact_phone || '',
contact_email: i.contact_email || '',
invigilator_notes: i.invigilator_notes || ''
})
})
return invigilators.filter(i => i.shadow_count == 2)
Expand Down