From ce88e7224801cb86082c39ffedf3c6dde826179e Mon Sep 17 00:00:00 2001 From: "mohamed.mekawy" Date: Sun, 15 Sep 2019 09:53:20 +0300 Subject: [PATCH] solve bugs --- Mohem/npm | 2 +- Mohem/package-lock.json | 318 ++++++++++-------- Mohem/package.json | 24 +- .../submit-absence.component.ts | 5 +- Mohem/src/app/app-routing.module.ts | 7 +- Mohem/src/app/app.component.html | 7 +- Mohem/src/app/app.component.scss | 7 + .../src/app/attendance/home/home.component.ts | 3 + .../authentication/login/login.component.html | 10 +- .../authentication/login/login.component.ts | 116 +++---- .../sms-page/sms-page.page.html | 2 +- .../authentication/sms-page/sms-page.page.ts | 6 + .../app/eit/eit-list/eit-list.component.ts | 1 + .../authentication/authentication.service.ts | 2 + .../models/check-user-auth.request.ts | 1 + .../authentication/models/login.request.ts | 1 + .../services/common/common.service.ts | 2 + .../services/connector/connector.service.ts | 10 +- .../ui/button/button.component.html | 8 +- .../hmg-common/ui/button/button.component.ts | 18 +- Mohem/src/app/home/home.page.ts | 9 +- .../app/my-team/details/details.component.ts | 10 +- .../work-list-rfc/work-list-rfc.component.ts | 3 +- .../worklist-main/worklist-main.component.ts | 4 +- Mohem/src/app/uI-elements/time.input.ts | 26 +- Mohem/src/assets/localization/i18n.json | 2 +- Mohem/src/main.ts | 2 +- Mohem/src/theme/styles.scss | 1 + 28 files changed, 350 insertions(+), 257 deletions(-) diff --git a/Mohem/npm b/Mohem/npm index d6a6d18f..f4d3795b 100644 --- a/Mohem/npm +++ b/Mohem/npm @@ -1 +1 @@ -latest versions based on package.json rules - install +to update ionic - install -g ionic diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index f8a05666..a3c25224 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -89,15 +89,6 @@ "rxjs": "6.3.3", "source-map": "0.7.3" } - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } } } }, @@ -160,15 +151,6 @@ "rxjs": "6.3.3", "source-map": "0.7.3" } - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } } } }, @@ -1096,15 +1078,6 @@ "rxjs": "6.3.3", "source-map": "0.7.3" } - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } } } }, @@ -1496,9 +1469,9 @@ } }, "acorn": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", - "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", + "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", "dev": true }, "acorn-dynamic-import": { @@ -2391,14 +2364,14 @@ } }, "browserslist": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz", - "integrity": "sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz", + "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000975", - "electron-to-chromium": "^1.3.164", - "node-releases": "^1.1.23" + "caniuse-lite": "^1.0.30000989", + "electron-to-chromium": "^1.3.247", + "node-releases": "^1.1.29" } }, "browserstack": { @@ -2587,9 +2560,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000975", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000975.tgz", - "integrity": "sha512-ZsXA9YWQX6ATu5MNg+Vx/cMQ+hM6vBBSqDeJs8ruk9z0ky4yIHML15MoxcFt088ST2uyjgqyUGRJButkptWf0w==", + "version": "1.0.30000989", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", + "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==", "dev": true }, "canonical-path": { @@ -4397,9 +4370,9 @@ "integrity": "sha1-JVipzlmY9tbcBs+S/Yu7nQkB8Wo=" }, "cordova-plugin-device": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz", - "integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro=" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz", + "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==" }, "cordova-plugin-geolocation": { "version": "4.0.2", @@ -4437,25 +4410,30 @@ "integrity": "sha512-y2QMX709RgrbCHVDHAewjvXi50h+u+VcuCQADPJS+tH/BosFie+x1vo5mMwysuIEiaQ25b0qhIzo63RCyT5Fyw==" }, "cordova-plugin-splashscreen": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz", - "integrity": "sha1-dH509W4gHNWFvGLRS8oZ9oZ/8e0=" + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.3.tgz", + "integrity": "sha512-rnoDXMDfzoeHDBvsnu6JmzDE/pV5YJCAfc5hYX/Mb2BIXGgSjFJheByt0tU6kp3Wl40tSyFX4pYfBwFblBGyRg==" }, "cordova-plugin-statusbar": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz", - "integrity": "sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY=" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz", + "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg==" }, "cordova-plugin-whitelist": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz", - "integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=" + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz", + "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==" }, "cordova-sms-plugin": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cordova-sms-plugin/-/cordova-sms-plugin-1.0.0.tgz", "integrity": "sha512-DdRf1zdJkwC9BJ3fVg2yx/faoW5eOscg6oFIWODfOIBu5AQ1oV6+gsGTO5pHVLBzlt5V8U9zG9PwhR1IbnW/EQ==" }, + "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=" + }, "core-js": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", @@ -5010,10 +4988,18 @@ "dev": true }, "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz", + "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==", + "dev": true, + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } }, "default-gateway": { "version": "2.7.2", @@ -5025,6 +5011,15 @@ "ip-regex": "^2.1.0" } }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -5297,15 +5292,15 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.166", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.166.tgz", - "integrity": "sha512-7XwtJz81H/PBnkmQ/07oVPOGTkBZs6ibZN8OqXNUrxjRPzR0Xj+MFcMmRZEXGilEg1Pm+97V8BZVI63qnBX1hQ==", + "version": "1.3.250", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.250.tgz", + "integrity": "sha512-2OAU91iUw83QvzuWJPfT+FMj+O+DC1EyTx1QBFcc9WZzOQSfZEAWINpdLWElxkgfiqTvQRDOKg0DkMZd9QoNug==", "dev": true }, "elliptic": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", - "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", + "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -5540,9 +5535,9 @@ } }, "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, "esutils": { @@ -6120,7 +6115,8 @@ "version": "2.1.1", "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6144,13 +6140,15 @@ "version": "1.0.0", "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6167,19 +6165,22 @@ "version": "1.1.0", "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6310,7 +6311,8 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6324,6 +6326,7 @@ "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6340,6 +6343,7 @@ "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6348,13 +6352,15 @@ "version": "0.0.8", "resolved": false, "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "resolved": false, "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6375,6 +6381,7 @@ "resolved": false, "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6463,7 +6470,8 @@ "version": "1.0.1", "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6477,6 +6485,7 @@ "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6572,7 +6581,8 @@ "version": "5.1.2", "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -6614,6 +6624,7 @@ "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6635,6 +6646,7 @@ "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6683,13 +6695,15 @@ "version": "1.0.2", "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "resolved": false, "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -6705,6 +6719,12 @@ "rimraf": "2" } }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -6884,6 +6904,15 @@ "har-schema": "^2.0.0" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -7257,9 +7286,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -7501,6 +7530,12 @@ } } }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true + }, "is-array": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz", @@ -7547,6 +7582,12 @@ } } }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "dev": true + }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -7670,6 +7711,15 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "dev": true, + "requires": { + "has": "^1.0.1" + } + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -8365,9 +8415,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.clonedeep": { "version": "4.5.0", @@ -8832,9 +8882,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -9181,9 +9231,9 @@ } }, "node-releases": { - "version": "1.1.23", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz", - "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==", + "version": "1.1.29", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.29.tgz", + "integrity": "sha512-R5bDhzh6I+tpi/9i2hrrvGJ3yKPYzlVOORDkXhnZuwi5D3q1I5w4vYy24PJXTcLk9Q0kws9TO77T75bcK8/ysQ==", "dev": true, "requires": { "semver": "^5.3.0" @@ -9423,6 +9473,18 @@ } } }, + "object-is": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz", + "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=", + "dev": true + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -9985,9 +10047,9 @@ } }, "portfinder": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz", - "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==", + "version": "1.0.23", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz", + "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==", "dev": true, "requires": { "async": "^1.5.2", @@ -10569,6 +10631,15 @@ "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" }, + "regexp.prototype.flags": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", + "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", + "dev": true, + "requires": { + "define-properties": "^1.1.2" + } + }, "regexpu-core": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", @@ -11003,9 +11074,9 @@ } }, "serialize-javascript": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz", - "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.0.tgz", + "integrity": "sha512-UkGlcYMtw4d9w7YfCtJFgdRTps8N4L0A48R+SmcGL57ki1+yHwJXnalk5bjgrw+ljv6SfzjzPjhohod2qllg/Q==", "dev": true }, "serve-index": { @@ -11074,9 +11145,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -11606,9 +11677,9 @@ "dev": true }, "spdy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz", - "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz", + "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", "dev": true, "requires": { "debug": "^4.1.0", @@ -12140,9 +12211,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -12234,9 +12305,9 @@ "dev": true }, "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", + "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { "setimmediate": "^1.0.4" @@ -12482,38 +12553,15 @@ "dev": true }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-filename": { @@ -13042,9 +13090,9 @@ } }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { "p-try": "^2.0.0" diff --git a/Mohem/package.json b/Mohem/package.json index 487ce452..c86118d7 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -64,20 +64,21 @@ "cordova-plugin-add-swift-support": "^2.0.2", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-badge": "^0.8.8", - "cordova-plugin-cszbar": "~1.3.2", - "cordova-plugin-datepicker": "~0.9.3", - "cordova-plugin-device": "^2.0.2", - "cordova-plugin-geolocation": "~4.0.1", + "cordova-plugin-cszbar": "^1.3.4", + "cordova-plugin-datepicker": "^0.9.3", + "cordova-plugin-device": "^2.0.3", + "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-local-notification": "^0.9.0-beta.2", "cordova-plugin-nativestorage": "^2.3.2", "cordova-plugin-sms-receive": "^1.0.2", - "cordova-plugin-splashscreen": "^5.0.2", - "cordova-plugin-statusbar": "^2.4.2", - "cordova-plugin-whitelist": "^1.3.3", + "cordova-plugin-splashscreen": "^5.0.3", + "cordova-plugin-statusbar": "^2.4.3", + "cordova-plugin-whitelist": "^1.3.4", "cordova-sms-plugin": "^1.0.0", + "cordova-support-google-services": "^1.1.0", "core-js": "^2.5.4", "date-fns": "^1.30.1", "mx.ferreyra.callnumber": "0.0.2", @@ -94,7 +95,7 @@ }, "devDependencies": { "@angular-devkit/architect": "~0.12.3", - "@angular-devkit/build-angular": "~0.13.0", + "@angular-devkit/build-angular": "^0.13.9", "@angular-devkit/core": "~7.2.3", "@angular-devkit/schematics": "~7.2.3", "@angular/cli": "7.3.6", @@ -136,11 +137,14 @@ "mx.ferreyra.callnumber": {}, "cordova-plugin-badge": {}, "cordova-plugin-ionic-keyboard": {}, - "cordova-android-support-gradle-release": {}, + "cordova-android-support-gradle-release": { + "ANDROID_SUPPORT_VERSION": "27.+" + }, "call-number": {}, "phonegap-plugin-push": { "GOOGLE_PLAY_SERVICES_VERSION": "16.0.0", - "FCM_VERSION": "15.0.0" + "FCM_VERSION": "15.0.0", + "ANDROID_SUPPORT_V13_VERSION": "27.+" }, "cordova-sms-plugin": {}, "cordova-plugin-datepicker": {}, 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 1cea406c..d4ed19b4 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -1025,7 +1025,10 @@ export class SubmitAbsenceComponent implements OnInit { elemVal = (document.getElementById( this.absenceDffresponse[i].APPLICATION_COLUMN_NAME ) as HTMLInputElement).value; - elemVal = moment(elemVal).format("YYYY/MM/DD hh:mm:ss"); + if(elemVal){ + elemVal = moment(elemVal).format("YYYY/MM/DD hh:mm:ss"); + } + }else{ elemVal = (document.getElementById( this.absenceDffresponse[i].APPLICATION_COLUMN_NAME diff --git a/Mohem/src/app/app-routing.module.ts b/Mohem/src/app/app-routing.module.ts index 94280fa5..11b5d4ea 100644 --- a/Mohem/src/app/app-routing.module.ts +++ b/Mohem/src/app/app-routing.module.ts @@ -5,9 +5,7 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { path: '', redirectTo: 'authentication/login', pathMatch: 'full' }, { - path: 'authentication', loadChildren: './authentication/authentication.module#AuthenticationPageModule', - data: { preload: true, delay: 1000 } - }, + path: 'authentication', loadChildren: './authentication/authentication.module#AuthenticationPageModule'}, { path: 'home', loadChildren: './home/home.module#HomePageModule' }, { path: 'profile', loadChildren: './profile/profile.module#ProfilePageModule' }, { path: 'vacation-rule', loadChildren: './vacation-rule/vacation-rule.module#VacationRulePageModule' }, @@ -24,7 +22,8 @@ const routes: Routes = [ @NgModule({ imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}), + /*RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}),*/ + RouterModule.forRoot(routes), ], exports: [RouterModule] }) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 548af300..772e1133 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -48,9 +48,12 @@ - +
+
+

{{CompanyImageDescription}}

+
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index c98011e2..64f3ed06 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -168,6 +168,13 @@ button.menu-item.item.item-block.item-ios { height: 100%; } +.logoImg{ + width: 120px; + position: relative; + left: 100px; + top: 120px; +} + .companyTxt { font-size: 12px; color: var(--customnavy); diff --git a/Mohem/src/app/attendance/home/home.component.ts b/Mohem/src/app/attendance/home/home.component.ts index fd65ee92..345c16c9 100644 --- a/Mohem/src/app/attendance/home/home.component.ts +++ b/Mohem/src/app/attendance/home/home.component.ts @@ -23,8 +23,11 @@ export class HomeComponent implements OnInit { this.geolocation.getCurrentPosition().then((resp) => { // resp.coords.latitude // resp.coords.longitude + //console.log("Loc 2"); console.log(resp.coords.latitude); console.log(resp.coords.longitude); + this.lat=resp.coords.latitude; + this.longt=resp.coords.longitude; }).catch((error) => { console.log('Error getting location', error); }); diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index fe9e7b18..d345eafd 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -23,16 +23,18 @@ {{ts.trPK('login','password')}} - +
{{ts.trPK('login','signup')}}
-
- - +
+ + +
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index f4d4816c..a6c63227 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -35,7 +35,7 @@ export class LoginComponent implements OnInit, OnDestroy { private isMobileFingerPrint: boolean; private FingerPrintPatientIdentificationID: string; private loginData = new LoginModel(); - + constructor( public cs: CommonService, public authService: AuthenticationService, @@ -81,6 +81,7 @@ export class LoginComponent implements OnInit, OnDestroy { } private checkUserAuthentication() { + console.log("debug Here!!"); this.cs.startLoading(); const request = new LoginRequest(); request.P_USER_NAME = this.username; @@ -88,11 +89,11 @@ export class LoginComponent implements OnInit, OnDestroy { request.P_PASSWORD = this.password; console.log(request); this.authService - .login(request, () => { + .login(request, () => { console.log("error here"); //console.log(result.MessageStatus); - this.sharedData.setSharedData(true,Password.IS_EXPIRED_PSW); - this.userCheck(); + //this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); + //this.userCheck(); }, this.ts.trPK("general", "ok")) .subscribe((result: CheckUserAuthenticationResponse) => { console.log("success"); @@ -100,17 +101,18 @@ export class LoginComponent implements OnInit, OnDestroy { if (this.cs.validResponse(result)) { this.loginData.LogInTokenID = result.LogInTokenID; this.loginData.MobileNumber = result.MemberLoginList.P_MOBILE_NUMBER; - this.loginData.P_USER_NAME=this.username; + this.loginData.P_USER_NAME = this.username; this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); this.cs.openSMSPage(); + } else{ + console.log("result.IsPasswordExpired"); + console.log(result.IsPasswordExpired); + if(result.IsPasswordExpired) + { + this.presentPasswordExpiredDialog(); } - // console.log("result.IsPasswordExpired"); - // console.log(result.IsPasswordExpired); - // if(result.IsPasswordExpired) - // { - // this.presentPasswordExpiredDialog(); - // } + } }); } @@ -118,22 +120,21 @@ export class LoginComponent implements OnInit, OnDestroy { this.smsService.stopSMSMonitoring(); } - async presentPasswordExpiredDialog() - { + async presentPasswordExpiredDialog() { const alert = await this.alertController.create({ - header: this.ts.trPK("general","confirm"), - message: this.ts.trPK("login","password-expired"), + header: this.ts.trPK("general", "confirm"), + message: this.ts.trPK("login", "password-expired"), buttons: [ - { - text: this.ts.trPK("general","ok"), - handler: () => { - console.log('Confirm Okay'); - this.sharedData.setSharedData(true,Password.IS_EXPIRED_PSW); - this.userCheck(); + { + text: this.ts.trPK("general", "ok"), + handler: () => { + console.log('Confirm Okay'); + this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); + this.userCheck(); + } } - } ] - }); + }); await alert.present(); } @@ -141,15 +142,14 @@ export class LoginComponent implements OnInit, OnDestroy { this.cs.openUserForgot(); } - public userCheck() - { - this.cs.startLoading(); - const request = new CheckUserAuthenticationRequest(); - request.P_USER_NAME = this.username; - this.authService.checkUserAuthentication( - request, - () => { - /* Write code for error */ + public userCheck() { + this.cs.startLoading(); + const request = new CheckUserAuthenticationRequest(); + request.P_USER_NAME = this.username; + this.authService.checkUserAuthentication( + request, + () => { + /* Write code for error */ }, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => { if (this.cs.validResponse(result)) { this.checkUserResult = result; @@ -157,35 +157,35 @@ export class LoginComponent implements OnInit, OnDestroy { this.sendSMSForForgotPassword(); } }); - } + } - private checkUserResult: CheckUserAuthenticationResponse; + private checkUserResult: CheckUserAuthenticationResponse; private sendSMSForForgotPassword() { - this.cs.startLoading(); - let changePwdObj= new LoginRequest(); - changePwdObj.MobileNumber= this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER; - changePwdObj.P_USER_NAME=this.username; - changePwdObj.P_MOBILE_NUMBER=this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER; - - this.authService.sendPublicSMS( - changePwdObj, - () => { - //this.sendSMSForForgotPassword(); - /* Write code for error */ - }, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => { - if (this.cs.validResponse(result)) { - this.checkUserResult = result; - console.log("2"); - console.log(result); - this.loginData.LogInTokenID = result.LogInTokenID; - this.loginData.P_USER_NAME = this.username; - this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); - this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); - this.sharedData.setSharedData(true,Password.IS_FORGET_PSW); - this.cs.stopLoading(); - this.cs.openSMSPage(); - }}); + this.cs.startLoading(); + let changePwdObj = new LoginRequest(); + changePwdObj.MobileNumber = this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER; + changePwdObj.P_USER_NAME = this.username; + changePwdObj.P_MOBILE_NUMBER = this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER; + this.authService.sendPublicSMS( + changePwdObj, + () => { + //this.sendSMSForForgotPassword(); + /* Write code for error */ + }, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => { + if (this.cs.validResponse(result)) { + this.checkUserResult = result; + console.log("2"); + console.log(result); + this.loginData.LogInTokenID = result.LogInTokenID; + this.loginData.P_USER_NAME = this.username; + this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); + this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); + this.sharedData.setSharedData(true, Password.IS_FORGET_PSW); + this.cs.stopLoading(); + this.cs.openSMSPage(); + } + }); } } diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index e6d46f1b..a26b8d07 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -28,7 +28,7 @@ {{'verificationcode,verificationcode' | translate}} - +
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 c6787c87..be747cbd 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -105,6 +105,12 @@ export class SmsPageComponent implements OnInit { this.pauseTimer(); } + checkOTPLength(){ + console.log(this.activationCode.length); + if(this.activationCode.length==4){ + this.checkVerificationCode(); + } + } checkVerificationCode() { if (this.count < 3) { if ( diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index ef6560c8..20b7eb2a 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -60,6 +60,7 @@ export class EitListComponent implements OnInit { } getEITTransactions() { + console.log("jkfdjkdfsffjhfsdahffg"); this.IsReachEnd = false; this.EITTransactionsListObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; 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 56bd2ff0..2529fd05 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -182,6 +182,7 @@ export class AuthenticationService { public login(request: LoginRequest, onError: any, errorLabel: string): Observable { this.setPublicFields(request); + request.P_APP_VERSION="CS"; return this.con.post(AuthenticationService.login, request, onError, errorLabel); } @@ -436,6 +437,7 @@ export class AuthenticationService { public checkUserAuthentication(request: CheckUserAuthenticationRequest, onError: any, errorLabel: string) : Observable { this.setPublicFields(request); + request.P_APP_VERSION="CS"; return this.con.post(AuthenticationService.userChecking, request, onError, errorLabel); } 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 45314c6f..031fd51d 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 @@ -11,4 +11,5 @@ export class CheckUserAuthenticationRequest extends Request { P_USER_NAME:string; P_LANGUAGE: string; P_PASSWORD: string; + P_APP_VERSION:string; } 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 47339ed1..fdb406ab 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 @@ -12,6 +12,7 @@ export class LoginRequest extends Request { P_MOBILE_NUMBER: string; P_PASSWORD: string; P_LANGUAGE: string; + P_APP_VERSION:string; public static SHARED_DATA = 'login-request'; public static NATIONALITY_CODE = "Nationality_Code"; // isDentalAllowedBackend: false 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 60f43713..3e846bef 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1151,7 +1151,9 @@ export class CommonService { public formatDate(date) { let FormatedDate; console.log(date); + if (date) { + date = date.slice(0, 10); FormatedDate = date.replace(/-/g, "/"); FormatedDate = FormatedDate + " 00:00:00"; } else { 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 ff28853e..aad89ca8 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -19,11 +19,11 @@ export class ConnectorService { public static timeOut = 30 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service - - public static host = 'https://hmgwebservices.com/'; - // public static host = 'http://10.50.100.198:6060/'; // development service - /* public static host = 'http://10.200.204.101:6060/'; // video conference development - public static host = 'http://10.50.100.198:6060/'; + 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/'; public static host = 'http://10.50.100.198:6060/'; // development service public static host = 'http://10.50.100.198:4040/'; // UAT service public static host = 'http://10.50.100.198:4444/'; // production service diff --git a/Mohem/src/app/hmg-common/ui/button/button.component.html b/Mohem/src/app/hmg-common/ui/button/button.component.html index 4beff4a7..08f3b9c6 100644 --- a/Mohem/src/app/hmg-common/ui/button/button.component.html +++ b/Mohem/src/app/hmg-common/ui/button/button.component.html @@ -7,13 +7,15 @@ --> - +
-
\ No newline at end of file + + + +--> \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/button/button.component.ts b/Mohem/src/app/hmg-common/ui/button/button.component.ts index 8f8ffc13..746c4ae7 100644 --- a/Mohem/src/app/hmg-common/ui/button/button.component.ts +++ b/Mohem/src/app/hmg-common/ui/button/button.component.ts @@ -8,7 +8,13 @@ import { TranslatorService } from '../../services/translator/translator.service' styleUrls: ['./button.component.scss'], }) export class ButtonComponent implements OnInit { + constructor() { + } + ngOnInit() { + + } + /* @Input() icon: string; @Input() title: string; @Output() trigger = new EventEmitter(); @@ -34,12 +40,7 @@ export class ButtonComponent implements OnInit { }; } - /* - const element = document.getElementById('modal'); - element.addEventListener('click', e => { - e.stopImmediatePropagation(); - }); - */ + } private isEnabled(enabled: boolean): string { @@ -61,20 +62,17 @@ export class Modal implements OnInit { ngOnInit() { console.log(' on initialization'); - //this.elRef.nativeElement.addEventListener('mouseenter', this.onMouseEnter); } ngOnDestroy() { - // this.elRef.nativeElement.removeEventListener('mouseenter', this.onMouseEnter); } onMouseEnter() { - // alert("Don't touch my bacon!") } @HostListener('click', ['$event']) onClick(event: any) { alert('click'); - // event.preventPropagation(); } + */ } diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 4a3cf9ec..55dbb8c0 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -52,8 +52,11 @@ export class HomePage implements OnInit { .then(resp => { // resp.coords.latitude // resp.coords.longitude + //console.log("Loc 3"); console.log(resp.coords.latitude); console.log(resp.coords.longitude); + this.lat=resp.coords.latitude; + this.longt=resp.coords.longitude; }) .catch(error => { console.log("Error getting location", error); @@ -101,8 +104,11 @@ export class HomePage implements OnInit { .then(resp => { // resp.coords.latitude // resp.coords.longitude + //console.log("Loc 1"); console.log(resp.coords.latitude); console.log(resp.coords.longitude); + this.lat=resp.coords.latitude; + this.longt=resp.coords.longitude; }) .catch(error => { console.log("Error getting location", error); @@ -223,7 +229,8 @@ export class HomePage implements OnInit { flash: "off", drawSight: false }; - console.log("your currnt location is"); + //console.log("your currnt location is"); + //console.log("Loc"); this.scanCode(); } diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index d565157f..52feb11f 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -224,11 +224,11 @@ export class DetailsComponent implements OnInit { NationalityCode: nationality }; //set emp and resp id - // this.sharedData.setSharedData(selEmpNo, MenuResponse.SHARED_SEL_EMP); - // this.sharedData.setSharedData( - // body.P_SELECTED_RESP_ID, - // MenuResponse.SHARED_SEL_RESP_ID - // ); + this.common.sharedService.setSharedData(selEmpNo, MenuResponse.SHARED_SEL_EMP); + this.common.sharedService.setSharedData( + body.P_SELECTED_RESP_ID, + MenuResponse.SHARED_SEL_RESP_ID + ); this.menuService.getMenuEntires(body).subscribe((result: MenuResponse) => { this.handleMenuEntiresResult(result); }); diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index a61b7aed..ce4e110a 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -117,7 +117,8 @@ export class WorkListRfcComponent implements OnInit { // msg=this.translate.translate("general.success"); // this.common.showAlert(msg); // this.navCtrl.push("HomePage"); - this.cs.openHome(); + // this.cs.openHome(); + this.cs.openNotificationPage(); } } // valid it } diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 010d3e2b..a3aa86a6 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -47,7 +47,7 @@ export class WorklistMainComponent implements OnInit { public common: CommonService, public ts: TranslatorService, public worklistMainService: WorklistMainService, - public elementRef: ElementRef + public elementRef: ElementRef, ) {} ngOnInit() { @@ -144,6 +144,8 @@ export class WorklistMainComponent implements OnInit { if (this.common.validResponse(result)) { if (result.MessageStatus == 1) { // this.navCtrl.push("HomePage"); + //this.common.openHome(); + this.common.openNotificationPage(); } } // valid it } diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index ca6c7d00..8f20eb5d 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -31,20 +31,20 @@ export class TimeInput extends UiElement { this.formatDate(); } const template = - // "
" + - // " " + - // // " "+ - // "
"+this.value+"
"+ - // "
"; + "
" + + " " + + // " "+ + "
"+this.value+"
"+ + "
"; - "" + - " " + this.label + "" + - // "
" + this.value + "
" + - "" + - // " "+ - // " "+ - // " "+ - "
" + // "" + + // " " + this.label + "" + + // // "
" + this.value + "
" + + // "" + + // // " "+ + // // " "+ + // // " "+ + // "
" return template; } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 571f4b89..1da49db5 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -682,7 +682,7 @@ "ar": "أنت تحاول حذف صف تم حذفه بالفعل." }, "noData": { - "en": "The are no requests", + "en": "There are no requests", "ar": "لا توجد طلبات" }, "noFileSelect": { diff --git a/Mohem/src/main.ts b/Mohem/src/main.ts index 91ec6da5..c27efc4d 100644 --- a/Mohem/src/main.ts +++ b/Mohem/src/main.ts @@ -5,7 +5,7 @@ import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; if (environment.production) { - enableProdMode(); + // enableProdMode(); } platformBrowserDynamic().bootstrapModule(AppModule) diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 7e13790a..291b459d 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -46,6 +46,7 @@ ion-label{ width: 90px; height: 90px; display: inline-flex; + overflow: hidden; background: transparent; -webkit-border-radius:50% !important; -moz-border-radius:50% !important;