Merge pull request #333 from ecare-software/createDate-backdate-fix

'Create Date' back date fix → dev
ecare-software · Apr 29, 2024 · 1dea973 · 1dea973
2 parents 9a167cb + 93afcec
commit 1dea973
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 14 deletions.
diff --git a/client/src/components/Forms/AdmissionAssessment.js b/client/src/components/Forms/AdmissionAssessment.js
@@ -182,6 +182,21 @@ class AdmissionAssessment extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -380,7 +395,9 @@ class AdmissionAssessment extends Component {
             ...currentState,
           }
         );
-
+        console.log('data', data)
+        console.log('currentState', currentState)
+        console.log('state', this.state)
         this.setState({ ...this.state, ...data });
         window.scrollTo(0, 0);
         this.toggleSuccessAlert();
@@ -568,7 +585,7 @@ class AdmissionAssessment extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control hide-on-print"

diff --git a/client/src/components/Forms/BodyCheck.js b/client/src/components/Forms/BodyCheck.js
@@ -125,6 +125,21 @@ class BodyCheck extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -452,7 +467,7 @@ class BodyCheck extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control hide-on-print"

diff --git a/client/src/components/Forms/DailyProgressAndActivity.js b/client/src/components/Forms/DailyProgressAndActivity.js
@@ -106,6 +106,21 @@ class DailyProgressAndActivity extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -415,7 +430,7 @@ class DailyProgressAndActivity extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control"

diff --git a/client/src/components/Forms/IllnessInjury.js b/client/src/components/Forms/IllnessInjury.js
@@ -80,6 +80,22 @@ class IllnessInjury extends Component {
     }
     this.setState(stateObj);
   };
+
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -365,7 +381,7 @@ class IllnessInjury extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control hide-on-print"

diff --git a/client/src/components/Forms/IncidentReport.js b/client/src/components/Forms/IncidentReport.js
@@ -97,6 +97,21 @@ class IncidentReport extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -447,7 +462,7 @@ class IncidentReport extends Component {
                       Create Date
                     </label>{" "}
                     <input
-                      onChange={this.handleFieldInput}
+                      onChange={this.handleFieldInputDate}
                       id="createDate"
                       value={this.state.createDate.slice(0, -8)}
                       className="form-control hide-on-print"

diff --git a/client/src/components/Forms/NightMonitoring.js b/client/src/components/Forms/NightMonitoring.js
@@ -46,7 +46,7 @@ class NightMonitoring extends Component {
 
   toggleSuccessAlert = () => {
     this.setState({
-      formSubmitted: !this.state.formSubmitted,
+      formSubmitted: true,
       loadingClients: false,
     });
   };
@@ -73,6 +73,21 @@ class NightMonitoring extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       ...this.state,
@@ -163,6 +178,9 @@ class NightMonitoring extends Component {
 
         this.setState({ ...this.state, ...data });
         window.scrollTo(0, 0);
+        this.setState({
+          formSubmitted: true,
+        });
         this.toggleSuccessAlert();
         // setTimeout(() => {
         //   this.toggleSuccessAlert();
@@ -342,7 +360,7 @@ class NightMonitoring extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control hide-on-print"

diff --git a/client/src/components/Forms/RestraintReport.js b/client/src/components/Forms/RestraintReport.js
@@ -110,6 +110,21 @@ class RestraintReport extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -493,7 +508,7 @@ class RestraintReport extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control hide-on-print"

diff --git a/client/src/components/Forms/SeriousIncidentReport.js b/client/src/components/Forms/SeriousIncidentReport.js
@@ -97,6 +97,21 @@ class SeriousIncidentReport extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -470,7 +485,7 @@ class SeriousIncidentReport extends Component {
                   Create Date
                 </label>{" "}
                 <input
-                  onChange={this.handleFieldInput}
+                  onChange={this.handleFieldInputDate}
                   id="createDate"
                   value={this.state.createDate.slice(0, -8)}
                   className="form-control hide-on-print"

diff --git a/client/src/components/Forms/TreatmentPlan72.js b/client/src/components/Forms/TreatmentPlan72.js
@@ -210,6 +210,22 @@ class TreatmentPlan72 extends Component {
     this.setState(stateObj);
   };
 
+  handleFieldInputDate = (event) => {
+    var stateObj = {};
+    if (event.target.id.indexOf(".") > -1) {
+      let level1Obj = event.target.id.split(".")[0];
+      let level2Obj = event.target.id.split(".")[1];
+
+      let nestedProperty = { ...this.state[level1Obj] };
+      nestedProperty[level2Obj] = event.target.value;
+      stateObj[level1Obj] = nestedProperty;
+    } else {
+      stateObj[event.target.id] = event.target.value.concat(':00.000Z');
+    }
+    this.setState(stateObj);
+  };
+
+
   resetForm = () => {
     this.setState({
       childMeta_name: "",
@@ -756,7 +772,7 @@ class TreatmentPlan72 extends Component {
                 <div className="form-group logInInputField">
                   <label className="control-label">Create Date</label>{" "}
                   <input
-                    onChange={this.handleFieldInput}
+                    onChange={this.handleFieldInputDate}
                     id="createDate"
                     value={this.state.createDate.slice(0, -8)}
                     className="form-control"

diff --git a/client/src/components/NightMonitoringChildRow.js b/client/src/components/NightMonitoringChildRow.js
@@ -25,6 +25,7 @@ export const NightMonitoringChildRow = ({
     rootState?.childMeta_name
   );
   const [childSelected, setChildSelected] = useState(rootState?.childSelected);
+  const [formSubmitted, setFormSubmitted] = useState(rootState?.formSubmitted);
 
   let sigCanvas;
   const doFormatChildMetaName = (val) => {
@@ -45,9 +46,9 @@ export const NightMonitoringChildRow = ({
   }, [signature]);
 
   useEffect(() => {
-    console.log(rootState);
-    if (childMeta_name !== "") {setChildSelected(true)}
-    // if (childMeta_name) {childSelected = true}
+    if (childMeta_name !== "") {
+      setChildSelected(true);
+    }
     setRootState({
       date,
       roomNumber,
@@ -57,6 +58,7 @@ export const NightMonitoringChildRow = ({
       signed,
       childMeta_name,
       childSelected,
+      formSubmitted,
     });
   }, [
     date,
@@ -67,6 +69,7 @@ export const NightMonitoringChildRow = ({
     signed,
     childMeta_name,
     childSelected,
+    formSubmitted,
   ]);
 
   return (