Skip to content

Sumesh - can you review? Do we need this?#118

Open
acoard-aot wants to merge 12 commits intomasterfrom
master-backup-sumesh-jan-21
Open

Sumesh - can you review? Do we need this?#118
acoard-aot wants to merge 12 commits intomasterfrom
master-backup-sumesh-jan-21

Conversation

@acoard-aot
Copy link
Collaborator

These were stale commits from 8mo ago. Do we need them? They were in master, but I overwrote master with whatever is in bcgov repo right now.

sumesh-aot and others added 12 commits May 20, 2020 20:27
* Bug fixes (#102)

* Changes for email service and job

* persisting data in store properly

* Demo feedback changes

* update user profile, setup email alert

* Update GeoModule to match new module setup

* Freezing the requirements.txt

* Trying with no flask mail

* Trying with no flask mail

* Adding dev config to allow cors

* Adding dev config to allow cors

* Adding changes for CORS and re-enabling email

* Changing citizen model

* Changing citizen model

* Adding onliine flag to appointment

* appointment listing

* Adding onliine flag to appointment

* clearing selected values

* Adding changes to delete appointments during blackout appointment creation

* appointment listing

* clearing selected values

* Fix CORS issue for local dev

* appointment listing

* clearing selected values

* appointment listing

* clearing selected values

* signout

* Fixing day_of_week to return array of string

* timeslot changes incorporated

* Adding authorization for all endpoints

* Commenting role based auth

* Geocoding and Google Maps logic complete

- Replaced all maps with static map API
- Calculating distance of all locations and sorting
-  All Geo/DataBC integration edge conditions

* user get

* delete appointments

* Adding authorization for all endpoints

* Adding authorization for all endpoints

* edit appointment

* show service link if any

* Add new rate limited route

* Change local proxy URL over to rate limited OpenShift URL

* Rename keycloak to keycloak-public.json

Used to match OpenShift ConfigMap

* Rename keycloak.json in keycloak-public.json

* enabling available dates and indicating it

* datetime format to common function

* avoided unwanted api calls while step change in stepper

* indicate already selected office

* showing selected time slot on edit mode

* Fixing issue with update appointment

* appointment success popup fix

* More mobile work on location list, header, hours section has line breaks

* Mobile responseiveness fo the actions buttons on location page

* Adding osd link hard coded - just for demo uat.

* Adding osd link hard coded - just for demo uat.

* Pinning flask admin to 1.5.5

* Pinning flask admin to 1.5.5

* Adding config templates

* Fixing issue with button width in email, and blackout email being deleted

* service selection link in option

* Excluding checked in appointments cancellation emails

* Hide BC Services card configured in configuration.json

* Mobile middle column sizing

* Reverting back to configuration.json for configs

* Accessibility, change default info/success colours

* BCEID Registration URL controlled by json param

* Adding snowplow and confirmation email changes

* Adding snowplow and confirmation email changes

* category correction
search service list

* Adding snowplow and confirmation email changes

* phone number optional
telephone in acc summary

* Change username to display_name for BCEID

* Update default configuration

* Add ConfigMap to deploymentconfig.

* Add missing parsed token variable copy

* Fixing issue with timezone

* Fixing issue with timezone

* Fixing issue with timezone

* Fixing issue with timezone

* Convert Appointments list to use StaticMap API

* Mobile responsiveness for book appointments page

* update requirements

* Allow Snowplow calls for self serve appointments, where there is no CSR
Fix bug with Snowplow calls for blackout appointments

* Adding snowplow and confirmation email changes

* Adding snowplow and confirmation email changes

* Adding snowplow and confirmation email changes

* Change username to display_name for BCEID

* Update default configuration

* Add ConfigMap to deploymentconfig.

* Add missing parsed token variable copy

* Fixing issue with timezone

* Fixing issue with timezone

* Fixing issue with timezone

* Fixing issue with timezone

* timezone dynamic from office

* service list as per requirement !

* stepper validation and back button

* Add autocomplete: true to geocoder

* Lazy load images, reducing Google Maps API calls

* Remove duplicate title from merge conflit

* Bypass stepper is configurable by env var

* Revert "Bypass stepper is configurable by env var"

This reverts commit d2b6427.

* Commenting out confirmation email to troubleshoot issue with appointments

* Added Terms of Service modal

* Fixed mobile responsiveness of back button on iphone

* allow appointments in non-reception office

* Fix cross browser Safari bug

* Mobile resposiveness of Date selection

* allow appointments in non-reception office

* allow appointments in non-reception office

* Show error message from API when booking appointment

* email alert on booking success modal

* text change on external link

* external name in category list

* UI cleanup

* click header logo to home

* Fixing issues with timeslot for GA and appointment slots

* Fixing issue with sending email asynchronously

* Sending confirmation on update

* Sending confirmation on update

* Adding fix for appointment reminder flag

* Troubleshooting issue with slots

* Troubleshooting issue with slots

* allow appointments in non-reception office

* Troubleshooting issue with email subject

* Troubleshooting issue with email subject

Troubleshooting issue with email subject

* Troubleshooting issue with email subject

* Troubleshooting issue with email subject

* Troubleshooting issue with email subject

* Troubleshooting issue with threading in test environment

* Adding daemon True for threads to fix issue with parallel running

* Fix stepper CSS for very small devices

* Responsiveness of time slot selection

* Adding CSP to caddy image

* Sort service list alphabetically

* Refactor alphabetical sort for clarity

* Adding CSP to caddy image

* Adding CSP to caddy image

* Adding CSP to caddy image

* Add local proxying to debug on IE on windows machine

* IE11 build config and timezone polyfill for date

* Add 'Alpha' header

* Keycloak-public.json ConfigMap

* Adding snowplow fix as per chris.mcintosh

* timezone fixes

* Updating postman collection and readme document

* Fix Safari timezone bug on appointment summary page

* Adding delay-request and new params

* Fixnpm run build issue from type signature

* Adding changes for disabling office selection and button changes

* Adding changes to let users to book appointment if the appointment is checked in for the day

* Bug fixes

* ui fixes, privacy statement

* Fixing office list issue

* Timezone fix

* Adding reminder alert and style fix

Co-authored-by: Nitheesh T Ganesh <nitheesh.ganesh@aot-technologies.com>
Co-authored-by: Adam Coard <arcoard+github@gmail.com>
Co-authored-by: acoard-aot <61285798+acoard-aot@users.noreply.github.com>
Co-authored-by: Karim Gillani <karim.gillani@gov.bc.ca>
Co-authored-by: Chris <Chris.McIntosh@gov.bc.ca>
Co-authored-by: Nitheesh T Ganesh <60233274+nitheesh-aot@users.noreply.github.com>
Co-authored-by: ozamani <ozamani9@gmail.com>

* unavailable page for ie < 11, and user without online appointment role

* service selection

* Adding manifest-src to CSP

* disabled service selection refresh issue fix

* Merge branch 'master' of https://github.com/AOT-Technologies/queue-management

* Time slot fix

* Time slot fix

* Time slot fix

* Commenting out logs

* frontend docs

* google mapi api info

Co-authored-by: Sumesh Punakkal Kariyil <sumesh.pk@aot-technologies.com>
Co-authored-by: Adam Coard <arcoard+github@gmail.com>
Co-authored-by: acoard-aot <61285798+acoard-aot@users.noreply.github.com>
Co-authored-by: Karim Gillani <karim.gillani@gov.bc.ca>
Co-authored-by: Chris <Chris.McIntosh@gov.bc.ca>
Co-authored-by: ozamani <ozamani9@gmail.com>
Merge from bcgov master
Adding sort to time slots after slot calculation
@acoard-aot acoard-aot requested a review from sumesh-aot January 21, 2021 17:07
end_time = add_delta_to_time(end_time, minutes=appointment_duration,
timezone=office.timezone.timezone_name)

# Sort the slot by time for the day

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't hurt, but I think the query is getting all appointments by time and the time slot calculation starts with ascending order of slots.

Copy link

@sumesh-aot sumesh-aot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't hurt, but I think the query is getting all appointments by time and the time slot calculation starts with ascending order of slots.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants