Merge pull request #349 from ecare-software/bug/query-changes

print timing
ecare-software · May 6, 2024 · 17edf05 · 17edf05
2 parents c4947c8 + a048266
commit 17edf05
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 67 deletions.
diff --git a/client/src/components/Forms/FormSubmitterListContainer.js b/client/src/components/Forms/FormSubmitterListContainer.js
@@ -112,7 +112,7 @@ class FormSubmitterListContainer extends Component {
   render() {
     if (this.state.formsToPrint.length > 0) {
       return (
-        <div className="container" style={{pageBreakBefore:"avoid", pageBreakInside:"avoid"}}>
+        <div className="container" style={{ pageBreakBefore: "avoid", pageBreakInside: "avoid" }}>
           <div
             style={{
               display: "flex",
@@ -133,7 +133,7 @@ class FormSubmitterListContainer extends Component {
             </div>
 
           </div>
-          <div className='hide-on-non-print' style={{pageBreakBefore:"avoid", pageBreakInside:"avoid"}}>
+          <div className='hide-on-non-print' style={{ pageBreakBefore: "avoid", pageBreakInside: "avoid" }}>
             {this.state.formsToPrint.map((form, idx) => (
               <div key={`print-form-${idx}`}>{form}</div>
             ))}
@@ -165,7 +165,7 @@ class FormSubmitterListContainer extends Component {
             )}
           </div>
           )} */}
-        <div className="hide-on-print" style={{ paddingBottom: '10px', display: 'flex', alignItems: 'center', justifyContent: 'center', pageBreakBefore:"avoid", pageBreakInside:"avoid"}}>
+        <div className="hide-on-print" style={{ paddingBottom: '10px', display: 'flex', alignItems: 'center', justifyContent: 'center', pageBreakBefore: "avoid", pageBreakInside: "avoid" }}>
           <button onClick={this.triggerPrint}
             className='btn btn-link'
             // disable button if no completed forms
@@ -213,7 +213,7 @@ class FormSubmitterListContainer extends Component {
                   <tr>
                     <td>
                       {/* display status as "IN PROGRESS" if form created before status attribute was added */}
-                      {(form.status === "" || !form.status) ? "IN PROGRESS" : form.status}
+                      {(form.status === "" || !form.status) ? "IN PROGRESS" : "SUBMITTED"}
                     </td>
                     <td>
                       {new Date(form.createDate).toLocaleDateString('en-US', { month: '2-digit', day: '2-digit', year: 'numeric' })}

diff --git a/client/src/components/Reports/FormReports.js b/client/src/components/Reports/FormReports.js
@@ -337,15 +337,15 @@ export class FormReports extends Component {
     /*
    3. change the view back after set amount of time, showing list of filtered forms again
    */
-    {
-      !this.state.isLoading &&
+
+    if (!this.state.isLoading) {
       setTimeout(() => {
         window.print();
-      }, 100000)
+      }, 10000);
 
       setTimeout(() => {
         this.setState({ ...this.state, showFullForms: false, formsToPrint: [] });
-      }, 120000);
+      }, 12000);
     }
   };
 

diff --git a/routes/api/SeriousIncidentReport.js b/routes/api/SeriousIncidentReport.js
@@ -81,20 +81,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   SeriousIncidentReport.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((IncidentReports) => res.json(IncidentReports))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -233,7 +233,7 @@ router.get(
     }
 
     SeriousIncidentReport.find(findObj)
-      .sort({ createDate: -1 })
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
       .exec()
       .then((seriousIncidentReports) => res.json(seriousIncidentReports))
       .catch((err) => res.status(404).json({ success: err }));

diff --git a/routes/api/admissionAssessment.js b/routes/api/admissionAssessment.js
@@ -180,20 +180,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   AdmissionAssessment.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((admissionAssessment) => res.json(admissionAssessment))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -253,7 +253,7 @@ router.get(
     }
 
     AdmissionAssessment.find(findObj)
-      .sort({ createDate: -1 })
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
       .exec()
       .then((admissionAssessment) => res.json(admissionAssessment))
       .catch((err) => res.status(404).json({ success: err }));

diff --git a/routes/api/bodyCheck.js b/routes/api/bodyCheck.js
@@ -64,20 +64,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   BodyCheck.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((bodyCheck) => res.json(bodyCheck))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -137,7 +137,7 @@ router.get(
     }
 
     BodyCheck.find(findObj)
-      .sort({ createDate: -1 })
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
       .exec()
       .then((bodyCheck) => res.json(bodyCheck))
       .catch((err) => res.status(404).json({ success: err }));

diff --git a/routes/api/dailyProgressAndActivity.js b/routes/api/dailyProgressAndActivity.js
@@ -64,20 +64,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   DailyProgressAndActivity.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((dailyProgressAndActivities) => res.json(dailyProgressAndActivities))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -137,8 +137,7 @@ router.get(
     }
 
     DailyProgressAndActivity.find(findObj)
-      .sort({ createDate: -1 })
-      .exec()
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true }).exec()
       .then((dailyProgressAndActivities) =>
         res.json(dailyProgressAndActivities)
       )

