Merge pull request #312 from bcgov/ofmcc-5446-time-picker-timezone-bug

ofmcc-5446 - fix timezone bug in LicenceDetails Operation Hour input
bcgov · Aug 6, 2024 · 49cfd74 · 49cfd74
2 parents a4f712a + 524abdb
commit 49cfd74
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 13 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -22,6 +22,7 @@
     "http-status-codes": "^2.2.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
+    "moment-timezone": "^0.5.45",
     "pinia": "^2.1.6",
     "rfdc": "^1.3.0",
     "sass": "^1.66.1",

diff --git a/frontend/src/components/licences/LicenceDetails.vue b/frontend/src/components/licences/LicenceDetails.vue
@@ -266,7 +266,7 @@ import AppLabel from '@/components/ui/AppLabel.vue'
 import AppNumberInput from '@/components/ui/AppNumberInput.vue'
 import AppTimeInput from '@/components/ui/AppTimeInput.vue'
 import AppYesNoInput from '@/components/ui/AppYesNoInput.vue'
-import LicenceService from '@/services/licenceService'
+import format from '@/utils/format'
 import rules from '@/utils/rules'
 import { useAppStore } from '@/stores/app'
 import { BLANK_FIELD, DAYS_OF_WEEK } from '@/utils/constants'
@@ -385,8 +385,8 @@ export default {
     },
 
     getErrorMessagesForOperationTime(licenceDetail) {
-      const from = LicenceService.convertToCRMOperationDateTimeFormat(licenceDetail?.operationFromTime)
-      const to = LicenceService.convertToCRMOperationDateTimeFormat(licenceDetail?.operationToTime)
+      const from = format.convertTimeToDateTimeFormat(licenceDetail?.operationFromTime)
+      const to = format.convertTimeToDateTimeFormat(licenceDetail?.operationToTime)
       return from >= to ? 'Hours To must be after Hours From' : ''
     },
   },

diff --git a/frontend/src/services/licenceService.js b/frontend/src/services/licenceService.js
@@ -54,11 +54,4 @@ export default {
   isSplitClassRoomInfoValid(licenceDetail) {
     return !licenceDetail.applyRoomSplitCondition || !isEmpty(licenceDetail.roomSplitDetails)
   },
-  convertToCRMOperationDateTimeFormat(time) {
-    const hours = time?.split(':')[0]
-    const minutes = time?.split(':')[1]
-    const convertedTime = new Date()
-    convertedTime.setHours(hours, minutes, 0, 0)
-    return convertedTime
-  },
 }
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
@@ -295,3 +295,5 @@ export const DAYS_OF_WEEK = Object.freeze([
     value: 7,
   },
 ])
+
+export const TIME_ZONE = 'America/Vancouver'
diff --git a/frontend/src/utils/format.js b/frontend/src/utils/format.js
@@ -1,7 +1,8 @@
 import { isEmpty } from 'lodash'
 import moment from 'moment'
+import momentTZ from 'moment-timezone'
 
-import { BLANK_FIELD } from '@/utils/constants'
+import { BLANK_FIELD, TIME_ZONE } from '@/utils/constants'
 
 function formatDate(date) {
   if (!date) return BLANK_FIELD
@@ -31,6 +32,16 @@ function convertUTCDatetoPSTDate(date) {
   return pstDate.toISOString().split('.')[0] + 'Z'
 }
 
+/* Example
+- Input: 13:00
+- Output: 2024-08-06 13:00:00 PDT
+*/
+function convertTimeToDateTimeFormat(time) {
+  const hours = time?.split(':')[0]
+  const minutes = time?.split(':')[1]
+  return momentTZ().tz(TIME_ZONE).hours(hours).minutes(minutes).seconds(0).milliseconds(0)
+}
+
 function formatTime12to24(time12h) {
   if (isEmpty(time12h) || !is12hFormat(time12h)) return time12h
   const [time, modifier] = time12h.split(' ')
@@ -69,6 +80,7 @@ function formatDecimalNumber(decimalNumber, numberOfFractionDigits = 2) {
 }
 
 export default {
+  convertTimeToDateTimeFormat,
   convertUTCDatetoPSTDate,
   formatDate,
   formatDateTime,

diff --git a/frontend/src/views/applications/ServiceDeliveryView.vue b/frontend/src/views/applications/ServiceDeliveryView.vue
@@ -67,6 +67,7 @@ import ApplicationService from '@/services/applicationService'
 import LicenceService from '@/services/licenceService'
 import { useApplicationsStore } from '@/stores/applications'
 import { APPLICATION_ERROR_MESSAGES, APPLICATION_ROUTES, OFM_PROGRAM_CODES } from '@/utils/constants'
+import format from '@/utils/format'
 import rules from '@/utils/rules'
 import alertMixin from '@/mixins/alertMixin'
 
@@ -214,8 +215,8 @@ export default {
 
     updateLicenceDetails(updatedModel) {
       const clonedModel = cloneDeep(updatedModel)
-      clonedModel.updatableOperationFromTime = LicenceService.convertToCRMOperationDateTimeFormat(clonedModel.operationFromTime)
-      clonedModel.updatableOperationToTime = LicenceService.convertToCRMOperationDateTimeFormat(clonedModel.operationToTime)
+      clonedModel.updatableOperationFromTime = format.convertTimeToDateTimeFormat(clonedModel.operationFromTime)
+      clonedModel.updatableOperationToTime = format.convertTimeToDateTimeFormat(clonedModel.operationToTime)
       clonedModel.weekDays = clonedModel?.weekDays?.toString()
       const index = this.changedLicences.findIndex((el) => el.licenceDetailId == clonedModel.licenceDetailId)
       if (index === -1) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -295,3 +295,5 @@ export const DAYS_OF_WEEK = Object.freeze([ @@
         value: 7,
       },
     ])
+    export const TIME_ZONE = 'America/Vancouver'