Revert "new stash august 2023"

This reverts commit d89074635c.

Mohem/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.SFHP.SFHPEServices" version="1.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.SFHP.SFHPEServices" version="1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SFHP E-services</name>
     <description>an app created by cloud Solutions</description>
     <author email="eservicescs@cloudsolution-sa.com" href="http://cloudsolution-sa.com">Cloud Solutions</author>
@@ -126,6 +126,7 @@
     <plugin name="cordova-plugin-nativestorage" spec="^2.3.2" />
     <plugin name="cordova-plugin-ble-central" spec="^1.2.4" />
     <plugin name="uk.co.workingedge.phonegap.plugin.launchnavigator" spec="^3.2.2" />
+    <plugin name="cordova-plugin-themeablebrowser" spec="^0.2.18" />
     <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
     <plugin name="cordova-plugin-android-permissions" spec="^1.0.2" />
     <plugin name="cordova-plugin-device" spec="^2.0.3" />

Mohem/package.json

@@ -24,6 +24,7 @@
     "@ionic-native/android-permissions": "^5.18.0",
     "@ionic-native/app-availability": "^5.18.0",
     "@ionic-native/app-rate": "^5.18.0",
+    "@ionic-native/background-geolocation": "^5.30.0",
     "@ionic-native/badge": "^5.18.0",
     "@ionic-native/barcode-scanner": "^5.18.0",
     "@ionic-native/base64": "^5.18.0",
@@ -55,6 +56,7 @@
     "@ionic-native/splash-screen": "^5.0.0",
     "@ionic-native/sqlite": "^5.18.0",
     "@ionic-native/status-bar": "^5.0.0",
+    "@ionic-native/themeable-browser": "^5.18.0",
     "@ionic-native/wifi-wizard-2": "^5.31.1",
     "@ionic-native/zbar": "^5.10.0",
     "@ionic/angular": "^4.1.0",
@@ -66,7 +68,6 @@
     "com-badrit-base64": "^0.2.0",
     "cordova-android": "^8.1.0",
     "cordova-android-support-gradle-release": "^3.0.1",
-    "cordova-ios": "^5.1.1",
     "cordova-open-native-settings": "^1.5.2",
     "cordova-plugin-actionsheet": "^2.3.3",
     "cordova-plugin-add-swift-support": "^2.0.2",
@@ -97,6 +98,7 @@
     "cordova-plugin-sms-retriever-manager": "^1.0.3",
     "cordova-plugin-splashscreen": "^5.0.3",
     "cordova-plugin-statusbar": "^2.4.3",
+    "cordova-plugin-themeablebrowser": "^0.2.18",
     "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-wifiwizard2": "^3.1.1",
     "cordova-plugin-x-socialsharing": "^6.0.3",
@@ -140,6 +142,7 @@
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~10.12.0",
     "codelyzer": "~4.5.0",
+    "cordova-ios": "^6.2.0",
     "cordova-plugin-wifiwizard2": "^3.1.1",
     "es6-promise-plugin": "^4.1.0",
     "jasmine-core": "~2.99.1",
@@ -188,6 +191,7 @@
       "cordova-sqlite-storage": {},
       "cordova-plugin-ble-central": {},
       "uk.co.workingedge.phonegap.plugin.launchnavigator": {},
+      "cordova-plugin-themeablebrowser": {},
       "cordova-plugin-local-notification": {},
       "cordova-plugin-appavailability": {},
       "cordova-plugin-apprate": {},
@@ -196,6 +200,9 @@
       },
       "cordova-plugin-androidx": {},
       "cordova-plugin-androidx-adapter": {},
+      "cordova-plugin-background-geolocation": {
+        "GOOGLE_PLAY_SERVICES_VERSION": "+"
+      },
       "phonegap-nfc": {},
       "wifiwizard2": {},
       "cordova-plugin-x-socialsharing": {},

Mohem/src/app/hmg-common/hmg-common.module.ts

@@ -109,7 +109,7 @@ import { NgCalendarModule } from 'ionic2-calendar';
 import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/date-info-modal.component';
 import { ChartModule } from 'primeng/chart';
 import { GenericHeaderComponent } from './ui/generic-header/generic-header.component';
-// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component';
 import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component';
 import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component';
@@ -319,7 +319,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
         MenuService,
         OpenNativeSettings,
         BarcodeScanner,
