Merge pull request #1176 from JGreenlee/energy-dashboard-2024

Reorganize In-App Dashboard & Use New Energy Footprint Calculations

package.cordovabuild.json

@@ -98,7 +98,8 @@
       },
       "cordova-plugin-bluetooth-classic-serial-port": {},
       "cordova-custom-config": {},
-      "com.unarin.cordova.beacon": {}
+      "com.unarin.cordova.beacon": {},
+      "cordova-plugin-statusbar": {}
     }
   },
   "dependencies": {
@@ -136,8 +137,9 @@
     "cordova-plugin-bluetooth-classic-serial-port": "git+https://github.com/e-mission/cordova-plugin-bluetooth-classic-serial-port.git",
     "cordova-custom-config": "^5.1.1",
     "com.unarin.cordova.beacon": "github:e-mission/cordova-plugin-ibeacon",
+    "cordova-plugin-statusbar": "^4.0.0",
     "core-js": "^2.5.7",
-    "e-mission-common": "github:JGreenlee/e-mission-common#semver:0.5.4",
+    "e-mission-common": "github:JGreenlee/e-mission-common#semver:0.6.1",
     "enketo-core": "^6.1.7",
     "enketo-transformer": "^4.0.0",
     "fast-xml-parser": "^4.2.2",
@@ -156,7 +158,8 @@
     "react-dom": "~18.2.0",
     "react-i18next": "^13.5.0",
     "react-native-paper": "^5.11.0",
-    "react-native-paper-dates": "^0.18.12",
+    "react-native-paper-dates": "0.21.8",
+    "react-native-paper-tabs": "^0.10.4",
     "react-native-safe-area-context": "^4.6.3",
     "react-native-screens": "^3.22.0",
     "react-native-vector-icons": "^9.2.0",

package.serve.json

@@ -65,7 +65,7 @@
     "chartjs-adapter-luxon": "^1.3.1",
     "chartjs-plugin-annotation": "^3.0.1",
     "core-js": "^2.5.7",
-    "e-mission-common": "github:JGreenlee/e-mission-common#semver:0.5.4",
+    "e-mission-common": "github:JGreenlee/e-mission-common#semver:0.6.1",
     "enketo-core": "^6.1.7",
     "enketo-transformer": "^4.0.0",
     "fast-xml-parser": "^4.2.2",
@@ -83,7 +83,8 @@
     "react-dom": "~18.2.0",
     "react-i18next": "^13.5.0",
     "react-native-paper": "^5.11.0",
-    "react-native-paper-dates": "^0.18.12",
+    "react-native-paper-dates": "0.21.8",
+    "react-native-paper-tabs": "^0.10.4",
     "react-native-safe-area-context": "^4.6.3",
     "react-native-screens": "^3.22.0",
     "react-native-vector-icons": "^9.2.0",

setup/setup_native.sh

@@ -121,7 +121,7 @@ sed -i -e "s|/usr/bin/env node|/usr/bin/env node --unhandled-rejections=strict|"
 
 npx cordova prepare$PLATFORMS
 
-EXPECTED_COUNT=25
+EXPECTED_COUNT=26
 INSTALLED_COUNT=`npx cordova plugin list | wc -l`
 echo "Found $INSTALLED_COUNT plugins, expected $EXPECTED_COUNT"
 if [ $INSTALLED_COUNT -lt $EXPECTED_COUNT ];

www/__tests__/confirmHelper.test.ts

@@ -5,8 +5,7 @@ import {
   inferFinalLabels,
   labelInputDetailsForTrip,
   labelKeyToReadable,
-  labelKeyToRichMode,
-  labelOptionByValue,
+  labelKeyToText,
   readableLabelToKey,
   verifiabilityForTrip,
 } from '../js/survey/multilabel/confirmHelper';
@@ -16,11 +15,7 @@ import { CompositeTrip, UserInputEntry } from '../js/types/diaryTypes';
 import { UserInputMap } from '../js/TimelineContext';
 window['i18next'] = initializedI18next;
 
-const fakeAppConfig = {
-  label_options: 'json/label-options.json.sample',
-};
 const fakeAppConfigWithModeOfStudy = {
-  ...fakeAppConfig,
   intro: {
     mode_studied: 'walk',
   },
@@ -61,10 +56,10 @@ jest.mock('../js/services/commHelper', () => ({
 }));
 
 describe('confirmHelper', () => {
-  it('returns labelOptions given an appConfig', async () => {
-    const labelOptions = await getLabelOptions(fakeAppConfig);
+  it('returns default labelOptions given a blank appConfig', async () => {
+    const labelOptions = await getLabelOptions({});
     expect(labelOptions).toBeTruthy();
-    expect(labelOptions.MODE[0].text).toEqual('Walk'); // translation is filled in
+    expect(labelOptions.MODE[0].value).toEqual('walk');
   });
 
   it('returns base labelInputDetails for a labelUserInput which does not have mode of study', () => {
@@ -112,10 +107,10 @@ describe('confirmHelper', () => {
 
   it('looks up a rich mode from a label key, or humanizes the label key if there is no rich mode', () => {
     const key = 'walk';
-    const richMode = labelKeyToRichMode(key);
+    const richMode = labelKeyToText(key);
     expect(richMode).toEqual('Walk');
     const key2 = 'scooby_doo_mystery_machine';
-    const readableMode = labelKeyToRichMode(key2);
+    const readableMode = labelKeyToText(key2);
     expect(readableMode).toEqual('Scooby Doo Mystery Machine');
   });