diff --git a/Mohem/package.json b/Mohem/package.json index 5acd1d9f..7a2ad9d7 100644 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -35,8 +35,10 @@ "@ionic-native/device": "^5.18.0", "@ionic-native/diagnostic": "^5.18.0", "@ionic-native/file": "^5.18.0", + "@ionic-native/file-chooser": "^5.36.0", "@ionic-native/file-opener": "^5.36.0", "@ionic-native/file-path": "^5.18.0", + "@ionic-native/file-picker": "^5.36.0", "@ionic-native/fingerprint-aio": "^5.18.0", "@ionic-native/firebase-x": "^5.34.0", "@ionic-native/geolocation": "^5.10.0", @@ -83,7 +85,9 @@ "cordova-plugin-dialogs": "^2.0.2", "cordova-plugin-file": "^6.0.2", "cordova-plugin-file-opener2": "^3.0.5", + "cordova-plugin-filechooser": "^1.2.0", "cordova-plugin-filepath": "^1.5.6", + "cordova-plugin-filepicker": "^1.1.6", "cordova-plugin-fingerprint-aio": "^3.0.0", "cordova-plugin-firebasex": "^13.0.0", "cordova-plugin-geolocation": "^4.0.2", @@ -241,11 +245,13 @@ }, "cordova-plugin-file-opener2": { "ANDROID_SUPPORT_V4_VERSION": "27.+" - } + }, + "cordova-plugin-filepicker": {}, + "cordova-plugin-filechooser": {} }, "platforms": [ "android", "ios" ] } -} \ No newline at end of file +} diff --git a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss index 3999867e..9a786617 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss @@ -176,6 +176,7 @@ letter-spacing: -0.64px; color: #2B353E; opacity: 1; + line-height: 20px; } diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 5b6eeb2b..1406aede 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -354,6 +354,7 @@ .hrTitle{ margin-left: 11px !important; font-size: 15px !important; + margin-right: 11px !important; } .date{ font-size: 15px !important; diff --git a/Mohem/src/assets/imgs/mohemm-action/More-2.png b/Mohem/src/assets/imgs/mohemm-action/More-2.png new file mode 100644 index 00000000..925f6ea5 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/More-2.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/More.png b/Mohem/src/assets/imgs/mohemm-action/More.png index 925f6ea5..005e24ba 100644 Binary files a/Mohem/src/assets/imgs/mohemm-action/More.png and b/Mohem/src/assets/imgs/mohemm-action/More.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/Skip-2.png b/Mohem/src/assets/imgs/mohemm-action/Skip-2.png new file mode 100644 index 00000000..03b3c23f Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/Skip-2.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/Skip.png b/Mohem/src/assets/imgs/mohemm-action/Skip.png index 03b3c23f..17e38cb3 100644 Binary files a/Mohem/src/assets/imgs/mohemm-action/Skip.png and b/Mohem/src/assets/imgs/mohemm-action/Skip.png differ