diff --git a/Mohem/config.xml b/Mohem/config.xml index d3a1da44..48ead64b 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -50,9 +50,6 @@ - - - @@ -112,29 +109,21 @@ - - - - - - - - diff --git a/Mohem/package.json b/Mohem/package.json index b1132541..fca1c296 100644 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -24,11 +24,8 @@ "@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", - "@ionic-native/ble": "^5.18.0", "@ionic-native/camera": "^5.18.0", "@ionic-native/core": "^5.8.0", "@ionic-native/date-picker": "^5.10.0", @@ -41,24 +38,17 @@ "@ionic-native/file-picker": "^5.36.0", "@ionic-native/fingerprint-aio": "^5.18.0", "@ionic-native/firebase-x": "^5.34.0", - "@ionic-native/geolocation": "^5.10.0", "@ionic-native/globalization": "^5.18.0", "@ionic-native/health": "^5.4.0", - "@ionic-native/in-app-browser": "^5.17.0", "@ionic-native/keyboard": "^5.17.0", "@ionic-native/launch-navigator": "^5.17.0", "@ionic-native/local-notifications": "^5.17.0", "@ionic-native/native-storage": "^5.17.0", - "@ionic-native/nfc": "^5.30.0", "@ionic-native/open-native-settings": "^5.14.0", "@ionic-native/sms-retriever": "^5.36.0", - "@ionic-native/social-sharing": "^5.34.0", "@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", "@ng-bootstrap/ng-bootstrap": "^4.2.2", "@swimlane/ngx-charts": "^10.1.0", @@ -69,7 +59,6 @@ "cordova-android": "^8.1.0", "cordova-android-support-gradle-release": "^3.0.1", "cordova-open-native-settings": "^1.5.2", - "cordova-opentok-android-permissions": "^1.0.1", "cordova-plugin-actionsheet": "^2.3.3", "cordova-plugin-add-swift-support": "^2.0.2", "cordova-plugin-android-permissions": "^1.0.2", @@ -78,7 +67,6 @@ "cordova-plugin-appavailability": "^0.4.2", "cordova-plugin-apprate": "^1.4.0", "cordova-plugin-badge": "^0.8.8", - "cordova-plugin-ble-central": "^1.2.4", "cordova-plugin-camera": "^4.1.0", "cordova-plugin-datepicker": "^0.9.3", "cordova-plugin-device": "^2.0.3", @@ -90,9 +78,7 @@ "cordova-plugin-filepicker": "^1.1.6", "cordova-plugin-fingerprint-aio": "^3.0.0", "cordova-plugin-firebasex": "^13.0.0", - "cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-globalization": "^1.11.0", - "cordova-plugin-inappbrowser": "^3.1.0", "cordova-plugin-ionic-keyboard": "^2.2.0", "cordova-plugin-ionic-webview": "^4.1.0", "cordova-plugin-local-notification": "^0.9.0-beta.2", @@ -100,16 +86,12 @@ "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", "cordova-sqlite-storage": "^3.4.0", "cordova-support-google-services": "^1.3.2", "cordova.plugins.diagnostic": "^5.0.1", "core-js": "^2.5.4", "date-fns": "^1.30.1", - "es6-promise-plugin": "^4.1.0", "ionic2-calendar": "^0.5.8", "ionic4-rating": "^1.0.9", "ng-circle-progress": "^1.5.1", @@ -117,8 +99,6 @@ "ng2-pdf-viewer": "^5.3.2", "ngx-gauge": "^1.0.0-beta.10", "npm": "^6.14.11", - "phonegap-nfc": "^1.2.0", - "phonegap-plugin-barcodescanner": "^8.1.0", "phonegap-plugin-multidex": "^1.0.0", "primeicons": "^1.0.0", "primeng": "^7.1.3", @@ -145,8 +125,6 @@ "@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", "jasmine-spec-reporter": "~4.2.1", "karma": "^4.0.1", @@ -173,10 +151,6 @@ "cordova-plugin-badge": {}, "cordova-plugin-ionic-keyboard": {}, "cordova-plugin-datepicker": {}, - "cordova-plugin-geolocation": {}, - "phonegap-plugin-barcodescanner": { - "ANDROID_SUPPORT_V4_VERSION": "27.+" - }, "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, @@ -191,12 +165,8 @@ "cordova-plugin-filepath": {}, "com-badrit-base64": {}, "cordova-sqlite-storage": {}, - "cordova-plugin-ble-central": {}, "uk.co.workingedge.phonegap.plugin.launchnavigator": {}, - "cordova-plugin-themeablebrowser": {}, - "cordova-plugin-inappbrowser": {}, "cordova-plugin-local-notification": {}, - "cordova-opentok-android-permissions": {}, "cordova-plugin-appavailability": {}, "cordova-plugin-apprate": {}, "cordova-plugin-fingerprint-aio": { @@ -204,12 +174,6 @@ }, "cordova-plugin-androidx": {}, "cordova-plugin-androidx-adapter": {}, - "cordova-plugin-background-geolocation": { - "GOOGLE_PLAY_SERVICES_VERSION": "+" - }, - "phonegap-nfc": {}, - "wifiwizard2": {}, - "cordova-plugin-x-socialsharing": {}, "cordova-plugin-firebasex": { "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", @@ -246,8 +210,8 @@ "cordova-plugin-filechooser": {} }, "platforms": [ - "android", - "ios" + "ios", + "android" ] } } \ No newline at end of file diff --git a/Mohem/resources/android/icon/drawable-hdpi-icon.png b/Mohem/resources/android/icon/drawable-hdpi-icon.png index 5d46f3d9..69acdfc1 100644 Binary files a/Mohem/resources/android/icon/drawable-hdpi-icon.png and b/Mohem/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-ldpi-icon.png b/Mohem/resources/android/icon/drawable-ldpi-icon.png index 8c1510b7..1ea2048e 100644 Binary files a/Mohem/resources/android/icon/drawable-ldpi-icon.png and b/Mohem/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-mdpi-icon.png b/Mohem/resources/android/icon/drawable-mdpi-icon.png index 193a0f48..438a8501 100644 Binary files a/Mohem/resources/android/icon/drawable-mdpi-icon.png and b/Mohem/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xhdpi-icon.png b/Mohem/resources/android/icon/drawable-xhdpi-icon.png index bc2b18f2..e219dada 100644 Binary files a/Mohem/resources/android/icon/drawable-xhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png index 48e05221..af5d4980 100644 Binary files a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png index 8c63ef9b..60fc51a4 100644 Binary files a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png index 0977910a..b7f86503 100644 Binary files a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png index 659aa8b4..c54fe8e4 100644 Binary files a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png and b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png index 278d3f41..2af050d4 100644 Binary files a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png index 40bd91f2..e3c292d0 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png index 7a31c133..ee24ef27 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png index 8079a542..d3ebd8ad 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png index d85466a8..6edd2239 100644 Binary files a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png index 1a4ee053..aadc12b8 100644 Binary files a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png and b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png index 1afc62ac..4ccba043 100644 Binary files a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png index 7ecd3276..c496f3db 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png index 208583df..1c2f9ea7 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png index 6635eb66..fff51003 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/Mohem/src/app/app.module.ts b/Mohem/src/app/app.module.ts index bce56c04..4f196c0f 100644 --- a/Mohem/src/app/app.module.ts +++ b/Mohem/src/app/app.module.ts @@ -8,16 +8,16 @@ import { StatusBar } from '@ionic-native/status-bar/ngx'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ZBar } from '@ionic-native/zbar/ngx'; -import { Geolocation } from '@ionic-native/geolocation/ngx'; +// import { ZBar } from '@ionic-native/zbar/ngx'; +// import { Geolocation } from '@ionic-native/geolocation/ngx'; import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import { FilePath } from '@ionic-native/file-path/ngx'; import { File } from '@ionic-native/file/ngx'; import { Base64 } from '@ionic-native/base64/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { NgCalendarModule } from 'ionic2-calendar'; -import { NFC, Ndef} from "@ionic-native/nfc/ngx" -import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; +// import { NFC, Ndef} from "@ionic-native/nfc/ngx" +// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { DigitalIdComponent } from './authentication/digital-id/digital-id.component'; import { BusinessCardComponent } from './authentication/business-card/business-card.component'; import { AppUpdateComponent } from './authentication/app-update/app-update.component'; @@ -38,17 +38,17 @@ import { AppUpdateComponent } from './authentication/app-update/app-update.compo providers: [ StatusBar, SplashScreen, - ZBar, - Geolocation, + // ZBar, + // Geolocation, Camera, File, FilePath, Base64, FirebaseX, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, - NFC, - Ndef, - WifiWizard2 + // NFC, + // Ndef, + // WifiWizard2 ], bootstrap: [AppComponent] }) diff --git a/Mohem/src/app/attendance/home/home.component.ts b/Mohem/src/app/attendance/home/home.component.ts index 4e9fe3dc..fb096330 100644 --- a/Mohem/src/app/attendance/home/home.component.ts +++ b/Mohem/src/app/attendance/home/home.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { Geolocation } from '@ionic-native/geolocation/ngx'; -import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; +// import { Geolocation } from '@ionic-native/geolocation/ngx'; +// import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @@ -11,28 +11,28 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl }) export class HomeComponent implements OnInit { - zbarOptions: any; + // zbarOptions: any; scannedResult: any; lat: any; longt: any; - constructor(public ts: TranslatorService, private zbar: ZBar, private geolocation: Geolocation) { + constructor(public ts: TranslatorService) { - this.zbarOptions = { - flash: 'off', - drawSight: false - }; + // this.zbarOptions = { + // flash: 'off', + // drawSight: false + // }; console.log('your currnt location is'); - this.geolocation.getCurrentPosition().then((resp) => { - // resp.coords.latitude - // resp.coords.longitude - // console.log("Loc 2"); - console.log(resp.coords.latitude); - console.log(resp.coords.longitude); - this.lat = resp.coords.latitude; - this.longt = resp.coords.longitude; - }).catch((error) => { - console.log('Error getting location', error); - }); + // this.geolocation.getCurrentPosition().then((resp) => { + // // resp.coords.latitude + // // resp.coords.longitude + // // console.log("Loc 2"); + // console.log(resp.coords.latitude); + // console.log(resp.coords.longitude); + // this.lat = resp.coords.latitude; + // this.longt = resp.coords.longitude; + // }).catch((error) => { + // console.log('Error getting location', error); + // }); this.scanCode(); } @@ -43,13 +43,13 @@ export class HomeComponent implements OnInit { } scanCode() { - this.zbar.scan(this.zbarOptions) - .then(result => { - console.log(result); // Scanned code - this.scannedResult = result; - }) - .catch(error => { - alert(error); // Error message - }); + // this.zbar.scan(this.zbarOptions) + // .then(result => { + // console.log(result); // Scanned code + // this.scannedResult = result; + // }) + // .catch(error => { + // alert(error); // Error message + // }); } } diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss index 661dd844..d636c587 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss @@ -2,9 +2,6 @@ height: 25vh; } -ion-content { - --background: #f5f5f5; -} .button-digital-id { --background: white !important; diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 85c98153..1486bf41 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -17,7 +17,7 @@ import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/aut import { LoginModel } from '../models/LoginModel'; import * as moment from 'moment'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; -import { NFC } from "@ionic-native/nfc/ngx"; +// import { NFC } from "@ionic-native/nfc/ngx"; import { DigitalIdComponent } from '../digital-id/digital-id.component'; import { AppUpdateComponent } from '../app-update/app-update.component'; import { Password } from '../models/password'; @@ -69,7 +69,7 @@ export class ConfirmLoginComponent implements OnInit { public platform: Platform, public modalController: ModalController, public alertController: AlertController, - private nfc: NFC, + // private nfc: NFC, private smsRetriever: SmsRetriever ) { this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); @@ -353,20 +353,20 @@ export class ConfirmLoginComponent implements OnInit { } async checkNFCStatus() { - try { - let nfcStatus = await this.nfc.enabled(); - console.log("nfc status >>>>>>>>>>" + nfcStatus); - this.isNFCAvailable = true; - } catch (err) { - console.log("Error reading tag", err); - if (err === "NO_NFC") { - this.isNFCAvailable = false; - } else if (err === "NFC_DISABLED") { - this.isNFCAvailable = true; - } else { - this.isNFCAvailable = false; - } - } + // try { + // let nfcStatus = await this.nfc.enabled(); + // console.log("nfc status >>>>>>>>>>" + nfcStatus); + // this.isNFCAvailable = true; + // } catch (err) { + // console.log("Error reading tag", err); + // if (err === "NO_NFC") { + // this.isNFCAvailable = false; + // } else if (err === "NFC_DISABLED") { + // this.isNFCAvailable = true; + // } else { + // this.isNFCAvailable = false; + // } + // } } public checkSMS() { diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 7112bca2..57d0feba 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -24,7 +24,7 @@ import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/ import * as moment from 'moment'; -import { NFC } from "@ionic-native/nfc/ngx"; +// import { NFC } from "@ionic-native/nfc/ngx"; import { SmsRetriever } from '@ionic-native/sms-retriever/ngx'; @@ -125,7 +125,7 @@ export class SmsPageComponent implements OnInit { public platform: Platform, - private nfc: NFC, + // private nfc: NFC, private smsRetriever: SmsRetriever @@ -367,33 +367,33 @@ export class SmsPageComponent implements OnInit { async checkNFCStatus() { - try { + // try { - let nfcStatus = await this.nfc.enabled(); + // let nfcStatus = await this.nfc.enabled(); - console.log("nfc status >>>>>>>>>>" + nfcStatus); + // console.log("nfc status >>>>>>>>>>" + nfcStatus); - this.isNFCAvailable = true; + // this.isNFCAvailable = true; - } catch (err) { + // } catch (err) { - console.log("Error reading tag", err); + // console.log("Error reading tag", err); - if (err === "NO_NFC") { + // if (err === "NO_NFC") { - this.isNFCAvailable = false; + // this.isNFCAvailable = false; - } else if (err === "NFC_DISABLED") { + // } else if (err === "NFC_DISABLED") { - this.isNFCAvailable = true; + // this.isNFCAvailable = true; - } else { + // } else { - this.isNFCAvailable = false; + // this.isNFCAvailable = false; - } + // } - } + // } } diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index 2b8da3ac..650f4c15 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -21,7 +21,7 @@ import { TranslatePipe } from './pipes/translate/translate.pipe'; import { DatePipeTransform } from './pipes/date/date.pipe'; import { AlertControllerService } from './ui/alert/alert-controller.service'; import { DateTimePipe } from './pipes/date-time/date-time.pipe'; -import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; +// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; import { LaunchNavigator } from '@ionic-native/launch-navigator/ngx'; import { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe'; import { BackButtonComponent } from './ui/back-button/back-button.component'; @@ -78,7 +78,7 @@ import { RouterModule } from '@angular/router'; import { HeaderButtonComponent } from './ui/header-button/header-button.component'; import { AppRate } from '@ionic-native/app-rate/ngx'; import { RatingService } from './services/rating/rating.service'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { RateService } from './services/rate/rate.service'; import { MenuService } from './services/menu/menuservice.service'; import { ReplacementListComponent } from '../vacation-rule/replacement-list/replacement-list.component'; @@ -99,7 +99,7 @@ import { ConfirmLoginComponent } from '../authentication/confirm-login/confirm-l import { WelcomeComponent } from './ui/welcome-login/welcome.component' import { FabButtonComponent } from './ui/fab-button/fab-button.component' import { AttendScanService } from './services/attend-services/attend-scan.service'; -import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; +// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { NgCircleProgressModule } from 'ng-circle-progress'; import { CardFilterComponent } from './ui/card-filter/card-filter.component'; import { EmployeeInformationComponent } from './ui/employee-information/employee-information.component'; @@ -108,7 +108,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'; @@ -287,7 +287,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe'; Globalization, SharedDataService, AlertControllerService, - ThemeableBrowser, + // ThemeableBrowser, LaunchNavigator, ProjectsService, NationalityService, @@ -309,14 +309,14 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe'; Diagnostic, AppRate, RatingService, - InAppBrowser, + // InAppBrowser, RateService, Camera, File, MenuService, OpenNativeSettings, - BarcodeScanner, - BackgroundGeolocation, + // BarcodeScanner, + // BackgroundGeolocation, FileOpener, FilePath, FileChooser, diff --git a/Mohem/src/app/hmg-common/hmg_utils.ts b/Mohem/src/app/hmg-common/hmg_utils.ts index d29b9946..cf15a655 100644 --- a/Mohem/src/app/hmg-common/hmg_utils.ts +++ b/Mohem/src/app/hmg-common/hmg_utils.ts @@ -1,9 +1,9 @@ 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'; -import { Geolocation } from '@ionic-native/geolocation/ngx'; +// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Platform } from "@ionic/angular"; declare const cordova: any; @@ -13,10 +13,10 @@ declare const cordova: any; }) export class HMGUtils { constructor( - public backgroundGeolocation: BackgroundGeolocation, + // public backgroundGeolocation: BackgroundGeolocation, public common: CommonService, public ts: TranslatorService, - private geolocation: Geolocation, + // private geolocation: Geolocation, public platform: Platform, public devicePermissionsService:DevicePermissionsService, ) { } @@ -98,32 +98,32 @@ export class HMGUtils { } private getGMSLocation(callBack: Function) { - this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { - if (resp && (resp.latitude && resp.longitude)) { - const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; - const lat = resp.latitude; - const long = resp.longitude; - callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) - } else { - this.common.presentAlert(this.ts.trPK('home', 'position-error')); - } - }, (error) => { - this.common.presentAlert(this.ts.trPK('home', 'position-error')); - }); + // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { + // if (resp && (resp.latitude && resp.longitude)) { + // const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; + // const lat = resp.latitude; + // const long = resp.longitude; + // callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) + // } else { + // this.common.presentAlert(this.ts.trPK('home', 'position-error')); + // } + // }, (error) => { + // this.common.presentAlert(this.ts.trPK('home', 'position-error')); + // }); } private getIOSLocation(callBack: Function) { - this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { - if (resp && resp.coords.latitude && resp.coords.longitude) { - const lat = resp.coords.latitude; - const long = resp.coords.longitude; - callBack({"latitude":lat, "longitude":long, "isfake":false}) - } else { - this.common.presentAlert(this.ts.trPK('home', 'position-error')); - } - }).catch(error => { - this.common.presentAlert(this.ts.trPK('home', 'position-error')); - }); + // this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { + // if (resp && resp.coords.latitude && resp.coords.longitude) { + // const lat = resp.coords.latitude; + // const long = resp.coords.longitude; + // callBack({"latitude":lat, "longitude":long, "isfake":false}) + // } else { + // this.common.presentAlert(this.ts.trPK('home', 'position-error')); + // } + // }).catch(error => { + // this.common.presentAlert(this.ts.trPK('home', 'position-error')); + // }); } diff --git a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts index 29c24f36..1b74485b 100644 --- a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts +++ b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@angular/core'; // import { DevicePermissionsService } from '../device-permissions/device-permissions.service'; import { DomSanitizer } from '@angular/platform-browser'; import { SharedDataService } from '../shared-data-service/shared-data.service'; -import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; +// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { AttendanceService } from 'src/app/home/services/attendance.services'; -import { ZBar } from '@ionic-native/zbar/ngx'; -import { Geolocation } from '@ionic-native/geolocation/ngx'; +// import { ZBar } from '@ionic-native/zbar/ngx'; +// import { Geolocation } from '@ionic-native/geolocation/ngx'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { AuthenticatedUser } from '../authentication/models/authenticated-user'; import { CommonService } from '../common/common.service'; @@ -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'; @@ -37,17 +37,17 @@ export class AttendScanService { public collection = 'CS'; constructor(private device: Device, - private zbar: ZBar, - private geolocation: Geolocation, + // private zbar: ZBar, + // private geolocation: Geolocation, private attendance_service: AttendanceService, - private barcodeScanner: BarcodeScanner, + // private barcodeScanner: BarcodeScanner, private cameraController: Camera, public sharedData: SharedDataService, private sanitizer: DomSanitizer, private permissions: DevicePermissionsService, public common: CommonService, public ts: TranslatorService, - public backgroundGeolocation: BackgroundGeolocation, + // public backgroundGeolocation: BackgroundGeolocation, public platform: Platform, public modalController: ModalController, public firebasex: FirebaseX, @@ -135,22 +135,22 @@ export class AttendScanService { } scanCode() { - this.barcodeScanner - .scan() - .then(barcodeData => { - if (!barcodeData.cancelled) { - this.scannedResult = barcodeData; - this.deviceID = this.device.uuid; - if (this.isFakeLocationUsed) { - this.fakeSwipeAttendance(); - } else { - this.swipeAttendance(); - } - } - }) - .catch(err => { - console.log('Error', err); - }); + // this.barcodeScanner + // .scan() + // .then(barcodeData => { + // if (!barcodeData.cancelled) { + // this.scannedResult = barcodeData; + // this.deviceID = this.device.uuid; + // if (this.isFakeLocationUsed) { + // this.fakeSwipeAttendance(); + // } else { + // this.swipeAttendance(); + // } + // } + // }) + // .catch(err => { + // console.log('Error', err); + // }); } fakeSwipeAttendance() { diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 5b827761..f41e90e8 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -13,7 +13,7 @@ import { AlertControllerService } from '../../ui/alert/alert-controller.service' //import { Response } from "../models/response"; import { Response } from 'src/app/hmg-common/services/models/response'; import { Location, DatePipe } from '@angular/common'; -import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; +// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; import { BrowserConfig } from './models/browser-config'; import { LaunchNavigator, @@ -26,7 +26,7 @@ import { SharedDataService } from '../shared-data-service/shared-data.service'; import { Badge } from '@ionic-native/badge/ngx'; import { LifeCycleService } from '../life-cycle/life-cycle.service'; import { Diagnostic } from '@ionic-native/diagnostic/ngx'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; @Injectable({ providedIn: 'root' @@ -105,7 +105,7 @@ export class CommonService { public toastController: ToastController, public alertController: AlertControllerService, public alertControllerIonic: AlertController, - public themeableBrowser: ThemeableBrowser, + // public themeableBrowser: ThemeableBrowser, public launchNavigation: LaunchNavigator, public platform: Platform, public device: Device, @@ -113,7 +113,7 @@ export class CommonService { public badge: Badge, public lifeCycle: LifeCycleService, public diagnostic: Diagnostic, - public iab: InAppBrowser, + // public iab: InAppBrowser, private menu: MenuController, ) { } @@ -683,52 +683,52 @@ export class CommonService { onSuccess?, successURLS?: string[] ) { - this.platform.ready().then(() => { - const browser = this.iab.create( - url, - '_blank', - 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no' - ); - - // browser.executeScript(...); - - // browser.insertCSS(...); - browser.on('loaderror').subscribe(event => { - if (onFaild) { - onFaild(); - } - browser.close(); - }); - - /* - browser.on('loadstop').subscribe(event => { - // browser.insertCSS({ code: 'body{color: white;}' }); - if (onSuccess) { - onSuccess(); - } - }); - */ - - browser.on('exit').subscribe(event => { - if (onExit) { - onExit(); - } - }); - - browser.on('loadstart').subscribe(event => { - if (successURLS) { - successURLS.forEach((successURL, index) => { - if (event.url && event.url.indexOf(successURL) >= 0) { - // alert('load start found success url'); - browser.close(); - if (onSuccess) { - onSuccess(); - } - } - }); - } - }); - }); + // this.platform.ready().then(() => { + // const browser = this.iab.create( + // url, + // '_blank', + // 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no' + // ); + + // // browser.executeScript(...); + + // // browser.insertCSS(...); + // browser.on('loaderror').subscribe(event => { + // if (onFaild) { + // onFaild(); + // } + // browser.close(); + // }); + + // /* + // browser.on('loadstop').subscribe(event => { + // // browser.insertCSS({ code: 'body{color: white;}' }); + // if (onSuccess) { + // onSuccess(); + // } + // }); + // */ + + // browser.on('exit').subscribe(event => { + // if (onExit) { + // onExit(); + // } + // }); + + // browser.on('loadstart').subscribe(event => { + // if (successURLS) { + // successURLS.forEach((successURL, index) => { + // if (event.url && event.url.indexOf(successURL) >= 0) { + // // alert('load start found success url'); + // browser.close(); + // if (onSuccess) { + // onSuccess(); + // } + // } + // }); + // } + // }); + // }); } public imageFromBase64(base64: string) { diff --git a/Mohem/src/app/hmg-common/services/common/models/browser-config.ts b/Mohem/src/app/hmg-common/services/common/models/browser-config.ts index 8cb6822b..4a070f8d 100644 --- a/Mohem/src/app/hmg-common/services/common/models/browser-config.ts +++ b/Mohem/src/app/hmg-common/services/common/models/browser-config.ts @@ -1,64 +1,64 @@ -import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx'; +// import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx'; export class BrowserConfig { - public static OPTIONS: ThemeableBrowserOptions = { - statusbar: { - color: '#ffffffff' - }, - toolbar: { - height: 44, - color: '#f0f0f0ff' - }, - title: { - color: '#003264ff', - showPageTitle: true - }, - backButton: { - image: 'back', - imagePressed: 'back_pressed', - align: 'left', - event: 'backPressed' - }, - forwardButton: { - image: 'forward', - imagePressed: 'forward_pressed', - align: 'left', - event: 'forwardPressed' - }, - closeButton: { - image: 'close', - imagePressed: 'close_pressed', - align: 'left', - event: 'closePressed' - }, - customButtons: [ - { - image: 'share', - imagePressed: 'share_pressed', - align: 'right', - event: 'sharePressed' - } - ], - menu: { - image: 'menu', - imagePressed: 'menu_pressed', - title: 'Test', - cancel: 'Cancel', - align: 'right', - items: [ - { - event: 'helloPressed', - label: 'Hello World!' - }, - { - event: 'testPressed', - label: 'Test!' - } - ] - }, - backButtonCanClose: true, - clearcache: true, - clearsessioncache: true, - disallowoverscroll: 'yes' - }; + // public static OPTIONS: ThemeableBrowserOptions = { + // statusbar: { + // color: '#ffffffff' + // }, + // toolbar: { + // height: 44, + // color: '#f0f0f0ff' + // }, + // title: { + // color: '#003264ff', + // showPageTitle: true + // }, + // backButton: { + // image: 'back', + // imagePressed: 'back_pressed', + // align: 'left', + // event: 'backPressed' + // }, + // forwardButton: { + // image: 'forward', + // imagePressed: 'forward_pressed', + // align: 'left', + // event: 'forwardPressed' + // }, + // closeButton: { + // image: 'close', + // imagePressed: 'close_pressed', + // align: 'left', + // event: 'closePressed' + // }, + // customButtons: [ + // { + // image: 'share', + // imagePressed: 'share_pressed', + // align: 'right', + // event: 'sharePressed' + // } + // ], + // menu: { + // image: 'menu', + // imagePressed: 'menu_pressed', + // title: 'Test', + // cancel: 'Cancel', + // align: 'right', + // items: [ + // { + // event: 'helloPressed', + // label: 'Hello World!' + // }, + // { + // event: 'testPressed', + // label: 'Test!' + // } + // ] + // }, + // backButtonCanClose: true, + // clearcache: true, + // clearsessioncache: true, + // disallowoverscroll: 'yes' + // }; } diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index de91469a..0b9240c4 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,7 +27,7 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - //public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/'; // public static host = 'http://10.0.50.241:1010/' // MOE vpn public static host = 'https://hrmsys.moenergy.gov.sa/' diff --git a/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts b/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts index a901e164..193ae520 100644 --- a/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts +++ b/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts @@ -1,74 +1,74 @@ import { Injectable } from '@angular/core'; -import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx'; +// import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx'; import { Platform } from '@ionic/angular'; @Injectable({ providedIn: 'root' }) export class HmgBrowserService { - static options: ThemeableBrowserOptions = { - statusbar: { - color: '#ffffffff' - }, - toolbar: { - height: 44, - color: '#f0f0f0ff' - }, - title: { - color: '#60686b', - showPageTitle: true - }, - backButton: { - image: 'back', - imagePressed: 'back_pressed', - align: 'left', - event: 'backPressed' - }, - forwardButton: { - image: 'forward', - imagePressed: 'forward_pressed', - align: 'left', - event: 'forwardPressed' - }, - closeButton: { - image: 'close', - imagePressed: 'close_pressed', - align: 'left', - event: 'closePressed' - }, - /* - customButtons: [ - { - image: 'share', - imagePressed: 'share_pressed', - align: 'right', - event: 'sharePressed' - } - ], - menu: { - image: 'menu', - imagePressed: 'menu_pressed', - title: 'Test', - cancel: 'Cancel', - align: 'right', - items: [ - { - event: 'helloPressed', - label: 'Hello World!' - }, - { - event: 'testPressed', - label: 'Test!' - } - ] - }, - */ - backButtonCanClose: true - }; + // static options: ThemeableBrowserOptions = { + // statusbar: { + // color: '#ffffffff' + // }, + // toolbar: { + // height: 44, + // color: '#f0f0f0ff' + // }, + // title: { + // color: '#60686b', + // showPageTitle: true + // }, + // backButton: { + // image: 'back', + // imagePressed: 'back_pressed', + // align: 'left', + // event: 'backPressed' + // }, + // forwardButton: { + // image: 'forward', + // imagePressed: 'forward_pressed', + // align: 'left', + // event: 'forwardPressed' + // }, + // closeButton: { + // image: 'close', + // imagePressed: 'close_pressed', + // align: 'left', + // event: 'closePressed' + // }, + // /* + // customButtons: [ + // { + // image: 'share', + // imagePressed: 'share_pressed', + // align: 'right', + // event: 'sharePressed' + // } + // ], + // menu: { + // image: 'menu', + // imagePressed: 'menu_pressed', + // title: 'Test', + // cancel: 'Cancel', + // align: 'right', + // items: [ + // { + // event: 'helloPressed', + // label: 'Hello World!' + // }, + // { + // event: 'testPressed', + // label: 'Test!' + // } + // ] + // }, + // */ + // backButtonCanClose: true + // }; - private browser: ThemeableBrowserObject; + // private browser: ThemeableBrowserObject; constructor( - private themeableBrowser: ThemeableBrowser, + // private themeableBrowser: ThemeableBrowser, private platform: Platform ) { } @@ -81,18 +81,18 @@ export class HmgBrowserService { } private registerEvent(eventName: string, event: any) { - if (this.browser) { - this.browser.on(eventName).subscribe((data: any) => { - if (event) { - event(); - } - }); - } + // if (this.browser) { + // this.browser.on(eventName).subscribe((data: any) => { + // if (event) { + // event(); + // } + // }); + // } } public openURLThemable(url: string) { this.platform.ready().then(() => { - this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options); + // this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options); }); } diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html index d7178526..e655a1a3 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html @@ -1,4 +1,4 @@ - +