-        // BackgroundGeolocation,
+        BackgroundGeolocation,
         FileOpener,
         FilePath,
         FileChooser,

Mohem/src/app/hmg-common/hmg_utils.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { CommonService } from "src/app/hmg-common/services/common/common.service";
 import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
 import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
@@ -13,7 +13,7 @@ declare const cordova: any;
 })
 export class HMGUtils {
     constructor(
-        // public backgroundGeolocation: BackgroundGeolocation,
+        public backgroundGeolocation: BackgroundGeolocation,
         public common: CommonService,
         public ts: TranslatorService,
         private geolocation: Geolocation,
@@ -98,18 +98,18 @@ export class HMGUtils {
     }
 
     private getGMSLocation(callBack: Function) {
-        // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+        this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
-        //     if (resp && (resp.latitude && resp.longitude)) {
+            if (resp && (resp.latitude && resp.longitude)) {
-        //         const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled;
+                const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled;
-        //         const lat = resp.latitude;
+                const lat = resp.latitude;
-        //         const long = resp.longitude;
+                const long = resp.longitude;
-        //         callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation})
+                callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation})
-        //     } else {
+            } else {
-        //         this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+                this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-        //     }
+            }
-        // }, (error) => {
+        }, (error) => {
-        //     this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+            this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-        // });
+        });
     }
 
     private getIOSLocation(callBack: Function) {

Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts

@@ -14,7 +14,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
 import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
 import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service';
 import { Device } from '@ionic-native/device/ngx';
-// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { Platform } from '@ionic/angular';
 import { ModalController } from '@ionic/angular';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
@@ -47,7 +47,7 @@ export class AttendScanService {
               private permissions: DevicePermissionsService,
               public common: CommonService,
               public ts: TranslatorService,
-              // public backgroundGeolocation: BackgroundGeolocation,
+              public backgroundGeolocation: BackgroundGeolocation,
               public platform: Platform,
               public modalController: ModalController,
               public firebasex: FirebaseX,

Mohem/src/app/home/attendance-options/attendance-options.component.ts

@@ -17,7 +17,7 @@ import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
 import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
 import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
 import { Geolocation } from '@ionic-native/geolocation/ngx';
-// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
 import { HMGUtils } from 'src/app/hmg-common/hmg_utils';
 
@@ -66,7 +66,7 @@ export class AttendanceOptionsComponent implements OnInit {
     private openNativeSettings: OpenNativeSettings,
     private devicePermissionsService:DevicePermissionsService,
     private geolocation: Geolocation,
-    // public backgroundGeolocation: BackgroundGeolocation,
+    public backgroundGeolocation: BackgroundGeolocation,
     public hmgUtils: HMGUtils
   ) {}
 

Mohem/src/app/home/home.page.ts

@@ -37,7 +37,7 @@ import { TimeCardService } from '../time-card/service/time-card.service';
 import { WorklistMainService } from '../notification/service/work-list.main.service';
 import { isThisISOWeek } from 'date-fns';
 import { Router } from '@angular/router';
-// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { NFC, Ndef } from "@ionic-native/nfc/ngx"
 import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
@@ -170,7 +170,7 @@ export class HomePage implements OnInit {
     public workListService: WorklistMainService,
     public router: Router,
     private platform: Platform,
-    // public backgroundGeolocation: BackgroundGeolocation,
+    public backgroundGeolocation: BackgroundGeolocation,
     public modalController: ModalController,
     private nfc: NFC,
     public firebasex: FirebaseX
@@ -283,20 +283,20 @@ export class HomePage implements OnInit {
       this.location = granted as boolean;
       if (this.location) {
         if (this.platform.is('android')) {
-          // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+          this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
-          //   if (resp && (resp.latitude && resp.longitude)) {
+            if (resp && (resp.latitude && resp.longitude)) {
-          //     if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
+              if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
-          //       this.isFakeLocationUsed = true;
+                this.isFakeLocationUsed = true;
-          //     }
+              }
-          //     this.lat = resp.latitude;
+              this.lat = resp.latitude;
-          //     this.longt = resp.longitude;
+              this.longt = resp.longitude;
-          //     this.attendance();
+              this.attendance();
-          //   } else {
+            } else {
-          //     this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+              this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-          //   }
+            }
-          // }, (error) => {
+          }, (error) => {
-          //   this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+            this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-          // });
+          });
         } else {
           this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
             if (resp && resp.coords.latitude && resp.coords.longitude) {