diff --git a/Mohem/config.xml b/Mohem/config.xml index f401fc25..14299fa7 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -1,5 +1,5 @@ - + MOHEMM an app created by cloud Solutions Cloud Solutions @@ -85,7 +85,6 @@ - @@ -99,9 +98,12 @@ - + + + + diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index 1e98e603..7eb9ad44 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -795,13 +795,6 @@ "integrity": "sha512-FwTHQD5TUaR441V76IoXQmrSdz7AZ/qBfrfh/rDaXWgYHg7iJA3prOlBPCW+YGfLV3qvlRJeq/ASub/JkTBDrg==", "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/ble": { @@ -4385,9 +4378,9 @@ "integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ==" }, "cordova-plugin-ionic-webview": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-3.1.2.tgz", - "integrity": "sha512-i4hFMMebCPDe0KCNbwWhtYcxNIDdbUEfwuo+HBubfaRL/b5xjti/K5KdaJk5x/zB2pqDkY1E9ggZEt1+6j6iIg==" + "version": "4.1.0", + "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", diff --git a/Mohem/package.json b/Mohem/package.json index f2ce5242..af2302f4 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -69,7 +69,7 @@ "cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-globalization": "^1.11.0", "cordova-plugin-ionic-keyboard": "^2.1.3", - "cordova-plugin-ionic-webview": "^3.1.2", + "cordova-plugin-ionic-webview": "4.1.0", "cordova-plugin-local-notification": "^0.9.0-beta.2", "cordova-plugin-nativestorage": "^2.3.2", "cordova-plugin-sms-receive": "^1.0.2", @@ -83,7 +83,7 @@ "mx.ferreyra.callnumber": "0.0.2", "ng2-file-upload": "^1.3.0", "ng2-pdf-viewer": "^5.3.2", - "phonegap-plugin-barcodescanner": "^8.1.0", + "phonegap-plugin-barcodescanner": "8.1.0", "phonegap-plugin-multidex": "^1.0.0", "primeicons": "^1.0.0", "primeng": "^7.1.3", @@ -125,9 +125,6 @@ "cordova-plugin-statusbar": {}, "cordova-plugin-device": {}, "cordova-plugin-splashscreen": {}, - "cordova-plugin-ionic-webview": { - "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - }, "cordova-plugin-nativestorage": {}, "cordova-plugin-globalization": {}, "cordova-plugin-android-permissions": {}, @@ -145,6 +142,9 @@ "cordova-plugin-geolocation": {}, "phonegap-plugin-barcodescanner": { "ANDROID_SUPPORT_V4_VERSION": "27.+" + }, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" } }, "platforms": [ diff --git a/Mohem/resources/android/icon/drawable-hdpi-icon.png b/Mohem/resources/android/icon/drawable-hdpi-icon.png index 53a08264..2571b1ce 100644 Binary files a/Mohem/resources/android/icon/drawable-hdpi-icon.png and b/Mohem/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-ldpi-icon.png b/Mohem/resources/android/icon/drawable-ldpi-icon.png index e35859d3..eda8f30a 100644 Binary files a/Mohem/resources/android/icon/drawable-ldpi-icon.png and b/Mohem/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-mdpi-icon.png b/Mohem/resources/android/icon/drawable-mdpi-icon.png index 7c2a6750..ba66ec9a 100644 Binary files a/Mohem/resources/android/icon/drawable-mdpi-icon.png and b/Mohem/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xhdpi-icon.png b/Mohem/resources/android/icon/drawable-xhdpi-icon.png index 890fbfc2..ea8d65eb 100644 Binary files a/Mohem/resources/android/icon/drawable-xhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png index 6e0e14e0..2f1933d4 100644 Binary files a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png index 4c38e708..9ec1f30f 100644 Binary files a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png index eae58bed..fda71cdc 100644 Binary files a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png index a89932b3..59a60721 100644 Binary files a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png and b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png index cfafd1b1..a9e8f341 100644 Binary files a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png index ee91191b..90783d4d 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png index 27c15545..ae81c7bf 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png index 60ed37a5..591f620d 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png index 1ec664c2..079f4cbb 100644 Binary files a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png index f5e9c42c..1739153a 100644 Binary files a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png and b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png index 3f30babf..f2148121 100644 Binary files a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png index 84b763e2..d48ffbc3 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png index 86d79531..e40401ba 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png index 0666f7e8..33f8534d 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/Mohem/resources/icon.png b/Mohem/resources/icon.png old mode 100644 new mode 100755 index 06dc8293..f44b5259 Binary files a/Mohem/resources/icon.png and b/Mohem/resources/icon.png differ diff --git a/Mohem/resources/icon.png.md5 b/Mohem/resources/icon.png.md5 index 2074d6f5..9dd53643 100644 --- a/Mohem/resources/icon.png.md5 +++ b/Mohem/resources/icon.png.md5 @@ -1 +1 @@ -c59c3c08d3f4d26269875bac17e4f520 \ No newline at end of file +1f488bbf4678f14e62f8bb82d7e4b0be \ No newline at end of file diff --git a/Mohem/resources/icon_CS.png b/Mohem/resources/icon_CS.png new file mode 100644 index 00000000..06dc8293 Binary files /dev/null and b/Mohem/resources/icon_CS.png differ diff --git a/Mohem/resources/ios/icon/icon-1024.png b/Mohem/resources/ios/icon/icon-1024.png index 86a5ae65..885e68e4 100644 Binary files a/Mohem/resources/ios/icon/icon-1024.png and b/Mohem/resources/ios/icon/icon-1024.png differ diff --git a/Mohem/resources/ios/icon/icon-40.png b/Mohem/resources/ios/icon/icon-40.png index 8b664d0c..864ffb19 100644 Binary files a/Mohem/resources/ios/icon/icon-40.png and b/Mohem/resources/ios/icon/icon-40.png differ diff --git a/Mohem/resources/ios/icon/icon-40@2x.png b/Mohem/resources/ios/icon/icon-40@2x.png index 13a818c6..baaa159a 100644 Binary files a/Mohem/resources/ios/icon/icon-40@2x.png and b/Mohem/resources/ios/icon/icon-40@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-40@3x.png b/Mohem/resources/ios/icon/icon-40@3x.png index 26fa8563..a90ec264 100644 Binary files a/Mohem/resources/ios/icon/icon-40@3x.png and b/Mohem/resources/ios/icon/icon-40@3x.png differ diff --git a/Mohem/resources/ios/icon/icon-50.png b/Mohem/resources/ios/icon/icon-50.png index 8db83db6..71ca38f5 100644 Binary files a/Mohem/resources/ios/icon/icon-50.png and b/Mohem/resources/ios/icon/icon-50.png differ diff --git a/Mohem/resources/ios/icon/icon-50@2x.png b/Mohem/resources/ios/icon/icon-50@2x.png index 504145a7..6c4bf7e0 100644 Binary files a/Mohem/resources/ios/icon/icon-50@2x.png and b/Mohem/resources/ios/icon/icon-50@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-60.png b/Mohem/resources/ios/icon/icon-60.png index 6fd8dd6a..e57f8ab4 100644 Binary files a/Mohem/resources/ios/icon/icon-60.png and b/Mohem/resources/ios/icon/icon-60.png differ diff --git a/Mohem/resources/ios/icon/icon-60@2x.png b/Mohem/resources/ios/icon/icon-60@2x.png index 18958907..a90ec264 100644 Binary files a/Mohem/resources/ios/icon/icon-60@2x.png and b/Mohem/resources/ios/icon/icon-60@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-60@3x.png b/Mohem/resources/ios/icon/icon-60@3x.png index 2b140522..f2bd54f3 100644 Binary files a/Mohem/resources/ios/icon/icon-60@3x.png and b/Mohem/resources/ios/icon/icon-60@3x.png differ diff --git a/Mohem/resources/ios/icon/icon-72.png b/Mohem/resources/ios/icon/icon-72.png index 53a08264..2571b1ce 100644 Binary files a/Mohem/resources/ios/icon/icon-72.png and b/Mohem/resources/ios/icon/icon-72.png differ diff --git a/Mohem/resources/ios/icon/icon-72@2x.png b/Mohem/resources/ios/icon/icon-72@2x.png index 6e0e14e0..2f1933d4 100644 Binary files a/Mohem/resources/ios/icon/icon-72@2x.png and b/Mohem/resources/ios/icon/icon-72@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-76.png b/Mohem/resources/ios/icon/icon-76.png index b3bd4b0c..7de7cc24 100644 Binary files a/Mohem/resources/ios/icon/icon-76.png and b/Mohem/resources/ios/icon/icon-76.png differ diff --git a/Mohem/resources/ios/icon/icon-76@2x.png b/Mohem/resources/ios/icon/icon-76@2x.png index c7d630e6..dcc6b5bd 100644 Binary files a/Mohem/resources/ios/icon/icon-76@2x.png and b/Mohem/resources/ios/icon/icon-76@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-83.5@2x.png b/Mohem/resources/ios/icon/icon-83.5@2x.png index 2a7d0ebc..c29576ae 100644 Binary files a/Mohem/resources/ios/icon/icon-83.5@2x.png and b/Mohem/resources/ios/icon/icon-83.5@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-small.png b/Mohem/resources/ios/icon/icon-small.png index c2adb14a..71287ef6 100644 Binary files a/Mohem/resources/ios/icon/icon-small.png and b/Mohem/resources/ios/icon/icon-small.png differ diff --git a/Mohem/resources/ios/icon/icon-small@2x.png b/Mohem/resources/ios/icon/icon-small@2x.png index e7040d34..6423d8a9 100644 Binary files a/Mohem/resources/ios/icon/icon-small@2x.png and b/Mohem/resources/ios/icon/icon-small@2x.png differ diff --git a/Mohem/resources/ios/icon/icon-small@3x.png b/Mohem/resources/ios/icon/icon-small@3x.png index ff89af2f..bc248bc2 100644 Binary files a/Mohem/resources/ios/icon/icon-small@3x.png and b/Mohem/resources/ios/icon/icon-small@3x.png differ diff --git a/Mohem/resources/ios/icon/icon.png b/Mohem/resources/ios/icon/icon.png index 7117b279..a11b6a28 100644 Binary files a/Mohem/resources/ios/icon/icon.png and b/Mohem/resources/ios/icon/icon.png differ diff --git a/Mohem/resources/ios/icon/icon@2x.png b/Mohem/resources/ios/icon/icon@2x.png index 7d36c90d..35c7b28f 100644 Binary files a/Mohem/resources/ios/icon/icon@2x.png and b/Mohem/resources/ios/icon/icon@2x.png differ diff --git a/Mohem/resources/ios/splash/Default-568h@2x~iphone.png b/Mohem/resources/ios/splash/Default-568h@2x~iphone.png index f2381201..ae189360 100644 Binary files a/Mohem/resources/ios/splash/Default-568h@2x~iphone.png and b/Mohem/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/Mohem/resources/ios/splash/Default-667h.png b/Mohem/resources/ios/splash/Default-667h.png index 8adb7a55..c932689d 100644 Binary files a/Mohem/resources/ios/splash/Default-667h.png and b/Mohem/resources/ios/splash/Default-667h.png differ diff --git a/Mohem/resources/ios/splash/Default-736h.png b/Mohem/resources/ios/splash/Default-736h.png index a4afb85d..5e15230e 100644 Binary files a/Mohem/resources/ios/splash/Default-736h.png and b/Mohem/resources/ios/splash/Default-736h.png differ diff --git a/Mohem/resources/ios/splash/Default-Landscape-736h.png b/Mohem/resources/ios/splash/Default-Landscape-736h.png index 09ecd75c..ba1fc46f 100644 Binary files a/Mohem/resources/ios/splash/Default-Landscape-736h.png and b/Mohem/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png b/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png index d0cc22bd..e4cc25c8 100644 Binary files a/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png and b/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png b/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png index f9a1e250..85db3097 100644 Binary files a/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png and b/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png differ diff --git a/Mohem/resources/ios/splash/Default-Landscape~ipad.png b/Mohem/resources/ios/splash/Default-Landscape~ipad.png index 1e4ec8e8..10952763 100644 Binary files a/Mohem/resources/ios/splash/Default-Landscape~ipad.png and b/Mohem/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png b/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png index a959fe70..06f400da 100644 Binary files a/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png and b/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png b/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png index 69e50e29..0c4737da 100644 Binary files a/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png and b/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png differ diff --git a/Mohem/resources/ios/splash/Default-Portrait~ipad.png b/Mohem/resources/ios/splash/Default-Portrait~ipad.png index 57401bcc..6124868d 100644 Binary files a/Mohem/resources/ios/splash/Default-Portrait~ipad.png and b/Mohem/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/Mohem/resources/ios/splash/Default@2x~iphone.png b/Mohem/resources/ios/splash/Default@2x~iphone.png index 6e70cf91..c3f80858 100644 Binary files a/Mohem/resources/ios/splash/Default@2x~iphone.png and b/Mohem/resources/ios/splash/Default@2x~iphone.png differ diff --git a/Mohem/resources/ios/splash/Default@2x~universal~anyany.png b/Mohem/resources/ios/splash/Default@2x~universal~anyany.png index 5abb292c..55d83429 100644 Binary files a/Mohem/resources/ios/splash/Default@2x~universal~anyany.png and b/Mohem/resources/ios/splash/Default@2x~universal~anyany.png differ diff --git a/Mohem/resources/ios/splash/Default~iphone.png b/Mohem/resources/ios/splash/Default~iphone.png index 3f30babf..04bfad2e 100644 Binary files a/Mohem/resources/ios/splash/Default~iphone.png and b/Mohem/resources/ios/splash/Default~iphone.png differ diff --git a/Mohem/resources/logo_HMG.png b/Mohem/resources/logo_HMG.png new file mode 100755 index 00000000..54d23807 Binary files /dev/null and b/Mohem/resources/logo_HMG.png differ diff --git a/Mohem/resources/splash.png b/Mohem/resources/splash.png old mode 100644 new mode 100755 index b3611afe..121950ff Binary files a/Mohem/resources/splash.png and b/Mohem/resources/splash.png differ diff --git a/Mohem/resources/splash.png.md5 b/Mohem/resources/splash.png.md5 index be55b5ca..b9777f40 100644 --- a/Mohem/resources/splash.png.md5 +++ b/Mohem/resources/splash.png.md5 @@ -1 +1 @@ -120da22872c96bf8e983fb4c4558bda0 \ No newline at end of file +b8fbf9d45bfbdf47560d99960bc65188 \ No newline at end of file diff --git a/Mohem/resources/splash_CS.png b/Mohem/resources/splash_CS.png new file mode 100644 index 00000000..b3611afe Binary files /dev/null and b/Mohem/resources/splash_CS.png differ diff --git a/Mohem/resources/splash_HMG.png b/Mohem/resources/splash_HMG.png new file mode 100755 index 00000000..121950ff Binary files /dev/null and b/Mohem/resources/splash_HMG.png differ 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 2529fd05..422ac828 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -182,7 +182,7 @@ export class AuthenticationService { public login(request: LoginRequest, onError: any, errorLabel: string): Observable { this.setPublicFields(request); - request.P_APP_VERSION="CS"; + request.P_APP_VERSION="HMG"; return this.con.post(AuthenticationService.login, request, onError, errorLabel); } @@ -437,7 +437,7 @@ export class AuthenticationService { public checkUserAuthentication(request: CheckUserAuthenticationRequest, onError: any, errorLabel: string) : Observable { this.setPublicFields(request); - request.P_APP_VERSION="CS"; + request.P_APP_VERSION="HMG"; return this.con.post(AuthenticationService.userChecking, request, onError, errorLabel); } 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 aad89ca8..8262c2d9 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -19,8 +19,8 @@ export class ConnectorService { public static timeOut = 30 * 1000; // 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://uat.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/home/home.page.html b/Mohem/src/app/home/home.page.html index 772027c2..2ba7c5f0 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -11,7 +11,7 @@ {{notBadge}} -
+

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

diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index b311253d..ff6ff455 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -12,6 +12,8 @@ min-height: 47px; background: transparent; font-size: 2rem; + position: absolute; +top: 40px; } #homeBadgeBtn{ position: absolute; @@ -24,6 +26,10 @@ min-width: auto; min-height: auto; border-radius: 50%; + } + .homeBox{ + + } .header-div{ background:var(--primary); @@ -47,8 +53,9 @@ .TxtPlace { margin: 0; - padding: 0 0 10px 0; + padding: 50px 0 10px 0; text-align: center; + width:100%; } .serviceItem {