diff --git a/routes/api/illnessInjury.js b/routes/api/illnessInjury.js
@@ -45,20 +45,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   IllnessInjury.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((illnessInjury) => res.json(illnessInjury))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -146,7 +146,7 @@ router.get(
     }
 
     IllnessInjury.find(findObj)
-      .sort({ createDate: -1 })
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
       .exec()
       .then((illnessInjury) => res.json(illnessInjury))
       .catch((err) => res.status(404).json({ success: err }));

diff --git a/routes/api/incidentReport.js b/routes/api/incidentReport.js
@@ -64,8 +64,8 @@ router.post("/", (req, res) => {
     lastEditDate: new Date().toISOString(),
 
     createDate: req.body.createDate,
-      // ? req.body.createDate
-      // : new Date(new Date().getTime() - new Date().getTimezoneOffset()*60000).toISOString(),
+    // ? req.body.createDate
+    // : new Date(new Date().getTime() - new Date().getTimezoneOffset()*60000).toISOString(),
 
     homeId: req.body.homeId,
 
@@ -83,20 +83,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   IncidentReport.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((IncidentReports) => res.json(IncidentReports))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -236,7 +236,7 @@ router.get(
     }
 
     IncidentReport.find(findObj)
-      .sort({ createDate: -1 })
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
       .exec()
       .then((incidentReports) => res.json(incidentReports))
       .catch((err) => res.status(404).json({ success: err }));

diff --git a/routes/api/restraintReport.js b/routes/api/restraintReport.js
@@ -119,20 +119,20 @@ router.post("/", (req, res) => {
 
 router.get("/:homeId", (req, res) => {
   RestraintReport.find({ homeId: req.params.homeId })
-    .sort({ createDate: -1 })
+    .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
     .exec()
     .then((RestraintReports) => res.json(RestraintReports))
     .catch((err) => res.status(404).json({ success: false }));
 });
 
 router.get(
   "/:homeId/:searchString" +
-    "/:lastEditDateAfter/:lastEditDateBefore" +
-    "/:childDOBAfter/:childDOBBefore" +
-    "/:childDOAAfter/:childDOABefore" +
-    "/:ethnicityA" +
-    "/:submittedByA" +
-    "/:approved",
+  "/:lastEditDateAfter/:lastEditDateBefore" +
+  "/:childDOBAfter/:childDOBBefore" +
+  "/:childDOAAfter/:childDOABefore" +
+  "/:ethnicityA" +
+  "/:submittedByA" +
+  "/:approved",
   (req, res) => {
     var findObj = {
       homeId: req.params.homeId,
@@ -271,7 +271,7 @@ router.get(
     }
 
     RestraintReport.find(findObj)
-      .sort({ createDate: -1 })
+      .sort({ createDate: -1 }).setOptions({ allowDiskUse: true })
       .exec()
       .then((restraintReports) => res.json(restraintReports))
       .catch((err) => res.status(404).json({ success: err }));