User (Doctor) Autocomplete for Consultation Verified By (ohcnetwork#6194

) * Consultation: Verified By Doctor as Dropdown * filter by home_facility instead * fixes ohcnetwork#6213 * fix cypress * fix cypress * fix more cypressss * fix moreeeee * fix inventory * fix inventory
yogeshbhutkar · Sep 7, 2023 · 0c2be8b · 0c2be8b
1 parent e1f00fa
commit 0c2be8b
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 34 deletions.
diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -118,9 +118,10 @@ describe("Patient Creation with consultation", () => {
       "170",
       "IP007",
       "generalnote",
-      "generalnote"
+      "Dev Doctor"
     );
     patientConsultationPage.submitConsultation();
+
     // Below code for the prescription module only present while creating a new consultation
     patientConsultationPage.clickAddPrescription();
     patientConsultationPage.interceptMediaBase();

diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -104,6 +104,7 @@ class FacilityPage {
   }
 
   clickManageFacilityDropdown() {
+    cy.get("#manage-facility-dropdown button").scrollIntoView();
     cy.get("#manage-facility-dropdown button")
       .contains("Manage Facility")
       .click();
@@ -118,7 +119,7 @@ class FacilityPage {
   }
 
   clickInventoryManagementOption() {
-    cy.get("[id=inventory-management]").click();
+    cy.get("#inventory-management").click();
   }
 
   clickResourceRequestOption() {

diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -16,7 +16,7 @@ export class PatientConsultationPage {
   }
 
   fillIllnessHistory(history: string) {
-    cy.get("#history_of_present_illness").scrollIntoView;
+    cy.get("#history_of_present_illness").scrollIntoView();
     cy.get("#history_of_present_illness").should("be.visible");
     cy.get("#history_of_present_illness").click().type(history);
   }
@@ -52,7 +52,12 @@ export class PatientConsultationPage {
       .click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);
-    cy.get("#verified_by").click().type(verificationBy);
+    cy.get("#verified_by")
+      .click()
+      .type(verificationBy)
+      .then(() => {
+        cy.get("[role='option']").contains("Dev Doctor").click();
+      });
   }
 
   submitConsultation() {

diff --git a/src/Components/Common/UserAutocompleteFormField.tsx b/src/Components/Common/UserAutocompleteFormField.tsx
@@ -8,11 +8,13 @@ import {
 } from "../Form/FormFields/Utils";
 import { UserModel } from "../Users/models";
 import { isUserOnline } from "../../Utils/utils";
+import { UserRole } from "../../Common/constants";
 
 type Props = FormFieldBaseProps<UserModel> & {
   placeholder?: string;
   facilityId?: string;
-  userType?: string;
+  homeFacility?: string;
+  userType?: UserRole;
   showActiveStatus?: boolean;
 };
 
@@ -26,6 +28,7 @@ export default function UserAutocompleteFormField(props: Props) {
   let search_filter: {
     limit: number;
     offset: number;
+    home_facility?: string;
     user_type?: string;
     search_text?: string;
   } = { limit: 5, offset: 0 };
@@ -34,6 +37,10 @@ export default function UserAutocompleteFormField(props: Props) {
     search_filter = { ...search_filter, user_type: props.userType };
   }
 
+  if (props.homeFacility) {
+    search_filter = { ...search_filter, home_facility: props.homeFacility };
+  }
+
   const getStatusIcon = (option: UserModel) => {
     if (!props.showActiveStatus) return null;
 
@@ -69,11 +76,11 @@ export default function UserAutocompleteFormField(props: Props) {
           onQuery={(query) =>
             fetchOptions(
               props.facilityId
-                ? getFacilityUsers(props.facilityId)
-                : getUserList({
+                ? getFacilityUsers(props.facilityId, {
                     ...search_filter,
                     search_text: query,
                   })
+                : getUserList({ ...search_filter, search_text: query })
             )
           }
           isLoading={isLoading}

diff --git a/src/Components/Facility/ConsultationDetails.tsx b/src/Components/Facility/ConsultationDetails.tsx
@@ -469,12 +469,15 @@ export const ConsultationDetails = (props: any) => {
                   label="Diagnosis (as per ICD-11 recommended by WHO)"
                 />
 
-                {consultationData.verified_by && (
+                {(consultationData.verified_by_object ||
+                  consultationData.deprecated_verified_by) && (
                   <div className="mt-2 text-sm">
                     <span className="font-semibold leading-relaxed">
                       Verified By:{" "}
                     </span>
-                    {consultationData.verified_by}
+                    {consultationData.verified_by_object
+                      ? `${consultationData.verified_by_object.first_name} ${consultationData.verified_by_object.last_name}`
+                      : consultationData.deprecated_verified_by}
                     <i className="fas fa-check ml-2 fill-current text-lg text-green-500"></i>
                   </div>
                 )}

diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
@@ -40,7 +40,10 @@ import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField";
 import DateFormField from "../Form/FormFields/DateFormField";
 import { DiagnosisSelectFormField } from "../Common/DiagnosisSelectFormField";
 import { FacilitySelect } from "../Common/FacilitySelect";
-import { FieldChangeEventHandler } from "../Form/FormFields/Utils";
+import {
+  FieldChangeEvent,
+  FieldChangeEventHandler,
+} from "../Form/FormFields/Utils";
 import { FormAction } from "../Form/Utils";
 import PatientCategorySelect from "../Patient/PatientCategorySelect";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
@@ -83,6 +86,7 @@ type FormDetails = {
   icd11_provisional_diagnoses_object: ICD11DiagnosisModel[];
   icd11_principal_diagnosis?: ICD11DiagnosisModel["id"];
   verified_by: string;
+  verified_by_object: UserModel | null;
   is_kasp: BooleanStrings;
   kasp_enabled_date: null;
   examination_details: string;
@@ -128,6 +132,7 @@ const initForm: FormDetails = {
   icd11_provisional_diagnoses_object: [],
   icd11_principal_diagnosis: undefined,
   verified_by: "",
+  verified_by_object: null,
   is_kasp: "false",
   kasp_enabled_date: null,
   examination_details: "",
@@ -329,12 +334,13 @@ export const ConsultationForm = (props: any) => {
                   ?.id ?? "Comfort"
               : "Comfort",
             patient_no: res.data.patient_no ?? "",
-            verified_by: res.data.verified_by ? res.data.verified_by : "",
             OPconsultation: res.data.consultation_notes,
             is_telemedicine: `${res.data.is_telemedicine}`,
             is_kasp: `${res.data.is_kasp}`,
             assigned_to: res.data.assigned_to || "",
             assigned_to_object: res.data.assigned_to_object,
+            verified_by: res.data.verified_by || "",
+            verified_by_object: res.data.verified_by_object,
             ett_tt: res.data.ett_tt ? Number(res.data.ett_tt) : 3,
             special_instruction: res.data.special_instruction || "",
             weight: res.data.weight ? res.data.weight : "",
@@ -745,7 +751,6 @@ export const ConsultationForm = (props: any) => {
           symptoms_onset_date: new Date(),
           category: "Critical",
           suggestion: "DD",
-          verified_by: "Brought Dead",
         },
       });
     } else if (event.name === "suggestion" && event.value === "DD") {
@@ -778,23 +783,23 @@ export const ConsultationForm = (props: any) => {
     }
   };
 
-  const handleDoctorSelect = (doctor: UserModel | null) => {
-    if (doctor?.id) {
+  const handleDoctorSelect = (event: FieldChangeEvent<UserModel | null>) => {
+    if (event.value?.id) {
       dispatch({
         type: "set_form",
         form: {
           ...state.form,
-          assigned_to: doctor.id.toString(),
-          assigned_to_object: doctor,
+          [event.name]: event.value.id.toString(),
+          [`${event.name}_object`]: event.value,
         },
       });
     } else {
       dispatch({
         type: "set_form",
         form: {
           ...state.form,
-          assigned_to: "",
-          assigned_to_object: null,
+          [event.name]: "",
+          [`${event.name}_object`]: null,
         },
       });
     }
@@ -1309,11 +1314,17 @@ export const ConsultationForm = (props: any) => {
                             className="col-span-6"
                             ref={fieldRef["verified_by"]}
                           >
-                            <TextAreaFormField
-                              {...field("verified_by")}
+                            <UserAutocompleteFormField
+                              name={"verified_by"}
                               label="Verified by"
-                              required
                               placeholder="Attending Doctors Name and Designation"
+                              required
+                              value={state.form.verified_by_object ?? undefined}
+                              onChange={handleDoctorSelect}
+                              showActiveStatus
+                              userType={"Doctor"}
+                              homeFacility={facilityId}
+                              error={state.errors.verified_by}
                             />
                           </div>
 
@@ -1358,11 +1369,10 @@ export const ConsultationForm = (props: any) => {
                                 value={
                                   state.form.assigned_to_object ?? undefined
                                 }
-                                onChange={(option) =>
-                                  handleDoctorSelect(option.value)
-                                }
+                                onChange={handleDoctorSelect}
                                 userType={"Doctor"}
                                 name={"assigned_to"}
+                                label="Assigned to"
                               />
                             </div>
                           )}

diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
@@ -2,6 +2,7 @@ import { AssignedToObjectModel } from "../Patient/models";
 import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { NormalPrescription, PRNPrescription } from "../Medicine/models";
 import { AssetData } from "../Assets/AssetTypes";
+import { UserBareMinimum } from "../Users/models";
 
 export interface LocalBodyModel {
   name: string;
@@ -113,7 +114,9 @@ export interface ConsultationModel {
   icd11_diagnoses_object?: ICD11DiagnosisModel[];
   icd11_provisional_diagnoses_object?: ICD11DiagnosisModel[];
   icd11_principal_diagnosis?: ICD11DiagnosisModel["id"];
+  deprecated_verified_by?: string;
   verified_by?: string;
+  verified_by_object?: UserBareMinimum;
   suggestion_text?: string;
   symptoms?: Array<number>;
   symptoms_text?: string;

diff --git a/src/Components/Users/models.tsx b/src/Components/Users/models.tsx
@@ -5,13 +5,18 @@ interface HomeFacilityObjectModel {
   id?: string;
   name?: string;
 }
-export type UserModel = {
+
+export type UserBareMinimum = {
   id: number;
   username: string;
   first_name: string;
   last_name: string;
   email: string;
   user_type: UserRole;
+  last_login: string | undefined;
+};
+
+export type UserModel = UserBareMinimum & {
   local_body?: number;
   district?: number;
   state?: number;
@@ -21,7 +26,6 @@ export type UserModel = {
   age?: number;
   is_superuser?: boolean;
   verified?: boolean;
-  last_login: string | undefined;
   home_facility_object?: HomeFacilityObjectModel;
   local_body_object?: LocalBodyModel;
   district_object?: DistrictModel;
@@ -42,13 +46,7 @@ export interface SkillModel {
   skill_object: SkillObjectModel;
 }
 
-export interface UserAssignedModel {
-  id?: number;
-  username?: string;
-  first_name?: string;
-  last_name?: string;
-  email?: string;
-  user_type?: number | string;
+export interface UserAssignedModel extends UserBareMinimum {
   local_body?: number;
   district?: number;
   state?: number;
@@ -58,7 +56,6 @@ export interface UserAssignedModel {
   age?: number;
   is_superuser?: boolean;
   verified?: boolean;
-  last_login?: Date;
   home_facility_object?: HomeFacilityObjectModel;
   doctor_qualification?: string;
   doctor_experience_commenced_on?: Date;