diff --git a/Mohem/config.xml b/Mohem/config.xml index 4a904808..70b638f5 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -1,5 +1,5 @@ - + MOHEMM an app created by cloud Solutions Cloud Solutions @@ -107,7 +107,7 @@ - + diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index 41c61077..8c6a7c3c 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -986,11 +986,18 @@ } }, "@ionic-native/background-geolocation": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/@ionic-native/background-geolocation/-/background-geolocation-5.19.1.tgz", - "integrity": "sha512-5TFXTxoEZtJGkfv5Kbv+kE0oyvLNcAbo3jAIwRyjNRXvmmN4lqgZjDNRlPlYreG5siGChgXS60rJCP5TxTbzmg==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@ionic-native/background-geolocation/-/background-geolocation-5.30.0.tgz", + "integrity": "sha512-Lwo8aG7SZu0eRgDTUtIUQS+NKJyOUNdcSqcRjrnu2p/k2Jlt2CF7MZjWuc0+On4+o7snJ4NfvDpAHuTT9oOo3w==", "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/badge": { @@ -1730,6 +1737,11 @@ } } }, + "@mauron85/cordova-plugin-background-geolocation": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@mauron85/cordova-plugin-background-geolocation/-/cordova-plugin-background-geolocation-3.1.0.tgz", + "integrity": "sha512-ZZDwkO5m0Bbi8VDJsO3ssBgXrgCiu43/kOBvSneh5djIFyRrQZJbj6IMNt/hP7F/m7Pmw0x7F5ASXjPMwjEAjg==" + }, "@ng-bootstrap/ng-bootstrap": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.2.tgz", @@ -2307,11 +2319,11 @@ "dev": true }, "android-versions": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.5.0.tgz", - "integrity": "sha512-/GWUAqa2OJNlDF5VGSe3SR1QMHEPXxx54Ur56r0qQC0H9FlBr7kyBF2SgVEhzFCPbrW4UcYgVuWrq/2Ty3QvXg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz", + "integrity": "sha512-ojC2Ig7b/KJ6iNtR8e4bacmOsJyEkoERk3CKMIsnH7kJz5z6551NMbrVaRb7KXYavu1d74Uhml/bfcmqT3nAcg==", "requires": { - "semver": "^5.4.1" + "semver": "^5.7.1" } }, "angular-calendar": { @@ -3681,9 +3693,9 @@ "dev": true }, "compare-func": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz", - "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz", + "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==", "requires": { "array-ify": "^1.0.0", "dot-prop": "^3.0.0" @@ -5634,6 +5646,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, "requires": { "is-arguments": "^1.0.4", "is-date-object": "^1.0.1", @@ -5666,6 +5679,7 @@ "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" } @@ -5711,11 +5725,6 @@ } } }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" - }, "del": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", @@ -5927,14 +5936,6 @@ "is-obj": "^1.0.0" } }, - "dotignore": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz", - "integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==", - "requires": { - "minimatch": "^3.0.4" - } - }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -6026,13 +6027,13 @@ } }, "endent": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz", - "integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz", + "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==", "requires": { "dedent": "^0.7.0", "fast-json-parse": "^1.0.3", - "objectorarray": "^1.0.3" + "objectorarray": "^1.0.4" } }, "engine.io": { @@ -6160,6 +6161,7 @@ "version": "1.17.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", + "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -6178,6 +6180,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -6690,14 +6693,6 @@ } } }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { - "is-callable": "^1.1.3" - } - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -7384,7 +7379,8 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "gauge": { "version": "2.7.4", @@ -7546,6 +7542,7 @@ "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" } @@ -7591,7 +7588,8 @@ "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true }, "has-unicode": { "version": "2.0.1", @@ -8185,7 +8183,8 @@ "is-arguments": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true }, "is-array": { "version": "1.0.1", @@ -8216,7 +8215,8 @@ "is-callable": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true }, "is-data-descriptor": { "version": "0.1.4", @@ -8241,7 +8241,8 @@ "is-date-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true }, "is-descriptor": { "version": "0.1.6", @@ -8375,6 +8376,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, "requires": { "has": "^1.0.3" } @@ -8389,6 +8391,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -13530,17 +13533,20 @@ "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true }, "object-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", - "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==" + "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==", + "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==" + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "object-visit": { "version": "1.0.1", @@ -13555,6 +13561,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, "requires": { "define-properties": "^1.1.2", "function-bind": "^1.1.1", @@ -13572,12 +13579,9 @@ } }, "objectorarray": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz", - "integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==", - "requires": { - "tape": "^4.8.0" - } + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz", + "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==" }, "obuf": { "version": "1.1.2", @@ -14758,6 +14762,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1" @@ -14925,14 +14930,6 @@ "signal-exit": "^3.0.2" } }, - "resumer": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", - "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", - "requires": { - "through": "~2.3.4" - } - }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -16112,20 +16109,11 @@ "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz", "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==" }, - "string.prototype.trim": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz", - "integrity": "sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1" - } - }, "string.prototype.trimleft": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "dev": true, "requires": { "define-properties": "^1.1.3", "function-bind": "^1.1.1" @@ -16135,6 +16123,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "dev": true, "requires": { "define-properties": "^1.1.3", "function-bind": "^1.1.1" @@ -16278,35 +16267,6 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", "dev": true }, - "tape": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/tape/-/tape-4.13.0.tgz", - "integrity": "sha512-J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw==", - "requires": { - "deep-equal": "~1.1.1", - "defined": "~1.0.0", - "dotignore": "~0.1.2", - "for-each": "~0.3.3", - "function-bind": "~1.1.1", - "glob": "~7.1.6", - "has": "~1.0.3", - "inherits": "~2.0.4", - "is-regex": "~1.0.5", - "minimist": "~1.2.0", - "object-inspect": "~1.7.0", - "resolve": "~1.14.2", - "resumer": "~0.0.0", - "string.prototype.trim": "~1.2.1", - "through": "~2.3.8" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, "tar": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", @@ -16520,7 +16480,8 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true }, "through2": { "version": "2.0.5", @@ -16798,9 +16759,9 @@ "dev": true }, "underscore": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", - "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==" + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz", + "integrity": "sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==" }, "union-value": { "version": "1.0.1", diff --git a/Mohem/package.json b/Mohem/package.json index 49311c3b..cffbebf1 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -24,7 +24,7 @@ "@ionic-native/android-permissions": "^5.18.0", "@ionic-native/app-availability": "^5.18.0", "@ionic-native/app-rate": "^5.18.0", - "@ionic-native/background-geolocation": "^5.4.0", + "@ionic-native/background-geolocation": "^5.30.0", "@ionic-native/badge": "^5.18.0", "@ionic-native/barcode-scanner": "^5.18.0", "@ionic-native/base64": "^5.18.0", @@ -54,6 +54,7 @@ "@ionic-native/themeable-browser": "^5.18.0", "@ionic-native/zbar": "^5.10.0", "@ionic/angular": "^4.1.0", + "@mauron85/cordova-plugin-background-geolocation": "^3.1.0", "@ng-bootstrap/ng-bootstrap": "^4.2.2", "@swimlane/ngx-charts": "^10.1.0", "angular-calendar": "^0.26.11", @@ -195,7 +196,25 @@ "cordova-plugin-fingerprint-aio": { "FACEID_USAGE_DESCRIPTION": "User Authentication" }, - "cordova-plugin-firebasex": {} + "cordova-plugin-firebasex": { + "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", + "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", + "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", + "ANDROID_ICON_ACCENT": "#FF00FFFF", + "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", + "ANDROID_FIREBASE_ANALYTICS_VERSION": "17.2.1", + "ANDROID_FIREBASE_MESSAGING_VERSION": "20.0.0", + "ANDROID_FIREBASE_CONFIG_VERSION": "19.0.3", + "ANDROID_FIREBASE_PERF_VERSION": "19.0.1", + "ANDROID_FIREBASE_AUTH_VERSION": "19.1.0", + "ANDROID_CRASHLYTICS_VERSION": "2.10.1", + "ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1" + }, + "cordova-plugin-androidx": {}, + "cordova-plugin-androidx-adapter": {}, + "cordova-plugin-background-geolocation": { + "GOOGLE_PLAY_SERVICES_VERSION": "+" + } }, "platforms": [ "browser", diff --git a/Mohem/resources/android/icon/drawable-hdpi-icon.png b/Mohem/resources/android/icon/drawable-hdpi-icon.png index 5b3ce910..0170bf37 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 d69c6ce6..bfa0158d 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 3e15a6e5..dbfdda39 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 8854e2dc..7de362ff 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 8e3a5903..0f0126ec 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 52c13b9b..98174aae 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 049727c9..eeee96c8 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 ddf677d7..9e03b7df 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 e5edf975..0a38dd15 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 6f264e22..b1c17f26 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 6d3fda04..d8138537 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 3497cec0..fd522a1d 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 5f192c2a..865b0ca1 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 5c239726..1288a343 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 2a6d9a25..bdd8e04e 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 658e946b..4971a419 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 42492889..7cddc775 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 6722931b..efa7f57d 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/android/xml/network_security_config.xml b/Mohem/resources/android/xml/network_security_config.xml index c15b28f7..f9fecaf7 100644 --- a/Mohem/resources/android/xml/network_security_config.xml +++ b/Mohem/resources/android/xml/network_security_config.xml @@ -1,6 +1,6 @@ - - localhost - - + + localhost + + \ No newline at end of file diff --git a/Mohem/resources/icon.png b/Mohem/resources/icon.png index 047ea31d..4833d5b4 100644 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 deleted file mode 100644 index 9dd53643..00000000 --- a/Mohem/resources/icon.png.md5 +++ /dev/null @@ -1 +0,0 @@ -1f488bbf4678f14e62f8bb82d7e4b0be \ No newline at end of file diff --git a/Mohem/resources/ios/icon/icon-1024.png b/Mohem/resources/ios/icon/icon-1024.png deleted file mode 100644 index 9f98ed52..00000000 Binary files a/Mohem/resources/ios/icon/icon-1024.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-108@2x.png b/Mohem/resources/ios/icon/icon-108@2x.png deleted file mode 100644 index 57dd4373..00000000 Binary files a/Mohem/resources/ios/icon/icon-108@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-20.png b/Mohem/resources/ios/icon/icon-20.png deleted file mode 100644 index 6c5716cf..00000000 Binary files a/Mohem/resources/ios/icon/icon-20.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-20@2x.png b/Mohem/resources/ios/icon/icon-20@2x.png deleted file mode 100644 index 1e91e219..00000000 Binary files a/Mohem/resources/ios/icon/icon-20@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-20@3x.png b/Mohem/resources/ios/icon/icon-20@3x.png deleted file mode 100644 index ca59caf0..00000000 Binary files a/Mohem/resources/ios/icon/icon-20@3x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-24@2x.png b/Mohem/resources/ios/icon/icon-24@2x.png deleted file mode 100644 index 3e15a6e5..00000000 Binary files a/Mohem/resources/ios/icon/icon-24@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-27.5@2x.png b/Mohem/resources/ios/icon/icon-27.5@2x.png deleted file mode 100644 index 13a6ba07..00000000 Binary files a/Mohem/resources/ios/icon/icon-27.5@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-29.png b/Mohem/resources/ios/icon/icon-29.png deleted file mode 100644 index bd2baa2d..00000000 Binary files a/Mohem/resources/ios/icon/icon-29.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-29@2x.png b/Mohem/resources/ios/icon/icon-29@2x.png deleted file mode 100644 index 5751133d..00000000 Binary files a/Mohem/resources/ios/icon/icon-29@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-29@3x.png b/Mohem/resources/ios/icon/icon-29@3x.png deleted file mode 100644 index 111045de..00000000 Binary files a/Mohem/resources/ios/icon/icon-29@3x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-40.png b/Mohem/resources/ios/icon/icon-40.png deleted file mode 100644 index 1e91e219..00000000 Binary files a/Mohem/resources/ios/icon/icon-40.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-40@2x.png b/Mohem/resources/ios/icon/icon-40@2x.png deleted file mode 100644 index d120c2e9..00000000 Binary files a/Mohem/resources/ios/icon/icon-40@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-40@3x.png b/Mohem/resources/ios/icon/icon-40@3x.png deleted file mode 100644 index 965af0ff..00000000 Binary files a/Mohem/resources/ios/icon/icon-40@3x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-44@2x.png b/Mohem/resources/ios/icon/icon-44@2x.png deleted file mode 100644 index 0496652c..00000000 Binary files a/Mohem/resources/ios/icon/icon-44@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-50.png b/Mohem/resources/ios/icon/icon-50.png deleted file mode 100644 index accf9a56..00000000 Binary files a/Mohem/resources/ios/icon/icon-50.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-50@2x.png b/Mohem/resources/ios/icon/icon-50@2x.png deleted file mode 100644 index 03e9d925..00000000 Binary files a/Mohem/resources/ios/icon/icon-50@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-60.png b/Mohem/resources/ios/icon/icon-60.png deleted file mode 100644 index ca59caf0..00000000 Binary files a/Mohem/resources/ios/icon/icon-60.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-60@2x.png b/Mohem/resources/ios/icon/icon-60@2x.png deleted file mode 100644 index 965af0ff..00000000 Binary files a/Mohem/resources/ios/icon/icon-60@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-60@3x.png b/Mohem/resources/ios/icon/icon-60@3x.png deleted file mode 100644 index 05b757ba..00000000 Binary files a/Mohem/resources/ios/icon/icon-60@3x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-72.png b/Mohem/resources/ios/icon/icon-72.png deleted file mode 100644 index 5b3ce910..00000000 Binary files a/Mohem/resources/ios/icon/icon-72.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-72@2x.png b/Mohem/resources/ios/icon/icon-72@2x.png deleted file mode 100644 index 8e3a5903..00000000 Binary files a/Mohem/resources/ios/icon/icon-72@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-76.png b/Mohem/resources/ios/icon/icon-76.png deleted file mode 100644 index 297a636e..00000000 Binary files a/Mohem/resources/ios/icon/icon-76.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-76@2x.png b/Mohem/resources/ios/icon/icon-76@2x.png deleted file mode 100644 index 53b767dc..00000000 Binary files a/Mohem/resources/ios/icon/icon-76@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-83.5@2x.png b/Mohem/resources/ios/icon/icon-83.5@2x.png deleted file mode 100644 index 6fe025bb..00000000 Binary files a/Mohem/resources/ios/icon/icon-83.5@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-86@2x.png b/Mohem/resources/ios/icon/icon-86@2x.png deleted file mode 100644 index ca222a6c..00000000 Binary files a/Mohem/resources/ios/icon/icon-86@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-98@2x.png b/Mohem/resources/ios/icon/icon-98@2x.png deleted file mode 100644 index 022d14cd..00000000 Binary files a/Mohem/resources/ios/icon/icon-98@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-small.png b/Mohem/resources/ios/icon/icon-small.png deleted file mode 100644 index bd2baa2d..00000000 Binary files a/Mohem/resources/ios/icon/icon-small.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-small@2x.png b/Mohem/resources/ios/icon/icon-small@2x.png deleted file mode 100644 index 5751133d..00000000 Binary files a/Mohem/resources/ios/icon/icon-small@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon-small@3x.png b/Mohem/resources/ios/icon/icon-small@3x.png deleted file mode 100644 index 111045de..00000000 Binary files a/Mohem/resources/ios/icon/icon-small@3x.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon.png b/Mohem/resources/ios/icon/icon.png deleted file mode 100644 index 8e68c5d4..00000000 Binary files a/Mohem/resources/ios/icon/icon.png and /dev/null differ diff --git a/Mohem/resources/ios/icon/icon@2x.png b/Mohem/resources/ios/icon/icon@2x.png deleted file mode 100644 index 6e74f8cd..00000000 Binary files a/Mohem/resources/ios/icon/icon@2x.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-1792h~iphone.png b/Mohem/resources/ios/splash/Default-1792h~iphone.png deleted file mode 100644 index 29c3a9ce..00000000 Binary files a/Mohem/resources/ios/splash/Default-1792h~iphone.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-2436h.png b/Mohem/resources/ios/splash/Default-2436h.png deleted file mode 100644 index 9d664d73..00000000 Binary files a/Mohem/resources/ios/splash/Default-2436h.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-2688h~iphone.png b/Mohem/resources/ios/splash/Default-2688h~iphone.png deleted file mode 100644 index 852b86f6..00000000 Binary files a/Mohem/resources/ios/splash/Default-2688h~iphone.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-568h@2x~iphone.png b/Mohem/resources/ios/splash/Default-568h@2x~iphone.png deleted file mode 100644 index 0563f848..00000000 Binary files a/Mohem/resources/ios/splash/Default-568h@2x~iphone.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-667h.png b/Mohem/resources/ios/splash/Default-667h.png deleted file mode 100644 index 8231bb70..00000000 Binary files a/Mohem/resources/ios/splash/Default-667h.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-736h.png b/Mohem/resources/ios/splash/Default-736h.png deleted file mode 100644 index 80048335..00000000 Binary files a/Mohem/resources/ios/splash/Default-736h.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape-1792h~iphone.png b/Mohem/resources/ios/splash/Default-Landscape-1792h~iphone.png deleted file mode 100644 index 0baf39c7..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape-1792h~iphone.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape-2436h.png b/Mohem/resources/ios/splash/Default-Landscape-2436h.png deleted file mode 100644 index 3b0a7e86..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape-2436h.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape-2688h~iphone.png b/Mohem/resources/ios/splash/Default-Landscape-2688h~iphone.png deleted file mode 100644 index c0b855c1..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape-2688h~iphone.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape-736h.png b/Mohem/resources/ios/splash/Default-Landscape-736h.png deleted file mode 100644 index 8a950bac..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape-736h.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png b/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png deleted file mode 100644 index eda9eacf..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape@2x~ipad.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png b/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png deleted file mode 100644 index 9fd2d68e..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape@~ipadpro.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Landscape~ipad.png b/Mohem/resources/ios/splash/Default-Landscape~ipad.png deleted file mode 100644 index f32e8920..00000000 Binary files a/Mohem/resources/ios/splash/Default-Landscape~ipad.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png b/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png deleted file mode 100644 index b3a7fb0d..00000000 Binary files a/Mohem/resources/ios/splash/Default-Portrait@2x~ipad.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png b/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png deleted file mode 100644 index a219a982..00000000 Binary files a/Mohem/resources/ios/splash/Default-Portrait@~ipadpro.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default-Portrait~ipad.png b/Mohem/resources/ios/splash/Default-Portrait~ipad.png deleted file mode 100644 index 05c11d5d..00000000 Binary files a/Mohem/resources/ios/splash/Default-Portrait~ipad.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default@2x~iphone.png b/Mohem/resources/ios/splash/Default@2x~iphone.png deleted file mode 100644 index a1f3d4b1..00000000 Binary files a/Mohem/resources/ios/splash/Default@2x~iphone.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default@2x~universal~anyany.png b/Mohem/resources/ios/splash/Default@2x~universal~anyany.png deleted file mode 100644 index 3d0be993..00000000 Binary files a/Mohem/resources/ios/splash/Default@2x~universal~anyany.png and /dev/null differ diff --git a/Mohem/resources/ios/splash/Default~iphone.png b/Mohem/resources/ios/splash/Default~iphone.png deleted file mode 100644 index 2a6d9a25..00000000 Binary files a/Mohem/resources/ios/splash/Default~iphone.png and /dev/null differ diff --git a/Mohem/resources/splash.png b/Mohem/resources/splash.png index b3611afe..f9ece115 100755 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 deleted file mode 100644 index b9777f40..00000000 --- a/Mohem/resources/splash.png.md5 +++ /dev/null @@ -1 +0,0 @@ -b8fbf9d45bfbdf47560d99960bc65188 \ No newline at end of file diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 7a1fc2ce..7b3eaa1f 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -257,7 +257,7 @@ ion-card-content.confirm-details{ } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } .confirmEitOkButton{ @@ -266,7 +266,7 @@ ion-card-content.confirm-details{ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #22c6b3; + --background: #65C399; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 1f026374..6f6728ed 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -57,7 +57,7 @@ .header-div { - background-color: #22C6B3; + background-color: #65C399; text-transform: capitalize; height: 160px; /* position: relative; */ @@ -66,7 +66,7 @@ } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } @@ -242,7 +242,7 @@ margin-top: -13px; .contentEit:before { position: absolute; content: ""; - // background: #22c6b3; + // background: #65C399; height: 140px; width: 100%; left: 0; diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss index 5803e3f2..1253a5da 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss @@ -32,7 +32,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #22c6b3; + --background:: #65C399; width: 100% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss index 477ee720..945d7e68 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -5,7 +5,7 @@ } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } .confirmEitOkButton{ @@ -14,7 +14,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #22c6b3; + --background: #65C399; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss index d98a85be..c8b999eb 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss @@ -1,3 +1,3 @@ .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } \ No newline at end of file diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 1579bf40..b768bcbc 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -75,7 +75,7 @@ header .logout{ - background-color:#22C6B3; + background-color:#65C399; border: none; color:white; // padding: 20px; @@ -94,7 +94,7 @@ padding: 6px 24px; } .logout-ar{ - background-color: #22C6B3; + background-color: #65C399; border: none; color: white; text-align: center; diff --git a/Mohem/src/app/attendance-tracking/home/home.component.ts b/Mohem/src/app/attendance-tracking/home/home.component.ts index cf572606..77d0a16e 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.ts +++ b/Mohem/src/app/attendance-tracking/home/home.component.ts @@ -129,16 +129,12 @@ export class HomeComponent implements OnInit { } -openDialog() { - this.cs.confirmAlertDialogAttendance( - () => { - this.attendScanService.getDeviceLocation(); - }, this.ts.trPK('general', 'ok'), - () => {}, this.ts.trPK('general', 'cancel'), - this.ts.trPK('vacation-rule', 'confirmation'), - this.ts.trPK('attendance-tracking', 'confirm-alert3') - + '
' + '
' + this.ts.trPK('attendance-tracking', 'confirm-alert1') - + this.ts.trPK('attendance-tracking', 'confirm-alert2') - ); -} + openDialog() { + this.cs.confirmAlertDialogAttendance(() => { + this.attendScanService.getDeviceLocation(); + }, this.ts.trPK('general', 'ok'), + () => {}, this.ts.trPK('general', 'cancel'), + this.ts.trPK('vacation-rule', 'confirmation'), + this.ts.trPK('attendance-tracking', 'confirm-alert1') + this.ts.trPK('attendance-tracking', 'confirm-alert2')); + } } diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html index d1812a7d..9e3d4134 100644 --- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html +++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html @@ -44,7 +44,7 @@ left: 79%; bottom: 35px; color: black; - background-color: #22c6b3; + background-color: #65C399; width: 20%; height: 6px;">
>>>>>>' + isVirtual); alert('You are using virtual device'); return false; } - this.permissions.requestLocationAutherization().then(granted => { this.location = granted as boolean; if (this.location) { - this.geolocation - .getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }) - .then(resp => { - this.lat = resp.coords.latitude; - this.longt = resp.coords.longitude; - this.attendance(); - }) - .catch(error => { - console.log('Error getting location', error); - }); - + this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { + if (this.platform.is('android')) { + if (resp && (resp.latitude && resp.longitude)) { + console.log(resp); + if (resp.isFromMockProvider || resp.mockLocationsEnabled) { + this.common.presentAlert(this.ts.trPK('home', 'fake-location')); + } else { + this.lat = resp.latitude; + this.longt = resp.longitude; + this.attendance(); + } + } + } else { + if (resp && (resp.latitude && resp.longitude)) { + this.lat = resp.latitude; + this.longt = resp.longitude; + this.attendance(); + } else { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + } + } + }, (error) => { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + }); } else { return false; } }); - } public attendance() { 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 2857c3b1..acd8ff0e 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -24,8 +24,8 @@ export class ConnectorService { public static timeOut = 120 * 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/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss index 67a8ab9d..d6c4a4be 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss @@ -8,14 +8,14 @@ .navbar{ font-size: 10px !important; - --background: #22C6B3 !important; + --background: #65C399 !important; color: aliceblue !important; } .menu { margin-top: 0px !important; font-size: 35px !important; - background: #22C6B3; + background: #65C399; color: aliceblue; margin-left: 0px !important; @@ -25,7 +25,7 @@ margin-left:100px !important; margin-top: 0px !important; font-size: 23px !important; - background: #22C6B3 !important; + background: #65C399 !important; color: aliceblue !important; } @@ -92,7 +92,7 @@ background:var(--primary); background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: #22C6B3; + background: #65C399; // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); color:var(--light); text-transform: capitalize; diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss index da5d7c33..9210cb05 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss @@ -10,8 +10,8 @@ .btnImge{ // button{ border-color:transparent !important; - --background: #22C6B3 !important; - background: #22C6B3 !important; + --background: #65C399 !important; + background: #65C399 !important; height: 57px !important; width: 60px !important; @@ -21,7 +21,7 @@ } //test .changeIcon{ - background: #22C6B3 !important; + background: #65C399 !important; border-radius: 50% !important; width: 73px; height: 55px; diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss index dabb931c..8f5ef95d 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss @@ -22,5 +22,5 @@ line-height: 46px; } .header-toolbar-new { - --background: #22c6b3; + --background: #65C399; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss index d6361074..43d3f25b 100644 --- a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss +++ b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss @@ -4,6 +4,6 @@ ion-menu-button { font-size: 0.8cm; color: white; - background: #22c6b3; + background: #65C399; margin: 0 auto; } \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index b0af3af9..68ee7cd8 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -4,7 +4,7 @@ ion-row { } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } .profile-image-container{ position: relative; @@ -50,7 +50,7 @@ ion-label{ .contentBg:before { position: absolute; content: ""; - background: #22c6b3; + background: #65C399; height: 100px; width: 100%; left: 0; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index a2b6cdfd..87fec3b9 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -36,6 +36,7 @@ import { TimeCardService } from '../time-card/service/time-card.service'; import { WorklistMainService } from '../notification/service/work-list.main.service'; import { isThisISOWeek } from 'date-fns'; import { Router } from '@angular/router'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; @Component({ selector: 'app-home', @@ -151,6 +152,7 @@ export class HomePage implements OnInit { public workListService: WorklistMainService, public router: Router, private platform: Platform, + public backgroundGeolocation: BackgroundGeolocation ) { this.events.subscribe('img-change', displayImg => { this.userImage = this.sanitizer.bypassSecurityTrustUrl( @@ -165,11 +167,6 @@ export class HomePage implements OnInit { this.common.openHome(); } }); - // this.getUserDetails(); - // this.getCount(); - // this.events.subscribe('getNotCount', badge => { - // this.notBadge = badge; - // }); this.direction = TranslatorService.getCurrentLanguageName(); this.myTeamTitle = this.ts.trPK('myTeam', 'myTeam-header'); this.vacationRuleTitle = this.ts.trPK('vacation-rule', 'vacationRule'); @@ -189,14 +186,6 @@ export class HomePage implements OnInit { this.getUserDetails(); } - // ionViewDidEnter() { - // // tslint:disable-next-line: only-arrow-functions - // document.addEventListener('backbutton', function(e) { - // e.preventDefault(); - // e.stopPropagation(); - // }, false); - // } - initTimer() { this.runTimer = false; this.hasStarted = false; @@ -256,20 +245,30 @@ export class HomePage implements OnInit { this.permissions.requestLocationAutherization().then(granted => { this.location = granted as boolean; if (this.location) { - this.geolocation - .getCurrentPosition({ - maximumAge: 3000, - timeout: 10000, - enableHighAccuracy: true - }) - .then(resp => { - this.lat = resp.coords.latitude; - this.longt = resp.coords.longitude; - this.attendance(); - }) - .catch(error => { + this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { + if (this.platform.is('android')) { + if (resp && (resp.latitude && resp.longitude)) { + console.log(resp); + if (resp.isFromMockProvider || resp.mockLocationsEnabled) { + this.common.presentAlert(this.ts.trPK('home', 'fake-location')); + } else { + this.lat = resp.latitude; + this.longt = resp.longitude; + this.attendance(); + } + } + } else { + if (resp && (resp.latitude && resp.longitude)) { + this.lat = resp.latitude; + this.longt = resp.longitude; + this.attendance(); + } else { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + } + } + }, (error) => { this.common.presentAlert(this.ts.trPK('home', 'position-error')); - }); + }); } else { return false; } diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index f60e443a..df918ed7 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -20,7 +20,7 @@ ion-title{ .contentBg:before { position: absolute; content: ""; - background: #22c6b3; + background: #65C399; height: 140px; width: 100%; left: 0; @@ -89,7 +89,7 @@ ion-title{ border-radius: $actionBtnSize; margin: 0 auto; display: block; - background-color: #22c6b3; + background-color: #65C399; line-height: $actionBtnSize; margin-bottom: 3px; img{ @@ -130,7 +130,7 @@ ion-title{ .active-Segment { font-size: 0.3cm !important; - background: #22c6b3 !important; + background: #65C399 !important; text-transform: none; --color-checked: none; border-radius: 100px; @@ -162,7 +162,7 @@ ion-title{ } .search-dropdown{ - background: #22c6b3; + background: #65C399; ion-select { .select-text{ margin-left: -10px; @@ -223,7 +223,7 @@ ion-title{ .activeArrow{ height: 20px; width: 20px; - color: #22c6b3; + color: #65C399; } .disabledArrow{ height: 20px; @@ -234,7 +234,7 @@ ion-title{ .activeArrow-ar{ height: 20px; width: 20px; - color: #22c6b3; + color: #65C399; margin-right: 275px; } .disabledArrow-ar{ @@ -389,7 +389,7 @@ ion-title{ } .green-label-container{ - border-top: 5px solid #22c6b3; + border-top: 5px solid #65C399; padding: 1px 0px; margin: 15px 0px } diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 89434b9b..91805532 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -281,7 +281,7 @@ export class DetailsComponent implements OnInit { data: [this.absentDays, this.attendedDays], backgroundColor: [ '#094875', - '#22c6b3' + '#65C399' ], borderWidth: 2 }] diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index e9b398a2..735f5987 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -18,7 +18,7 @@ ion-title{ .contentBg:before { position: absolute; content: ""; - background: #22c6b3; + background: #65C399; height: 140px; width: 100%; left: 0; @@ -89,7 +89,7 @@ ion-content { } } .search-dropdown{ - background: #22c6b3; + background: #65C399; ion-select { .select-text{ margin-left: -10px; diff --git a/Mohem/src/app/my-team/home/home.component.ts b/Mohem/src/app/my-team/home/home.component.ts index 262d9ead..1dab5abb 100644 --- a/Mohem/src/app/my-team/home/home.component.ts +++ b/Mohem/src/app/my-team/home/home.component.ts @@ -39,7 +39,7 @@ export class HomeComponent implements OnInit { { data: [100], backgroundColor: [ - '#22c6b3' + '#65C399' ], borderWidth: 5 }] diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 36116457..88200d03 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -246,7 +246,7 @@ height: 100%; .contentBg:before { position: absolute; content: ""; -background: #22c6b3; +background: #65C399; height: 140px; width: 100%; left: 0; @@ -448,7 +448,7 @@ border-radius: 15px; .text-span-active{ font-size: 12px; color: #888; -background-color:#22c6b3; +background-color:#65C399; width: 93%; height: 30px; border: 1px solid; diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss index d98a85be..c8b999eb 100644 --- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss +++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss @@ -1,3 +1,3 @@ .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 06d775fa..a03ddca2 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -1,5 +1,5 @@ - + {{ 'vacation-rule, search-employee' | translate}} diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 4357dffe..0abf02aa 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -70,14 +70,14 @@ } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } .colorBG{ --background: #f0efef; } .header-div { - background-color: #22C6B3; + background-color: #65C399; text-transform: capitalize; height: 119px; position: relative; @@ -368,7 +368,7 @@ left: 83%; bottom: 117px; color: black; - background-color: #22c6b3; + background-color: #65C399; width: 16%; height: 6px; } @@ -377,13 +377,13 @@ // left: 77%; // bottom: 117px; // color: black; - // background-color: #22c6b3; + // background-color: #65C399; // width: 20%; height: 6px; position: relative; left: 4%; bottom: 117px; color: black; - background-color: #22c6b3; + background-color: #65C399; width: 15%; height: 6px; } diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 9943440a..51f8016c 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -239,7 +239,7 @@ slidePrev(object, slideView) { datasets: [ { data: [this.earingTotal,this.deductionTotal], backgroundColor: [ - '#22c6b3', + '#65C399', '#094875', ], borderWidth: 2 } diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 294575dc..432f0612 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -9,14 +9,14 @@ } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } .colorBG{ --background: #f0efef; } .header-div{ text-transform: capitalize; - background: #22C6B3; + background: #65C399; display: block; position: relative; height: 113px; diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index c508d39d..ab1cf255 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -7,7 +7,7 @@ ion-col.colBold, ion-col.colBold > label{ } .header-div{ text-transform: capitalize; - background: #22C6B3; + background: #65C399; display: block; position: relative; height: 160px; diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index 202c73a9..1c96ac08 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -6,7 +6,7 @@ } .header-div{ text-transform: capitalize; - background: #22C6B3; + background: #65C399; display: block; position: relative; height: 160px; diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts index 6b14fc93..2b08b130 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -46,7 +46,7 @@ export class PerformanceEvaluationComponent implements OnInit { colorScheme = { - domain: ['#22C6B3', '#094875', '#3CB9D5', '#1FA269', '#0D155E'] + domain: ['#65C399', '#094875', '#3CB9D5', '#1FA269', '#0D155E'] }; ngOnInit() { diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss index 0de83e93..1f9d686b 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.scss +++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss @@ -9,7 +9,7 @@ // border-radius: 50% !important; // } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } .imgCircle{ @@ -50,5 +50,5 @@ width: 234px; } .header-toolbar-new{ - --background: #22c6b3; + --background: #65C399; } \ No newline at end of file diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index f52bd47c..ba490355 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -185,7 +185,7 @@ // .header-div { -// background-color: #22C6B3; +// background-color: #65C399; // text-transform: capitalize; // height: 180px; // position: relative; @@ -214,7 +214,7 @@ // .navbar{ // font-size: 10px !important; -// --background: #22C6B3 !important; +// --background: #65C399 !important; // color: aliceblue !important; // // margin-top: 10px !important; @@ -224,7 +224,7 @@ // // margin-left:330px !important; // margin-top: 0px !important; // font-size: 35px !important; -// background: #22C6B3; +// background: #65C399; // color: aliceblue; // margin-left: 0px !important; @@ -235,7 +235,7 @@ // margin-left:100px !important; // margin-top: 0px !important; // font-size: 23px !important; -// background: #22C6B3 !important; +// background: #65C399 !important; // color: aliceblue !important; // } @@ -374,7 +374,7 @@ // background:var(--primary); // background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); // background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// background: #22C6B3; +// background: #65C399; // // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); // color:var(--light); // text-transform: capitalize; @@ -508,7 +508,7 @@ ion-title{ .contentBg:before { position: absolute; content: ""; -background: #22c6b3; +background: #65C399; height: 140px; width: 100%; left: 0; @@ -577,7 +577,7 @@ $actionBtnSize : 36px; border-radius: $actionBtnSize; margin: 0 auto; display: block; - background-color: #22c6b3; + background-color: #65C399; line-height: $actionBtnSize; margin-bottom: 3px; img{ @@ -617,7 +617,7 @@ $actionBtnSize : 36px; .active-Segment { font-size: 0.3cm !important; - background: #22c6b3 !important; + background: #65C399 !important; text-transform: none; --color-checked: none; border-radius: 100px; @@ -649,7 +649,7 @@ $actionBtnSize : 36px; } .search-dropdown{ - background: #22c6b3; + background: #65C399; ion-select { .select-text{ margin-left: -10px; @@ -864,7 +864,7 @@ $actionBtnSize : 36px; } .green-label-container{ - border-top: 5px solid #22c6b3; + border-top: 5px solid #65C399; padding: 1px 0px; margin: 15px 0px } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 2395bafd..ca5aabc3 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -185,7 +185,7 @@ export class TimeCardDetailsComponent implements OnInit { data: [this.absentDays, this.attendedDays], backgroundColor: [ '#094875', - '#22c6b3' + '#65C399' ], borderWidth: 2 }] diff --git a/Mohem/src/assets/icon/moving.gif b/Mohem/src/assets/icon/moving.gif index 95e0fadc..ffefdb00 100644 Binary files a/Mohem/src/assets/icon/moving.gif and b/Mohem/src/assets/icon/moving.gif differ diff --git a/Mohem/src/assets/imgs/CSLogo.png b/Mohem/src/assets/imgs/CSLogo.png index 5b690525..d0724eb4 100644 Binary files a/Mohem/src/assets/imgs/CSLogo.png and b/Mohem/src/assets/imgs/CSLogo.png differ diff --git a/Mohem/src/assets/imgs/moving.gif b/Mohem/src/assets/imgs/moving.gif index 95e0fadc..ffefdb00 100644 Binary files a/Mohem/src/assets/imgs/moving.gif and b/Mohem/src/assets/imgs/moving.gif differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index add5c3f0..88342a0a 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -209,6 +209,10 @@ } }, "general": { + "location-permission-dialog": { + "en": "Allow the Mohemm app to access your location for marking your attendance", + "ar": "اسمح لتطبيق مهم بالوصول إلى موقعك لتحديد حضورك" + }, "not-now":{ "en":"not now", "ar":"لاحقاً" @@ -873,9 +877,13 @@ } }, "home": { + "fake-location": { + "en": "We traced out that you may be using fake location! Please do not try this and if not then please try again.", + "ar": "لقد توصلنا إلى أنك ربما تستخدم موقعًا مزيفًا! من فضلك لا تحاول هذا وإذا لم يكن كذلك يرجى المحاولة مرة أخرى." + }, "position-error": { "en": "Error getting your location. Please try again!", - "ar": "Error getting your location. Please try again!" + "ar": "خطأ في الحصول على موقعك. حاول مرة اخرى!" }, "dashboard": { "en": "My Dashboard", @@ -2597,10 +2605,10 @@ }, "confirm-alert1": { "en": "Are you sure, you want to", - "ar": "هل انت متأكد تريد لإنصراف من العمل؟" + "ar": "هل أنت متأكد أنك تريد التمرير؟" }, "confirm-alert2": { - "en": " check out", + "en": "swipe", "ar": "" }, "confirm-alert3": { diff --git a/Mohem/src/imgs/moving.gif b/Mohem/src/imgs/moving.gif index 95e0fadc..ffefdb00 100644 Binary files a/Mohem/src/imgs/moving.gif and b/Mohem/src/imgs/moving.gif differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 7ccd3aed..b2cddf6a 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1322,7 +1322,7 @@ border:0px --background: #094773 !important; } .header-toolbar-new { - --background: #22c6b3; + --background: #65C399; } @@ -1340,7 +1340,7 @@ border:0px // margin-left:0; // } // .search-dropdown{ -// background: #22c6b3; +// background: #65C399; // ion-select { // .select-text{ // margin-left: -10px; @@ -1413,7 +1413,7 @@ border:0px &.present { color:#fff !important; &:before { - background-color: #22c6b3 !important; + background-color: #65C399 !important; } } diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index 72f055c1..0297d1fd 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -69,7 +69,7 @@ --red:#BE1E2D; --blue:#223262; --cyanblue:#1b75bc; - --newgreen:#22c6b3; + --newgreen:#65C399; --darkblue:#094875; --lightblue:#3cb9d5; --newred:#cb3232;