rename util -> datetimeUtil

www/__tests__/util.ts → www/__tests__/datetimeUtil.test.ts

@@ -1,4 +1,4 @@
-import { formatForDisplay } from '../js/util';
+import { formatForDisplay } from '../js/datetimeUtil';
 
 describe('util.ts', () => {
   describe('formatForDisplay', () => {

www/js/TimelineContext.ts

@@ -22,7 +22,7 @@ import { getNotDeletedCandidates, mapInputsToTimelineEntries } from './survey/in
 import { EnketoUserInputEntry } from './survey/enketo/enketoHelper';
 import { primarySectionForTrip } from './diary/diaryHelper';
 import useAppStateChange from './useAppStateChange';
-import { isoDateRangeToTsRange, isoDateWithOffset } from './util';
+import { isoDateRangeToTsRange, isoDateWithOffset } from './datetimeUtil';
 import { base_modes } from 'e-mission-common';
 
 const TODAY_DATE = DateTime.now().toISODate();

www/js/config/useImperialConfig.ts

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import useAppConfig from '../useAppConfig';
-import { formatForDisplay } from '../util';
+import { formatForDisplay } from '../datetimeUtil';
 
 export type ImperialConfig = {
   distanceSuffix: string;

www/js/diary/diaryHelper.ts

@@ -4,7 +4,7 @@ import { LabelOptions } from '../types/labelTypes';
 import { LocalDt } from '../types/serverData';
 import { ImperialConfig } from '../config/useImperialConfig';
 import { base_modes } from 'e-mission-common';
-import { humanizeIsoRange } from '../util';
+import { humanizeIsoRange } from '../datetimeUtil';
 
 export type BaseModeKey = string; // TODO figure out how to get keyof typeof base_modes.BASE_MODES
 

www/js/diary/list/DateSelect.tsx

@@ -19,7 +19,7 @@ import { Text, useTheme } from 'react-native-paper';
 import i18next from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { NavBarButton } from '../../components/NavBar';
-import { formatIsoNoYear, isoDateRangeToTsRange } from '../../util';
+import { formatIsoNoYear, isoDateRangeToTsRange } from '../../datetimeUtil';
 
 // formats as e.g. 'Aug 1'
 const MONTH_DAY_SHORT: Intl.DateTimeFormatOptions = {

www/js/diary/list/TimelineScrollList.tsx

@@ -7,7 +7,7 @@ import { ActivityIndicator, Banner, Button, Icon, Text } from 'react-native-pape
 import LoadMoreButton from './LoadMoreButton';
 import { useTranslation } from 'react-i18next';
 import TimelineContext from '../../TimelineContext';
-import { isoDateRangeToTsRange, isoDateWithOffset } from '../../util';
+import { isoDateRangeToTsRange, isoDateWithOffset } from '../../datetimeUtil';
 import { DateTime } from 'luxon';
 
 function renderCard({ item: listEntry, index }) {

www/js/diary/useDerivedProperties.tsx

@@ -7,7 +7,7 @@ import {
   primarySectionForTrip,
 } from './diaryHelper';
 import TimelineContext from '../TimelineContext';
-import { formatIsoNoYear, formatIsoWeekday, humanizeIsoRange, isoDatesDifference } from '../util';
+import { formatIsoNoYear, formatIsoWeekday, humanizeIsoRange } from '../datetimeUtil';
 
 const useDerivedProperties = (tlEntry) => {
   const imperialConfig = useImperialConfig();

www/js/metrics/MetricsTab.tsx

@@ -14,7 +14,7 @@ import { metrics_summaries } from 'e-mission-common';
 import MetricsScreen from './MetricsScreen';
 import { LabelOptions } from '../types/labelTypes';
 import { useAppTheme } from '../appTheme';
-import { isoDatesDifference } from '../util';
+import { isoDatesDifference } from '../datetimeUtil';
 
 const N_DAYS_TO_LOAD = 14; // 2 weeks
 export const DEFAULT_METRIC_LIST: MetricList = {

www/js/metrics/SummaryCard.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import { Card, Text } from 'react-native-paper';
-import { formatForDisplay } from '../util';
+import { formatForDisplay } from '../datetimeUtil';
 import { colors } from '../appTheme';
 import { t } from 'i18next';
 import { FootprintGoal } from '../types/appConfigTypes';

www/js/metrics/footprint/FootprintComparisonCard.tsx

@@ -5,7 +5,7 @@ import BarChart from '../../components/BarChart';
 import { useTranslation } from 'react-i18next';
 import { ChartRecord } from '../../components/Chart';
 import TimelineContext from '../../TimelineContext';
-import { formatIsoNoYear } from '../../util';
+import { formatIsoNoYear } from '../../datetimeUtil';
 
 const FootprintComparisonCard = ({
   type,

www/js/metrics/footprint/FootprintSection.tsx

@@ -6,7 +6,7 @@ import SummaryCard from '../SummaryCard';
 import { useTranslation } from 'react-i18next';
 import { sumMetricEntries } from '../metricsHelper';
 import TimelineContext from '../../TimelineContext';
-import { formatIso, isoDatesDifference } from '../../util';
+import { formatIso, isoDatesDifference } from '../../datetimeUtil';
 import WeeklyFootprintCard from './WeeklyFootprintCard';
 import useAppConfig from '../../useAppConfig';
 import { getFootprintGoals } from './footprintHelper';

www/js/metrics/footprint/WeeklyFootprintCard.tsx

@@ -10,7 +10,7 @@ import {
   sumMetricEntries,
   trimGroupingPrefix,
 } from '../metricsHelper';
-import { formatIsoNoYear, isoDateWithOffset } from '../../util';
+import { formatIsoNoYear, isoDateWithOffset } from '../../datetimeUtil';
 import { useTranslation } from 'react-i18next';
 import BarChart from '../../components/BarChart';
 import { ChartRecord } from '../../components/Chart';

www/js/metrics/metricsHelper.ts

@@ -6,7 +6,12 @@ import { MetricName, groupingFields } from '../types/appConfigTypes';
 import { ImperialConfig } from '../config/useImperialConfig';
 import i18next from 'i18next';
 import { base_modes, metrics_summaries } from 'e-mission-common';
-import { formatForDisplay, formatIsoNoYear, isoDatesDifference, isoDateWithOffset } from '../util';
+import {
+  formatForDisplay,
+  formatIsoNoYear,
+  isoDatesDifference,
+  isoDateWithOffset,
+} from '../datetimeUtil';
 import { LabelOptions, RichMode } from '../types/labelTypes';
 import { labelOptions, textToLabelKey } from '../survey/multilabel/confirmHelper';
 import { UNCERTAIN_OPACITY } from '../components/charting';

www/js/metrics/movement/WeeklyActiveMinutesCard.tsx

@@ -13,7 +13,7 @@ import { useTranslation } from 'react-i18next';
 import BarChart from '../../components/BarChart';
 import { labelKeyToText } from '../../survey/multilabel/confirmHelper';
 import TimelineContext from '../../TimelineContext';
-import { formatIsoNoYear, isoDateWithOffset } from '../../util';
+import { formatIsoNoYear, isoDateWithOffset } from '../../datetimeUtil';
 
 type Props = { userMetrics?: MetricsData; activeModes: string[] };
 const WeeklyActiveMinutesCard = ({ userMetrics, activeModes }: Props) => {

www/js/survey/enketo/AddedNotesList.tsx

@@ -11,7 +11,7 @@ import EnketoModal from './EnketoModal';
 import { useTranslation } from 'react-i18next';
 import { EnketoUserInputEntry } from './enketoHelper';
 import { displayErrorMsg, logDebug } from '../../plugin/logger';
-import { formatIsoNoYear, isoDatesDifference } from '../../util';
+import { formatIsoNoYear, isoDatesDifference } from '../../datetimeUtil';
 
 type Props = {
   timelineEntry: any;