From e1a98a65bee5675f38484eea70b13e8c6eded88c Mon Sep 17 00:00:00 2001 From: Karyamsetty Helen Grace Date: Thu, 21 Sep 2023 22:39:32 +0530 Subject: [PATCH 1/8] child multi mapping validation correction --- .../ecd-questionnaire.component.ts | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/src/app/app-modules/associate-anm-mo/ecd-questionnaire/ecd-questionnaire.component.ts b/src/app/app-modules/associate-anm-mo/ecd-questionnaire/ecd-questionnaire.component.ts index 47bd79f..36f3c6a 100644 --- a/src/app/app-modules/associate-anm-mo/ecd-questionnaire/ecd-questionnaire.component.ts +++ b/src/app/app-modules/associate-anm-mo/ecd-questionnaire/ecd-questionnaire.component.ts @@ -535,17 +535,27 @@ export class EcdQuestionnaireComponent implements OnInit { const indexToRemove = questionnaire.enabledQues.indexOf(answer.parentQuesId); if (indexToRemove !== -1) { questionnaire.enabledQues.splice(indexToRemove, 1); - questionnaire.answer = null; + if(questionnaire.enabledQues.length <= 0){ + questionnaire.answer = null; + } + this.processFilteredQuestionnaires(questionnaire); } } } }) - } else if((questionnaire.parentQuestionId === selectedAnsweredQues.questionid) && - (selectedAnsweredQues.answer == null || !questionnaire.parentAnswer.includes(selectedAnsweredQues.answer) )) { - questionnaire.enabledQues = false; - questionnaire.answer = null; - this.processFilteredQuestionnaires(questionnaire); + } else if(questionnaire.parentQuestionId !== null && questionnaire.parentQuestionId.includes(selectedAnsweredQues.questionid) && + selectedAnsweredQues.answer == null){ // || !questionnaire.parentAnswer.includes(selectedAnsweredQues.answer) )) { + questionnaire.parentAnswer.forEach((answer: any) => { + const indexToRemove = questionnaire.enabledQues.indexOf(answer.parentQuesId); + if (indexToRemove !== -1) { + questionnaire.enabledQues.splice(indexToRemove, 1); + if(questionnaire.enabledQues.length <= 0){ + questionnaire.answer = null; + this.processFilteredQuestionnaires(questionnaire); + } + } + }); } } else if (selectedAnsweredQues.answerType != null && selectedAnsweredQues.answerType != undefined && selectedAnsweredQues.answerType.toLowerCase() === "multiple") { @@ -553,8 +563,8 @@ export class EcdQuestionnaireComponent implements OnInit { selectedAnsweredQues.answer != null){ // && selectedAnsweredQues.answer.includes(questionnaire.parentAnswer)) { questionnaire.parentAnswer.forEach((answer: any) => { if(answer.parentQuesId == selectedAnsweredQues.questionid) - if(answer.parentAnswerList.filter((item:any) => item.includes(selectedAnsweredQues.answer))){ - console.log("Condition passed: answer.parentAnswerList includes selectedAnsweredQues.answer"); + if (answer.parentAnswerList.some((item: any) => selectedAnsweredQues.answer.includes(item))) { + console.log("Condition passed: at least one item in answer.parentAnswerList matches selectedAnsweredQues.answer"); if(!questionnaire.enabledQues.includes(answer.parentQuesId) ){ questionnaire.enabledQues.push(answer.parentQuesId); } @@ -562,18 +572,28 @@ export class EcdQuestionnaireComponent implements OnInit { const indexToRemove = questionnaire.enabledQues.indexOf(answer.parentQuesId); if (indexToRemove !== -1) { questionnaire.enabledQues.splice(indexToRemove, 1); - questionnaire.answer = null; + if(questionnaire.enabledQues.length <= 0){ + questionnaire.answer = null; + } + this.processFilteredQuestionnaires(questionnaire); } } }); } - }else if((questionnaire.parentQuestionId === selectedAnsweredQues.questionid) && + else if(questionnaire.parentQuestionId !== null && questionnaire.parentQuestionId.includes(selectedAnsweredQues.questionid) && (selectedAnsweredQues.answer == null)){ //|| !selectedAnsweredQues.answer.includes(questionnaire.parentAnswer))) { - questionnaire.enabledQues = false; - questionnaire.answer = null; + questionnaire.parentAnswer.forEach((answer: any) => { + const indexToRemove = questionnaire.enabledQues.indexOf(answer.parentQuesId); + if (indexToRemove !== -1) { + questionnaire.enabledQues.splice(indexToRemove, 1); + if(questionnaire.enabledQues.length <= 0){ + questionnaire.answer = null; this.processFilteredQuestionnaires(questionnaire); } - //} + } + }); + } + } }); }); } From b99863667d080a27df3341d74a41c6ef9ff276b2 Mon Sep 17 00:00:00 2001 From: Mithun James Date: Thu, 26 Oct 2023 17:28:10 +0530 Subject: [PATCH 2/8] Add CI build process, update Java packages --- .gitignore | 2 + .java-version | 1 + Gruntfile.js | 73 ---- angular.json | 21 + package-lock.json | 330 +++++++++++++--- package.json | 8 +- pom.xml | 408 ++++++++++---------- scripts/ci-prebuild.js | 51 +++ src/environments/environment.ci.ts.template | 248 ++++++++++++ tsconfig.app.json | 2 +- tsconfig.json | 3 +- 11 files changed, 802 insertions(+), 345 deletions(-) create mode 100644 .java-version delete mode 100644 Gruntfile.js create mode 100755 scripts/ci-prebuild.js create mode 100644 src/environments/environment.ci.ts.template diff --git a/.gitignore b/.gitignore index 9c9e7e4..89f7697 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ testem.log .DS_Store Thumbs.db /.vscode +src/environments/environment.ci.ts +target diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..03b6389 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17.0 diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index b2de468..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,73 +0,0 @@ -/* -* AMRIT – Accessible Medical Records via Integrated Technology -* Integrated EHR (Electronic Health Records) Solution -* -* Copyright (C) "Piramal Swasthya Management and Research Institute" -* -* This file is part of AMRIT. -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see https://www.gnu.org/licenses/. -*/ - - -/* -* AMRIT – Accessible Medical Records via Integrated Technology -* Integrated EHR (Electronic Health Records) Solution -* -* Copyright (C) "Piramal Swasthya Management and Research Institute" -* -* This file is part of AMRIT. -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see https://www.gnu.org/licenses/. -*/ - - -module.exports = function (grunt) { - - grunt.loadNpmTasks('grunt-war'); - // Project configuration. - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - war: { - target: { - options: { - war_dist_folder: 'target', /* Folder where to generate the WAR. */ - war_name: 'ecd-ui-v1.0', /* The name fo the WAR file (.war will be the extension) */ - webxml_display_name: 'ecd-ui-v1.0', - }, - files: [ - { - expand: true, - cwd: 'dist', - src: ['**'], - dest: '' - } - ] - } - } - }); - - grunt.registerTask('default', ['war']); -}; diff --git a/angular.json b/angular.json index d7f1158..0466e1e 100644 --- a/angular.json +++ b/angular.json @@ -49,6 +49,27 @@ ], "outputHashing": "all" }, + "ci": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "4mb", + "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "1mb", + "maximumError": "2mb" + } + ], + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.ci.ts" + } + ], + "outputHashing": "all" + }, "development": { "buildOptimizer": false, "optimization": false, diff --git a/package-lock.json b/package-lock.json index 9ad5fa4..b71fca1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "ecd-ui", "version": "0.0.0", + "hasInstallScript": true, "dependencies": { "@angular/animations": "^14.0.0-next.0", "@angular/cdk": "^14.2.7", @@ -39,6 +40,7 @@ "@types/file-saver": "^2.0.5", "@types/jasmine": "~4.0.0", "@types/jquery": "^3.5.16", + "ejs": "^3.1.9", "jasmine-core": "~4.3.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.1.0", @@ -2938,16 +2940,6 @@ "node": ">= 8" } }, - "node_modules/@popperjs/core": { - "version": "2.11.6", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/@schematics/angular": { "version": "14.2.10", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-14.2.10.tgz", @@ -3654,6 +3646,12 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "dev": true + }, "node_modules/autoprefixer": { "version": "10.4.13", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", @@ -5053,6 +5051,21 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "dev": true }, + "node_modules/ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "dev": true, + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.4.284", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", @@ -5906,6 +5919,15 @@ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "dependencies": { + "minimatch": "^5.0.1" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -7086,6 +7108,116 @@ "node": ">=8" } }, + "node_modules/jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "dev": true, + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jake/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/jake/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jake/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jake/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jake/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jake/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jasmine-core": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.3.0.tgz", @@ -13873,15 +14005,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz", "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==", - "dev": true, - "requires": {} + "dev": true }, "@csstools/selector-specificity": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.0.tgz", "integrity": "sha512-zJ6hb3FDgBbO8d2e83vg6zq7tNvDqSq9RwdwfzJ8tdm9JHNvANq2fqwyRn6mlpUb7CwTs5ILdUrGwi9Gk4vY5w==", - "dev": true, - "requires": {} + "dev": true }, "@discoveryjs/json-ext": { "version": "0.5.7", @@ -13992,8 +14122,7 @@ "version": "14.2.10", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-14.2.10.tgz", "integrity": "sha512-sLHapZLVub6mEz5b19tf1VfIV1w3tYfg7FNPLeni79aldxu1FbP1v2WmiFAnMzrswqyK0bhTtxrl+Z/CLKqyoQ==", - "dev": true, - "requires": {} + "dev": true }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -14124,12 +14253,6 @@ } } }, - "@popperjs/core": { - "version": "2.11.6", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", - "peer": true - }, "@schematics/angular": { "version": "14.2.10", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-14.2.10.tgz", @@ -14577,8 +14700,7 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "requires": {} + "dev": true }, "adjust-sourcemap-loader": { "version": "4.0.0", @@ -14763,6 +14885,12 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "dev": true + }, "autoprefixer": { "version": "10.4.13", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", @@ -14958,8 +15086,7 @@ "bootstrap": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", - "requires": {} + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==" }, "brace-expansion": { "version": "2.0.1", @@ -15576,8 +15703,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", - "dev": true, - "requires": {} + "dev": true }, "css-select": { "version": "4.3.0", @@ -15791,6 +15917,15 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "dev": true }, + "ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "dev": true, + "requires": { + "jake": "^10.8.5" + } + }, "electron-to-chromium": { "version": "1.4.284", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", @@ -16363,6 +16498,15 @@ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, + "filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "requires": { + "minimatch": "^5.0.1" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -16848,8 +16992,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} + "dev": true }, "ieee754": { "version": "1.2.1", @@ -17248,6 +17391,88 @@ "istanbul-lib-report": "^3.0.0" } }, + "jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "dev": true, + "requires": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "jasmine-core": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.3.0.tgz", @@ -17512,8 +17737,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.0.0.tgz", "integrity": "sha512-SB8HNNiazAHXM1vGEzf8/tSyEhkfxuDdhYdPBX2Mwgzt0OuF2gicApQ+uvXLID/gXyJQgvrM9+1/2SxZFUUDIA==", - "dev": true, - "requires": {} + "dev": true }, "karma-source-map-support": { "version": "1.4.0", @@ -18888,15 +19112,13 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz", "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==", - "dev": true, - "requires": {} + "dev": true }, "postcss-gap-properties": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz", "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==", - "dev": true, - "requires": {} + "dev": true }, "postcss-image-set-function": { "version": "4.0.7", @@ -18922,8 +19144,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", - "dev": true, - "requires": {} + "dev": true }, "postcss-lab-function": { "version": "4.2.1", @@ -18950,22 +19171,19 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz", "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==", - "dev": true, - "requires": {} + "dev": true }, "postcss-media-minmax": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz", "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -19010,8 +19228,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz", "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==", - "dev": true, - "requires": {} + "dev": true }, "postcss-overflow-shorthand": { "version": "3.0.4", @@ -19026,8 +19243,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz", "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==", - "dev": true, - "requires": {} + "dev": true }, "postcss-place": { "version": "7.0.5", @@ -19108,8 +19324,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz", "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-selector-not": { "version": "6.0.1", @@ -19620,8 +19835,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -20282,8 +20496,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -20645,8 +20858,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -20747,8 +20959,7 @@ "version": "8.12.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -20865,8 +21076,7 @@ "version": "8.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "dev": true, - "requires": {} + "dev": true }, "y18n": { "version": "5.0.8", diff --git a/package.json b/package.json index 63d7182..6d8c5d9 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,9 @@ "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test", + "postinstall": "chmod +x ./scripts/*.js", "build-prod": "node --max_old_space_size=7000 ./node_modules/@angular/cli/bin/ng build --configuration production", - "war": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=production --aot && grunt" + "build-ci": "./scripts/ci-prebuild.js && node --max_old_space_size=7000 ./node_modules/@angular/cli/bin/ng build --configuration ci" }, "private": true, "dependencies": { @@ -43,14 +44,13 @@ "@types/file-saver": "^2.0.5", "@types/jasmine": "~4.0.0", "@types/jquery": "^3.5.16", + "ejs": "^3.1.9", "jasmine-core": "~4.3.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.1.0", "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", - "typescript": "~4.7.2", - "grunt": "1.0.3", - "grunt-war": "0.5.1" + "typescript": "~4.7.2" } } diff --git a/pom.xml b/pom.xml index 20cc099..3b44ae1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,210 +1,206 @@ - - 4.0.0 - com.iemr.ecdui - ecd-ui - 1.0 - ecd-ui - war - - - dev - - 10.208.122.38 - 10.208.122.99 - 10.208.122.38 - 10.208.122.99 - dev - - - true - - - - uat - - 10.208.122.38 - 10.208.122.99 - deviemr.piramalswasthya.org - helplines.piramalswasthya.org - uat - - - - local - - 10.208.122.38 - 10.208.122.99 - localhost - localhost - local - - - - test - - 10.208.122.38 - 10.208.122.99 - 10.208.122.32 - 10.208.122.99 - test - - - - - - - UTF-8 - ecdui-v1.0 - 10.208.122.38 - 9990 - localhost - 9990 - 10.208.122.32 - 9990 - deviemr.piramalswasthya.org - 9990 - wildfly-${environment} - {hostname-${environment}} - {port-${environment}} - - - - - ecd-ui-v1.0 - - - maven-clean-plugin - 3.0.0 - - - - dist - - - false - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.iemr.ecdui + ecd-ui + 1.0 + ecd-ui + war + + + dev + + 10.208.122.38 + 10.208.122.99 + 10.208.122.38 + 10.208.122.99 + dev + + + true + + + + uat + + 10.208.122.38 + 10.208.122.99 + deviemr.piramalswasthya.org + helplines.piramalswasthya.org + uat + + + + local + + 10.208.122.38 + 10.208.122.99 + localhost + localhost + local + + + + test + + 10.208.122.38 + 10.208.122.99 + 10.208.122.32 + 10.208.122.99 + test + + + + ci + + ci + + + - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - running npm install - compile - - exec - - - - running npm install ---> ${build.timestamp} - exec-dir: ${project.build.directory} - - npm - - install - - - - - - - running ng build --configuration production - compile - - exec - - - - running ng build --configuration production ---> ${build.timestamp} - exec-dir: ${project.build.directory} - dist-dir: ${project.build.outputDirectory} - - - npm - - run - build-prod - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.2 - - - default-copy-resources - prepare-package - - true - ${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/ - - - ${project.basedir}/dist - - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.4 - - false - - - - dist - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - properties-updated 1 - prepare-package - - run - - - - replacing/updating urls ${project.basedir} 2 - - - - - - - - - - - - - + + + UTF-8 + ecdui-v1.0 + 10.208.122.38 + 9990 + localhost + 9990 + 10.208.122.32 + 9990 + deviemr.piramalswasthya.org + 9990 + wildfly-${environment} + {hostname-${environment}} + {port-${environment}} + + + + + ecd-ui-v1.0 + + + maven-clean-plugin + 3.3.1 + + + + dist + + + false + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.1 + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + npm-install + compile + + exec + + + npm + + install + + + + + + + running-ng-build + compile + + exec + + + npm + + run + build-${environment} + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + default-copy-resources + prepare-package + + true + ${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/ + + + + ${project.basedir}/dist + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + false + + + + dist + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + properties-updated 1 + prepare-package + + run + + + + replacing/updating urls ${project.basedir} 2 + + + + + + + + + + + + + diff --git a/scripts/ci-prebuild.js b/scripts/ci-prebuild.js new file mode 100755 index 0000000..ccc8830 --- /dev/null +++ b/scripts/ci-prebuild.js @@ -0,0 +1,51 @@ +#!/usr/bin/env node + +/* +* AMRIT – Accessible Medical Records via Integrated Technology +* Integrated EHR (Electronic Health Records) Solution +* +* Copyright (C) "Piramal Swasthya Management and Research Institute" +* +* This file is part of AMRIT. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. +*/ + +const fs = require('fs'); +const path = require('path'); + +const ejs = require('ejs'); + +const environmentFilesDirectory = path.join(__dirname, '../src/environments'); +const targetEnvironmentTemplateFileName = 'environment.ci.ts.template'; +const targetEnvironmentFileName = 'environment.ci.ts'; + +// Load template file +const environmentTemplate = fs.readFileSync( + path.join(environmentFilesDirectory, targetEnvironmentTemplateFileName), + {encoding: 'utf-8'} +); + +const defaultEnvValues = { + COMMON_API_BASE: '', + ADMIN_API_BASE: '', + ECD_API_BASE: '', +}; + +// Generate output data +const output = ejs.render(environmentTemplate, Object.assign({}, defaultEnvValues, process.env)); +// Write environment file +fs.writeFileSync(path.join(environmentFilesDirectory, targetEnvironmentFileName), output); + +process.exit(0); diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template new file mode 100644 index 0000000..5807202 --- /dev/null +++ b/src/environments/environment.ci.ts.template @@ -0,0 +1,248 @@ +/* +* AMRIT – Accessible Medical Records via Integrated Technology +* Integrated EHR (Electronic Health Records) Solution +* +* Copyright (C) "Piramal Swasthya Management and Research Institute" +* +* This file is part of AMRIT. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. +*/ + +const COMMON_API = '<%= COMMON_API_BASE %>'; +const ADMIN_API = '<%= ADMIN_API_BASE %>'; +const ECD_API = '<%= ECD_API_BASE %>'; +const biologicalScreeningDeviceAPI = `${ADMIN_API}diagnostics/biologicalScreeningDevice`; + +export const environment = { + production: true, + ioturl: `${biologicalScreeningDeviceAPI}`, + extendSessionUrl: `${ECD_API}common/extend/redisSession`, + language: 'English', + licenseUrl: `${COMMON_API}license.html`, + + getSecurityQuestionURL: `${COMMON_API}user/getsecurityquetions`, + getLoginURL: `${COMMON_API}user/userAuthenticate`, + userLogoutPreviousSessionUrl: `${COMMON_API}user/logOutUserFromConcurrentSession`, + setForgotPasswordURL: `${COMMON_API}/user/setForgetPassword`, + saveUserQuestionAns: `${COMMON_API}/user/saveUserSecurityQuesAns`, + validateSecQuesAnsURL: `${COMMON_API}/user/validateSecurityQuestionAndAnswer`, + forgotPasswordURL: `${COMMON_API}/user/forgetPassword`, + getSessionExistsURL: `${COMMON_API}user/getLoginResponse`, + logoutUrl: `${COMMON_API}user/userLogout`, + getLanguageList: `${COMMON_API}beneficiary/getLanguageList`, + + /* Supervisor Urls */ + getCallConfigsUrl: `${ECD_API}callConfiguration/getByPSMId/`, + + createCallConfigurationUrl: `${ECD_API}callConfiguration/create`, + updateCallConfigurationUrl: `${ECD_API}callConfiguration/update`, + getUnallocatedCallsUrl: `${ECD_API}callAllocation/getEligibleRecordsInfo`, + getAllocateCallsUrl: `${ECD_API}callAllocation/allocateCalls`, + deleteReallocationUrl: `${ECD_API}callAllocation/moveToBin`, + getAllocatedCountUrl: `${ECD_API}callAllocation/getAllocatedCallCountUser`, + updateRealloateCallsUrl: `${ECD_API}callAllocation/reAllocateCalls`, + + + saveQuestionnaireUrl: `${ECD_API}Questionnaire/createQuestionnaires`, + getQuestionnaireUrl: `${ECD_API}Questionnaire/getQuestionnairesByPSMId`, + updateQuestionnaireUrl: `${ECD_API}Questionnaire/updateQuestionnaire`, + getDataUploadURL: `${ECD_API}uploadRCHData`, + getUploadTemplateURL: `${ECD_API}dataTemplate/uploadTemplate`, + getDownloadTemplateURL: `${ECD_API}dataTemplate/downloadTemplate`, + createParentChildMappingURL: `${ECD_API}Questionnaire/createQuestionnairesMap`, + getQuestionnairesForMappingURL: `${ECD_API}Questionnaire/getQuestionnaires`, + getMappedQuestionsURL: `${ECD_API}Questionnaire/getMappedParentChildQuestionnaire`, + updateParentChildMappingURL: `${ECD_API}Questionnaire/editQuestionnairesMap`, + + + // supervisor - section configuration Urls + getSectionConfigurationsUrl: `${ECD_API}Questionnaire/getSectionsByProvider/`, + getAlertsNotificationUrl: `${COMMON_API}notification/getSupervisorNotification`, + getNotificationTypeUrl: `${COMMON_API}notification/getNotificationType`, + createSuprSectionConfigurationUrl: `${ECD_API}Questionnaire/createSections`, + updateSuprSectionConfigurationUrl: `${ECD_API}Questionnaire/updateSection`, + + getQuestionnaireTypeUrl: `${ECD_API}master/getQuestionnaireType`, + getAnswerTypeUrl: `${ECD_API}master/getAnswerType`, + getRolesURL: `${COMMON_API}user/getRolesByProviderID`, + getOfficesFromRoleURL: `${COMMON_API}user/getLocationsByProviderID`, + updateNotificationURL: `${COMMON_API}notification/updateNotification`, + createNotificationURL: `${COMMON_API}notification/createNotification`, + getSupervisorNotificationsURL: `${COMMON_API}notification/getSupervisorNotification`, + forceUserLogoutURL: `${COMMON_API}user/forceLogout`, + publishAlertURL: `${COMMON_API}alerts/publishAlerts`, + publishNotificationURL: `${COMMON_API}notifications/publishNotifications`, + publishLocationMessagesURL: `${COMMON_API}locationMessages/publishLocationMessage`, + getDateWiseAuditorWorklistUrl: `${ECD_API}qualityAudit/getQualityAuditorWorklistDatewise`, + + saveQuestionnaireSectionMappingUrl: `${ECD_API}Questionnaire/mapQuestionnairesAndSection`, + updateQuestionnaireSectionMappingUrl: `${ECD_API}Questionnaire/editQuestionnaireSectionMap`, + getSectionMastersUrl: `${ECD_API}Questionnaire/getSectionsByProvider`, + getSectionQuestionnaireMapUrl: `${ECD_API}Questionnaire/getQuestionnairesAndSectionMapByProvider`, + getAuditSectionMapUrl: `${ECD_API}sectionConfiguration/getByPSMId`, + getUnMappedQuestionnairesUrl: `${ECD_API}Questionnaire/getUnMappedQuestionnaires`, + getSMSTypeUrl: `${ECD_API}get/smsType`, + getAutoPreviewDialingUrl: `${ECD_API}get/call/isAutoPreviewDialing`, + createCallSectionMappingUrl: `${ECD_API}callConfiguration/mapCallAndSection`, + getMappedSectionsUrl: `${ECD_API}callConfiguration/getCallAndSectionMapByPsmIdAndCallConfigId/`, + getSectionsUrl: `${COMMON_API}callConfiguration/callConfiguration`, + dialPreferenceURL: `${ECD_API}autoPreviewDialing/addDialPreference`, + fetchDialPreferenceUrl: `${ECD_API}autoPreviewDialing/getDialPreference`, + + getLocationsURL: `${COMMON_API}user/getLocationsByProviderID`, + + /**Quality Supervisor Urls */ + getCentreOverallQualityRatingUrl: `${ECD_API}charts/getCentreOverallQualityRating/`, + getSkillSetQualityRatingUrl: `${ECD_API}charts/getActorWiseQualityRatings/`, + getCustomerSatisfactionUrl: `${ECD_API}charts/getCSatScoreByPSMIdAndFrequency`, + getTenureWiseQualityRatingUrl: `${ECD_API}charts/getTenureWiseQualityRating/`, + getNumberOfAgentScoreUrl: `${ECD_API}charts/getGradeWiseAgentCount/`, + getRoleMasterUrl: `${ECD_API}master/getRolesByPsmId`, + getOfficeMasterUrl: `${ECD_API}master/getOfficesByPSMID`, + getFrequencyMasterUrl: `${ECD_API}master/getFrequency`, + getAuditorMastersUrl: `${ECD_API}get/getAuditorByPSMId`, + getRoleMastersUrl: `${ECD_API}master/getRolesByPsmId`, + saveQualityAuditorAgentUrl: `${ECD_API}agentQualityAuditorMap/create`, + updateQualityAuditorAgentUrl: `${ECD_API}agentQualityAuditorMap/update`, + getAgentMappedDataUrl: `${ECD_API}agentQualityAuditorMap/getByPSMId`, + saveGradesUrl: `${ECD_API}gradeConfiguration/create`, + updateGradeConfigurationUrl: `${ECD_API}gradeConfiguration/update`, + getGradeMastersUrl: `${ECD_API}master/getGrades`, + getQuestionnaireDataUrl: `${ECD_API}questionnaireConfiguration/getByPSMId`, + updateQuestionConfigurationUrl: `${ECD_API}questionnaireConfiguration/update`, + saveQuestionConfigurationUrl: `${ECD_API}questionnaireConfiguration/create`, + getOfficeMasterDataUrl: `${ADMIN_API}m/location/getAlllocationNew`, + + createSectionConfigurationUrl: `${ECD_API}sectionConfiguration/create`, + updateSectionConfigurationUrl: `${ECD_API}sectionConfiguration/update`, + deleteSectionConfigurationUrl: `${ECD_API}callConfigurationController/put/configuration`, + qualitySupervisorReportURL: `${ECD_API}callConfigurationController/put/configuration`, + + /**Quality Auditor Urls */ + getAuditorWorklistUrl: `${ECD_API}qualityAudit/getQualityAuditorWorklist`, + getLanguageMasterUrl: `${ECD_API}master/getLanguage`, + getLanguageMasterByUserIdUrl: `${ECD_API}master/getLanguageByUserId/`, + getQualityAuditGradesByPsmIdUrl: `${ECD_API}qualityAudit/getQualityAuditGradesByPSMID/`, + getQuesSecForQualityUrl: `${ECD_API}qualityAudit/getQuestionSectionForCallRatings/`, + saveQualityRatingsUrl: `${ECD_API}qualityAudit/saveCallQualityRatings`, + getBenCallRatingsUrl: `${ECD_API}qualityAudit/getCallQualityRatings/`, + getCallRecordingUrl: `${COMMON_API}call/getFilePathCTI`, + updateQualityRatingsUrl: `${ECD_API}qualityAudit/call-reaudit`, + + getAlertsAndNotificatonsUrl: `${COMMON_API}/notification/getAlertsAndNotificationDetail`, + getAlertsAndNotificatonsCountUrl: `${COMMON_API}notification/getAlertsAndNotificationCount`, + deleteAlertNotifLocMsgsUrl: `${COMMON_API}notification/markDelete`, + changeNotificationStatusUrl: `${COMMON_API}notification/changeNotificationStatus`, + + getMappedGradeURL: `${ECD_API}gradeConfiguration/getByPSMId`, + getCycleMastersUrl: `${ECD_API}master/getCycles`, + saveSampleUrl: `${ECD_API}sampleSelectionConfiguration/create`, + getMappedCycleURL: `${ECD_API}sampleSelectionConfiguration/getByPSMId`, + updateCycleConfigurationURL: `${ECD_API}sampleSelectionConfiguration/update`, + getAgentMastersUrl: `${ECD_API}master/getAgentsByRoleId`, + getCaseSheetDataURL: `${ECD_API}qualityAudit/getBeneficiaryCasesheet`, + /** Associate-anm-mo Urls */ + getAgentAuditScoreUrl: `${ECD_API}autoPreviewDialing/getRatingsByUserIdAndPsmId`, + updateCallClosureUrl: `${ECD_API}closure/closeCall`, + saveBenCallDetails: `${ECD_API}callHistory/saveBenCallDetails`, + getAgentMasterDataUrl: `${ECD_API}get/masterData`, + getAgentAutoPreviewDialingUrl: `${ECD_API}autoPreviewDialing/getAutoPreviewDialingByUserIdAndRoleIdAndPsmId`, + getCallAnsweredVerifiedCount: `${ECD_API}agent/get-call-statistics`, + getBenHistoryURL: `${COMMON_API}cti/getAgentCallStats`, + getBenHrpHrniDetailsUrl: `${ECD_API}callHistory/getHrpHrniDetails?`, + getBeneficiaryQuestionnaire: `${ECD_API}Questionnaire/getQuesAndSecMapAssociateByProvider/`, + saveBenQuestionnaireResponseUrl: `${ECD_API}callHistory/create/beneficiaryQuestionnaireResponse`, + getMotherOutboundWorkListUrl: `${ECD_API}outbound-worklist/get-mother-data`, + getChildOutboundWorkListUrl: `${ECD_API}outbound-worklist/get-child-data`, + updateCommonCallClosureUrl: `${COMMON_API}call/closeCall`, + patchBenHistoryURL: `${COMMON_API}cti/getAgentCallStats`, + getCallTypesUrl: `${COMMON_API}call/getCallTypes`, + getNoFurtherCallsReasonUrl: `${ECD_API}master/getNoFurtherCallsReason`, + getReasonsOfNotCallAnsweredUrl: `${ECD_API}master/getCallNotAnswered`, + getTypeOfComplaintsUrl: `${ECD_API}master/getTypeOfComplaints`, + getHrpReasonMasterUrl: `${ECD_API}master/getHRPReasons`, + getHrniReasonMasterUrl: `${ECD_API}master/getHRNIReasons`, + getCongentialAnomaliesMasterUrl: `${ECD_API}master/getCongenitalAnomalies`, + + getBeneficiaryCallHistoryUrl: `${ECD_API}callHistory/getBeneficiaryCallHistory`, + getCallHistoryDetailsUrl: `${ECD_API}callHistory/getBeneficiaryCallDetails`, + /**CTI Urls */ + ctiUrl: `http://10.208.122.99/`, + ctiEventUrl: `bar/cti_handler.php?e=`, + getLoginKeyUrl: `${COMMON_API}cti/getLoginKey`, + getAgentsDataUrl: `${ECD_API}master/getAgentsByRoleId`, + getAgentState: `${COMMON_API}cti/getAgentState`, + getCallStatistics: `${COMMON_API}cti/getAgentCallStats`, + getAgentIpAddressUrl: `${COMMON_API}cti/getAgentIPAddress`, + getWrapupTimeUrl: `${COMMON_API}user/role`, + callBeneficiaryManualUrl: `${COMMON_API}cti/callBeneficiary`, + getDisconnectCallUrl: `${COMMON_API}cti/disconnectCall`, + agentCtiLogOutUrl: `${COMMON_API}cti/doAgentLogout`, + + + // SMSTenplateURLS + getSMStemplates_url: `${COMMON_API}sms/getSMSTemplates`, + getSMStypes_url: `${COMMON_API}sms/getSMSTypes`, + sendSMS_url: `${COMMON_API}sms/sendSMS`, + // SMSTenplateURLS + saveSMStemplate_url: `${COMMON_API}sms/saveSMSTemplate`, + updateSMStemplate_url: `${COMMON_API}sms/updateSMSTemplate`, + getSMSparameters_url: `${COMMON_API}sms/getSMSParameters`, + getFullSMSTemplate_url: `${COMMON_API}sms/getFullSMSTemplate`, + + getSMSTypesURL: `${ECD_API}master/getSMSTypes`, + getSMSParamsURL: `${ECD_API}master/getSMSParameters`, + getSMSValuesURL: `${ECD_API}master/getSMSValues`, + getListOfMapQuestionaireConfigurationUrl: `${ECD_API}questionnaireConfiguration/getByPSMId`, + + + /**Demographic Masters */ + getStatesMasterUrl: `${COMMON_API}location/states`, + getDistrictMasterUrl: `${COMMON_API}location/districts`, + getBlockMasterUrl: `${COMMON_API}location/taluks`, + getVillageMasterUrl: `${COMMON_API}location/village`, + + /**Beneficiary Registration & Update Url */ + registerBeneficiaryUrl: `${ECD_API}beneficary/registration`, + updateBeneficiaryUrl: `${ECD_API}beneficary/updateBeneficiaryDetails`, + + /** Gender Master */ + getGenderMasterUrl: `${ECD_API}master/getGender`, + + // Reports + downloadCumulativeReportURL: `${ECD_API}ecdReportController/getECDCumulativeDistrictReport`, + downloadCallDetailReportURL: `${ECD_API}ecdReportController/getECDCallDetailsReport`, + downloadCallSummaryReportURL: `${ECD_API}ecdReportController/getECDCallSummaryReport`, + downloadBenificiaryWiseReportURL: `${ECD_API}ecdReportController/getECDBeneficiarywisefollowupdetailsReport`, + downloadCallUniqueReportURL: `${ECD_API}ecdReportController/getECDCallDetailReportUnique`, + downloadBirthDefectReportURL: `${ECD_API}ecdReportController/getECDBirthDefectReport`, + downloadAashaHomeReportURL: `${ECD_API}ecdReportController/getECDAashaHomeVisitGapReport`, + downloadCalciumIfaReportURL: `${ECD_API}ecdReportController/getECDCalciumIFATabNonadherenceReport`, + downloadAbsenceVhsndReportURL: `${ECD_API}ecdReportController/getECDAbsenceInVHSNDReport`, + downloadVaccineDropoutReportURL: `${ECD_API}ecdReportController/getECDVaccineDropOutIdentifiedReport`, + downloadVaccineLeftoutReportURL: `${ECD_API}ecdReportController/getECDVaccineLeftOutIdentifiedReport`, + downloadDevDelayReportURL: `${ECD_API}ecdReportController/getECDDevelopmentalDelayReport`, + downloadAbortionReportURL: `${ECD_API}ecdReportController/getECDAbortionReport`, + downloadDeliveryStatusReportURL: `${ECD_API}ecdReportController/getECDDeliveryStatusReport`, + downloadHrpwCasesReportURL: `${ECD_API}ecdReportController/getECDHRPCasesIdentifiedReport`, + downloadInfantHighRiskReportURL: `${ECD_API}ecdReportController/getECDInfantsHighRiskReport`, + downloadMaternalDeathReportURL: `${ECD_API}ecdReportController/getECDMaternalDeathReport`, + downloadStillBirthReportURL: `${ECD_API}ecdReportController/getECDStillBirthReport`, + downloadBabyDeathReportURL: `${ECD_API}ecdReportController/getECDBabyDeathReport`, + downloadNotConnectedReportURL: `${ECD_API}ecdReportController/getECDNotConnectedPhonelistDiffformatReport`, + downloadJsyReportURL: `${ECD_API}ecdReportController/getECDJSYRelatedComplaintsReport`, + downloadMiscarriageReportURL: `${ECD_API}ecdReportController/getECDMiscarriageReport`, + +}; diff --git a/tsconfig.app.json b/tsconfig.app.json index ff396d4..6bb6c9d 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -3,7 +3,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/app", - "types": [] + "types": ["node"] }, "files": ["src/main.ts", "src/polyfills.ts"], "include": ["src/**/*.d.ts"] diff --git a/tsconfig.json b/tsconfig.json index 89cb6b1..f5d51d4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,8 @@ "importHelpers": true, "target": "es2020", "module": "es2020", - "lib": ["es2020", "dom"] + "lib": ["es2020", "dom"], + "types": ["node"] }, "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, From cd7797cdd3b0db40176e8bda62a15296e9a24ac3 Mon Sep 17 00:00:00 2001 From: Mithun James Date: Thu, 26 Oct 2023 17:33:02 +0530 Subject: [PATCH 3/8] Edit README --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e6a0c4..9447d3a 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,18 @@ To install the ECD module, please follow these steps: - Run the command `npm start`. 3. Open your browser and access `http://localhost:4200/#/login` to view the login page of module. -## Configuration -The ECD module can be configured by editing the config.js file. This file contains all of the settings for the module, such as the database connection string, the user authentication mechanism, and the role hierarchy. +## Building war files +To build deployable war files +```bash +mvn -B package --file pom.xml -P +``` + +The available profiles include dev, local, test, and ci. +Refer to `src/environments/environment.ci.template` file and ensure that the right environment variables are set for the build. + +Packing with `ci` profile calls `build-ci` script in `package.json`. +It creates a `environment.ci.ts` file with all environment variables used in the generated build. ## Usage From ebc8d22225e7fa96694586e7886f17960fb65363 Mon Sep 17 00:00:00 2001 From: Karyamsetty Helen Grace Date: Mon, 30 Oct 2023 21:15:38 +0530 Subject: [PATCH 4/8] changed date format to MM/DD/YYYY --- .../beneficiary-call-history.component.html | 6 +++--- .../ben-registration/ben-registration.component.ts | 3 --- .../outbound-worklist.component.html | 4 ++-- .../view-details/view-details.component.html | 2 +- .../view-details/view-details.component.ts | 14 +++++++------- .../call-statistics/call-statistics.component.html | 2 +- .../app-modules/core/rating/rating.component.html | 2 +- .../view-casesheet/view-casesheet.component.html | 14 +++++++------- .../alert-notification.component.html | 4 ++-- .../supervisor-notification.component.html | 4 ++-- .../location-messages.component.html | 4 ++-- .../uploadexcel/uploadexcel.component.html | 4 ++-- .../forgot-password/forgot-password.component.html | 2 +- .../user-login/login/login.component.html | 2 +- 14 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/app/app-modules/associate-anm-mo/beneficiary-call-history/beneficiary-call-history.component.html b/src/app/app-modules/associate-anm-mo/beneficiary-call-history/beneficiary-call-history.component.html index a0ae00c..f8f6f21 100644 --- a/src/app/app-modules/associate-anm-mo/beneficiary-call-history/beneficiary-call-history.component.html +++ b/src/app/app-modules/associate-anm-mo/beneficiary-call-history/beneficiary-call-history.component.html @@ -44,7 +44,7 @@

{{ currentLanguageSet?.benCallHis - {{item.displayEcdCallType}}-{{item.lastModDate | date: 'dd/MM/yyyy'}} + {{item.displayEcdCallType}}-{{item.lastModDate | date: 'MM/DD/YYYY'}} @@ -208,7 +208,7 @@

{{ currentLanguageSet?.benCallHis matInput placeholder="" id="lmpDate" - [value]="beneficiaryCallDetails.lmpDate | date: 'dd/MM/yyyy'" + [value]="beneficiaryCallDetails.lmpDate | date: 'MM/DD/YYYY'" appMobileNumber type="text" defaultNull @@ -229,7 +229,7 @@

{{ currentLanguageSet?.benCallHis matInput placeholder="" id="dateOfBirth" - [value]="beneficiaryCallDetails.dob |date: 'dd/MM/yyyy'" + [value]="beneficiaryCallDetails.dob |date: 'MM/DD/YYYY'" appMobileNumber type="text" defaultNull diff --git a/src/app/app-modules/associate-anm-mo/beneficiary-registration/ben-registration/ben-registration.component.ts b/src/app/app-modules/associate-anm-mo/beneficiary-registration/ben-registration/ben-registration.component.ts index 2d77f1d..cab9829 100644 --- a/src/app/app-modules/associate-anm-mo/beneficiary-registration/ben-registration/ben-registration.component.ts +++ b/src/app/app-modules/associate-anm-mo/beneficiary-registration/ben-registration/ben-registration.component.ts @@ -37,7 +37,6 @@ import * as moment from 'moment'; styleUrls: ['./ben-registration.component.css'] })export class BenRegistrationComponent implements OnInit { - datePipeString : any='2023-02-15T00:00:00.000Z'; // viewDetails:any=this.data.selectedDetails; enableMotherRecord: boolean = false; // viewDetails: any[]=[]; @@ -91,8 +90,6 @@ import * as moment from 'moment'; private loginService: LoginserviceService, ) { - this.datePipeString = this.datePipe.transform(this.datePipeString,'dd/MM/yyyy'); - console.log(this.datePipeString); } ngOnInit(): void { diff --git a/src/app/app-modules/associate-anm-mo/outbound-worklist/outbound-worklist.component.html b/src/app/app-modules/associate-anm-mo/outbound-worklist/outbound-worklist.component.html index 2bf93f1..34dd72d 100644 --- a/src/app/app-modules/associate-anm-mo/outbound-worklist/outbound-worklist.component.html +++ b/src/app/app-modules/associate-anm-mo/outbound-worklist/outbound-worklist.component.html @@ -136,7 +136,7 @@

{{currentLanguageSet?.recordUploadDate}} - {{ element.recordUploadDate | date: 'dd/MM/yyyy'}} + {{ element.recordUploadDate | date: 'MM/dd/yyyy'}} @@ -265,7 +265,7 @@

{{currentLanguageSet?.recordUploadDate}} - {{ element.recordUploadDate | date: 'dd/MM/yyyy' }} + {{ element.recordUploadDate | date: 'MM/dd/yyyy' }} diff --git a/src/app/app-modules/associate-anm-mo/view-details/view-details.component.html b/src/app/app-modules/associate-anm-mo/view-details/view-details.component.html index 76eb3ee..c723f15 100644 --- a/src/app/app-modules/associate-anm-mo/view-details/view-details.component.html +++ b/src/app/app-modules/associate-anm-mo/view-details/view-details.component.html @@ -210,7 +210,7 @@

View Record

- Expected Deivery Date + Expected Delivery Date

- {{ today | date : "dd/MM/YYYY - HH:mm:ss" }} + {{ today | date : "MM/DD/YYYY - HH:mm:ss" }}

diff --git a/src/app/app-modules/core/rating/rating.component.html b/src/app/app-modules/core/rating/rating.component.html index a20a07c..8a9972a 100644 --- a/src/app/app-modules/core/rating/rating.component.html +++ b/src/app/app-modules/core/rating/rating.component.html @@ -43,7 +43,7 @@ {{ currentLanguageSet?.date }} - {{element.date | date: 'dd/MM/yyyy'}} + {{element.date | date: 'MM/DD/YYYY'}} diff --git a/src/app/app-modules/quality-auditor/view-casesheet/view-casesheet.component.html b/src/app/app-modules/quality-auditor/view-casesheet/view-casesheet.component.html index 9d5345a..42004a7 100644 --- a/src/app/app-modules/quality-auditor/view-casesheet/view-casesheet.component.html +++ b/src/app/app-modules/quality-auditor/view-casesheet/view-casesheet.component.html @@ -37,7 +37,7 @@

{{ currentLanguageSet?.childName}} {{beneficiaryCaseSheetData?.beneficiaryName}} {{ currentLanguageSet?.createdDate }} - {{beneficiaryCaseSheetData?.createdDate | date: 'dd/MM/yyyy' }} + {{beneficiaryCaseSheetData?.createdDate | date: 'MM/DD/YYYY' }} @@ -61,14 +61,14 @@

{{ currentLanguageSet?.age}} {{beneficiaryCaseSheetData?.age}} {{ currentLanguageSet?.dob}} - {{beneficiaryCaseSheetData?.dateOfBirth | date: 'dd/MM/yyyy' }} + {{beneficiaryCaseSheetData?.dateOfBirth | date: 'MM/DD/YYYY' }} {{ currentLanguageSet?.lmp}} - {{beneficiaryCaseSheetData?.lmp | date: 'dd/MM/yyyy'}} + {{beneficiaryCaseSheetData?.lmp | date: 'MM/DD/YYYY'}} {{ currentLanguageSet?.edd}} - {{beneficiaryCaseSheetData?.edd | date: 'dd/MM/yyyy'}} + {{beneficiaryCaseSheetData?.edd | date: 'MM/DD/YYYY'}} {{ currentLanguageSet?.address}} @@ -96,7 +96,7 @@

{{ currentLanguageSet?.createdDate }} - {{beneficiaryCaseSheetData?.createdDate | date: 'dd/MM/yyyy' }} + {{beneficiaryCaseSheetData?.createdDate | date: 'MM/DD/YYYY' }} @@ -162,7 +162,7 @@

{{ currentLanguageSet?.nextAttemptDate }} - {{beneficiaryCaseSheetData?.nextAttemptDate | date: 'dd/MM/yyyy'}} + {{beneficiaryCaseSheetData?.nextAttemptDate | date: 'MM/DD/YYYY'}} {{ currentLanguageSet?.callRemarks }} {{beneficiaryCaseSheetData?.callRemarks}} @@ -174,7 +174,7 @@

diff --git a/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html b/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html index 9d3ecaa..39b12e2 100644 --- a/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html +++ b/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html @@ -125,13 +125,13 @@

{{ currentLanguageSet?.alerts }}

{{ currentLanguageSet?.validFrom }} - {{ element.validFrom |utcdate| date: 'dd/MM/yyyy' }} + {{ element.validFrom |utcdate| date: 'MM/DD/YYYY' }} {{ currentLanguageSet?.validTill }} - {{ element.validTill |utcdate| date: 'dd/MM/yyyy' }} + {{ element.validTill |utcdate| date: 'MM/DD/YYYY' }} diff --git a/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html b/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html index 39b12e2..0959794 100644 --- a/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html +++ b/src/app/app-modules/supervisor/activities/alerts/alert-notification/alert-notification.component.html @@ -24,7 +24,7 @@

{{ currentLanguageSet?.alerts }}

style="padding: 15px; width: 320px; font-size: 12px !important;" class="fontStyleDate"> {{ currentLanguageSet?.enterDateRange }} - + {{ currentLanguageSet?.alerts }}

{{ currentLanguageSet?.validFrom }} - {{ element.validFrom |utcdate| date: 'MM/DD/YYYY' }} + {{ element.validFrom |utcdate| date: 'MM/dd/yyyy' }} {{ currentLanguageSet?.validTill }} - {{ element.validTill |utcdate| date: 'MM/DD/YYYY' }} + {{ element.validTill |utcdate| date: 'MM/dd/yyyy' }}