Add hybrid

www/i18n/en.json

@@ -154,6 +154,8 @@
         "scootershare": "Scooter share",
         "drove_alone": "Gas Car Drove Alone",
         "shared_ride": "Gas Car Shared Ride",
+        "hybrid_drove_alone": "Hybrid Drove Alone",
+        "hybrid_shared_ride": "Hybrid Shared Ride",
         "e_car_drove_alone": "E-Car Drove Alone",
         "e_car_shared_ride": "E-Car Shared Ride",
         "moped": "Moped",

www/js/App.tsx

@@ -91,9 +91,9 @@ const App = () => {
     <AppContext.Provider value={appContextValue}>
       {appContent}
 
-      { /* If we are past the consent page (route > CONSENT), the permissions popup can show if needed.
-          This also includes if onboarding is DONE altogether (because "DONE" is > "CONSENT") */ }
-      {(onboardingState && onboardingState.route > OnboardingRoute.CONSENT) &&
+      { /* If we are fully consented, (route > PROTOCOL), the permissions popup can show if needed.
+          This also includes if onboarding is DONE altogether (because "DONE" is > "PROTOCOL") */ }
+      {(onboardingState && onboardingState.route > OnboardingRoute.PROTOCOL) &&
         <AppStatusModal permitVis={permissionsPopupVis} setPermitVis={setPermissionsPopupVis} />
       }
     </AppContext.Provider>

www/js/onboarding/OnboardingStack.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { StyleSheet } from "react-native";
 import { AppContext } from "../App";
 import WelcomePage from "./WelcomePage";
-import ConsentPage from "./ConsentPage";
+import ProtocolPage from "./ProtocolPage";
 import SurveyPage from "./SurveyPage";
 import SaveQrPage from "./SaveQrPage";
 import SummaryPage from "./SummaryPage";
@@ -19,8 +19,8 @@ const OnboardingStack = () => {
     return <WelcomePage />;
   } else if (onboardingState.route == OnboardingRoute.SUMMARY) {
     return <SummaryPage />;
-  } else if (onboardingState.route == OnboardingRoute.CONSENT) {
-    return <ConsentPage />;
+  } else if (onboardingState.route == OnboardingRoute.PROTOCOL) {
+    return <ProtocolPage />;
   } else if (onboardingState.route == OnboardingRoute.SAVE_QR) {
     return <SaveQrPage />;
   } else if (onboardingState.route == OnboardingRoute.SURVEY) {

www/js/onboarding/ConsentPage.tsx → www/js/onboarding/ProtocolPage.tsx

@@ -7,8 +7,9 @@ import { AppContext } from '../App';
 import { getAngularService } from '../angular-react-helper';
 import PrivacyPolicy from './PrivacyPolicy';
 import { onboardingStyles } from './OnboardingStack';
+import { setProtocolDone } from './onboardingHelper';
 
-const ConsentPage = () => {
+const ProtocolPage = () => {
 
   const { t } = useTranslation();
   const context = useContext(AppContext);
@@ -20,10 +21,8 @@ const ConsentPage = () => {
   };
 
   function agree() {
-    const StartPrefs = getAngularService('StartPrefs');
-    StartPrefs.markConsented().then((response) => {
-      refreshOnboardingState();
-    });
+   setProtocolDone(true);
+   refreshOnboardingState();
   };
 
   // privacy policy and data collection info, followed by accept/reject buttons
@@ -40,4 +39,4 @@ const ConsentPage = () => {
   </>);
 }
 
-export default ConsentPage;
+export default ProtocolPage;

www/js/onboarding/SaveQrPage.tsx

@@ -22,12 +22,15 @@ const SaveQrPage = ({  }) => {
 
   useEffect(() => {
     if (overallStatus == true && !registerUserDone) {
-      logDebug('permissions done, going to log in');
-      login(onboardingState.opcode).then((response) => {
-        logDebug('login done, refreshing onboarding state');
-        setRegisterUserDone(true);
-        preloadDemoSurveyResponse();
-        refreshOnboardingState();
+      const StartPrefs = getAngularService('StartPrefs');
+      StartPrefs.markConsented().then((response) => {
+        logDebug('permissions done, going to log in');
+        login(onboardingState.opcode).then((response) => {
+          logDebug('login done, refreshing onboarding state');
+          setRegisterUserDone(true);
+          preloadDemoSurveyResponse();
+          refreshOnboardingState();
+        });
       });
     } else {
       logDebug('permissions not done, waiting');

www/js/onboarding/onboardingHelper.ts

@@ -7,12 +7,12 @@ import { logDebug } from "../plugin/logger";
 export const INTRO_DONE_KEY = 'intro_done';
 
 // route = WELCOME if no config present
-// route = SUMMARY if config present, but not consented and summary not done
-// route = CONSENT if config present, but not consented and summary done
-// route = SAVE_QR if config present, consented, but save qr not done
+// route = SUMMARY if config present, but protocol not done and summary not done
+// route = PROTOCOL if config present, but protocol not done and summary done
+// route = SAVE_QR if config present, protocol done, but save qr not done
 // route = SURVEY if config present, consented and save qr done
 // route = DONE if onboarding is finished (intro_done marked)
-export enum OnboardingRoute { WELCOME, SUMMARY, CONSENT, SAVE_QR, SURVEY, DONE };
+export enum OnboardingRoute { WELCOME, SUMMARY, PROTOCOL, SAVE_QR, SURVEY, DONE };
 export type OnboardingState = {
   opcode: string,
   route: OnboardingRoute,
@@ -21,6 +21,9 @@ export type OnboardingState = {
 export let summaryDone = false;
 export const setSummaryDone = (b) => summaryDone = b;
 
+export let protocolDone = false;
+export const setProtocolDone = (b) => protocolDone = b;
+
 export let saveQrDone = false;
 export const setSaveQrDone = (b) => saveQrDone = b;
 
@@ -41,10 +44,10 @@ export function getPendingOnboardingState(): Promise<OnboardingState> {
       route = OnboardingRoute.DONE;
     } else if (!config) {
       route = OnboardingRoute.WELCOME;
-    } else if (!isConsented && !summaryDone) {
+    } else if (!protocolDone && !summaryDone) {
       route = OnboardingRoute.SUMMARY;
-    } else if (!isConsented) {
-      route = OnboardingRoute.CONSENT;
+    } else if (!protocolDone) {
+      route = OnboardingRoute.PROTOCOL;
     } else if (!saveQrDone) {
       route = OnboardingRoute.SAVE_QR;
     } else {

www/json/label-options.json.sample

@@ -7,6 +7,8 @@
     {"value":"scootershare", "baseMode":"E_SCOOTER", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.00894},
     {"value":"drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031},
     {"value":"shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.11015},
+    {"value":"hybrid_drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.127},
+    {"value":"hybrid_shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.0635},
     {"value":"e_car_drove_alone", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216},
     {"value":"e_car_shared_ride", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.04108},
     {"value":"moped", "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.05555},
@@ -51,4 +53,4 @@
     {"value":"free_shuttle"},
     {"value":"other"}
   ]
-}
+}