From 0dda43d4c20d1f07a68301ce946f6c39f44cfee7 Mon Sep 17 00:00:00 2001 From: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Date: Tue, 6 Feb 2024 02:13:35 -0800 Subject: [PATCH 1/3] Merging develop to master (#38) (#45) * Update package.json * Update .gitignore * Update package-lock.json * Update reset-user-password.component.ts * Update reset-user-password.component.ts * Update login.component.ts * Update reset-user-password.component.ts * Serviceline CDSS changes * serviceline patching * serviceline changes * Revert "Update package.json" * Client cross site scripting --------- Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com> Co-authored-by: Burdhi. Shivani Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com> Co-authored-by: Devika From aeb4ed758c58e458d69a9434b576fc7d36dbd49c Mon Sep 17 00:00:00 2001 From: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Date: Tue, 6 Feb 2024 23:24:13 -0800 Subject: [PATCH 2/3] Changed service Id filteration in CDSS mapping screen for HWC (#46) * Corrected API name from swymed to videoConsultation * Changed service Id filteration from 4 to 9 in CDSS mapping screen for HWC --------- Co-authored-by: Devika --- .../institute-directory-master-service.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/ProviderAdminServices/institute-directory-master-service.service.ts b/src/app/services/ProviderAdminServices/institute-directory-master-service.service.ts index 747ddc32..8a48bd41 100644 --- a/src/app/services/ProviderAdminServices/institute-directory-master-service.service.ts +++ b/src/app/services/ProviderAdminServices/institute-directory-master-service.service.ts @@ -138,7 +138,7 @@ export class InstituteDirectoryMasterService { console.log(response.json().data, 'role service file success response'); let result = []; result = response.json().data.filter(function (item) { - if (item.serviceID === 4) { + if (item.serviceID === 9) { return item; } }); From 9f4b53b334c18eff038e0dd1d5dd281a242d1979 Mon Sep 17 00:00:00 2001 From: Mithun James Date: Mon, 1 Jul 2024 14:23:42 +0530 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e9c37406..49e6e48e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# ❗❗❗ NOTICE ❗❗❗ + +A new version of the repository is available here [PSMRI/Admin-UI](https://github.com/PSMRI/Admin-UI) + # AMRIT - Admin [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ![branch parameter](https://github.com/PSMRI/Admin-UI/actions/workflows/sast-and-package.yml/badge.svg)