Merge branch 'master' of https://github.com/e-mission/e-mission-phone …

…into ceo_ebike_project_stage
GabrielKS · Jul 20, 2021 · 5dc1da1 · 5dc1da1
2 parents 75a138e + 066dc51
commit 5dc1da1
Show file tree

Hide file tree

Showing 11 changed files with 298 additions and 235 deletions.
diff --git a/package.cordovabuild.json b/package.cordovabuild.json
@@ -75,10 +75,10 @@
     "cordova-plugin-app-version": "0.1.9",
     "cordova-plugin-customurlscheme": "5.0.1",
     "cordova-plugin-device": "2.0.1",
-    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.5.0",
-    "cordova-plugin-em-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.3",
+    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.6.0",
+    "cordova-plugin-em-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.4",
     "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.3",
-    "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.2.4",
+    "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.2.5",
     "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.2",
     "cordova-plugin-em-transition-notify": "git+https://github.com/e-mission/e-mission-transition-notify.git#v1.2.6",
     "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.3",

diff --git a/www/css/main.diary.css b/www/css/main.diary.css
@@ -110,19 +110,32 @@ a.item-content {
   margin-left: 3px;
   margin-top: 3px;
 }
+.btn-input-confirm-red,
+.btn-input-confirm-red:hover,
+.btn-input-confirm-red:active {
+  background-color: #ED2D3A;
+  color: white;
+}
+.btn-input-confirm-yellow,
+.btn-input-confirm-yellow:hover,
+.btn-input-confirm-yellow:active {
+  background-color: #FFC108;
+  color: white;
+}
 .btn-input-confirm-green,
 .btn-input-confirm-green:hover,
 .btn-input-confirm-green:active {
   background-color: #30A64A;
   color: white;
 }
-.btn-input-confirm-white,
+/* White confirm buttons are currently unused */
+/* .btn-input-confirm-white,
 .btn-input-confirm-white:hover,
 .btn-input-confirm-white:active {
   background-color: #ddd;
   color: #333;
   font-size: 0.8em;
-}
+} */
 .btn-input-confirm {
   line-height: 30px;
   min-height: 30px;
@@ -149,6 +162,25 @@ a.item-content {
   border-width: 0;
 }
 
-.button.on {
-    background-color: darkgray;
+.button.labelfilter {
+  color: #01D0A7;
+  border-radius: 0px;
+  border-width: 0;
+  box-shadow: 0 1px 2px rgba(0,0,0,0.16), 0 2px 2px rgba(0,0,0,0.23);
 }
+
+.button.labelfilter.on {
+    background-color: #01D0A7;
+    color: white;
+}
+
+.labelfilter:first-of-type {
+  margin-left:5%;
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.labelfilter:last-of-type {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
diff --git a/www/css/style.css b/www/css/style.css
@@ -887,6 +887,10 @@ button.button.back-button.buttons.button-clear.header-item {
 .list-card-lg {
  width: 95%;
 }
+.list-card .row {
+  padding-left: 5px;
+  padding-right: 5px;
+}
 .list-col-left-margin {
   text-align: center; padding: 0.7em 0.8em 0.4em 0.8em; border-right-width: 0.5px; border-right-color: #ccc; border-right-style: solid; border-bottom-color: #ccc; border-bottom-width: 0.5px; border-bottom-style: solid;
 }
@@ -971,9 +975,37 @@ button.button.back-button.buttons.button-clear.header-item {
   display: inline-block;
   width: calc(100% - 25px);
 }
-.diary-arrow-container i {
+.diary-more-container i {
   font-size: 32px;
-  float: right;
+}
+.diary-checkmark-container i {
+  font-size: 24px;
+  padding: 3px;
+}
+
+.diary-checkmark-container i.can-verify {
+  color: #30A64A;
+  background-color: #ddd;
+  border-radius: 5px;
+}
+.diary-checkmark-container i.cannot-verify {
+  color: #E6B8B8;
+}
+.diary-checkmark-container i.already-verified {
+  color: #B8E6C2;
+}
+/* .diary-checkmark-container i.already-verified, .diary-checkmark-container i.cannot-verify {
+  color: #BFBFBF;
+} */
+
+.center-vert {
+  display: flex;
+  align-items: center;
+}
+
+.center-horiz {
+  display: flex;
+  justify-content: center;
 }
 
 .side-menu-item {

diff --git a/www/i18n/en.json b/www/i18n/en.json
@@ -153,9 +153,10 @@
         "mode": "Mode",
         "replaces": "Replaces Mode",
         "purpose": "Purpose",
-        "unlabeled": "Unlabeled🔍",
-        "invalid-ebike": "Invalid🔍",
-        "show-all": "All",
+        "unlabeled": "All Unlabeled",
+        "invalid-ebike": "Invalid",
+        "to-label": "To Label",
+        "show-all": "All Trips",
         "no-trips-found": "No trips found",
         "for-current-filter": "for current filter. Show All to remove filters",
         "scroll-to-load-more": "Scroll to load more",
@@ -302,10 +303,11 @@
     "intro": {
         "permissions": {
             "locationPermExplanation-android-lt-6": "you accepted the permission during installation. You don't need to do anything now.",
-            "locationPermExplanation-android-gte-6": "please select 'allow'",
-            "locationPermExplanation-android-gte-10": "please select 'Allow all the time'",
+            "locationPermExplanation-android-6-9": "please select 'allow'",
+            "locationPermExplanation-android-10": "please select 'Allow all the time'",
+            "locationPermExplanation-android-gte-11": "please select 'Allow all the time' for location permissions on the app page",
             "locationPermExplanation-ios-lt-13": "please select 'Always allow'. This allows us to understand your travel even when you are not actively using the app",
-            "locationPermExplanation-ios-gte-13": "please select 'when in use' now. After a few days, you will be asked whether you want to give the app background permission. Please say 'Always Allow' at that time. This allows us to understand your travel even when you are not actively using the app"
+            "locationPermExplanation-ios-gte-13": "please select 'always' and 'precise' in the app settings page and return here to continue"
         }
     },
     "allow_background": {

diff --git a/www/js/diary/infinite_scroll_filters.js b/www/js/diary/infinite_scroll_filters.js
@@ -17,7 +17,7 @@ angular.module('emission.main.diary.infscrollfilters',[
     var unlabeledCheck = function(t) {
        return ConfirmHelper.INPUTS
            .map((inputType, index) => !angular.isDefined(t.userInput[inputType]))
-           .reduce((acc, val) => acc && val, true);
+           .reduce((acc, val) => acc || val, false);
     }
 
     var invalidCheck = function(t) {
@@ -29,16 +29,24 @@ angular.module('emission.main.diary.infscrollfilters',[
        return retVal;
     }
 
+    var toLabelCheck = function(trip) {
+        console.log(trip.expectation.to_label)
+        return trip.expectation.to_label && unlabeledCheck(trip);
+    }
+
     sf.UNLABELED = {
         text: $translate.instant(".unlabeled"),
-        width: "col-40",
         filter: unlabeledCheck
     }
 
     sf.INVALID_EBIKE = {
         text: $translate.instant(".invalid-ebike"),
-        width: "col-40",
         filter: invalidCheck
     }
+
+    sf.TO_LABEL = {
+        text: $translate.instant(".to-label"),
+        filter: toLabelCheck
+    }
     return sf;
 });