again

beyondessential · Mar 8, 2024 · 4113e10 · 4113e10
1 parent b6695ec
commit 4113e10
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx b/packages/meditrak-app/app/assessment/actions/submitSurvey/processSurveyResponse.jsx
@@ -4,7 +4,7 @@
  */
 
 import generateUUID from 'bson-objectid';
-import moment from 'moment';
+import moment from 'moment-timezone';
 import RNFS from 'react-native-fs';
 
 import {

diff --git a/packages/utils/src/stripTimezoneFromDate.js b/packages/utils/src/stripTimezoneFromDate.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
  */
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 // used to strip the tz suffix so that a date can be added to the database without converting to utc
 // we don't want any timezone conversions when working with data_time

diff --git a/packages/utils/src/validation/validatorFunctions.js b/packages/utils/src/validation/validatorFunctions.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 Beyond Essential Systems Pty Ltd
  */
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 import validator from 'validator';
 
 import { toArray } from '../array';

diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/analytics/analyticsYearOnYear.js
@@ -5,7 +5,7 @@
 
 import { periodToMoment } from '@tupaia/tsutils';
 import { reduceToDictionary } from '@tupaia/utils';
-import moment from 'moment';
+import moment from 'moment-timezone';
 import { AnalyticsPerPeriodBuilder } from './analyticsPerPeriod';
 import { formatLayeredDataElementCode, layerYearOnYear } from '../../../utils/layerYearOnYear';
 

diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/dataDownload/rawDataValues.js
@@ -3,7 +3,7 @@ import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder';
 import { reduceToDictionary } from '@tupaia/utils';
 import { transposeMatrix, mergeTableDataOnKey, sortByColumns } from '/apiV1/utils';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 import flatten from 'lodash.flatten';
 import keyBy from 'lodash.keyby';
 

diff --git a/...-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js b/...-server/src/apiV1/dataBuilders/generic/percentage/percentOperationalFacilitiesWithData.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
 import { aggregateOperationalFacilityValues, getFacilityStatuses } from '/apiV1/utils';
 
 // Example use: % clinics surveyed in last 6 months

diff --git a/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js b/packages/web-config-server/src/apiV1/dataBuilders/generic/table/simpleTableOfEvents.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2018 Beyond Essential Systems Pty Ltd
  */
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder';
 
 const buildResponse = rawData => {

diff --git a/...erver/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js b/...erver/src/apiV1/dataBuilders/generic/table/tableOfDataValues/TableOfDataValuesWithCalc.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Beyond Essential Systems Pty Ltd
  */
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 import { CustomError } from '@tupaia/utils';
 import { TableOfDataValuesBuilder } from './tableOfDataValues';

diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export const FLIGHT_DATE = 'QMIA028';
 const TIMEZONE_SAMOA = 'Pacific/Apia';

diff --git a/...nfig-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js b/...nfig-server/src/apiV1/dataBuilders/modules/covid-samoa/totalNumOfPassengerByFlightDate.js
@@ -2,7 +2,7 @@
  * Tupaia Config Server
  * Copyright (c) 2019 Beyond Essential Systems Pty Ltd
  */
-import moment from 'moment';
+import moment from 'moment-timezone';
 import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder';
 import { Flight, getTotalNumPassengers, FLIGHT_DATE } from './flight';
 

diff --git a/...r/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js b/...r/src/apiV1/dataBuilders/modules/covid-samoa/valueAndPercentageByDataValueByFlightDate.js
@@ -2,7 +2,7 @@
  * Tupaia Config Server
  * Copyright (c) 2019 Beyond Essential Systems Pty Ltd
  */
-import moment from 'moment';
+import moment from 'moment-timezone';
 import { DataBuilder } from '/apiV1/dataBuilders/DataBuilder';
 import {
   Flight,

diff --git a/packages/web-config-server/src/apiV1/utils/getDateRange.js b/packages/web-config-server/src/apiV1/utils/getDateRange.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 const DEFAULT_RANGE = 2;
 /**

diff --git a/packages/web-config-server/src/export/exportChartHandler.js b/packages/web-config-server/src/export/exportChartHandler.js
@@ -1,5 +1,5 @@
 import xlsx from 'xlsx';
-import moment from 'moment';
+import moment from 'moment-timezone';
 import fs from 'fs';
 
 import { USER_SESSION_CONFIG } from '/authSession';
@@ -57,7 +57,7 @@ export const exportChartHandler = async (req, res) => {
     true,
     {
       authorization: authHeader,
-    }
+    },
   );
 
   const matrixData = {