Merge pull request #7 from paulnagle/develop

Bug fixes

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.naitalia.app" version="2.1.00" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.naitalia.app" version="2.1.06" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>NA Italia</name>
     <description>NA Italia</description>
     <author email="[email protected]" href="https://www.naitalia.org">NA Italia</author>

package.json

@@ -32,9 +32,13 @@
     "@ngx-translate/core": "^12.1.2",
     "@ngx-translate/http-loader": "^5.0.0",
     "@types/googlemaps": "^3.39.8",
+    "@types/moment-precise-range-plugin": "^0.2.0",
     "cordova": "^10.0.0",
     "cordova-androidx-build": "^1.0.3",
+    "cordova-browser": "6.0.0",
     "cordova-plugin-googlemaps-sdk": "git+https://github.com/mapsplugin/cordova-plugin-googlemaps-sdk.git",
+    "moment": "^2.27.0",
+    "moment-precise-range-plugin": "^1.3.0",
     "rxjs": "~6.5.1",
     "thenby": "^1.3.3",
     "tslib": "^1.10.0",
@@ -53,7 +57,7 @@
     "codelyzer": "^5.1.2",
     "com-badrit-base64": "^0.2.0",
     "cordova-android": "^9.0.0",
-    "cordova-ios": "^6.1.0",
+    "cordova-ios": "^6.1.1",
     "cordova-plugin-advanced-http": "^3.0.1",
     "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-file": "^6.0.2",
@@ -96,6 +100,7 @@
       "com-badrit-base64": {}
     },
     "platforms": [
+      "browser",
       "ios",
       "android"
     ]

src/app/pages/calc/calc.page.html

@@ -15,6 +15,8 @@
     <ion-label>{{'ENTERCLEANDATE' | translate}}-> </ion-label>
     <ion-datetime
       displayFormat="DD MMM YYYY"
+      display-timezone="utc"
+      max="{{maxDisplayDate}}"
       [monthShortNames]="monthShortNames"
       [monthNames]="monthNames"
       [cancelText]="cancelText"
@@ -24,6 +26,12 @@
     </ion-datetime>
   </ion-item>
 
+  <ion-card *ngIf="cleanHumanized">
+    <ion-card-content>
+      <h1>{{ cleanHumanized.years}} {{ 'YEARS' | translate}}, {{ cleanHumanized.months }}  {{'MONTHS' | translate }}, {{ cleanHumanized.days }} {{ 'DAYS' | translate}}</h1>
+    </ion-card-content>
+  </ion-card>
+
   <div *ngIf="tag != 'none'">
     <ion-card>
       <ion-card-header>{{'BIRTHDAY' | translate}}</ion-card-header>
@@ -34,25 +42,4 @@ <h1>{{ tagTime }} {{ tag | translate }}</h1>
     </ion-card>
   </div>
 
-  <ion-card>
-    <ion-card-header>{{'CLEANTIMEINDAYS' | translate }}</ion-card-header>
-    <ion-card-content>
-      <h1>{{ cleanTimeInDays }} {{'DAYS' | translate}}</h1>
-    </ion-card-content>
-  </ion-card>
-
-  <ion-card>
-    <ion-card-header>{{'CLEANTIMEINWEEKS' | translate }}</ion-card-header>
-    <ion-card-content>
-      <h1>{{ cleanTimeInWeeks }} {{'WEEKS' | translate}}</h1>
-    </ion-card-content>
-  </ion-card>
-
-  <ion-card>
-    <ion-card-header>{{'CLEANTIMEINYEARS' | translate }}</ion-card-header>
-    <ion-card-content>
-      <h1>{{ cleanTimeInYears }}&nbsp;{{'YEARS' | translate}}</h1>
-    </ion-card-content>
-  </ion-card>
-
 </ion-content>