Merge pull request #1007 from JGreenlee/more-jul-2023-fixes

🐛 More Jul 2023 Fixes

www/css/style.css

@@ -11,14 +11,6 @@
 /* nvd3 styles */
 @import 'nvd3/build/nv.d3.css';
 
-/* Annoyingly, React Native Web applies `white-space: nowrap`
-    on Text elements and doesn't give us a way to change it in the style prop,
-    effectively preventing multiline text.
-  This is a workaround to override that style. */
-div[class*='css-text'] {
-  white-space: normal;
-}
-
 .fill-container {
   display: block;
   position: relative;
@@ -502,7 +494,7 @@ ion-nav-view {
 }
 /* this controls bacground color of dashboard and profile - label screen now styled in react*/
 .pane {
-  background-color: #e4e9ed !important;
+  background-color: #edf1f6 !important;
 }
 .tabs-custom > .tabs,
 .tabs.tabs-custom {

www/i18n/en.json

@@ -347,6 +347,8 @@
 
     "intro": {
         "appstatus": {
+            "fix": "Fix",
+            "refresh":"Refresh",
             "overall-description": "This app works in the background to automatically build a travel diary for you.  Make sure that all the settings below are green so that the app can work properly!",
             "overall-loc-name": "Location",
             "overall-loc-description": "We use the background location permission to track your location in the background, even when the app is closed. Reading background locations removes the need to turn tracking on and off, making the app easier to use and preventing battery drain.",
@@ -422,6 +424,7 @@
         "samsung": "Disable 'Medium power saving mode'"
     },
     "consent":{
+        "permissions" : "Permissions",
         "button-accept": "I accept",
         "button-decline": "I refuse"
     },
@@ -478,7 +481,8 @@
         "all-green-status": "Make sure that all status checks are green",
         "dont-force-kill": "Do not force kill the app",
         "background-restrictions": "On Samsung and Huwaei phones, make sure that background restrictions are turned off",
-        "close": "Close"
+        "close": "Close",
+        "tips-title": "Tip(s) for correct operation:"
     },
     "config": {
         "unable-read-saved-config": "Unable to read saved config",

www/js/appTheme.ts

@@ -12,9 +12,9 @@ const AppTheme = {
     onPrimaryContainer: '#001e30', // lch(10% 50 250)
     secondary: '#f2795c', // lch(65% 60 40)
     secondaryContainer: '#ffb39e', // lch(80% 45 40)
-    background: '#f2f2f2', // lch(95% 0 0)
+    background: '#edf1f6', // lch(95% 3 250) - background of label screen, other screens still have this as CSS .pane
     surface: '#fafdff', // lch(99% 30 250)
-    surfaceVariant: '#e4e9ed', // lch(92% 30 250) -- blueish gray used as background on label screen (was same as level 4)
+    surfaceVariant: '#e0f0ff', // lch(94% 50 250) - background of DataTable
     elevation: {
       level0: 'transparent',
       level1: '#fafdff', // lch(99% 30 250)

www/js/diary/LabelListScreen.tsx

@@ -24,7 +24,7 @@ const LabelListScreen = () => {
       <Appbar.Action icon="refresh" size={32} onPress={() => refresh()}
         style={{marginLeft: 'auto'}} />
     </Appbar.Header>
-    <View style={{ flex: 1, backgroundColor: colors.surfaceVariant }}>
+    <View style={{ flex: 1, backgroundColor: colors.background }}>
       <TimelineScrollList
         listEntries={displayedEntries}
         queriedRange={queriedRange}

www/js/diary/LabelTab.tsx

@@ -105,14 +105,14 @@ const LabelTab = () => {
         labelsResultMap = manualResultMap;
         notesResultMap = enbsResultMap;
         console.log("After reading in the label controller, manualResultMap " + JSON.stringify(manualResultMap), manualResultMap);
-        setPipelineRange(pipelineRange);
       }
+      setPipelineRange(pipelineRange);
     });
   }
 
   // once pipelineRange is set, load the most recent week of data
   useEffect(() => {
-    if (pipelineRange) {
+    if (pipelineRange && pipelineRange.end_ts) {
       loadAnotherWeek('past');
     }
   }, [pipelineRange]);

www/js/diary/list/TimelineScrollList.tsx

@@ -54,11 +54,15 @@ const TimelineScrollList = ({ listEntries, queriedRange, pipelineRange, loadMore
     </Banner>
   );
 
-  if (!pipelineRange) { // nothing has been processed for this user yet
+  if (pipelineRange && !pipelineRange.end_ts && !listEntries?.length) {
+    /* Condition: pipelineRange has been fetched but has no defined end, meaning nothing has been
+      processed for this OPCode yet, and there are no unprocessed trips either. Show 'no travel'. */
     return noTravelBanner;
   } else if (isLoading=='replace') {
+    /* Condition: we're loading an entirely new batch of trips, so show a big spinner */
     return bigSpinner;
   } else if (listEntries && listEntries.length == 0) {
+    /* Condition: we've loaded all travel and set `listEntries`, but it's empty. Show 'no travel'. */
     return noTravelBanner;
   } else {
     return (

www/js/diary/services.js

@@ -339,14 +339,14 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
         distance: dists.reduce((a, b) => a + b, 0),
         duration: endPoint.data.ts - startPoint.data.ts,
         end_fmt_time: endMoment.format(),
-        end_local_dt: moment2localdate(endMoment),
+        end_local_dt: moment2localdate(endMoment, endPoint.metadata.time_zone),
         end_ts: endPoint.data.ts,
         expectation: {to_label: true},
         inferred_labels: [],
         locations: locations,
         source: "unprocessed",
         start_fmt_time: startMoment.format(),
-        start_local_dt: moment2localdate(startMoment),
+        start_local_dt: moment2localdate(startMoment, startPoint.metadata.time_zone),
         start_ts: startPoint.data.ts,
         user_input: {},
       }

www/js/intro.js

@@ -133,6 +133,7 @@ angular.module('emission.intro', ['emission.splash.startprefs',
       } else {
         CommHelper.registerUser(function(successResult) {
           $scope.currentToken = token;
+          $scope.qrToken = "emission://login_token?token=" + token;
           $scope.next();
         }, function(errorResult) {
           $scope.alertError('User registration error', errorResult);

www/js/survey/enketo/enketo-demographics.js

@@ -84,7 +84,7 @@ angular.module('emission.survey.enketo.demographics',
                 console.log("demographic survey result ", result);
               }).catch(e => console.trace(e));
         }
-    }, 10); // wait for 10 ms to load to ensure that the form is in place
+    }, 50); // wait for 50 ms to load to ensure that the form is in place
   }
 
   $scope.initForm = function() {