From f5bf5aa6b35a9f27b23100ab2bdd3d6d79f16f50 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 5 Aug 2023 14:04:36 +0530 Subject: [PATCH] driver seen added --- package-lock.json | 301 ++++++++++++++++-- .../authentication/login/login.component.html | 4 +- .../authentication/login/login.component.ts | 6 +- .../driver/driver-list/driver-list.page.ts | 31 ++ .../return-order/return-order.component.html | 2 +- src/app/pages/vnms/vnms.service.ts | 6 + 6 files changed, 309 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c38b60..3b2e630 100644 --- a/package-lock.json +++ b/package-lock.json @@ -810,6 +810,38 @@ "typescript": "*" } }, + "node_modules/@angular/animations": { + "version": "15.0.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.0.3.tgz", + "integrity": "sha512-kwUprQMjMvMawpyd5aLzW9DWLd7grlzm4ut4YIqXRf1UJm35KsTjwhvQWNj481u2gUjKxD2rBfkVakyzW5Na3A==", + "peer": true, + "dependencies": { + "tslib": "^2.3.0" + }, + "engines": { + "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + }, + "peerDependencies": { + "@angular/core": "15.0.3" + } + }, + "node_modules/@angular/cdk": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.0.2.tgz", + "integrity": "sha512-khTZT/vWDLoCkIxXyrpmeFIMfsED3KdKQqWCiuvUHGHhJn5iOa2wDQXQEkrFpNaQ4v1mbHE2I11DljiieIyv5w==", + "peer": true, + "dependencies": { + "tslib": "^2.3.0" + }, + "optionalDependencies": { + "parse5": "^7.1.2" + }, + "peerDependencies": { + "@angular/common": "^15.0.0 || ^16.0.0", + "@angular/core": "^15.0.0 || ^16.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + } + }, "node_modules/@angular/cli": { "version": "15.0.3", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.0.3.tgz", @@ -882,6 +914,7 @@ "version": "15.0.3", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.0.3.tgz", "integrity": "sha512-3IH1Ns4Ed/VFQlNNtgIcorht7JK7SoBzpbxrbqjogoHZwUR3OTn+dvX87N7zMn0yxAL0T6Jv0UTILcGY0EP9HQ==", + "dev": true, "dependencies": { "@babel/core": "^7.17.2", "chokidar": "^3.0.0", @@ -911,6 +944,7 @@ "version": "0.27.0", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", + "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.13" }, @@ -1095,10 +1129,17 @@ "rxjs": "^5.5.0 || ^6.5.0 || ^7.3.0" } }, - "node_modules/@awesome-cordova-plugins/camera/node_modules/@types/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" + "node_modules/@awesome-cordova-plugins/core": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-6.4.0.tgz", + "integrity": "sha512-06I5JdTgAgKTby+VG+3sQF5+z4RNCEyVl6y7tz2rICx8MURL1biuh3oGGN1rCQQjsuMZcX5siMBr0NF/OHqxLQ==", + "peer": true, + "dependencies": { + "@types/cordova": "latest" + }, + "peerDependencies": { + "rxjs": "^5.5.0 || ^6.5.0 || ^7.3.0" + } }, "node_modules/@awesome-cordova-plugins/splash-screen": { "version": "6.2.0", @@ -1112,11 +1153,6 @@ "rxjs": "^5.5.0 || ^6.5.0 || ^7.3.0" } }, - "node_modules/@awesome-cordova-plugins/splash-screen/node_modules/@types/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" - }, "node_modules/@awesome-cordova-plugins/status-bar": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/status-bar/-/status-bar-6.2.0.tgz", @@ -1129,11 +1165,6 @@ "rxjs": "^5.5.0 || ^6.5.0 || ^7.3.0" } }, - "node_modules/@awesome-cordova-plugins/status-bar/node_modules/@types/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" - }, "node_modules/@babel/code-frame": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", @@ -4550,6 +4581,92 @@ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==" }, + "node_modules/@ionic/cordova-builders/node_modules/@angular/compiler": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-14.3.0.tgz", + "integrity": "sha512-E15Rh0t3vA+bctbKnBCaDmLvc3ix+ZBt6yFZmhZalReQ+KpOlvOJv+L9oiFEgg+rYVl2QdvN7US1fvT0PqswLw==", + "peer": true, + "dependencies": { + "tslib": "^2.3.0" + }, + "engines": { + "node": "^14.15.0 || >=16.10.0" + }, + "peerDependencies": { + "@angular/core": "14.3.0" + }, + "peerDependenciesMeta": { + "@angular/core": { + "optional": true + } + } + }, + "node_modules/@ionic/cordova-builders/node_modules/@angular/compiler-cli": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-14.3.0.tgz", + "integrity": "sha512-eoKpKdQ2X6axMgzcPUMZVYl3bIlTMzMeTo5V29No4BzgiUB+QoOTYGNJZkGRyqTNpwD9uSBJvmT2vG9+eC4ghQ==", + "peer": true, + "dependencies": { + "@babel/core": "^7.17.2", + "chokidar": "^3.0.0", + "convert-source-map": "^1.5.1", + "dependency-graph": "^0.11.0", + "magic-string": "^0.26.0", + "reflect-metadata": "^0.1.2", + "semver": "^7.0.0", + "sourcemap-codec": "^1.4.8", + "tslib": "^2.3.0", + "yargs": "^17.2.1" + }, + "bin": { + "ng-xi18n": "bundles/src/bin/ng_xi18n.js", + "ngc": "bundles/src/bin/ngc.js", + "ngcc": "bundles/ngcc/main-ngcc.js" + }, + "engines": { + "node": "^14.15.0 || >=16.10.0" + }, + "peerDependencies": { + "@angular/compiler": "14.3.0", + "typescript": ">=4.6.2 <4.9" + } + }, + "node_modules/@ionic/cordova-builders/node_modules/@angular/compiler-cli/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "peer": true + }, + "node_modules/@ionic/cordova-builders/node_modules/@angular/compiler/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "peer": true + }, + "node_modules/@ionic/cordova-builders/node_modules/@angular/core": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-14.3.0.tgz", + "integrity": "sha512-wYiwItc0Uyn4FWZ/OAx/Ubp2/WrD3EgUJ476y1XI7yATGPF8n9Ld5iCXT08HOvc4eBcYlDfh90kTXR6/MfhzdQ==", + "optional": true, + "peer": true, + "dependencies": { + "tslib": "^2.3.0" + }, + "engines": { + "node": "^14.15.0 || >=16.10.0" + }, + "peerDependencies": { + "rxjs": "^6.5.3 || ^7.4.0", + "zone.js": "~0.11.4 || ~0.12.0" + } + }, + "node_modules/@ionic/cordova-builders/node_modules/@angular/core/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "optional": true, + "peer": true + }, "node_modules/@ionic/cordova-builders/node_modules/@babel/core": { "version": "7.18.10", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz", @@ -5936,6 +6053,12 @@ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==", + "peer": true + }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", @@ -7003,6 +7126,11 @@ "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", "devOptional": true }, + "node_modules/@types/cordova": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", + "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" + }, "node_modules/@types/cors": { "version": "2.8.13", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", @@ -8724,6 +8852,18 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, + "node_modules/chart.js": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.3.tgz", + "integrity": "sha512-aTk7pBw+x6sQYhon/NR3ikfUJuym/LdgpTlgZRe2PaEhjUMKBKyNaFCMVRAyTEWYFNO7qRu7iQVqOw/OqzxZxQ==", + "peer": true, + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=7" + } + }, "node_modules/cheerio": { "version": "1.0.0-rc.12", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", @@ -20327,6 +20467,25 @@ "@typescript-eslint/utils": "5.43.0" } }, + "@angular/animations": { + "version": "15.0.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.0.3.tgz", + "integrity": "sha512-kwUprQMjMvMawpyd5aLzW9DWLd7grlzm4ut4YIqXRf1UJm35KsTjwhvQWNj481u2gUjKxD2rBfkVakyzW5Na3A==", + "peer": true, + "requires": { + "tslib": "^2.3.0" + } + }, + "@angular/cdk": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.0.2.tgz", + "integrity": "sha512-khTZT/vWDLoCkIxXyrpmeFIMfsED3KdKQqWCiuvUHGHhJn5iOa2wDQXQEkrFpNaQ4v1mbHE2I11DljiieIyv5w==", + "peer": true, + "requires": { + "parse5": "^7.1.2", + "tslib": "^2.3.0" + } + }, "@angular/cli": { "version": "15.0.3", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.0.3.tgz", @@ -20373,6 +20532,7 @@ "version": "15.0.3", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.0.3.tgz", "integrity": "sha512-3IH1Ns4Ed/VFQlNNtgIcorht7JK7SoBzpbxrbqjogoHZwUR3OTn+dvX87N7zMn0yxAL0T6Jv0UTILcGY0EP9HQ==", + "dev": true, "requires": { "@babel/core": "^7.17.2", "chokidar": "^3.0.0", @@ -20390,6 +20550,7 @@ "version": "0.27.0", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", + "dev": true, "requires": { "@jridgewell/sourcemap-codec": "^1.4.13" } @@ -20508,13 +20669,15 @@ "integrity": "sha512-TFWhm/fyhRHyotUlOZ+ovnFqsdMhUp/OqLK6R+ItQTqIW5LT21x5J6yAuWcl33/fZiLTIicZkD9vS0WTtU++Qg==", "requires": { "@types/cordova": "latest" - }, - "dependencies": { - "@types/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" - } + } + }, + "@awesome-cordova-plugins/core": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-6.4.0.tgz", + "integrity": "sha512-06I5JdTgAgKTby+VG+3sQF5+z4RNCEyVl6y7tz2rICx8MURL1biuh3oGGN1rCQQjsuMZcX5siMBr0NF/OHqxLQ==", + "peer": true, + "requires": { + "@types/cordova": "latest" } }, "@awesome-cordova-plugins/splash-screen": { @@ -20523,13 +20686,6 @@ "integrity": "sha512-Ssh2osgS47Tb1U74lG0PbEI/yGhQrmoM+rQ76yQ/YcAiVR49YWv454m/qHHWOhR2BL64VBAnFzscZqHlaBEGGQ==", "requires": { "@types/cordova": "latest" - }, - "dependencies": { - "@types/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" - } } }, "@awesome-cordova-plugins/status-bar": { @@ -20538,13 +20694,6 @@ "integrity": "sha512-FF3OwbC0+IE//QPBG7JMHAGXmDEQb3ORk2XwlIckp/Df5cuP0QdQgLN0hQYdBs/GicGWDZRGpUvIdYwWN0rPrg==", "requires": { "@types/cordova": "latest" - }, - "dependencies": { - "@types/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" - } } }, "@babel/code-frame": { @@ -22899,6 +23048,68 @@ } } }, + "@angular/compiler": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-14.3.0.tgz", + "integrity": "sha512-E15Rh0t3vA+bctbKnBCaDmLvc3ix+ZBt6yFZmhZalReQ+KpOlvOJv+L9oiFEgg+rYVl2QdvN7US1fvT0PqswLw==", + "peer": true, + "requires": { + "tslib": "^2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "peer": true + } + } + }, + "@angular/compiler-cli": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-14.3.0.tgz", + "integrity": "sha512-eoKpKdQ2X6axMgzcPUMZVYl3bIlTMzMeTo5V29No4BzgiUB+QoOTYGNJZkGRyqTNpwD9uSBJvmT2vG9+eC4ghQ==", + "peer": true, + "requires": { + "@babel/core": "^7.17.2", + "chokidar": "^3.0.0", + "convert-source-map": "^1.5.1", + "dependency-graph": "^0.11.0", + "magic-string": "^0.26.0", + "reflect-metadata": "^0.1.2", + "semver": "^7.0.0", + "sourcemap-codec": "^1.4.8", + "tslib": "^2.3.0", + "yargs": "^17.2.1" + }, + "dependencies": { + "tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "peer": true + } + } + }, + "@angular/core": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-14.3.0.tgz", + "integrity": "sha512-wYiwItc0Uyn4FWZ/OAx/Ubp2/WrD3EgUJ476y1XI7yATGPF8n9Ld5iCXT08HOvc4eBcYlDfh90kTXR6/MfhzdQ==", + "optional": true, + "peer": true, + "requires": { + "tslib": "^2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "optional": true, + "peer": true + } + } + }, "@babel/core": { "version": "7.18.10", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz", @@ -23903,6 +24114,12 @@ } } }, + "@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==", + "peer": true + }, "@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", @@ -24890,6 +25107,11 @@ "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", "devOptional": true }, + "@types/cordova": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.0.tgz", + "integrity": "sha512-AtBm1IAqqXsXszJe6XxuA2iXLhraNCj25p/FHRyikPeW0Z3YfgM6qzWb+VJglJTmZc5lqRNy84cYM/sQI5v6Vw==" + }, "@types/cors": { "version": "2.8.13", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", @@ -26147,6 +26369,15 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, + "chart.js": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.3.tgz", + "integrity": "sha512-aTk7pBw+x6sQYhon/NR3ikfUJuym/LdgpTlgZRe2PaEhjUMKBKyNaFCMVRAyTEWYFNO7qRu7iQVqOw/OqzxZxQ==", + "peer": true, + "requires": { + "@kurkle/color": "^0.3.0" + } + }, "cheerio": { "version": "1.0.0-rc.12", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", diff --git a/src/app/pages/authentication/login/login.component.html b/src/app/pages/authentication/login/login.component.html index e91f633..4dec20f 100644 --- a/src/app/pages/authentication/login/login.component.html +++ b/src/app/pages/authentication/login/login.component.html @@ -87,8 +87,8 @@ - - Remember Me + diff --git a/src/app/pages/authentication/login/login.component.ts b/src/app/pages/authentication/login/login.component.ts index 80da554..70994bc 100644 --- a/src/app/pages/authentication/login/login.component.ts +++ b/src/app/pages/authentication/login/login.component.ts @@ -12,7 +12,7 @@ import { Storage } from '@ionic/storage-angular'; styleUrls: ['./login.component.scss'], }) export class LoginPage implements OnInit { - isChecked:any = false; + isChecked:any = true; public onLoginForm: FormGroup; showPassword: boolean = true; passwordType: string = 'password'; @@ -238,13 +238,13 @@ export class LoginPage implements OnInit { login:res }; - if(this.isChecked == true){ + // if(this.isChecked == true){ this.setItem('remember',auth) this.storeData(auth) - } + // } this._api.sideDetails.next(res) // localStorage.setItem('email',JSON.stringify(auth)) this.navCtrl.navigateRoot(['vnms-list']); diff --git a/src/app/pages/vnms/driver/driver-list/driver-list.page.ts b/src/app/pages/vnms/driver/driver-list/driver-list.page.ts index 284c1de..1b64faf 100644 --- a/src/app/pages/vnms/driver/driver-list/driver-list.page.ts +++ b/src/app/pages/vnms/driver/driver-list/driver-list.page.ts @@ -115,6 +115,8 @@ export class DriverListPage implements OnInit { } }); + this.seen(); + this.random_ng_past() } @@ -153,4 +155,33 @@ console.log(data) view(){ } + +seen(){ + + let product:any =[]; + + if( this.orderlist.length>0){ + + + + this.orderlist.forEach((element:any) => { + if(element.seenStatus !=1){ + product.push({orderId:element.orderId,seenStatus:1 ,seenTime:new Date()}) + } + + }); + + + let param = {product:product} + + this._api.CreateDriverSeen(param).subscribe((res:any) => { + console.log(res) + if(res.status == 200){ + + + } + }) +} +} + } diff --git a/src/app/pages/vnms/driver/return-order/return-order.component.html b/src/app/pages/vnms/driver/return-order/return-order.component.html index 4dbde5b..7f28759 100644 --- a/src/app/pages/vnms/driver/return-order/return-order.component.html +++ b/src/app/pages/vnms/driver/return-order/return-order.component.html @@ -29,7 +29,7 @@ - Empty Return Cylinders + Empty Collected diff --git a/src/app/pages/vnms/vnms.service.ts b/src/app/pages/vnms/vnms.service.ts index 15ec52c..ea42813 100644 --- a/src/app/pages/vnms/vnms.service.ts +++ b/src/app/pages/vnms/vnms.service.ts @@ -106,5 +106,11 @@ export class VnmsService { return this._http.post(this.apiUrl + 'getProductList', addParams) } + CreateDriverSeen(addParams:any): Observable { + return this._http.post(this.apiUrl + 'CreateDriverSeen', addParams) + + } + + }