From b7af5250c904f5a445a18990153d21df0f3619eb Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Fri, 15 Dec 2023 12:21:32 +0530 Subject: [PATCH 1/4] hide user conflict notification (#6869) --- src/Components/Users/UserAdd.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx index d26d0832b27..26ba9e44b4b 100644 --- a/src/Components/Users/UserAdd.tsx +++ b/src/Components/Users/UserAdd.tsx @@ -189,6 +189,7 @@ export const UserAdd = (props: UserProps) => { setUsernameExists(userExistsEnums.checking); const { res: usernameCheck } = await request(routes.checkUsername, { pathParams: { username }, + silent: true, }); if (usernameCheck === undefined || usernameCheck.status === 409) setUsernameExists(userExistsEnums.exists); From 1f5ea20a5722f6cfb1d4df4130b8309f257abb60 Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Fri, 15 Dec 2023 18:00:14 +0530 Subject: [PATCH 2/4] daily rounds, clone last default to null (#6872) * daily rounds, clone last default to null * i don't know what this does * skip check for continue form --- src/Components/Patient/DailyRounds.tsx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx index 4105cffb96c..651b278c0de 100644 --- a/src/Components/Patient/DailyRounds.tsx +++ b/src/Components/Patient/DailyRounds.tsx @@ -50,7 +50,7 @@ const initForm: any = { admitted_to: "", taken_at: null, rounds_type: "NORMAL", - clone_last: true, + clone_last: false, systolic: null, diastolic: null, pulse: null, @@ -223,7 +223,7 @@ export const DailyRounds = (props: any) => { RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) || "0", temperature: parseFloat(res.data.temperature), - clone_last: res.data.count > 0 ? true : false, + // clone_last: res.data.count > 0 ? true : false, }, }); } @@ -250,12 +250,6 @@ export const DailyRounds = (props: any) => { invalidForm = true; } return; - case "clone_last": - if (state.form.clone_last === null) { - errors[field] = "Please choose a value"; - invalidForm = true; - } - return; default: return; @@ -271,7 +265,7 @@ export const DailyRounds = (props: any) => { if (validForm) { setIsLoading(true); const baseData = { - clone_last: state.form.clone_last, + clone_last: state.form.clone_last ?? false, rounds_type: state.form.rounds_type, patient_category: state.form.patient_category, taken_at: state.form.taken_at @@ -479,7 +473,7 @@ export const DailyRounds = (props: any) => { /> )} - {(state.form.clone_last === false || id) && ( + {(!state.form.clone_last || id) && (
{ goBack()} /> Date: Tue, 19 Dec 2023 18:44:26 +0530 Subject: [PATCH 3/4] thank everyone (#6777) --- .github/workflows/thank-you.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/thank-you.yml b/.github/workflows/thank-you.yml index cd36e64d888..c8104ad73a5 100644 --- a/.github/workflows/thank-you.yml +++ b/.github/workflows/thank-you.yml @@ -1,7 +1,7 @@ name: Say thanks for the contributors on: - pull_request: + pull_request_target: types: - closed From 7d15c037d927d815b7bf2eca0dc5c8b9c78a4517 Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Tue, 19 Dec 2023 18:44:54 +0530 Subject: [PATCH 4/4] Remove Copilot for PR tags (#6725) --- .github/pull_request_template.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 892fea40ab3..b67b01cc863 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,9 +1,6 @@ -### WHAT -copilot:summary - ## Proposed Changes -- Fixes #issue? +- Fixes #issue_number - Change 1 - Change 2 - More? @@ -18,6 +15,3 @@ copilot:summary - [ ] Prep screenshot or demo video for changelog entry, and attach it to issue. - [ ] Request for Peer Reviews - [ ] Completion of QA - -### HOW -copilot:walkthrough