diff --git a/Mohem/call b/Mohem/call index 2fe4d09c..425727fe 100644 --- a/Mohem/call +++ b/Mohem/call @@ -1 +1 @@ -to add ios - ionic cordova platform add ios +to add ios - ionic cordova platform add ios diff --git a/Mohem/install-plugins.sh b/Mohem/install-plugins.sh new file mode 100644 index 00000000..1a6adb31 --- /dev/null +++ b/Mohem/install-plugins.sh @@ -0,0 +1,167 @@ +#!/bin/sh + +echo start installing required native and 3rd party plugins + +echo to update angular -> npm install -g @angular/cli +echo to update ionic -> npm install -g ionic + +echo add browser, android , ios platforms commit non required +echo to add browser -> call ionic cordova platform add browser +echo to add ios -> call ionic cordova platform add ios + +ionic cordova platform add android + +echo copying android FCM google servcie file + cp ./google-services.json ./platforms/android/ + + npm i @angular/animations + npm i @swimlane/ngx-charts --save + +echo primeng framework [angular] + + npm install primeng --save + npm install primeicons --save + +echo add css links for primeng in global.scss +echo @import "../node_modules/primeng/resources/themes/nova-light/theme.css"; +echo @import "../node_modules/primeng/resources/primeng.min.css"; +echo @import "../node_modules/primeicons/primeicons.css"; + +echo install chartjs as dependency for primeng chartjs +npm install chart.js --save +# echo add reference in [angular.json] in [scripts] array add (node_modules/chart.js/dist/Chart.js) + + +echo calendar https://mattlewis92.github.io/angular-calendar/#/kitchen-sink + npm install --save @ng-bootstrap/ng-bootstrap + npm install --save angular-calendar date-fns + +echo install android support gradle release because of barcode scanner to install missing android attributes +ionic cordova plugin add cordova-android-support-gradle-release --fetch + + +echo push notifications +ionic cordova plugin add phonegap-plugin-push --variable GOOGLE_PLAY_SERVICES_VERSION="16.0.0" --variable FCM_VERSION="15.0.0" +npm install @ionic-native/push + + +echo sqlite storage + ionic cordova plugin add cordova-sqlite-storage + npm install @ionic-native/sqlite + + +echo native storage + ionic cordova plugin add cordova-plugin-nativestorage + npm install @ionic-native/native-storage + + +echo bluetooth ble centeral //check interface assets/js/bletooth.js + ionic cordova plugin add cordova-plugin-ble-central + npm install @ionic-native/ble + + +echo launch navigator +echo warning : for now we stick with launch navigator 3 since 5 has issue +# call ionic cordova plugin add uk.co.workingedge.phonegap.plugin.launchnavigator --variable GOOGLE_API_KEY_FOR_ANDROID="AIzaSyC-XbzwGMyAVCnspof0cqiO4iLfKmeEYVA" + ionic cordova plugin add uk.co.workingedge.phonegap.plugin.launchnavigator@3 + npm install @ionic-native/launch-navigator + + echo themeablebrowser + + ionic cordova plugin add cordova-plugin-themeablebrowser + npm install @ionic-native/themeable-browser + +echo in app browser +ionic cordova plugin add cordova-plugin-inappbrowser +npm install @ionic-native/in-app-browser + + +echo globalization + + ionic cordova plugin add cordova-plugin-globalization + npm install @ionic-native/globalization + + +echo android permissions plugin + ionic cordova plugin add cordova-plugin-android-permissions + npm install @ionic-native/android-permissions + +echo sms reader https://www.npmjs.com/package/cordova-plugin-sms-receive + npm i cordova-plugin-sms-receive + cordova plugin add cordova-plugin-sms-receive + +echo device information§ + ionic cordova plugin add cordova-plugin-device + npm install @ionic-native/device + +echo local notifications + ionic cordova plugin add cordova-plugin-local-notification + npm install @ionic-native/local-notifications + +echo call phone number + ionic cordova plugin add call-number + npm install @ionic-native/call-number + +echo badge + ionic cordova plugin add cordova-plugin-badge + npm install @ionic-native/badge + + +echo biometric features + ionic cordova plugin add cordova-plugin-fingerprint-aio --variable FACEID_USAGE_DESCRIPTION="User Authentication" + npm install @ionic-native/fingerprint-aio + +echo install diagnostic + ionic cordova plugin add cordova.plugins.diagnostic + npm install @ionic-native/diagnostic + +echo install background-geolocation + ionic cordova plugin add cordova-plugin-mauron85-background-geolocation@alpha --variable GOOGLE_PLAY_SERVICES_VERSION="16.0.0" + npm install @ionic-native/background-geolocation + +echo install barcode plugin + ionic cordova plugin add phonegap-plugin-barcodescanner + npm install @ionic-native/barcode-scanner + +echo install camera plugin + ionic cordova plugin add cordova-plugin-camera + npm install @ionic-native/camera + +echo install keyboard plugin + ionic cordova plugin add cordova-plugin-ionic-keyboard + npm install @ionic-native/keyboard + +echo install opentok required permissions +ionic cordova plugin add cordova-opentok-android-permissions + +echo install health plugin +ionic cordova plugin add cordova-plugin-health --variable HEALTH_READ_PERMISSION="App needs read access to read heart rate" --variable HEALTH_WRITE_PERMISSION="App needs write access for heart rate" --variable GMS_VERSION="16.0.1" +npm install @ionic-native/health + +echo install App Availability Plugin +ionic cordova plugin add cordova-plugin-appavailability +npm install @ionic-native/app-availability + +echo install rate plugin +ionic cordova plugin add cordova-plugin-apprate +npm install @ionic-native/app-rate + + +echo reinitializing git repository +echo git init +echo git remote add origin https://enas_yaghi@hmg.git.cloudforge.com/patientappionic.git +echo git push -f origin master + + +echo update project from package.js change if necessary +echo to install all dependencies in package.json + +echo npm cache clean --force +echo exact version -> npm install --save --save-exact react +echo latest versions based on package.json rules -> npm install + +echo to build or serve for (( production )) +echo export NODE_OPTIONS=--max-old-space-size=4096 +echo ionic serve --prod -> for serving in production +echo ionic cordova build android --release --aot --minifyjs --optimizejs --minifycss +echo ionic cordova build ios --release --aot --minifyjs --optimizejs --minifycss diff --git a/Mohem/npm b/Mohem/npm index f4d3795b..cca3af47 100644 --- a/Mohem/npm +++ b/Mohem/npm @@ -1 +1 @@ -to update ionic - install -g ionic +latest versions based on package.json rules - install diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index 0908127d..3ef154ef 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -743,33 +743,54 @@ } }, "@ionic-native/android-permissions": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/android-permissions/-/android-permissions-5.8.0.tgz", - "integrity": "sha512-02VOlzmYmYl07f2XqLt7itCUBrS/kO8XP/0+b0R4p3ozZBxnEp/DKCjJoswiZpa++fmf9b3PfpJnPBGTyC/U0Q==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/android-permissions/-/android-permissions-5.16.0.tgz", + "integrity": "sha512-fOxH00vISgc+eNI3gwiQK1dzOFJ9z1fssiv8fWheJmjmX4F9owRw0phV0RTBHIg3HFSXumrycET47RnZOQRILA==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/app-availability": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/app-availability/-/app-availability-5.8.0.tgz", - "integrity": "sha512-v/7g7TGKZoC2WMIpnJPcpM7atzT8bejrRhgpOv1XyDTmQk0dz5ziSv4I42R30PN6jPwUkHKZI06LD1e1rZ8YbA==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/app-availability/-/app-availability-5.16.0.tgz", + "integrity": "sha512-tkzAfGCwINusbMKLslFXJMSX8ml3tu1oDdfpUy7W2ag81P5tB/9Z4D8FWp8leKuqDO7kJceZgtV6yem2FUFb4A==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/app-rate": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/app-rate/-/app-rate-5.8.0.tgz", - "integrity": "sha512-GugKjCv5ZcozCkl7G7pFbRIgutipXUXgsNUqcSmAmDwYoXTqfIgNeIBRCmCGW40b6bqNyXVpEdcMGEHnZVWh5w==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/app-rate/-/app-rate-5.16.0.tgz", + "integrity": "sha512-Kh9Ko/4kk/U2JUrf7E0hIHOOMKS8sU8UwiBTuH2gUp/RC+Hm4dLcFgTFOoJy3sYJX40bFjvWFQOUve3RY91HsQ==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/background-geolocation": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/background-geolocation/-/background-geolocation-5.8.0.tgz", - "integrity": "sha512-/2PmhKHMkYMESKAHqt0w7CUtzmdrrjG9OED9iHS67jR+04qu2pZCd/LQK3y8njfszxZE/9XyfUpI8UghImks9g==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/background-geolocation/-/background-geolocation-5.16.0.tgz", + "integrity": "sha512-rjkLLFAv5LrrN4yZ+UiLLUCraPsLf3t4VdYtfpNothPlHyvvx4sNGo4WuK/nLwr1NVc/NjMvf+SXHrJoMD0mIw==", "requires": { "@types/cordova": "^0.0.34" }, @@ -782,19 +803,33 @@ } }, "@ionic-native/badge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.8.0.tgz", - "integrity": "sha512-rhLyEP8p6jKA7/ynr+R/FMM+i4bkJzMMdGz+jfFvsIEDDSxdsi/hDeW9wkBDkiyA+paKRj3lEzc49gmX1bNFnQ==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/badge/-/badge-5.16.0.tgz", + "integrity": "sha512-jSUpX8r3IjSqDG3urs0IQQ1mVTkPnHYh9XloVrcGXppLlC5zvJ+B2PtWeWpQRa+cb7e+oK66QY9fr2/eAElkqQ==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/barcode-scanner": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.14.0.tgz", - "integrity": "sha512-FwTHQD5TUaR441V76IoXQmrSdz7AZ/qBfrfh/rDaXWgYHg7iJA3prOlBPCW+YGfLV3qvlRJeq/ASub/JkTBDrg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.16.0.tgz", + "integrity": "sha512-j1zqSZKbQUdX+lduLAYa49/U8lWIFX4MNpTLxfTFZLQjFNSrYarZJoijL15cvRUYkmN8TTJQ5x8bVaRL/t7eqA==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/base64": { @@ -813,17 +848,39 @@ } }, "@ionic-native/ble": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/ble/-/ble-5.8.0.tgz", - "integrity": "sha512-qlu6At74EqRcDVsdhXoDrJh6Vm1DTdVJUyQxAfMrIFYh6v75+XuGhcWl048FpOuvXs8+P9O9S3cM9QA+f4DLPw==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/ble/-/ble-5.16.0.tgz", + "integrity": "sha512-lp6D1msCtObPuhZrNezudXMKmauIOr4bKHO7/8LESFI2eurdrVtJNNZAhbBPnJp7OjeiolQpTHBQBZM1Od/tIQ==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } + } + }, + "@ionic-native/call-number": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.16.0.tgz", + "integrity": "sha512-LFqQ0y0R72ksC6hSlgIUDh6ul64JA5zmAV4AoaZ2/gfTR48xx+g3mVcs4i4Mn7YNj+gLddjHfZ69TOVMCJwbVw==", + "requires": { + "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/camera": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.14.0.tgz", - "integrity": "sha512-BykX5nOtwA/D8jmMgbsAJz3Vw45Uw26XKQRNPAqsthcS+jxoSbFeEsdWbSZjiCFVX1M+d7irq7GCi3H9SJ2bAA==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.16.0.tgz", + "integrity": "sha512-JrZkScGDy5pbqr1Ld+FrRgaOoEcGpWw9Hd9LgfzlD/Xs3B0ZEMp8sE8UnrIbDxPKQ/5bXV5WxC6mTNmYLKAszg==", "requires": { "@types/cordova": "^0.0.34" }, @@ -852,17 +909,24 @@ } }, "@ionic-native/device": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.8.0.tgz", - "integrity": "sha512-JXx7gR4cEKKwtLqKjTcAT9O8xQfANo3tEM0RJCbrHi9rUmx3xF9Y5WpqFK/eayyXt8J5+8HktZkAy+K/u0/D1A==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.16.0.tgz", + "integrity": "sha512-pQQn0YcYCTu+lVhOvIxmvE3XU21CGQrmwr/w7M0Mf8T9h+6bB9o6OMF1Q2WmbXtx3MeEGVB4HopGQ+ZDQL35MQ==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/diagnostic": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.14.0.tgz", - "integrity": "sha512-hptAqkpfyORE3uJamItsBVBVdQwjU/4aO8JLtnueTadGSbPNQfYoXpYONZzz8/qOkrw+Uvqr6/e7Eu9Lsk0Iyg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.16.0.tgz", + "integrity": "sha512-QgjwvWkrigJi/r+z8Ru1HZq6r1rem7PsN02ax/bEEcYy/p0zVr+75anQRzTyEC6IK3RkjRJ5a0kkB/YeT3+uoQ==", "requires": { "@types/cordova": "^0.0.34" }, @@ -905,11 +969,18 @@ } }, "@ionic-native/fingerprint-aio": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/fingerprint-aio/-/fingerprint-aio-5.8.0.tgz", - "integrity": "sha512-KVLV5a7zErFZBr18J+dQPBo5G7QoS6xOFKC+8lPRIKGlTVGEFUNAW66yyJk+qJTpRI966YKhGHKqcDsGplRnqA==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/fingerprint-aio/-/fingerprint-aio-5.16.0.tgz", + "integrity": "sha512-0Xz9KR24/f8CzAWQlFSODUrUGgt5iAnvJqwQ7wHlOwEFMPvXkWtbmQtUY0xyxlRU0CKIGrq0AASLtgN433IjZg==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/geolocation": { @@ -921,17 +992,24 @@ } }, "@ionic-native/globalization": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.8.0.tgz", - "integrity": "sha512-rIpce2YY3qFh5Gszpm9VhXbX+QR73WLwC8A2Rz3EZBS63lL9UR/THlXE2J5IJpY2pD0tXf8sgAtItUM8AlPOvg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.16.0.tgz", + "integrity": "sha512-bY3D8Z/hpboaNEo1vhZYUOtxD5oep05vQfWfkoIr3Rx2WLHDDDTQtNpKdvh5bqU3nwVbvvn0Jwe8c+unbWQCyQ==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/health": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/health/-/health-5.8.0.tgz", - "integrity": "sha512-zpBJJYuX3Oe39qhMSXeUb6Zreco5pu5fJBOuhPQy2pexgh6GwdEctNNC37SdHq2MK9afzraj+aiVJlNhDsLDsQ==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/health/-/health-5.16.0.tgz", + "integrity": "sha512-TJi9zfNE5OjY8IaV6vRIw6pkYIzDIfGuEw6nT4QRt5Kg4IlRh4Hao3GU7tWpAwmj4xWSWCYjLUK2gZp1q2xYQA==", "requires": { "@types/cordova": "^0.0.34" }, @@ -944,35 +1022,93 @@ } }, "@ionic-native/in-app-browser": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.8.0.tgz", - "integrity": "sha512-47QonrALGE8HHNm6+d3IQn8gbT0u2IvaPeRcUJNWhE+7LHPe6uBIcDN1pd4LyLOTA/KT/hQjGnZ414B6P9yuTg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.16.0.tgz", + "integrity": "sha512-OgrHGzY6Mf4mZCqMTdH4N+Z+SGMKPmvbnFokGFl/kmpLL83tSfO26E7PbSFMCCJPxsnI4X9bm9EXuzTrUPzhtg==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/keyboard": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.8.0.tgz", - "integrity": "sha512-uJ017rW3BE/FsucyXls4hgC7h07F6cKkurWzoOml6Cvb25vequNs859ZiBN4ahmRgKRaYPKPnw7K7wWqyCyvbg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.16.0.tgz", + "integrity": "sha512-WG0k2gI72nmyv8sH+5Q1Fp4WIKUBBF5es60pzwgqmo/Wle3EqneRHIVW445/Vrh93DFYMgZR0MPQlzjbzD40kQ==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/launch-navigator": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/launch-navigator/-/launch-navigator-5.8.0.tgz", - "integrity": "sha512-DoAm4y/UbpvfrYEDTqJvfx5xPk934Ta4XennDF8yk0o0oYCOk/9w/ULFcTk/kIvLVioR+kNMexlCR0jJPj7jyA==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/launch-navigator/-/launch-navigator-5.16.0.tgz", + "integrity": "sha512-oFtaw8Bdv66CHluyCOaWfceVSExBhfRsC1OBF7zTKqVzyGEqW6qS1uYtWWQJiOkaW7TOHJu/xEiELmIBhQVmtA==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } + } + }, + "@ionic-native/local-notifications": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.16.0.tgz", + "integrity": "sha512-JdwCjT4YwR+N56J0kRGHus1n5WuIxxMZzgXfVP/nhZYcT7GCchfVySbgMY6tUTZkpBhpgosHDz334Fe82zzpig==", + "requires": { + "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/native-storage": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/native-storage/-/native-storage-5.8.0.tgz", - "integrity": "sha512-wrvW+zIXuzHmt+mDSBITdlqo7bAze8TdkTQXRivimAdnnixOYlI9Q696qEitSyComj6OO5NR1rEiASCDTjJwOw==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/native-storage/-/native-storage-5.16.0.tgz", + "integrity": "sha512-ZPY/c7mEVx/cVMoZcU0MhgrSsSi2BGn7Hjmu2+tLBURU6QDR+PRB83DGcjQRPDe1+7gCH7npp/rg0kfsniSxyg==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } + } + }, + "@ionic-native/onesignal": { + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@ionic-native/onesignal/-/onesignal-5.17.0.tgz", + "integrity": "sha512-PQfEki/34yGM4i+548Rt40RV8A4T0srRSk3GVEDZzoHiPMxnbxbLmsxiEjYG74K1AXBzT6tZmnlSiGumJtky6A==", + "requires": { + "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/open-native-settings": { @@ -991,11 +1127,18 @@ } }, "@ionic-native/push": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.8.0.tgz", - "integrity": "sha512-JLfw8fMzZIskKU3fG7UO4POQTNoIY2IfGKYV8Q+cf45LFg+tLJSlN14y0ZPr3bm7y9DacQtiKQsErpIZLT64yw==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-5.16.0.tgz", + "integrity": "sha512-c1uQBtQh4sPlZn7e1dnM1WLS6CD42zml8caRohUh4IJWRFN4s4QNgr2dHndxk6+Z977emIrHHxqhdVkagtcGAg==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/splash-screen": { @@ -1014,11 +1157,18 @@ } }, "@ionic-native/sqlite": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.8.0.tgz", - "integrity": "sha512-VpVt0peSqxzEYIftzLJupIJnXePPLMmCu7XSW5BxfnV7faVKpezhLUiHgt6CctDz1FZGMT/SsfOW4WIvvY4x4w==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.16.0.tgz", + "integrity": "sha512-30OKEO4OWEOIfrtMdyXOxBDc7Kj0V0rl3EYSFYXIliIZzyRYOidn4iLg483+xUHFzofI+qeGZ71HgH12ltOcZw==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/status-bar": { @@ -1037,11 +1187,18 @@ } }, "@ionic-native/themeable-browser": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ionic-native/themeable-browser/-/themeable-browser-5.8.0.tgz", - "integrity": "sha512-MDdvWCxJT+pCzRU54ytTYMpVjj3aREN68PhNEdCOQlVWSelRIefkA04ycrSr6v2Un2skIeWRuM7WCcVfEM0IQg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@ionic-native/themeable-browser/-/themeable-browser-5.16.0.tgz", + "integrity": "sha512-ZBs4Ay/rg7od+qBvj3X2arp1HueB7cn2SD+2aMEvwiIVZXAY2NJLuMy5gqeFK/2UFtpDW8W1TqFne09aIPsYQw==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/zbar": { @@ -1089,9 +1246,9 @@ } }, "@ng-bootstrap/ng-bootstrap": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.1.tgz", - "integrity": "sha512-7etP9X9jKIkbuDzU3ngI2jQhHQDZxIu0ErvlkHb7u7YH9akIOLVkXvz2mTMvcFABWZhze64UjFuEgR46b6WGSw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.2.tgz", + "integrity": "sha512-v8QmC17bv9he5Ep6zutaI9aQ2w/2NqySP0fejOKe7cacKpGUqsLIakpyd2FD7mfZu7pSCCtHYpRWR+h6yq+Ngg==", "requires": { "tslib": "^1.9.0" } @@ -1609,18 +1766,18 @@ } }, "angular-draggable-droppable": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-4.3.2.tgz", - "integrity": "sha512-x3Fg+mggoBumO41XNzEztWnl92ymGXoVgrYKX2InnIg8i/PIGv7npi8pBvMzKQSKHWtqww3nBHAVcWmIE/3Z0g==", + "version": "4.3.8", + "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-4.3.8.tgz", + "integrity": "sha512-IIl3M+oXvaWPfLrbJdvdWcZLJb6/FqhImELNqBhbTlYMudyiJaLn1lUFYWz8xDti+b1eUoJpEPU3hliBYZmAvw==", "requires": { "dom-autoscroller": "^2.3.4", "tslib": "^1.9.0" } }, "angular-resizable-element": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-3.2.4.tgz", - "integrity": "sha512-Qd/WRTaJgmDJoeWzmK0F52I3X0nLtFPirmsVC2ceic4EQ/3X2yYFCOWgCtH+PvMZct6Whoky3OQLqCpFXQsKHQ==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-3.2.6.tgz", + "integrity": "sha512-8vp5w4YFIrZ2M8EmGpIt/yMwLBjkUJe7aPLPxDDQhi5HQWF0HLJ6lb4tXgEzW572roxNnHFg105EM6XGAMZDIg==", "requires": { "tslib": "^1.9.0" } @@ -2667,28 +2824,21 @@ "dev": true }, "chart.js": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.8.0.tgz", - "integrity": "sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.2.tgz", + "integrity": "sha512-AagP9h27gU7hhx8F64BOFpNZGV0R1Pz1nhsi0M1+KLhtniX6ElqLl0z0obKSiuGMl9tcRe6ZhruCGCJWmH6snQ==", "requires": { "chartjs-color": "^2.1.0", "moment": "^2.10.2" } }, "chartjs-color": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.3.0.tgz", - "integrity": "sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz", + "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==", "requires": { "chartjs-color-string": "^0.6.0", - "color-convert": "^0.5.3" - }, - "dependencies": { - "color-convert": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", - "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=" - } + "color-convert": "^1.9.3" } }, "chartjs-color-string": { @@ -2905,7 +3055,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -3920,9 +4069,9 @@ } }, "cordova-common": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.0.tgz", - "integrity": "sha512-EvlQ6PirfR65hGDoQvsluW00uSS2MTVIRKQ3c1Xvsddx7D5T5JgF3fHWkGik/Y/8yNcpI0zI2NcJyie2z/ak2A==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz", + "integrity": "sha512-xg0EnjnA6EipxXG8cupdlYQYeDA6+ghbN+Pjq88xN1LInwP6Bo7IyGBdSV5QnfjOvzShF9BBwSxBAv0FOO0C2Q==", "requires": { "ansi": "^0.3.1", "bplist-parser": "^0.1.0", @@ -3962,9 +4111,9 @@ } }, "graceful-fs": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", - "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "strip-bom": { "version": "3.0.0", @@ -4272,6 +4421,16 @@ "resolved": "https://registry.npmjs.org/cordova-open-native-settings/-/cordova-open-native-settings-1.5.2.tgz", "integrity": "sha512-UvcTZAH3/r3U/jred2bOqoYIXUo5Gmq0in6fgkqvwgRCcOSQtQJWnUqg4i0RlHkEd1zKDi61JdpeSyJT+K8ZRQ==" }, + "cordova-opentok-android-permissions": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cordova-opentok-android-permissions/-/cordova-opentok-android-permissions-1.0.1.tgz", + "integrity": "sha1-/mYUXx3eHx/LKTHzy1Fuzb9dESg=" + }, + "cordova-plugin-actionsheet": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-actionsheet/-/cordova-plugin-actionsheet-2.3.3.tgz", + "integrity": "sha1-6SYbLQBKjaQHOI1g31NMFWxS/xE=" + }, "cordova-plugin-add-swift-support": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz", @@ -4294,6 +4453,26 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-android-permissions/-/cordova-plugin-android-permissions-1.0.0.tgz", "integrity": "sha1-nnwRa+Zo6336QUkbE9jUfalUgUk=" }, + "cordova-plugin-appavailability": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz", + "integrity": "sha1-oBeq8PiCfuWZ3HeLYkXcwTULy6g=" + }, + "cordova-plugin-apprate": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-apprate/-/cordova-plugin-apprate-1.4.0.tgz", + "integrity": "sha512-4HflFYuxzctnxQHYL9L5og7GVtVDQuqFX4WGXBzslln8V9/ODCafBTTtLSt+EKoIOJvL1iD5dztYkfyDn7HpBg==" + }, + "cordova-plugin-badge": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz", + "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ==" + }, + "cordova-plugin-ble-central": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.2.4.tgz", + "integrity": "sha512-NBRcAiH+VbKbmM3iNY3Psa4jGDYjWm/KGB3sikv0Fv0ZWfsI7XqjX6Fs6hmQJ+M7/X4qe/s8zDwRkQgU7ZOrjw==" + }, "cordova-plugin-camera": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-4.1.0.tgz", @@ -4309,6 +4488,11 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz", "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==" }, + "cordova-plugin-dialogs": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-dialogs/-/cordova-plugin-dialogs-2.0.2.tgz", + "integrity": "sha512-FUHI6eEVeoz2VkxbF0P56QlUQLGzXcvw3i4xuXyM9gEct6Y+FA3Xzgl2pJTZcTg5wRqLWzN08kgNoHPkom15pw==" + }, "cordova-plugin-file": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz", @@ -4319,6 +4503,14 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-filepath/-/cordova-plugin-filepath-1.5.6.tgz", "integrity": "sha512-YvrnXfoq4hzruVXnKo2qAiWlJ6xqo9RWLycEOI13WAIb69pzVvvFHXLREv7otSXkTn2tugpHQWcopxnPPOvFtA==" }, + "cordova-plugin-fingerprint-aio": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-fingerprint-aio/-/cordova-plugin-fingerprint-aio-2.0.0.tgz", + "integrity": "sha512-2F+T27HUYLMCkvX56yNJ7ZtY6r/Bl4nkskUyBtkh5nuUMRvZI7Fzyde7JUtD08JrJUpqvC4d6FmLm984w/NK5w==", + "requires": { + "cordova-plugin-add-swift-support": "^2.0.2" + } + }, "cordova-plugin-geolocation": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.0.2.tgz", @@ -4329,6 +4521,16 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz", "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4=" }, + "cordova-plugin-health": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-health/-/cordova-plugin-health-1.1.3.tgz", + "integrity": "sha512-hX2C95AetTbeQ5OXOu7xugDQhJVhSe7hnbmN3EJccbRvy5dN/vaWE/MaYhdzZxrOzYSd2V/z6lLJliWVX5bRjA==" + }, + "cordova-plugin-inappbrowser": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-3.1.0.tgz", + "integrity": "sha512-YqrZfYgbGTS20SFID0mrRxud312VH072QVlFonCAkPgtGg1Svy7lELOCNFd+KU7t4mVtZeTEjZPEeefvjaetwQ==" + }, "cordova-plugin-ionic-keyboard": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz", @@ -4339,11 +4541,26 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.1.0.tgz", "integrity": "sha512-aY1yI042TMgyDoh07rUSxSedlTwQfrvS44UnpakmCqmA/BapjSv88ixa5qUun95vwsYdTERX2VJp6h/YrR1lFQ==" }, + "cordova-plugin-local-notification": { + "version": "0.9.0-beta.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-beta.2.tgz", + "integrity": "sha512-63n77K1pt8dnbWnNR8QWETi9Glezi1bvNHvHWmGNIOv0xCb0phZnm+Ku49BQ+omwe8Z5voMvrA4I03SYPpv38w==" + }, + "cordova-plugin-mauron85-background-geolocation": { + "version": "3.0.0-alpha.50", + "resolved": "https://registry.npmjs.org/cordova-plugin-mauron85-background-geolocation/-/cordova-plugin-mauron85-background-geolocation-3.0.0-alpha.50.tgz", + "integrity": "sha512-TVdsJ4gPOuFANB3SX/bDLp4igK6o5nPXO95+tv9RpLr5Rwh2XhiozmEpaC0mnMFiuKi6j1xbaZLklhhVBwC14w==" + }, "cordova-plugin-nativestorage": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/cordova-plugin-nativestorage/-/cordova-plugin-nativestorage-2.3.2.tgz", "integrity": "sha512-olg/BzYRk0NGbKQ5f7rf21RYQEyJI19CCZn6RpVMO9/kbRRFqae/6ixjDNy81dXSu2TQ42brjBddGe1Qpn5ViA==" }, + "cordova-plugin-sms-receive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-sms-receive/-/cordova-plugin-sms-receive-1.0.2.tgz", + "integrity": "sha512-y2QMX709RgrbCHVDHAewjvXi50h+u+VcuCQADPJS+tH/BosFie+x1vo5mMwysuIEiaQ25b0qhIzo63RCyT5Fyw==" + }, "cordova-plugin-splashscreen": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.3.tgz", @@ -4354,15 +4571,33 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz", "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==" }, + "cordova-plugin-themeablebrowser": { + "version": "0.2.18", + "resolved": "https://registry.npmjs.org/cordova-plugin-themeablebrowser/-/cordova-plugin-themeablebrowser-0.2.18.tgz", + "integrity": "sha512-FdE1L3wItbTtUudysX/QxN6DTnfGPTMiS4Np/XKeSfYM0bU8sP6DhUIUp1vA8GAulihkEfbNIvy68oVkx2xtFQ==" + }, "cordova-plugin-whitelist": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz", "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==" }, + "cordova-sqlite-storage": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-3.4.0.tgz", + "integrity": "sha512-Uavq3HulVIYXxTFCp5aafiQhYrZF0/cGlyN76RYhIftcD5IRhza9+ghhV5abJYvuGlzY+p9dM5hPcjnYxfAH+g==", + "requires": { + "cordova-sqlite-storage-dependencies": "2.1.0" + } + }, + "cordova-sqlite-storage-dependencies": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-2.1.0.tgz", + "integrity": "sha512-m0cPOWPzckAqS0/e7v+xtcM+FrHrw63qgh5T91JdkXMKCK8sN9bDoqVNJHZ5E9y7sRO7liMUIDm6Dz439RYqGA==" + }, "cordova-support-google-services": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.1.0.tgz", - "integrity": "sha1-RjTFIgD4cGDReV6yhw6ZRC12Lm0=" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.3.2.tgz", + "integrity": "sha512-RtEWzULreUX662MFWopGhFispLiHX7gUf2GijPOC2mY2oCNuUobj2mO4tl5q7PYbOreSxq+PrSekhmS6TAAWdw==" }, "cordova.plugins.diagnostic": { "version": "5.0.1", @@ -4674,9 +4909,9 @@ "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo=" }, "d3-brush": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.6.tgz", - "integrity": "sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.3.tgz", + "integrity": "sha512-v8bbYyCFKjyCzFk/tdWqXwDykY8YWqhXYjcYxfILIit085VZOpj4XJKOMccTsvWxgzSLMJQg5SiqHjslsipEDg==", "requires": { "d3-dispatch": "1", "d3-drag": "1", @@ -4700,9 +4935,9 @@ "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI=" }, "d3-color": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.8.tgz", - "integrity": "sha512-yeANXzP37PHk0DbSTMNPhnJD+Nn4G//O5E825bR6fAfHH43hobSBpgB9G9oWVl9+XgUaQ4yCnsX1H+l8DoaL9A==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz", + "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg==" }, "d3-dispatch": { "version": "1.0.3", @@ -4745,9 +4980,9 @@ } }, "d3-format": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.3.2.tgz", - "integrity": "sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.1.tgz", + "integrity": "sha512-TUswGe6hfguUX1CtKxyG2nymO+1lyThbkS1ifLX0Sr+dOQtAD5gkrffpHnx+yHNKUZ0Bmg5T4AjUQwugPDrm0g==" }, "d3-geo": { "version": "1.9.1", @@ -4839,9 +5074,9 @@ "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ==" }, "d3-time-format": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz", - "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.1.tgz", + "integrity": "sha512-VA6WqORO1+H1SvSzgl2oT0z3niANh3opa8Cencpen1LFthw/bEX71R/DgjPlWw78J4UHmD0jCPP1W0HpwMkhjg==", "requires": { "d3-time": "1" } @@ -5467,9 +5702,9 @@ } }, "es-abstract": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz", - "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", + "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", "requires": { "es-to-primitive": "^1.2.0", "function-bind": "^1.1.1", @@ -5479,8 +5714,8 @@ "is-regex": "^1.0.4", "object-inspect": "^1.6.0", "object-keys": "^1.1.1", - "string.prototype.trimleft": "^2.0.0", - "string.prototype.trimright": "^2.0.0" + "string.prototype.trimleft": "^2.1.0", + "string.prototype.trimright": "^2.1.0" } }, "es-to-primitive": { @@ -7480,6 +7715,11 @@ } } }, + "install": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz", + "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0=" + }, "internal-ip": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz", @@ -9116,6 +9356,11 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "mx.ferreyra.callnumber": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/mx.ferreyra.callnumber/-/mx.ferreyra.callnumber-0.0.2.tgz", + "integrity": "sha512-J9FJiMrfWG9Q8AQEz/cgYLcXTTD/Z5+vfq29hn8K7yVWjxkSzr7zFi7Dpn8wcv2iKHBHDJY+U0z8yoAzDugXMw==" + }, "nan": { "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", @@ -9579,6 +9824,11 @@ "wrappy": "1" } }, + "onesignal-cordova-plugin": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/onesignal-cordova-plugin/-/onesignal-cordova-plugin-2.7.0.tgz", + "integrity": "sha512-ZkvF9uus+WdX+9Nh2p0OlZ6gUJHqKI88IQz78wW1Dat0kPmQvi8bYFi+MI8LYTkg2IFza6W0IbVVkEw7ye58cw==" + }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", @@ -10060,6 +10310,14 @@ "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz", "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA==" }, + "phonegap-plugin-push": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/phonegap-plugin-push/-/phonegap-plugin-push-2.3.0.tgz", + "integrity": "sha512-0R35BGVvvNzov3fckBspc7snwsIdClIBhI7jUCIa7AgSZy2Lrwm8kPuLTyzMVSNR3MJTxWX6s06aDlVL7EvQ3w==", + "requires": { + "install": "^0.8.2" + } + }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -10120,9 +10378,9 @@ } }, "positioning": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/positioning/-/positioning-1.4.0.tgz", - "integrity": "sha512-LbN+mgAXtcDdN46xMJ3yZwjndqqYJODaO5qKmU+MVMu5tL3K2dlm1Qha/zh1k2JAFym5HDaZpnPfO4gr91VTRw==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/positioning/-/positioning-1.5.1.tgz", + "integrity": "sha512-Al3inO/WAlq7Q986pghpdWC9fsSCCKxOAwRt8ZGpcQn58SP8RJX7bjC53I7xeq9ngN+odcyF4B+wMdpyyiF5wQ==" }, "posix-character-classes": { "version": "0.1.1", @@ -12191,9 +12449,9 @@ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -12698,6 +12956,11 @@ } } }, + "uk.co.workingedge.phonegap.plugin.launchnavigator": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/uk.co.workingedge.phonegap.plugin.launchnavigator/-/uk.co.workingedge.phonegap.plugin.launchnavigator-3.2.2.tgz", + "integrity": "sha1-g7rPTQyjspbtFL5tQpRzHQd4jkQ=" + }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", diff --git a/Mohem/package.json b/Mohem/package.json index 3674ed31..b0949ab0 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -21,75 +21,97 @@ "@angular/platform-browser": "^7.2.2", "@angular/platform-browser-dynamic": "^7.2.2", "@angular/router": "^7.2.2", - "@ionic-native/android-permissions": "^5.8.0", - "@ionic-native/app-availability": "^5.8.0", - "@ionic-native/app-rate": "^5.8.0", - "@ionic-native/background-geolocation": "^5.4.0", - "@ionic-native/badge": "^5.8.0", - "@ionic-native/barcode-scanner": "^5.14.0", + "@ionic-native/android-permissions": "^5.16.0", + "@ionic-native/app-availability": "^5.16.0", + "@ionic-native/app-rate": "^5.16.0", + "@ionic-native/background-geolocation": "^5.16.0", + "@ionic-native/badge": "^5.16.0", + "@ionic-native/barcode-scanner": "^5.16.0", "@ionic-native/base64": "^5.15.1", - "@ionic-native/ble": "^5.8.0", - "@ionic-native/camera": "^5.14.0", + "@ionic-native/ble": "^5.16.0", + "@ionic-native/call-number": "^5.16.0", + "@ionic-native/camera": "^5.16.0", "@ionic-native/core": "^5.8.0", "@ionic-native/date-picker": "^5.10.0", - "@ionic-native/device": "^5.8.0", - "@ionic-native/diagnostic": "^5.14.0", + "@ionic-native/device": "^5.16.0", + "@ionic-native/diagnostic": "^5.16.0", "@ionic-native/file": "^5.15.1", "@ionic-native/file-path": "^5.15.1", - "@ionic-native/fingerprint-aio": "^5.8.0", + "@ionic-native/fingerprint-aio": "^5.16.0", "@ionic-native/geolocation": "^5.10.0", - "@ionic-native/globalization": "^5.8.0", - "@ionic-native/health": "^5.4.0", - "@ionic-native/in-app-browser": "^5.8.0", - "@ionic-native/keyboard": "^5.8.0", - "@ionic-native/launch-navigator": "^5.8.0", - "@ionic-native/native-storage": "^5.8.0", + "@ionic-native/globalization": "^5.16.0", + "@ionic-native/health": "^5.16.0", + "@ionic-native/in-app-browser": "^5.16.0", + "@ionic-native/keyboard": "^5.16.0", + "@ionic-native/launch-navigator": "^5.16.0", + "@ionic-native/local-notifications": "^5.16.0", + "@ionic-native/native-storage": "^5.16.0", + "@ionic-native/onesignal": "^5.17.0", "@ionic-native/open-native-settings": "^5.14.0", - "@ionic-native/push": "^5.8.0", + "@ionic-native/push": "^5.16.0", "@ionic-native/splash-screen": "^5.0.0", - "@ionic-native/sqlite": "^5.8.0", + "@ionic-native/sqlite": "^5.16.0", "@ionic-native/status-bar": "^5.0.0", - "@ionic-native/themeable-browser": "^5.8.0", + "@ionic-native/themeable-browser": "^5.16.0", "@ionic-native/zbar": "^5.10.0", "@ionic/angular": "^4.1.0", - "@ng-bootstrap/ng-bootstrap": "^4.2.1", + "@ng-bootstrap/ng-bootstrap": "^4.2.2", "@swimlane/ngx-charts": "^10.1.0", "angular-calendar": "^0.26.11", "app": "0.1.0", - "chart.js": "^2.8.0", + "chart.js": "^2.9.2", "com-badrit-base64": "^0.2.0", - "cordova-android": "8.1.0", + "cordova-android": "^8.1.0", "cordova-android-support-gradle-release": "^3.0.1", "cordova-browser": "5.0.4", "cordova-ios": "4.5.5", "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.0", + "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", + "cordova-plugin-dialogs": "^2.0.2", "cordova-plugin-file": "^6.0.2", "cordova-plugin-filepath": "^1.5.6", + "cordova-plugin-fingerprint-aio": "^2.0.0", "cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-globalization": "^1.11.0", + "cordova-plugin-health": "^1.1.3", + "cordova-plugin-inappbrowser": "^3.1.0", "cordova-plugin-ionic-keyboard": "^2.1.3", "cordova-plugin-ionic-webview": "4.1.0", + "cordova-plugin-local-notification": "^0.9.0-beta.2", + "cordova-plugin-mauron85-background-geolocation": "^3.0.0-alpha.50", "cordova-plugin-nativestorage": "^2.3.2", + "cordova-plugin-sms-receive": "^1.0.2", "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-support-google-services": "^1.1.0", + "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", + "mx.ferreyra.callnumber": "0.0.2", "ng2-file-upload": "^1.3.0", "ng2-pdf-viewer": "^5.3.2", + "onesignal-cordova-plugin": "^2.7.0", "phonegap-plugin-barcodescanner": "8.1.0", "phonegap-plugin-multidex": "^1.0.0", + "phonegap-plugin-push": "^2.3.0", "primeicons": "^1.0.0", "primeng": "^7.1.3", "run": "1.4.0", "rxjs": "~6.3.3", + "uk.co.workingedge.phonegap.plugin.launchnavigator": "^3.2.2", "xlsx": "^0.14.3", "zone.js": "~0.8.29" }, @@ -140,19 +162,48 @@ "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, - "cordova-android-support-gradle-release": { - "ANDROID_SUPPORT_VERSION": "27.+" - }, - "cordova.plugins.diagnostic": { - "ANDROID_SUPPORT_VERSION": "28.+" - }, + "cordova-android-support-gradle-release": {}, + "cordova.plugins.diagnostic": {}, "cordova-open-native-settings": {}, - "cordova-plugin-camera": { - "ANDROID_SUPPORT_V4_VERSION": "27.+" - }, + "cordova-plugin-camera": {}, "cordova-plugin-file": {}, "cordova-plugin-filepath": {}, - "com-badrit-base64": {} + "com-badrit-base64": {}, + "call-number": {}, + "phonegap-plugin-push": { + "GOOGLE_PLAY_SERVICES_VERSION": "16.0.0", + "FCM_VERSION": "15.0.0", + "ANDROID_SUPPORT_V13_VERSION": "27.+" + }, + "cordova-sqlite-storage": {}, + "cordova-plugin-ble-central": {}, + "uk.co.workingedge.phonegap.plugin.launchnavigator": {}, + "cordova-plugin-themeablebrowser": {}, + "cordova-plugin-inappbrowser": {}, + "cordova-plugin-sms-receive": {}, + "cordova-plugin-local-notification": {}, + "cordova-plugin-fingerprint-aio": { + "FACEID_USAGE_DESCRIPTION": "User Authentication" + }, + "cordova-plugin-mauron85-background-geolocation": { + "GOOGLE_PLAY_SERVICES_VERSION": "16.0.0", + "ANDROID_SUPPORT_LIBRARY_VERSION": "26+", + "ICON": "@mipmap/icon", + "SMALL_ICON": "@mipmap/icon", + "ACCOUNT_NAME": "@string/app_name", + "ACCOUNT_LABEL": "@string/app_name", + "ACCOUNT_TYPE": "$PACKAGE_NAME.account", + "CONTENT_AUTHORITY": "$PACKAGE_NAME" + }, + "cordova-opentok-android-permissions": {}, + "cordova-plugin-health": { + "HEALTH_READ_PERMISSION": "App needs read access to read heart rate", + "HEALTH_WRITE_PERMISSION": "App needs write access for heart rate", + "GMS_VERSION": "16.0.1" + }, + "cordova-plugin-appavailability": {}, + "cordova-plugin-apprate": {}, + "onesignal-cordova-plugin": {} }, "platforms": [ "browser", diff --git a/Mohem/src/app/absence/models/AbsenceNotificationBodyRes.ts b/Mohem/src/app/absence/models/AbsenceNotificationBodyRes.ts index cc09ebf0..9c6a6ebd 100644 --- a/Mohem/src/app/absence/models/AbsenceNotificationBodyRes.ts +++ b/Mohem/src/app/absence/models/AbsenceNotificationBodyRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { AbsenceNotificationBodyItems } from './AbsenceNotificationBodtItems'; export class AbsenceNotificatonBodyResponse extends Response { diff --git a/Mohem/src/app/absence/models/abs.attach.response.ts b/Mohem/src/app/absence/models/abs.attach.response.ts index ea968453..2bf12268 100644 --- a/Mohem/src/app/absence/models/abs.attach.response.ts +++ b/Mohem/src/app/absence/models/abs.attach.response.ts @@ -1,4 +1,4 @@ -import {Response} from './response' +import { Response } from 'src/app/hmg-common/services/models/response'; import {AbsenceAttahcment} from './abs.attach' export class AbsenceAttahcmentResponse extends Response{ public static SHARED_DATA = 'absence-attachment'; diff --git a/Mohem/src/app/absence/models/abs_dff_response.ts b/Mohem/src/app/absence/models/abs_dff_response.ts index a4eeafae..4e65f7c9 100644 --- a/Mohem/src/app/absence/models/abs_dff_response.ts +++ b/Mohem/src/app/absence/models/abs_dff_response.ts @@ -1,4 +1,6 @@ -import {Response} from './response' + +import { Response } from 'src/app/hmg-common/services/models/response'; + export class AbsenceDffResponse extends Response{ public static SHARED_DATA = 'absence_dff_resp'; public P_TRANSACTION_ID:number; diff --git a/Mohem/src/app/absence/models/absence.response.ts b/Mohem/src/app/absence/models/absence.response.ts index b5280276..4bb14986 100644 --- a/Mohem/src/app/absence/models/absence.response.ts +++ b/Mohem/src/app/absence/models/absence.response.ts @@ -1,4 +1,4 @@ -import {Response} from './response' +import { Response } from 'src/app/hmg-common/services/models/response'; export class AbsenceResponse extends Response{ public static SHARED_DATA = 'absence_tr_id'; public P_TRANSACTION_ID:number; diff --git a/Mohem/src/app/absence/models/absence.transaction.ts b/Mohem/src/app/absence/models/absence.transaction.ts index eb3259a8..a4178bb4 100644 --- a/Mohem/src/app/absence/models/absence.transaction.ts +++ b/Mohem/src/app/absence/models/absence.transaction.ts @@ -1,4 +1,4 @@ -import { Request } from './request'; +import { Request } from '../../hmg-common/services/models/request'; export class AbsenceTransaction extends Request{ public static SHARED_DATA = 'absence_transaction'; diff --git a/Mohem/src/app/absence/models/replacement-Service.request.ts b/Mohem/src/app/absence/models/replacement-Service.request.ts index 320af90f..685ebd9c 100644 --- a/Mohem/src/app/absence/models/replacement-Service.request.ts +++ b/Mohem/src/app/absence/models/replacement-Service.request.ts @@ -1,4 +1,4 @@ -import {Request} from './request' +import { Request } from '../../hmg-common/services/models/request'; export class ReplacementServiceRequest extends Request{ P_SEARCH_USER_NAME:string; diff --git a/Mohem/src/app/absence/models/replacment-response.ts b/Mohem/src/app/absence/models/replacment-response.ts index 976e0ed9..4d76ce56 100644 --- a/Mohem/src/app/absence/models/replacment-response.ts +++ b/Mohem/src/app/absence/models/replacment-response.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import {replacmentinfo} from './replacment-info'; export class ReplacmentResponse extends Response { diff --git a/Mohem/src/app/absence/service/replacement-list.service.ts b/Mohem/src/app/absence/service/replacement-list.service.ts index d03c419e..28091380 100644 --- a/Mohem/src/app/absence/service/replacement-list.service.ts +++ b/Mohem/src/app/absence/service/replacement-list.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; import { ConnectorService } from 'src/app/hmg-common/services/connector/connector.service'; -import { Observable } from 'rxjs';; +import { Observable } from 'rxjs'; import {Request} from '../models/request' import { ReplacementServiceRequest } from '../models/replacement-Service.request'; diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index d4ed19b4..81d1bc98 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -20,7 +20,8 @@ import { DateInput } from "../../uI-elements/date.input"; import { TimeInput } from "../../uI-elements/time.input"; import { DateTimeInput } from "../../uI-elements/date-time.input"; import { DatePicker } from "@ionic-native/date-picker/ngx"; -import { Request } from "../models/request"; +import { Request } from '../../hmg-common/services/models/request'; +// import { Request } from "../models/request"; import * as moment from "moment"; import {ReplacementListComponent} from "../../vacation-rule/replacement-list/replacement-list.component"; import {ReplacmentResponse} from "../models/replacment-response"; diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 42310a69..1556b050 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -8,7 +8,7 @@

