Merge branch '2.8' of github.com:I-TECH-UW/OpenELIS-Global-2 into 2.8

I-TECH-UW · Sep 19, 2023 · 2ad8ceb · 2ad8ceb
2 parents f45d800 + b2956c8
commit 2ad8ceb
Show file tree

Hide file tree

Showing 21 changed files with 325 additions and 897 deletions.
diff --git a/frontend/src/components/addOrder/AddOrder.js b/frontend/src/components/addOrder/AddOrder.js
@@ -322,8 +322,12 @@ const AddOrder = (props) => {
           receivedTime: configurationProperties.currentTimeAsText,
         },
       });
-      setAllowSiteNameOptions(configurationProperties.restrictFreeTextRefSiteEntry);
-      setAllowRequesterOptions(configurationProperties.restrictFreeTextProviderEntry);
+      setAllowSiteNameOptions(
+        configurationProperties.restrictFreeTextRefSiteEntry,
+      );
+      setAllowRequesterOptions(
+        configurationProperties.restrictFreeTextProviderEntry,
+      );
     }
     if (orderFormValues.sampleOrderItems.requestDate != "") {
       setInnitialized(true);

diff --git a/frontend/src/components/formModel/innitialValues/SearchResultValidationFormValues.js b/frontend/src/components/formModel/innitialValues/SearchResultValidationFormValues.js
diff --git a/frontend/src/components/layout/Header.js b/frontend/src/components/layout/Header.js
@@ -344,6 +344,9 @@ function OEHeader(props) {
                           <SideNavMenuItem href="/validation?type=testDate">
                             <FormattedMessage id="sidenav.label.validation.testdate" />
                           </SideNavMenuItem>
+                          <SideNavMenuItem href="/validation?type=range">
+                            <FormattedMessage id="sidenav.label.results.byrange" />
+                          </SideNavMenuItem>
                         </SideNavMenu>
 
                         <SideNavMenu aria-label="Reports" title="Reports">

diff --git a/frontend/src/components/modifyOrder/ModifyOrder.js b/frontend/src/components/modifyOrder/ModifyOrder.js
@@ -11,9 +11,11 @@ function ModifyOrder() {
 
   return (
     <>
+     <div className="orderLegendBody">
       <SearchPatientForm
         getSelectedPatient={getSelectedPatient}
       ></SearchPatientForm>
+      </div>
     </>
   );
 }

diff --git a/frontend/src/components/patient/CreatePatientForm.js b/frontend/src/components/patient/CreatePatientForm.js
@@ -3,6 +3,7 @@ import { FormattedMessage, injectIntl } from "react-intl";
 import "../Style.css";
 import { getFromOpenElisServer, postToOpenElisServer } from "../utils/Utils";
 import { nationalityList } from "../data/countries";
+import format from 'date-fns/format'
 
 import {
   Heading,
@@ -39,13 +40,86 @@ function CreatePatientForm(props) {
   const [maritalStatuses, setMaritalStatuses] = useState([]);
   const [formAction, setFormAction] = useState("ADD");
   const componentMounted = useRef(false);
+  const [dateOfBirthFormatter,setDateOfBirthFormatter] = useState({
+    "years": "", "months": "", "days": ""
+  })
 
   const handleDatePickerChange = (values, ...e) => {
     var patient = values;
     patient.birthDateForDisplay = e[1];
     setPatientDetails(patient);
+    if (patient.birthDateForDisplay !== "") {
+      getYearsMonthsDaysFromDOB(patient.birthDateForDisplay)
+    }
   };
 
+  function getYearsMonthsDaysFromDOB(date) {
+    const selectedDate = date.split('/');
+    let today = new Date();
+
+    let year = today.getFullYear();
+    let month = today.getMonth() + 1;
+    let day = today.getDate();
+
+    let yy = parseInt(selectedDate[2]);
+    let mm = parseInt(selectedDate[1]);
+    let dd = parseInt(selectedDate[0]);
+
+    let years, months, days;
+    months = month - mm;
+    if (day < dd) {
+      months = months - 1;
+    }
+    years = year - yy;
+    if (month * 100 + day < mm * 100 + dd) {
+      years = years - 1;
+      months = months + 12;
+    }
+    days = Math.floor((today.getTime() - (new Date(yy + years, mm + months - 1, dd)).getTime()) / (24 * 60 * 60 * 1000));
+
+    setDateOfBirthFormatter({
+      ...dateOfBirthFormatter,
+      years: years, months: months, days: days
+    });
+  }
+
+  const getDOBByYearMonthsDays = () => {
+    const currentDate = new Date();
+    const pastDate = new Date();
+
+    pastDate.setFullYear(currentDate.getFullYear() - dateOfBirthFormatter.years);
+    pastDate.setMonth(currentDate.getMonth() - dateOfBirthFormatter.months);
+    pastDate.setDate(currentDate.getDate() - dateOfBirthFormatter.days);
+    const dob = format(new Date(pastDate),'dd/MM/yyyy');
+    setPatientDetails((prevState) => ({
+      ...prevState,
+      birthDateForDisplay: dob,
+    }));
+  }
+
+  function handleYearsChange(e){
+    let years = e.target.value;
+    setDateOfBirthFormatter({
+      ...dateOfBirthFormatter,
+      years: years
+    });
+  }
+
+  function handleMonthsChange(e){
+    let months = e.target.value;
+    setDateOfBirthFormatter({
+      ...dateOfBirthFormatter,
+      months: months
+    });
+  }
+
+  function handleDaysChange(e){
+    let days = e.target.value;
+    setDateOfBirthFormatter({
+      ...dateOfBirthFormatter,
+      days: days
+    });
+  }
   const handleRegionSelection = (e, values) => {
     var patient = values;
     patient.healthDistrict = "";
@@ -61,6 +135,10 @@ function CreatePatientForm(props) {
     setHealthDistricts(res);
   }
 
+  useEffect(()=>{
+    getDOBByYearMonthsDays();
+  },[dateOfBirthFormatter])
+
   useEffect(() => {
     if (props.selectedPatient.patientPK) {
       if (props.selectedPatient.healthRegion != null) {
@@ -76,6 +154,7 @@ function CreatePatientForm(props) {
       const patient = props.selectedPatient;
       patient.patientUpdateStatus = "UPDATE";
       setPatientDetails(patient);
+      getYearsMonthsDaysFromDOB(patient.birthDateForDisplay);
       setFormAction("UPDATE");
     }
   }, [props.selectedPatient]);
@@ -87,6 +166,7 @@ function CreatePatientForm(props) {
         props.orderFormValues.patientProperties.guid !== ""
       ) {
         setPatientDetails(props.orderFormValues.patientProperties);
+        getYearsMonthsDaysFromDOB(props.orderFormValues.patientProperties.birthDateForDisplay);
       }
     }
   };
@@ -393,27 +473,56 @@ function CreatePatientForm(props) {
                   </DatePicker>
                 )}
               </Field>
-              <Field name="gender">
-                {({ field }) => (
-                  <RadioButtonGroup
-                    valueSelected={values.gender}
-                    legendText="Gender"
-                    name={field.name}
+
+                <TextInput
+                    value={dateOfBirthFormatter.years}
+                    name="years"
+                    labelText="Age/Years"
+                    id="years"
+                    onChange={ handleYearsChange }
                     className="inputText"
-                    id="create_patient_gender"
-                  >
-                    <RadioButton id="radio-1" labelText="Male" value="M" />
-                    <RadioButton id="radio-2" labelText="Female" value="F" />
-                  </RadioButtonGroup>
-                )}
-              </Field>
+                />
+
+                <TextInput
+                    value={dateOfBirthFormatter.months}
+                    name="months"
+                    labelText="Months"
+                    onChange={  handleMonthsChange }
+                    id="months"
+                    className="inputText"
+                />
+
+                <TextInput
+                    value={dateOfBirthFormatter.days}
+                    name="days"
+                    onChange={ handleDaysChange}
+                    labelText="Days"
+                    id="days"
+                    className="inputText"
+                />
               <div className="error">
                 <ErrorMessage name="birthDateForDisplay"></ErrorMessage>
               </div>
               <div className="error">
                 <ErrorMessage name="gender"></ErrorMessage>
               </div>
             </div>
+            <div className="inlineDiv">
+              <Field name="gender">
+                {({ field }) => (
+                    <RadioButtonGroup
+                        valueSelected={values.gender}
+                        legendText="Gender"
+                        name={field.name}
+                        className="inputText"
+                        id="create_patient_gender"
+                    >
+                      <RadioButton id="radio-1" labelText="Male" value="M" />
+                      <RadioButton id="radio-2" labelText="Female" value="F" />
+                    </RadioButtonGroup>
+                )}
+              </Field>
+            </div>
             <Accordion>
               <AccordionItem title="Additional Information">
                 <div className="inlineDiv">