Merge branch 'develop' into issue#5364

ohcnetwork · Dec 19, 2023 · 47d9359 · 47d9359
2 parents 63c8c57 + 7d15c03
commit 47d9359
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git 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
diff --git 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
 

diff --git 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) && (
           <div className="grid grid-cols-1 gap-x-6 md:grid-cols-2">
             <TextAreaFormField
               {...field("physical_examination_info")}
@@ -650,6 +644,7 @@ export const DailyRounds = (props: any) => {
           <Cancel onClick={() => goBack()} />
           <Submit
             disabled={
+              buttonText === "Save" &&
               state.form.clone_last !== null &&
               !state.form.clone_last &&
               formFields.every(

diff --git 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);