{{ts.trPK('home','hello')}}, {{User_name_Emp}}

-
+
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index b86865d2..0a6314c5 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -8,6 +8,16 @@ header .content-ios:not([no-bounce])>.scroll-content::before { bottom: 0; } +.menuImg{ + width: 80px; + height: 80px; + display: inline-flex; + overflow: hidden; + background: transparent; + border-radius: 50% !important; + position: relative; + top: 0px; +} .menu-header .logo { position: absolute; 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 3eb241b9..9e697fd4 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -1,379 +1,789 @@ import { Component, OnInit } from '@angular/core'; + import {ButtonSettings} from "src/app/hmg-common/ui/button/models/button-settingsl"; + import {TranslatorService} from "src/app/hmg-common/services/translator/translator.service"; + import { CommonService } from 'src/app/hmg-common/services/common/common.service'; + import { LoginRequest } from 'src/app/hmg-common/services/authentication/models/login.request'; + import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; + import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; + import { SendActivationByType } from '../models/sendActivationByType'; + import { FingerprintAIO } from '@ionic-native/fingerprint-aio/ngx'; + import { GetLoginInfoRequest } from "../../hmg-common/services/authentication/models/get-login-info.request"; + import { GetLoginInfoResponse } from "../../hmg-common/services/authentication/models/get-login-info.response"; + import { SMSCheckRequest } from "src/app/hmg-common/services/authentication/models/smscheck.request"; + import { SMSCheckResponse } from "src/app/hmg-common/services/authentication/models/smscheck.response"; + import { PushService } from 'src/app/hmg-common/services/push/push.service'; +import { Platform } from '@ionic/angular'; + + + + @Component({ + selector: 'app-confirm-login', + templateUrl: './confirm-login.component.html', + styleUrls: ['./confirm-login.component.scss'], + }) + export class ConfirmLoginComponent implements OnInit { + public logo = "assets/imgs/CS.png"; + public buttons:any=[]; + isFaceorFinger: any; + onlySMSBox: any = true; + loginData:any; + selectedOption: any; + lastLogin: any; + loginTokenID:any + deviceToken:any; + + constructor( + public ts: TranslatorService, + public cs: CommonService, + public authService: AuthenticationService, + public sharedData: SharedDataService, + private faio: FingerprintAIO, + public pushService: PushService, + public platform: Platform, + + + + + + ) { + this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + console.log(this.loginData); + this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); + console.log("deviceToken :"+this.deviceToken); + //if device token undefind + if(this.deviceToken == undefined){ + this.deviceToken = localStorage.getItem("deviceToken"); + + } + this.lastLogin = this.cs.sharedService.getSharedData(AuthenticationService.LAST_LOGIN, false); + + } + + ngOnInit() { + //**checkIfAvailable FAIO **// + this.checkIfAvailable(); + //**getSharedData of IMEI_USER_DATA and REGISTER_DATA_FOR_LOGIIN to set defult value **// + + // this.setDefault(); + + + this.button(); + } + + checkIfAvailable() { + this.faio.isAvailable().then( + options => { + this.isFaceorFinger = options; - if (this.isFaceorFinger === 'finger' && this.lastLogin === 1) { - this.selectedOption = 2; - this.cs.presentConfirmDialog( - this.ts.trPK("login", "biometric-support"), - () => { - this.presentBiometricDialog(); - this.cs.sharedService.setSharedData( - this.selectedOption, - AuthenticationService.LAST_LOGIN - ); - }, - () => { } - ); - } + + // && this.lastLogin === 1 + + // if (this.isFaceorFinger === 'finger' || this.isFaceorFinger === 'biometric') { + + // this.selectedOption = 2; + + // this.cs.presentConfirmDialog( + + // this.ts.trPK("login", "biometric-support"), + + // () => { + + // this.presentBiometricDialog(); + + // this.cs.sharedService.setSharedData( + + // this.selectedOption, + + // AuthenticationService.LAST_LOGIN + + // ); + + // }, + + // () => { } + + // ); + + // } + this.button(); + }, + () => { + this.isFaceorFinger = null; + this.button(); + } + ); + } + + button() { + console.log("button"); + + this.buttons = [ + [{ + title: "login,verify-with-fingerprint", + url: null, + icon: "assets/icon/login/102.png", + settings: new ButtonSettings(true, true, true, true), + value: 2, - disabled: this.isFaceorFinger === "finger" ? false : true, + + disabled: this.isFaceorFinger === "finger" || this.isFaceorFinger === "biometric" ? false : true, + visible: this.onlySMSBox + }, + { + title: "login,verify-with-faceid", + url: null, + icon: "assets/icon/login/101.png", + settings: new ButtonSettings(true, true, true, true), + value: 3, - disabled: this.isFaceorFinger === "face" ? false : true, + + disabled: this.isFaceorFinger === "face" ? false : true, + visible: this.onlySMSBox + }, + { + title: "login,verify-with-whatsapp", + url: null, + icon: "assets/icon/login/104.png", + settings: new ButtonSettings(true, true, true, true), + value: 4, + visible: true + }, + { + title: "login,verify-with-sms", + url: null, + icon: "assets/icon/login/103.png", + settings: new ButtonSettings(true, true, true, true), + value: 1, + visible: true + } + ] + ]; + } + + confirm(el: any) { + console.log("confirm:"+ el ); + this.selectedOption = this.selectedOption && !this.onlySMSBox ? this.selectedOption : el.value; + switch (el.value) { + case 1: + console.log(el.value); + this.loginWithSMS(el); + break; + case 2: + console.log(el.value); + + this.loginWithFingurePrint(el); + break; + case 3: + console.log(el.value); + + this.faceReconization(el); + break; + case 4: + console.log(el.value); + + this.loginWithWhatsapp(el); + break; + default: + break; + } + this.cs.sharedService.setSharedData( + this.selectedOption, + AuthenticationService.LAST_LOGIN + ); + } + + loginWithSMS(el) { + console.log("loginWithSMS: "+ el); + + if (!el.disabled) { + + // if (this.user && !this.registerd_data) { + //calling because i dont have token id which required to the send activation code + /// this.checkUserAuthentication(1); + // this.checkUserAuthentication(); *** + + // } else { + if (this.loginData.LogInTokenID) { + this.sendActivationCode(1); + } else { + // this.checkUserAuthentication(1); + // this.checkUserAuthentication();** + + } + // } + } + } + + loginWithWhatsapp(el) { + if (!el.disabled) { + // if (this.user && !this.registerd_data) { + //calling because i dont have token id which required to the send activation code + // this.checkUserAuthentication(2); + // } else { + if (this.loginData.LogInTokenID) { + this.sendActivationCode(2); + } else { + // this.checkUserAuthentication(2); + } + // } + } + } + + public sendActivationCode(type: number) { + let request = new SendActivationByType(); + this.authService.setPublicFields(request); + request.OTP_SendType = type; + request.MobileNumber = this.loginData.MobileNumber; + request.IsMobileFingerPrint =0; + request.P_USER_NAME=this.loginData.P_USER_NAME; + request.LogInTokenID =this.loginData.LogInTokenID; + request.P_LEGISLATION_CODE ="SA"; + // request.VersionID ="2.0"; + + + + // request.LanguageID = imeiData && imeiData.PreferredLanguage || request.LanguageID; + this.authService + .sendActivationCodeByType( + request, + () => { }, + this.ts.trPK("general", "ok") + ) + .subscribe((result: any) => { + if (result.isSMSSent) { + this.cs.sharedService.setSharedData({ + MobileNumber: this.loginData.mobileNumber, + loginType: this.selectedOption + }, + SMSCheckRequest.SHARED_DATA + ); + + this.cs.openSMSPage(); + } + }); + } + + loginWithFingurePrint(el: any) { + if (!el.disabled) { + this.startBiometricLoginIfAvailable(); + } + } + faceReconization(el: any) { + if (!el.disabled) { + this.startBiometricLoginIfAvailable(); + } + } + + private startBiometricLoginIfAvailable() { + // this.setting.isBiometricsEnabled().then(result => { + // console.log(result); + this.faio.isAvailable().then( + options => { + // if biometric supported + //if (result) { + // ask if login with face or finger + this.presentBiometricDialog(); + // } else { + // //ask to enable biometric + // this.getPermissionToActivateBiometric(); + // } + }, + () => { + alert("not avaliable ") + // if biometric not supported do nothing unless + // user session time out from last login + // if (AuthenticationService.isRequireRelogin()) { + // this.initializeInputsFromSessionTimeOut(user); + // } + // this.hideSplashScreen(true); + } + ); + //}); + } + + private presentBiometricDialog() { + this.faio + .show({ - clientId: "Fingerprint Authetnciation", - clientSecret: "Ate343_9347lajF", // Only necessary for Android - disableBackup: true, // Only for Android(optional) - localizedFallbackTitle: this.ts.trPK("general", "use-pin"), // Only for iOS - localizedReason: this.ts.trPK("general", "auth-please") // Only for iOS + + + + + + title: 'Biometric Authetnciation', // (Android Only) | optional | Default: " Biometric Sign On" + + // subtitle: 'Coolest Plugin ever' ,// (Android Only) | optional | Default: null + + // description: this.ts.trPK("general", "auth-please"),// optional | Default: null + + fallbackButtonTitle: this.ts.trPK("general", "use-pin"), // optional | When disableBackup is false defaults to "Use Pin". + + // When disableBackup is true defaults to "Cancel" + + disableBackup:true, // optional | default: false + + + + + + // clientId: "Fingerprint Authetnciation", + + // clientSecret: "Ate343_9347lajF", // Only necessary for Android + + // disableBackup: true, // Only for Android(optional) + + // localizedFallbackTitle: this.ts.trPK("general", "use-pin"), // Only for iOS + + // localizedReason: this.ts.trPK("general", "auth-please") // Only for iOS + }) + .then((result: any) => { + console.log("1"); + // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); + let request = new GetLoginInfoRequest(); + this.authService.setPublicFields(request); + request.MobileNumber = this.loginData.MobileNumber; + request.P_USER_NAME=this.loginData.P_USER_NAME; + request.UserName=this.loginData.P_USER_NAME; + request.LogInTokenID =this.loginData.LogInTokenID; + request.CompanyID =1;//cs=1 , HMG=2 + request.DeviceType= this.cs.getDeviceType(); + request.DeviceToken=this.deviceToken; + + this.getMobileInfo(request); + }) + .catch((error: any) => { + console.log(error); + }); + } + + private getMobileInfo(request: GetLoginInfoRequest) { + console.log("2"); + + this.authService.getLoginInfo(request,() => { },this.ts.trPK("general", "ok")).subscribe((result: GetLoginInfoResponse) => { + console.log("authService.getLoginInfo"); + if(result.Mohemm_GetPatientID_List.length > 0){ + if ( result.Mohemm_GetPatientID_List[0].LoginType == 2 || result.Mohemm_GetPatientID_List[0].LoginType == 3) { + this.loginTokenID = result.LogInTokenID; + this.checkSMS(); + } else { + + this.onlySMSBox = false; + this.button(); + } + }else { + this.onlySMSBox = false; + this.button(); + + } + }); + } + + public checkSMS() { + const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + const request = new SMSCheckRequest(); + + request.LogInTokenID = data.LogInTokenID; + request.activationCode = ""; + request.P_USER_NAME = data.P_USER_NAME; + request.MobileNumber = data.MobileNumber; + + this.authService + .checkSMS(request, () => {}, this.ts.trPK("general", "ok")) + .subscribe((result: SMSCheckResponse) => { + console.log(result); + if (this.cs.validResponse(result)) { + AuthenticationService.servicePrivilage=result.Privilege_List; + this.authService.setAuthenticatedUser(result).subscribe(() => { - this.insertMobileLogin(); + + if (this.platform.is("mobile")) { + + this.insertMobileLogin(); + + } + this.cs.openHome(); + }); + } + }); + } + + + public insertMobileLogin(){ + let request = new GetLoginInfoRequest(); + this.authService.setPublicFields(request); + request.MobileNumber = this.loginData.MobileNumber; + request.P_USER_NAME=this.loginData.P_USER_NAME; + request.UserName=this.loginData.P_USER_NAME; + request.LogInTokenID =this.loginData.LogInTokenID; + request.CompanyID =1;//CompanyID + request.DeviceType= this.cs.getDeviceType(); + request.DeviceToken=this.deviceToken; + //request.TokenID= + request.LoginType=this.selectedOption; + + this.authService + .insertMobileLoginInfo( + request, + () => { }, + this.ts.trPK("general", "ok") + ) + .subscribe((result: any) => { + console.log(result); + + console.log("succssful insertMobileLoginInfo" ); + }); + + } -} \ No newline at end of file + + +}​ \ No newline at end of file diff --git a/Mohem/src/app/authentication/models/forget.password.ts b/Mohem/src/app/authentication/models/forget.password.ts index b6cda129..fae546e1 100644 --- a/Mohem/src/app/authentication/models/forget.password.ts +++ b/Mohem/src/app/authentication/models/forget.password.ts @@ -1,4 +1,4 @@ -import { Request } from 'src/app/hmg-common/services/models/request'; +import { Request } from '../../hmg-common/services/models/request'; export class ForgetPassword extends Request { public static IS_FORGET_PSW:string="is_forget_password"; public P_NEW_PASSWORD: string; diff --git a/Mohem/src/app/authentication/models/password.ts b/Mohem/src/app/authentication/models/password.ts index 28820371..1166fbde 100644 --- a/Mohem/src/app/authentication/models/password.ts +++ b/Mohem/src/app/authentication/models/password.ts @@ -1,4 +1,4 @@ -import { Request } from 'src/app/hmg-common/services/models/request'; +import { Request } from '../../hmg-common/services/models/request'; export class Password extends Request { 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 f2dd4a85..2172f349 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -1,226 +1,462 @@ + import { Component, OnInit } from "@angular/core"; + import { ElementRef } from "@angular/core"; -import { NavController } from "@ionic/angular"; + +import { NavController, Platform } from "@ionic/angular"; + import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; + import { CommonService } from "src/app/hmg-common/services/common/common.service"; + import { SharedDataService } from "src/app/hmg-common/services/shared-data-service/shared-data.service"; + import { SMSCheckRequest } from "src/app/hmg-common/services/authentication/models/smscheck.request"; + import { LoginModel } from "../models/LoginModel"; + import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; + import { SMSCheckResponse } from "src/app/hmg-common/services/authentication/models/smscheck.response"; + import { Password } from "../models/password"; + import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/models/get-login-info.request'; + + @Component({ + selector: "app-sms-page", + templateUrl: "./sms-page.page.html", + styleUrls: ["./sms-page.page.scss"] + }) + export class SmsPageComponent implements OnInit { + public static LOGIN_DATA = "LOGIN_DATA"; + Channel: number = 0; + activationCode: string; + P_SESSION_ID: number; + P_USER_NAME: string; + timeInSeconds: any; + time: any; + runTimer: any; + hasStarted: any; + hasFinished: any; + remainingTime: any; + displayTime: any; + loginTokenID: string; + public isForgetPwd: boolean = false; + public isExpiredPwd: boolean = false; + public count: number = 0; + private loginData = new LoginModel(); + public deviceToken:any; + public loginTypeData:any; + constructor( + public navCtrl: NavController, + public translate: TranslatorService, + public common: CommonService, + private elementRef: ElementRef, + public authService: AuthenticationService, - public sharedData: SharedDataService + + public sharedData: SharedDataService, + + public platform: Platform, + + + ) {} + + ngOnInit() { + this.count = 0; + this.initTimer(); + this.startTimer(); + this.isForgetPwd = + this.sharedData.getSharedData(Password.IS_FORGET_PSW) || false; + this.isExpiredPwd = + this.sharedData.getSharedData(Password.IS_EXPIRED_PSW) || false; + this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + console.log("loginData : "+ this.loginData); + this.deviceToken= this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); + if(this.deviceToken == undefined){ + this.deviceToken = localStorage.getItem("deviceToken"); + + } + console.log("deviceToken :"+this.deviceToken); + this.loginTypeData= this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); + console.log("loginType :"+this.loginTypeData.loginType); + + + } + + initTimer() { + // Pomodoro is usually for 25 minutes + if (!this.timeInSeconds) { + this.timeInSeconds = 600; + } + + this.time = this.timeInSeconds; + this.runTimer = false; + this.hasStarted = false; + this.hasFinished = false; + this.remainingTime = this.timeInSeconds; + + this.displayTime = this.common.getSecondsAsDigitalClock(this.remainingTime); + } + + startTimer() { + this.runTimer = true; + this.hasStarted = true; + this.timerTick(); + } + + pauseTimer() { + this.runTimer = false; + } + + resumeTimer() { + this.startTimer(); + } + + timerTick() { + setTimeout(() => { + if (!this.runTimer) { + return; + } + this.remainingTime--; + this.displayTime = this.common.getSecondsAsDigitalClock( + this.remainingTime + ); + if (this.remainingTime > 0) { + this.timerTick(); + } else { + this.hasFinished = true; + this.pauseTimer(); + this.navCtrl.pop(); + } + }, 1000); + } + + ionViewWillLeave() { + this.pauseTimer(); + } + + checkOTPLength(){ + console.log(this.activationCode.length); + if(this.activationCode.length==4){ + this.checkVerificationCode(); + } + } + checkVerificationCode() { + if (this.count < 3) { + if ( + this.activationCode == undefined || + this.activationCode == null || + this.activationCode == "" + ) { + // this.common.showAlert(this.translate.translate('verificationcode.emptyCode')); + } else { + this.count = this.count + 1; + if (this.isForgetPwd || this.isExpiredPwd) { + this.checkForgetPwdSMS(); + } else { + this.checkSMS(); + } + } + } else { + let msg: string = this.translate.trPK("general", "noOfTriesLogin"); + this.common.JustAlertDialog(this.translate.trPK("general", "ok"), msg); + } + } + + public checkSMS() { + // alert("checkSMS in page") + const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + const request = new SMSCheckRequest(); + + request.LogInTokenID = data.LogInTokenID; + request.activationCode = this.activationCode; + request.P_USER_NAME = data.P_USER_NAME; + request.MobileNumber = data.MobileNumber; + + this.authService + .checkSMS(request, () => {}, this.translate.trPK("general", "ok")) + .subscribe((result: SMSCheckResponse) => { + console.log(result); + if (this.common.validResponse(result)) { + AuthenticationService.servicePrivilage=result.Privilege_List; + this.authService.setAuthenticatedUser(result).subscribe(() => { + //call insert Mobile Login - this.insertMobileLogin(); + + + + if (this.platform.is("mobile")) { + + this.insertMobileLogin(); + + } + this.common.openHome(); + + }); + } + }); + } + + public insertMobileLogin(){ + // alert("insertMobileLogin"); + let request = new GetLoginInfoRequest(); + this.authService.setPublicFields(request); + request.MobileNumber = this.loginData.MobileNumber; + request.P_USER_NAME=this.loginData.P_USER_NAME; + request.UserName=this.loginData.P_USER_NAME; + request.LogInTokenID =this.loginData.LogInTokenID; + request.CompanyID =1;//CompanyID + request.DeviceType= this.common.getDeviceType(); + request.DeviceToken=this.deviceToken; + request.LoginType=this.loginTypeData.loginType; + this.authService + .insertMobileLoginInfo( + request, + () => { }, + this.translate.trPK("general", "ok") + ) + .subscribe((result: any) => { + + console.log("successful insertMobileLogin" ); + }); + } + + public checkForgetPwdSMS() { + const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + const request = new SMSCheckRequest(); + + request.LogInTokenID = data.LogInTokenID; + request.activationCode = this.activationCode; + request.P_USER_NAME = data.P_USER_NAME; + console.log(data.LogInTokenID); + console.log(data.P_USER_NAME); + + this.authService + .checkForgetSMS(request, () => {}, this.translate.trPK("general", "ok")) + .subscribe((result: SMSCheckResponse) => { + console.log(result); + if (this.common.validResponse(result)) { + console.log(result); + if (this.isForgetPwd) { + this.common.openForgotPassword(); + } + if(this.isExpiredPwd) { + this.sharedData.setSharedData(true,Password.IS_EXPIRED_PSW); + this.common.openChangePassword(); + } + } + }); + } -} + +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 8bd54015..1e615403 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -1,11 +1,13 @@ import { Injectable } from "@angular/core"; -import { Request } from "../models/request"; +import { Request } from 'src/app/hmg-common/services/models/request'; +// import { Request } from "../models/request"; import { TranslatorService } from "../translator/translator.service"; import { ConnectorService } from "../connector/connector.service"; import { Observable, throwError } from "rxjs"; //import { CheckPatientRegisterationRequest } from "./models/check-patient-registeration.request"; import { LoginRequest } from "./models/login.request"; -import { Response } from "../models/response"; +// import { Response } from "../models/response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { AuthenticatedUser } from "./models/authenticated-user"; import { CommonService } from "../common/common.service"; import { CheckUserAuthenticationRequest } from "./models/check-user-auth.request"; @@ -104,6 +106,7 @@ export class AuthenticationService { request.TokenID = user.TokenID; request.P_USER_NAME = user.EMPLOYEE_NUMBER; request.UserName = user.EMPLOYEE_NUMBER; + request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS; if (AuthenticationService.requireRelogin) { this.sessionTimeOutDialog(); diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.request.ts index 6a68265f..7d39d28b 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class CheckActivationCodeRequest extends Request { FingerPrintPatientIdentificationID?: string ; // "" diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts index a1518041..ed065473 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts @@ -1,4 +1,5 @@ -import { Response } from '../../models/response'; +// import { Response } from '../../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { PatientUserModel } from './PatientUserModel'; import { AuthenticatedUser } from './authenticated-user'; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-app-version.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-app-version.response.ts index 6424c884..cc97b4be 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-app-version.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-app-version.response.ts @@ -1,4 +1,5 @@ -import { Response } from '../../models/response'; +//import { Response } from '../../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class CheckAppVersionResponse extends Response { public IOSLink :string; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-registeration-code.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-registeration-code.request.ts index 412ab906..db1168e6 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-registeration-code.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-registeration-code.request.ts @@ -1,5 +1,5 @@ -import { Request } from '../../models/request'; - +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class CheckRegisterationCodeRequest extends Request { ForRegisteration: boolean; LogInTokenID: string; // null if not exist diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.request.ts index 031fd51d..41934545 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class CheckUserAuthenticationRequest extends Request { // PatientIdentificationID: string; // id diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.response.ts index cc33d22d..1322f30a 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-user-auth.response.ts @@ -1,4 +1,5 @@ -import { Response } from '../../models/response'; +//import { Response } from '../../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { BasicInfo } from './basic.info'; import { MemberList } from './member.list'; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/forgot-File-ID.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/forgot-File-ID.response.ts index 11e1b53f..7320d8ff 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/forgot-File-ID.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/forgot-File-ID.response.ts @@ -1,4 +1,5 @@ -import { Response } from '../../models/response'; +//import { Response } from '../../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class ForgotFileIDResponse extends Response { ReturnMessage: string; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.request.ts index fb4f5b2d..46671721 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; import { AuthenticatedUser } from './authenticated-user'; import { CountryCode } from 'src/app/hmg-common/ui/mobile-number/international-mobile/models/country-code.model'; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.response.ts index 8a92cbf4..a43ece48 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/get-login-info.response.ts @@ -1,4 +1,5 @@ -import { Response } from '../../models/response'; +//import { Response } from '../../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class GetLoginInfoResponse extends Response { SMSLoginRequired: boolean; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/login.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/login.request.ts index fdb406ab..c7623ff3 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/login.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/login.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class LoginRequest extends Request { PatientID: number; // 0 diff --git a/Mohem/src/app/hmg-common/services/authentication/models/register-information.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/register-information.request.ts index 722f7137..9d5b32c1 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/register-information.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/register-information.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; import { RegisterInformationPatientModel } from './register-information-patient.model'; export class RegisterInformationRequest extends Request { diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.request.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.request.ts index 41910021..1265b04c 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.request.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class SMSCheckRequest extends Request { LogInTokenID: string ; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts index 5532d782..c6a5352f 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts @@ -1,4 +1,5 @@ -import { Response } from '../../models/response'; +//import { Response } from '../../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { AuthenticatedUser } from './authenticated-user'; import { PrivilageModel } from './privilage-model'; export class SMSCheckResponse extends Response { 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 dc49580f..cac4d5cb 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -10,7 +10,8 @@ import { import { Router } from "@angular/router"; import { TranslatorService } from "../translator/translator.service"; import { AlertControllerService } from "../../ui/alert/alert-controller.service"; -import { Response } from "../models/response"; +//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 { BrowserConfig } from "./models/browser-config"; 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 3754c522..958d91c0 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -7,7 +7,8 @@ import { import { Observable, throwError, TimeoutError } from "rxjs"; import { catchError, retry, tap, timeout } from "rxjs/operators"; import { CommonService } from "../common/common.service"; -import { Response } from "../models/response"; +//import { Response } from "../models/response"; +import { Response } from 'src/app/hmg-common/services/models/response'; @Injectable({ providedIn: "root" @@ -24,7 +25,7 @@ export class ConnectorService { // public static host = 'http://10.50.100.113:6060/'; // development service public static host = "https://uat.hmgwebservices.com/"; - // public static host = 'https://hmgwebservices.com/'; + //public static host = 'https://hmgwebservices.com/'; // public static host = 'http://10.50.100.198:6060/'; // public static host = 'http://10.50.100.113:6060/'; // development service /* public static host = 'http://10.50.100.198:6060/'; diff --git a/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts b/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts index 2b49d10e..68487c69 100644 --- a/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts +++ b/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts @@ -3,7 +3,8 @@ import {Http, Response, Headers, } from "@angular/http"; import {AuthenticationService} from "../authentication/authentication.service"; import { Observable } from 'rxjs'; import {MenuEntries} from './models/menu-entries.request'; -import {Request} from '../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; +//import {Request} from '../models/request'; import {MenuResponse} from './models/menu-response' import { ConnectorService } from '../connector/connector.service'; @Injectable() diff --git a/Mohem/src/app/hmg-common/services/menu/models/menu-entries.request.ts b/Mohem/src/app/hmg-common/services/menu/models/menu-entries.request.ts index 69a71f55..762f2a67 100644 --- a/Mohem/src/app/hmg-common/services/menu/models/menu-entries.request.ts +++ b/Mohem/src/app/hmg-common/services/menu/models/menu-entries.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../models/request'; +// import { Request } from '../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class MenuEntries extends Request { public P_MENU_TYPE:string; public P_SELECTED_EMPLOYEE_NUMBER:string; diff --git a/Mohem/src/app/hmg-common/services/models/appointment-request.ts b/Mohem/src/app/hmg-common/services/models/appointment-request.ts index 1d2bd14c..e5290485 100644 --- a/Mohem/src/app/hmg-common/services/models/appointment-request.ts +++ b/Mohem/src/app/hmg-common/services/models/appointment-request.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class AppointmentRequest extends Request{ public AppointmentNo: number; diff --git a/Mohem/src/app/hmg-common/services/models/email-request.ts b/Mohem/src/app/hmg-common/services/models/email-request.ts index e14cdca1..68f8f2ee 100644 --- a/Mohem/src/app/hmg-common/services/models/email-request.ts +++ b/Mohem/src/app/hmg-common/services/models/email-request.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class EmailRequest extends Request { DoctorName: string; diff --git a/Mohem/src/app/hmg-common/services/push/models/register-authenticated-user.request.ts b/Mohem/src/app/hmg-common/services/push/models/register-authenticated-user.request.ts index 0e23d6ec..a54b24dd 100644 --- a/Mohem/src/app/hmg-common/services/push/models/register-authenticated-user.request.ts +++ b/Mohem/src/app/hmg-common/services/push/models/register-authenticated-user.request.ts @@ -1,5 +1,6 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; import { RegisterNormalUserRequest } from './register-normal-user.request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class RegisterAuthenticatedUserRequest extends RegisterNormalUserRequest { PatientMobileNumber: string; diff --git a/Mohem/src/app/hmg-common/services/push/models/register-normal-user.request.ts b/Mohem/src/app/hmg-common/services/push/models/register-normal-user.request.ts index 6f221070..b58ebd05 100644 --- a/Mohem/src/app/hmg-common/services/push/models/register-normal-user.request.ts +++ b/Mohem/src/app/hmg-common/services/push/models/register-normal-user.request.ts @@ -1,4 +1,5 @@ -import { Request } from '../../models/request'; +// import { Request } from '../../models/request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class RegisterNormalUserRequest extends Request { ChannelID: number; diff --git a/Mohem/src/app/hmg-common/services/push/push.service.ts b/Mohem/src/app/hmg-common/services/push/push.service.ts index 035112df..b5490471 100644 --- a/Mohem/src/app/hmg-common/services/push/push.service.ts +++ b/Mohem/src/app/hmg-common/services/push/push.service.ts @@ -5,7 +5,8 @@ import { TranslatorService } from '../translator/translator.service'; import { NotificationModel } from './models/notification.model'; import { SharedDataService } from '../shared-data-service/shared-data.service'; import { ConnectorService } from '../connector/connector.service'; -import { Response } from '../models/response'; +//import { Response } from '../models/response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { RegisterAuthenticatedUserRequest } from './models/register-authenticated-user.request'; import { Platform, Events } from '@ionic/angular'; import { RegisterNormalUserRequest } from './models/register-normal-user.request'; diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 82d0a99b..7be21549 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -5,12 +5,15 @@ {{notBadge}} --> - +
+

{{ts.trPK('home','hello')}}, {{userData.EMPLOYEE_DISPLAY_NAME}}

@@ -18,6 +21,7 @@
+
@@ -49,29 +53,49 @@ + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
{{notificationList.BEGIN_DATE | dateString }}
+
+ + +
+
+
+ + {{notificationList.SUBJECT}} + + +
+ +
+
+ + + There is no Notification + + + + + - -
{{notificationList.BEGIN_DATE | dateString }}
-
+ +
+

PO

-
+ + - {{notificationList.SUBJECT}} - + +
+

MR

+
+
+ + + +
+

HR

+
+
+ + +
+

ITG

+
+
--> + +
+
+
-
-
- @@ -75,11 +155,73 @@ - - -
+ + {{ts.trPK('worklist','search')}} + + + + + + + + +
+ + {{ts.trPK('worklist','view')}} + + {{ts.trPK('worklist','openNot')}} + {{ts.trPK('worklist','fyi')}} + {{ts.trPK('worklist','toDo')}} + {{ts.trPK('worklist','all')}} + {{ts.trPK('worklist','meNot')}} + + + +
+
+ + {{ts.trPK('worklist','searchby')}} + + {{ts.trPK('worklist','from')}} + {{ts.trPK('worklist','subject')}} + {{ts.trPK('worklist','sent')}} + {{ts.trPK('worklist','itemType')}} + {{ts.trPK('worklist','none')}} + + + +
+
+ + {{ts.trPK('worklist','sent')}} + + +
+
+ + + + +
+
+
+ + {{ts.trPK('worklist','search')}} + + {{ts.trPK('general','close')}} +
- {{ts.trPK('worklist','search')}} -
+ Call details ITG + Call count ITG + +
+ + +
\ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index ae8332ce..084cba3b 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -27,7 +27,8 @@ position: absolute; top: 0; bottom: 0; - width: 4px; + width: 1.5%; + height: 99%; background: #e4e4e4; z-index: 1; /* margin-left: -10px; */ @@ -95,28 +96,30 @@ } .notification-list{ + background: none; ion-item{ // margin-top: 5px; // margin-bottom: 5px; background-color: transparent; .item-date{ - width: 55px; - font-size: 14px; + width: 100%; + font-size: 16px; font-weight: bold; - text-align: center; + text-align: start; padding: 0; margin: 0; position: absolute; left: 0; - top: 0; + top: 12%; } ion-label , [item-end]{ white-space: normal; font-size: 14px; + padding-top: 15%; // :root[dir="ltr"]{ // margin-left: 10px; // } @@ -135,17 +138,22 @@ ion-input ,ion-datetime{ border-bottom: #dedede 1px solid; } .left { + --background: #f0efef; .timeline:before{ - left: 62px; + left: 21px; } .notification-list ion-item{ padding-left: 3px; + margin-left: -12%; } .timeline-thumb{ - left: 37px; + left: 9%; + top: 30%; } + } .right { + --background: #f0efef; .timeline:before{ right: 62px; } @@ -156,4 +164,56 @@ ion-input ,ion-datetime{ right: 37px; } } - \ No newline at end of file + +.menuList{ + margin-left: -40px; + height: 160%; + padding-top: 370%; + } + .colorBG{ + --background: #f0efef; + } + +.menuListCol{ + padding-left: 50px; + margin-left: -33px; +} +.menuListItem{ + padding-top: 9%; + margin: -20%; + padding-left: 13%; +} +.menuListBtn{ + width: 100%; + background: white; + --background: white; +} +.activeTabMenu{ + --background: #ff726f; +} + +.notifincationList{ + margin-left: 5%; + margin-top: 6%; +} +.itemListNotification{ + padding-bottom: 18px; +} + +.footerSearchBtn{ + padding: 0px !important; + background: #f0efef !important; +} + +.viewAndSearch{ + margin-bottom: 13px; +} + +.toSearchBtn{ + margin-top: 4%; +} + +.emptyItem{ + white-space: normal; + padding-left: 10%; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 1b56f510..ae011cbf 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -6,6 +6,7 @@ import * as moment from "moment"; import { WorKListResponse } from "../models/workListResponse"; import { WorklistService } from "../service/worklist.service"; import { IonInfiniteScroll } from '@ionic/angular'; +import { WorklistMainService } from '../service/work-list.main.service'; @Component({ selector: "app-home", @@ -14,8 +15,8 @@ import { IonInfiniteScroll } from '@ionic/angular'; }) export class HomeComponent implements OnInit { // @ViewChild(Navbar) navBar: Navbar; - public static NOTIFICATION_DATA='notification_data'; - public static NOTIFICATION_ARR='notification_arr'; + public static NOTIFICATION_DATA = 'notification_data'; + public static NOTIFICATION_ARR = 'notification_arr'; @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; private WorkListObj: WorkListRequest; WorkListResObj: any; //WorKListResponse; @@ -32,12 +33,22 @@ export class HomeComponent implements OnInit { HideDateInput: boolean = false; HideTextInput: boolean = false; InputDate: string; + filteredNotificationList: any; IsReachEnd: boolean = false; + public noData: boolean = false; + public isAll: boolean = true; + public isPR: boolean = false; + public isPO: boolean = false; + public isMR: boolean = false; + public isHR: boolean = false; + public isITG: boolean = false; + public isSearch: boolean = false; public direction = 'ltr'; constructor( public common: CommonService, public ts: TranslatorService, - public WorklistService: WorklistService + public WorklistService: WorklistService, + public workListService: WorklistMainService ) { this.WorkListObj = new WorkListRequest(); this.WorkListObj.P_NOTIFICATION_TYPE = "1"; @@ -135,6 +146,7 @@ export class HomeComponent implements OnInit { if (this.common.hasData(result.GetWorkList)) { this.WorkListObj.P_PAGE_NUM++; this.WorkListResObj = result.GetWorkList; + this.filteredNotificationList = this.WorkListResObj; this.common.sharedService.setSharedData(this.WorkListResObj, HomeComponent.NOTIFICATION_ARR); let lastItemIndex = this.WorkListResObj.length - 1; if (result.GetWorkList[lastItemIndex]) { @@ -200,4 +212,110 @@ export class HomeComponent implements OnInit { if (this.infiniteScroll) this.infiniteScroll.complete(); } } //end infiniteScroll + + Count() { + this.workListService.getITGCount() + .subscribe((result: any) => { + console.log("ENAD ITG COUNT:") + console.log(result); + }); + } + + filterNotificationByRequestType(reqType) { + let filterdType = []; + if (reqType == "All") { + this.filteredNotificationList = this.WorkListResObj; + if (this.filteredNotificationList == [] || this.filteredNotificationList == null || this.filteredNotificationList == "") { + this.noData = true; + return false; + } else { + this.noData = false; + return false; + } + } + for (let i = 0; i < this.WorkListResObj.length; i++) { + if (reqType == this.WorkListResObj[i].REQUEST_TYPE) { + filterdType.push(this.WorkListResObj[i]); + } + } + + this.filteredNotificationList = filterdType; + if (this.filteredNotificationList == [] || this.filteredNotificationList == null || this.filteredNotificationList == "") { + this.noData = true; + return false; + } else { + this.noData = false; + return false; + } + } + + Details() { + this.workListService.getITGDetails() + .subscribe((result: any) => { + console.log("ENAD ITG Details:") + console.log(result); + }); + } + + + AllNotification() { + this.filterNotificationByRequestType("All"); + this.isAll = true; + this.isPR = false; + this.isPO = false; + this.isMR = false; + this.isHR = false; + this.isITG = false; + } + PRNotification() { + this.filterNotificationByRequestType("PR"); + this.isAll = false; + this.isPR = true; + this.isPO = false; + this.isMR = false; + this.isHR = false; + this.isITG = false; + } + PONotification() { + this.filterNotificationByRequestType("PO"); + this.isAll = false; + this.isPR = false; + this.isPO = true; + this.isMR = false; + this.isHR = false; + this.isITG = false; + + } + MRNotification() { + this.filterNotificationByRequestType("MO"); + this.isAll = false; + this.isPR = false; + this.isPO = false; + this.isMR = true; + this.isHR = false; + this.isITG = false; + } + HRNotification() { + this.filterNotificationByRequestType("HR"); + this.isAll = false; + this.isPR = false; + this.isPO = false; + this.isMR = false; + this.isHR = true; + this.isITG = false; + } + ITGNotification() { + // this.Details(); + this.isAll = false; + this.isPR = false; + this.isPO = false; + this.isMR = false; + this.isHR = false; + this.isITG = true; + } + + searchBtn() { + this.isSearch = !this.isSearch; + } + } diff --git a/Mohem/src/app/notification/models/AbsenceNotificationBodyRes.ts b/Mohem/src/app/notification/models/AbsenceNotificationBodyRes.ts index cc09ebf0..9c6a6ebd 100644 --- a/Mohem/src/app/notification/models/AbsenceNotificationBodyRes.ts +++ b/Mohem/src/app/notification/models/AbsenceNotificationBodyRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { AbsenceNotificationBodyItems } from './AbsenceNotificationBodtItems'; export class AbsenceNotificatonBodyResponse extends Response { diff --git a/Mohem/src/app/notification/models/ActionHistoryReq.ts b/Mohem/src/app/notification/models/ActionHistoryReq.ts index 1b23d13e..2e8b9440 100644 --- a/Mohem/src/app/notification/models/ActionHistoryReq.ts +++ b/Mohem/src/app/notification/models/ActionHistoryReq.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListActionHistoryRequest extends Request{ //public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/ActionHistoryRes.ts b/Mohem/src/app/notification/models/ActionHistoryRes.ts index 196046e2..4438413c 100644 --- a/Mohem/src/app/notification/models/ActionHistoryRes.ts +++ b/Mohem/src/app/notification/models/ActionHistoryRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class WorkListActionHistoryResponse extends Response { //public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/EITNotificationBodyRes.ts b/Mohem/src/app/notification/models/EITNotificationBodyRes.ts index 673db702..76f30e41 100644 --- a/Mohem/src/app/notification/models/EITNotificationBodyRes.ts +++ b/Mohem/src/app/notification/models/EITNotificationBodyRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { EITNotificationBodyItems } from './EITNotificationBodyItems'; export class EITNotificatonBodyResponse extends Response { diff --git a/Mohem/src/app/notification/models/MOItemHistoryList.ts b/Mohem/src/app/notification/models/MOItemHistoryList.ts index baec25ae..ca3b5a77 100644 --- a/Mohem/src/app/notification/models/MOItemHistoryList.ts +++ b/Mohem/src/app/notification/models/MOItemHistoryList.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; export class GetMoItemHistoryList extends Response { public REQUEST_NUMBER: string; diff --git a/Mohem/src/app/notification/models/MOItemHistoryReq.ts b/Mohem/src/app/notification/models/MOItemHistoryReq.ts index 33bb64d5..76193840 100644 --- a/Mohem/src/app/notification/models/MOItemHistoryReq.ts +++ b/Mohem/src/app/notification/models/MOItemHistoryReq.ts @@ -1,4 +1,5 @@ -import { Request } from "./request"; +// import { Request } from "./request"; +import { Request } from 'src/app/hmg-common/services/models/request'; export class MOItemHistoryReq extends Request { //public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/MOItemHistoryRes.ts b/Mohem/src/app/notification/models/MOItemHistoryRes.ts index e1de9002..648091d3 100644 --- a/Mohem/src/app/notification/models/MOItemHistoryRes.ts +++ b/Mohem/src/app/notification/models/MOItemHistoryRes.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { GetMoItemHistoryList } from './MOItemHistoryList'; export class MOItemHistoryRes extends Response { diff --git a/Mohem/src/app/notification/models/MONotificationBodyRes.ts b/Mohem/src/app/notification/models/MONotificationBodyRes.ts index 39e9ff2f..77a5a38a 100644 --- a/Mohem/src/app/notification/models/MONotificationBodyRes.ts +++ b/Mohem/src/app/notification/models/MONotificationBodyRes.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { MONotificationBodyItems } from './MONotificationBodyItems'; export class MONotificatonBodyResponse extends Response { diff --git a/Mohem/src/app/notification/models/NotificationActionReq.ts b/Mohem/src/app/notification/models/NotificationActionReq.ts index dc23e68d..e390547b 100644 --- a/Mohem/src/app/notification/models/NotificationActionReq.ts +++ b/Mohem/src/app/notification/models/NotificationActionReq.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListActionRequest extends Request{ // public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/NotificationBodyReq.ts b/Mohem/src/app/notification/models/NotificationBodyReq.ts index 2105beec..93e95ba9 100644 --- a/Mohem/src/app/notification/models/NotificationBodyReq.ts +++ b/Mohem/src/app/notification/models/NotificationBodyReq.ts @@ -1,4 +1,5 @@ -import { Request } from "./request"; +// import { Request } from "./request"; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListBodyRequest extends Request { // public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/NotificationButtonReq.ts b/Mohem/src/app/notification/models/NotificationButtonReq.ts index 30ce7eef..2daf25ed 100644 --- a/Mohem/src/app/notification/models/NotificationButtonReq.ts +++ b/Mohem/src/app/notification/models/NotificationButtonReq.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListButtonRequest extends Request{ //public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/NotificationButtonRes.ts b/Mohem/src/app/notification/models/NotificationButtonRes.ts index c857d787..fd8a8a43 100644 --- a/Mohem/src/app/notification/models/NotificationButtonRes.ts +++ b/Mohem/src/app/notification/models/NotificationButtonRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class NotificatonButtonResponse extends Response { //public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/NotificationGetAttachRes.ts b/Mohem/src/app/notification/models/NotificationGetAttachRes.ts index e6f28069..820596a5 100644 --- a/Mohem/src/app/notification/models/NotificationGetAttachRes.ts +++ b/Mohem/src/app/notification/models/NotificationGetAttachRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class NotificationGetAttachResponse extends Response { public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/POItemHistoryList.ts b/Mohem/src/app/notification/models/POItemHistoryList.ts index 8e5e5d37..1cc54a92 100644 --- a/Mohem/src/app/notification/models/POItemHistoryList.ts +++ b/Mohem/src/app/notification/models/POItemHistoryList.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; export class GetItemHistoryList extends Response { public OU_NAME: string; diff --git a/Mohem/src/app/notification/models/POItemHistoryReq.ts b/Mohem/src/app/notification/models/POItemHistoryReq.ts index bc163477..ab085ef7 100644 --- a/Mohem/src/app/notification/models/POItemHistoryReq.ts +++ b/Mohem/src/app/notification/models/POItemHistoryReq.ts @@ -1,4 +1,5 @@ -import { Request } from "./request"; +// import { Request } from "./request"; +import { Request } from 'src/app/hmg-common/services/models/request'; export class POItemHistoryRequest extends Request { //public static SHARED_DATA = ''; diff --git a/Mohem/src/app/notification/models/POItemHistoryRes.ts b/Mohem/src/app/notification/models/POItemHistoryRes.ts index 78e34cef..cc00887f 100644 --- a/Mohem/src/app/notification/models/POItemHistoryRes.ts +++ b/Mohem/src/app/notification/models/POItemHistoryRes.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { GetItemHistoryList } from "./POItemHistoryList"; export class POItemHistoryRes extends Response { diff --git a/Mohem/src/app/notification/models/PONotificationBodyList.ts b/Mohem/src/app/notification/models/PONotificationBodyList.ts index 2cbd0437..ef0f3eb5 100644 --- a/Mohem/src/app/notification/models/PONotificationBodyList.ts +++ b/Mohem/src/app/notification/models/PONotificationBodyList.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { PoHeaderNotificationBodyItems } from "./PoHeaderNotificationBodyItems"; import { PoLinesNotificationBodyItems } from "./PoLinesNotificationBodyItems"; diff --git a/Mohem/src/app/notification/models/PONotificationBodyRes.ts b/Mohem/src/app/notification/models/PONotificationBodyRes.ts index 7d9eb808..842b1f15 100644 --- a/Mohem/src/app/notification/models/PONotificationBodyRes.ts +++ b/Mohem/src/app/notification/models/PONotificationBodyRes.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { PONotificatonBodyList } from "./PONotificationBodyList"; export class PONotificatonBodyResponse extends Response { diff --git a/Mohem/src/app/notification/models/PRNotificationBodyList.ts b/Mohem/src/app/notification/models/PRNotificationBodyList.ts index fa53ecd3..49972246 100644 --- a/Mohem/src/app/notification/models/PRNotificationBodyList.ts +++ b/Mohem/src/app/notification/models/PRNotificationBodyList.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { PRLinesNotificationBodyItems } from "./PRLinesNotificationBodyItems"; import { PRHeaderNotificationBodyItems } from "./PRHeaderNotificationBodyItems"; diff --git a/Mohem/src/app/notification/models/PRNotificationBodyRes.ts b/Mohem/src/app/notification/models/PRNotificationBodyRes.ts index e47db663..12c799c7 100644 --- a/Mohem/src/app/notification/models/PRNotificationBodyRes.ts +++ b/Mohem/src/app/notification/models/PRNotificationBodyRes.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import { PRNotificatonBodyList } from './PRNotificationBodyList'; export class PRNotificatonBodyResponse extends Response { diff --git a/Mohem/src/app/notification/models/RFC-EmployeeRes.ts b/Mohem/src/app/notification/models/RFC-EmployeeRes.ts index 4f3279db..b6e138f3 100644 --- a/Mohem/src/app/notification/models/RFC-EmployeeRes.ts +++ b/Mohem/src/app/notification/models/RFC-EmployeeRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import {RFCEmployeeList } from './RFCEmployee'; export class WorKListRFCEmployeeResponse extends Response { diff --git a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts index fbb83818..3cbbc80c 100644 --- a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts +++ b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListReplacmentEmployeeRequest extends Request{ public P_PAGE_NUM : any; diff --git a/Mohem/src/app/notification/models/ReplacmentEmployeeRes.ts b/Mohem/src/app/notification/models/ReplacmentEmployeeRes.ts index 459a0adc..f0afa027 100644 --- a/Mohem/src/app/notification/models/ReplacmentEmployeeRes.ts +++ b/Mohem/src/app/notification/models/ReplacmentEmployeeRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import {ReplacmentEmployeeList } from './ReplacmentEmployeeList'; export class WorKListReplacmentEmployeeResponse extends Response { diff --git a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts index c11f6867..cd32d6ec 100644 --- a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts +++ b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListSubmitterInfoRequest extends Request{ public P_NOTIFICATION_TYPE: string;//string diff --git a/Mohem/src/app/notification/models/WorklistsubmitterInfoRes.ts b/Mohem/src/app/notification/models/WorklistsubmitterInfoRes.ts index 7a61ea1c..963ac0cc 100644 --- a/Mohem/src/app/notification/models/WorklistsubmitterInfoRes.ts +++ b/Mohem/src/app/notification/models/WorklistsubmitterInfoRes.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { WorklistsubmitterInfoItems } from './WorklistsubmitterInfoItems'; export class WorklistsubmitterInfoResponse extends Response { diff --git a/Mohem/src/app/notification/models/getItgCountRes.ts b/Mohem/src/app/notification/models/getItgCountRes.ts new file mode 100644 index 00000000..4223daf5 --- /dev/null +++ b/Mohem/src/app/notification/models/getItgCountRes.ts @@ -0,0 +1,9 @@ +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; + +export class GetItgCount extends Response { +public BUTTON_SEQ = -1; +public BUTTON_LABEL = ''; +public BUTTON_ACTION = ''; + +} \ No newline at end of file diff --git a/Mohem/src/app/notification/models/quotationAnalysisList.ts b/Mohem/src/app/notification/models/quotationAnalysisList.ts index 17cfbb42..46e1283b 100644 --- a/Mohem/src/app/notification/models/quotationAnalysisList.ts +++ b/Mohem/src/app/notification/models/quotationAnalysisList.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; export class QuotationAnalysisList extends Response { public QUOT_NUM: string; diff --git a/Mohem/src/app/notification/models/quotationAnalysisReq.ts b/Mohem/src/app/notification/models/quotationAnalysisReq.ts index 8556c5ca..14d1e7c8 100644 --- a/Mohem/src/app/notification/models/quotationAnalysisReq.ts +++ b/Mohem/src/app/notification/models/quotationAnalysisReq.ts @@ -1,4 +1,5 @@ -import { Request } from "./request"; +// import { Request } from "./request"; +import { Request } from 'src/app/hmg-common/services/models/request'; export class QuotationAnalysisRequest extends Request { public P_PO_HEADER_ID: number; diff --git a/Mohem/src/app/notification/models/quotationAnalysisRes.ts b/Mohem/src/app/notification/models/quotationAnalysisRes.ts index c68ab63f..99615661 100644 --- a/Mohem/src/app/notification/models/quotationAnalysisRes.ts +++ b/Mohem/src/app/notification/models/quotationAnalysisRes.ts @@ -1,4 +1,5 @@ -import { Response } from "./response"; +//import { Response } from "./response"; +import { Response } from 'src/app/hmg-common/services/models/response'; import {QuotationAnalysisList } from "./quotationAnalysisList"; export class QuotationAnalysisResponse extends Response { diff --git a/Mohem/src/app/notification/models/workListRequest.ts b/Mohem/src/app/notification/models/workListRequest.ts index 0936e2a1..018942ab 100644 --- a/Mohem/src/app/notification/models/workListRequest.ts +++ b/Mohem/src/app/notification/models/workListRequest.ts @@ -1,4 +1,5 @@ -import { Request } from './request'; +// import { Request } from './request'; +import { Request } from 'src/app/hmg-common/services/models/request'; export class WorkListRequest extends Request{ public static SHARED_DATA = 'login-request'; diff --git a/Mohem/src/app/notification/models/workListResponse.ts b/Mohem/src/app/notification/models/workListResponse.ts index 43807895..64db4fd7 100644 --- a/Mohem/src/app/notification/models/workListResponse.ts +++ b/Mohem/src/app/notification/models/workListResponse.ts @@ -1,4 +1,5 @@ -import { Response } from './response'; +//import { Response } from './response'; +import { Response } from 'src/app/hmg-common/services/models/response'; import { WorkListResItems } from './workListResItems'; export class WorKListResponse extends Response { diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index 958925a5..dd6c585b 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -16,6 +16,8 @@ import { PRNotificatonBodyResponse } from "../models/PRNotificationBodyRes"; import { StaticInjector } from "@angular/core/src/di/injector"; import { POItemHistoryRes } from "../models/POItemHistoryRes"; import { MOItemHistoryRes } from "../models/MOItemHistoryRes"; +import { Request } from 'src/app/hmg-common/services/models/request'; +import { LoginModel } from '../../authentication/models/LoginModel'; @Injectable() export class WorklistMainService { @@ -38,10 +40,17 @@ export class WorklistMainService { "Services/ERP.svc/REST/NOTIFICATION_ACTIONS"; public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES"; + public static getITGFormTaskCount = + 'http://10.80.100.124:7086/Services/COCWS.svc/REST/ITGGetTaskCountRequestType'; + public static getITGFormTaskDetails = + 'http://10.80.100.124:7086/Services/COCWS.svc/REST/ITGFormsPendingTasks'; + + + constructor( public api: ConnectorService, public authService: AuthenticationService - ) {} + ) { } public getEITNotificationBody( WorkListBodyRequest: any, @@ -207,4 +216,30 @@ export class WorklistMainService { errorLabel ); } + + public getITGCount( onError?: any, errorLabel?: string): Observable { + const request = new Request; + console.log(request) + this.authService.authenticateRequest(request); + return this.api.postToken( + WorklistMainService.getITGFormTaskCount, + request, + onError, + errorLabel + ); + } + + + public getITGDetails( onError?: any, errorLabel?: string): Observable { + const request = new Request; + console.log(request) + this.authService.authenticateRequest(request); + return this.api.postToken( + WorklistMainService.getITGFormTaskDetails, + request, + onError, + errorLabel + ); + } + } diff --git a/Mohem/src/assets/imgs/E.png b/Mohem/src/assets/imgs/E.png index bb3f63cd..f65d24d3 100644 Binary files a/Mohem/src/assets/imgs/E.png and b/Mohem/src/assets/imgs/E.png differ diff --git a/Mohem/src/assets/imgs/E2.png b/Mohem/src/assets/imgs/E2.png new file mode 100644 index 00000000..bb3f63cd Binary files /dev/null and b/Mohem/src/assets/imgs/E2.png differ diff --git a/Mohem/src/assets/imgs/M.png b/Mohem/src/assets/imgs/M.png index d4b49bd5..25dd49ab 100644 Binary files a/Mohem/src/assets/imgs/M.png and b/Mohem/src/assets/imgs/M.png differ diff --git a/Mohem/src/assets/imgs/M1.png b/Mohem/src/assets/imgs/M1.png new file mode 100644 index 00000000..d4b49bd5 Binary files /dev/null and b/Mohem/src/assets/imgs/M1.png differ diff --git a/Mohem/src/assets/imgs/S.png b/Mohem/src/assets/imgs/S.png index 40389e3f..6f1b46cb 100644 Binary files a/Mohem/src/assets/imgs/S.png and b/Mohem/src/assets/imgs/S.png differ diff --git a/Mohem/src/assets/imgs/S1.png b/Mohem/src/assets/imgs/S1.png new file mode 100644 index 00000000..40389e3f Binary files /dev/null and b/Mohem/src/assets/imgs/S1.png differ diff --git a/Mohem/src/assets/imgs/home/accrualBalances.png b/Mohem/src/assets/imgs/home/accrualBalances.png new file mode 100644 index 00000000..d5fa7730 Binary files /dev/null and b/Mohem/src/assets/imgs/home/accrualBalances.png differ diff --git a/Mohem/src/assets/imgs/home/announcements.png b/Mohem/src/assets/imgs/home/announcements.png new file mode 100644 index 00000000..fec65d84 Binary files /dev/null and b/Mohem/src/assets/imgs/home/announcements.png differ diff --git a/Mohem/src/assets/imgs/home/arabicSwitch.png b/Mohem/src/assets/imgs/home/arabicSwitch.png new file mode 100644 index 00000000..24e7cced Binary files /dev/null and b/Mohem/src/assets/imgs/home/arabicSwitch.png differ diff --git a/Mohem/src/assets/imgs/home/attendanceSwipe.png b/Mohem/src/assets/imgs/home/attendanceSwipe.png new file mode 100644 index 00000000..c7d01237 Binary files /dev/null and b/Mohem/src/assets/imgs/home/attendanceSwipe.png differ diff --git a/Mohem/src/assets/imgs/home/burgerMenu.png b/Mohem/src/assets/imgs/home/burgerMenu.png new file mode 100644 index 00000000..532e2802 Binary files /dev/null and b/Mohem/src/assets/imgs/home/burgerMenu.png differ diff --git a/Mohem/src/assets/imgs/home/camera.png b/Mohem/src/assets/imgs/home/camera.png new file mode 100644 index 00000000..0ea8c25f Binary files /dev/null and b/Mohem/src/assets/imgs/home/camera.png differ diff --git a/Mohem/src/assets/imgs/home/changePasword.png b/Mohem/src/assets/imgs/home/changePasword.png new file mode 100644 index 00000000..919b9ef4 Binary files /dev/null and b/Mohem/src/assets/imgs/home/changePasword.png differ diff --git a/Mohem/src/assets/imgs/home/myRequests.png b/Mohem/src/assets/imgs/home/myRequests.png new file mode 100644 index 00000000..f65d24d3 Binary files /dev/null and b/Mohem/src/assets/imgs/home/myRequests.png differ diff --git a/Mohem/src/assets/imgs/home/paySlip.png b/Mohem/src/assets/imgs/home/paySlip.png new file mode 100644 index 00000000..8ea046d8 Binary files /dev/null and b/Mohem/src/assets/imgs/home/paySlip.png differ diff --git a/Mohem/src/assets/imgs/home/paySlip1.png b/Mohem/src/assets/imgs/home/paySlip1.png new file mode 100644 index 00000000..086f694d Binary files /dev/null and b/Mohem/src/assets/imgs/home/paySlip1.png differ diff --git a/Mohem/src/assets/imgs/home/timeAttendance.png b/Mohem/src/assets/imgs/home/timeAttendance.png new file mode 100644 index 00000000..e2aad720 Binary files /dev/null and b/Mohem/src/assets/imgs/home/timeAttendance.png differ diff --git a/Mohem/src/assets/imgs/home/vacationRule.png b/Mohem/src/assets/imgs/home/vacationRule.png new file mode 100644 index 00000000..32a999e2 Binary files /dev/null and b/Mohem/src/assets/imgs/home/vacationRule.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/All1.png b/Mohem/src/assets/imgs/menuTabs/All1.png new file mode 100644 index 00000000..a511d599 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/All1.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/All2.png b/Mohem/src/assets/imgs/menuTabs/All2.png new file mode 100644 index 00000000..9abc654e Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/All2.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/HR1.png b/Mohem/src/assets/imgs/menuTabs/HR1.png new file mode 100644 index 00000000..45e82948 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/HR1.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/HR2.png b/Mohem/src/assets/imgs/menuTabs/HR2.png new file mode 100644 index 00000000..36545363 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/HR2.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/ITG1.png b/Mohem/src/assets/imgs/menuTabs/ITG1.png new file mode 100644 index 00000000..be0233df Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/ITG1.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/ITG2.png b/Mohem/src/assets/imgs/menuTabs/ITG2.png new file mode 100644 index 00000000..62ede7a3 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/ITG2.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/MR1.png b/Mohem/src/assets/imgs/menuTabs/MR1.png new file mode 100644 index 00000000..13819485 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/MR1.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/MR2.png b/Mohem/src/assets/imgs/menuTabs/MR2.png new file mode 100644 index 00000000..ac3c96eb Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/MR2.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/PO1.png b/Mohem/src/assets/imgs/menuTabs/PO1.png new file mode 100644 index 00000000..399f02bc Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/PO1.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/PO2.png b/Mohem/src/assets/imgs/menuTabs/PO2.png new file mode 100644 index 00000000..6cc6bbdf Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/PO2.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/PR1.png b/Mohem/src/assets/imgs/menuTabs/PR1.png new file mode 100644 index 00000000..e2833114 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/PR1.png differ diff --git a/Mohem/src/assets/imgs/menuTabs/PR2.png b/Mohem/src/assets/imgs/menuTabs/PR2.png new file mode 100644 index 00000000..008d46c9 Binary files /dev/null and b/Mohem/src/assets/imgs/menuTabs/PR2.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 80c31789..9f666b16 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -45,6 +45,14 @@ "en": "Change Password", "ar": "غير كلمة السر" }, + "announcement":{ + "en":"Announcement", + "ar":"اعلان" + }, + "payslip": { + "en": "payslip", + "ar": "كشف بالراتب" + }, "forgot-your-id": { "en": "Forgot Your Patient ID", "ar": "هل نسيت رقم ملف المريض" @@ -858,6 +866,10 @@ "swipeAlertFailed": { "en": "your swipe Failed, please try again...", "ar": "حدث خطاء في تسجيل الدخول فضلاً اعد المحاولة" + }, + "timeAndAttendance":{ + "en":"Time & Attendance", + "ar":"الوقت و الحضور" } }, "userProfile": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index adbcd8ed..eb862e82 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -47,14 +47,16 @@ ion-label{ --width:100%; } .profileImg{ - width: 90px; - height: 90px; + width: 160px; + height: 160px; display: inline-flex; overflow: hidden; background: transparent; -webkit-border-radius:50% !important; -moz-border-radius:50% !important; - border-radius: 50% !important; + border-radius: 20% !important; + position: relative; + top: 7px; // margin:0 auto 40px; img{ -webkit-border-radius:50% !important;