Merge pull request #126 from kjannette/forward7

Forward7

src/Components/Document/DocEditPage.js

@@ -46,14 +46,13 @@ const DocEditPage = () => {
   const [index, setIndex] = useState(0);
   const [isBusy, setIsBusy] = useState(false);
   // For document generation:
-
+  const state = group?.state[0] ? group.state[0].code : "ny";
-  const state = group.state[0] ? group.state[0].code : "ny";
   const lawFirm = group ? group?.firm : null;
   const streetAdd = group ? group?.streetAddress : null;
-  const city = group ? group.city : null;
+  const city = group ? group?.city : null;
-  const usState = group.state[0] ? group.state[0].code : "ny";
+  const usState = group?.state[0] ? group?.state[0].code : "ny";
-  const zipCode = group ? group.zipCode : null;
+  const zipCode = group ? group?.zipCode : null;
-  const telephone = group ? group.telephone : null;
+  const telephone = group ? group?.telephone : null;
 
   const apiUrl =
     process.env.NODE_ENV === "development"
@@ -404,14 +403,14 @@ const DocEditPage = () => {
       ? fetchedCase?.leadAttorneys
       : null;
     const reqType = documentType;
-    const captionOne = fetchedCase.caption;
+    const captionOne = fetchedCase?.caption;
-    const captionTwo = fetchedCase.captionTwo;
+    const captionTwo = fetchedCase?.captionTwo;
-    const caseNum = fetchedCase.caseNumber;
+    const caseNum = fetchedCase?.caseNumber;
-    const plaintiffs = fetchedCase.plaintiffParties;
+    const plaintiffs = fetchedCase?.plaintiffParties;
-    const defendants = fetchedCase.defendantParties;
+    const defendants = fetchedCase?.defendantParties;
-    const venued = fetchedCase.venue;
+    const venued = fetchedCase?.venue;
-    const juris = fetchedCase.jurisdiction;
+    const juris = fetchedCase?.jurisdiction;
-    const judge = fetchedCase.judge;
+    const judge = fetchedCase?.judge;
     const clientPosition = fetchedCase?.clientPosition
       ? fetchedCase?.clientPosition
       : null;

src/Components/Document/ReqEditPage.js

@@ -15,6 +15,7 @@ import {
   rogInstructions,
   rogDefinitions,
   foundationRogs,
+  standardProd,
 } from "../../Constants/Copy/reqEditCopy.js";
 import { db } from "../../firebase";
 import {
@@ -37,7 +38,7 @@ const RequestEditPage = () => {
   const [fetchedCase, setFetchedCase] = useState();
   const [showInputEle, setShowInputEle] = useState(true);
   const [document, setDocument] = useState(null);
-  const appUserId = group ? group.appUserId : null;
+  const appUserId = group ? group?.appUserId : null;
   const [docId, setDocId] = useState(documentId);
   const [saveDocumentId, setSaveDocumentId] = useState("");
   const [showSaveModal, setShowSaveModal] = useState(false);
@@ -46,13 +47,13 @@ const RequestEditPage = () => {
   const [showErrorModal, setShowErrorModal] = useState(false);
   const [isBusy, setIsBusy] = useState(false);
   // Case Vars
-  const state = group.state[0] ? group.state[0].code : "ny";
+  const state = group?.state[0] ? group.state[0].code : "ny";
   const lawFirm = group ? group?.firm : null;
   const streetAdd = group ? group?.streetAddress : null;
-  const city = group ? group.city : null;
+  const city = group ? group?.city : null;
-  const usState = group.state[0] ? group.state[0].code : "ny";
+  const usState = group?.state[0] ? group?.state[0].code : "ny";
-  const zipCode = group ? group.zipCode : null;
+  const zipCode = group ? group?.zipCode : null;
-  const telephone = group ? group.telephone : null;
+  const telephone = group ? group?.telephone : null;
 
   const apiUrl =
     process.env.NODE_ENV === "development"
@@ -190,14 +191,14 @@ const RequestEditPage = () => {
       ? fetchedCase?.leadAttorneys
       : null;
     const reqType = documentType;
-    const captionOne = fetchedCase.caption;
+    const captionOne = fetchedCase?.caption;
-    const captionTwo = fetchedCase.captionTwo;
+    const captionTwo = fetchedCase?.captionTwo;
-    const caseNum = fetchedCase.caseNumber;
+    const caseNum = fetchedCase?.caseNumber;
-    const plaintiffs = fetchedCase.plaintiffParties;
+    const plaintiffs = fetchedCase?.plaintiffParties;
-    const defendants = fetchedCase.defendantParties;
+    const defendants = fetchedCase?.defendantParties;
-    const venued = fetchedCase.venue;
+    const venued = fetchedCase?.venue;
-    const juris = fetchedCase.jurisdiction;
+    const juris = fetchedCase?.jurisdiction;
-    const judge = fetchedCase.judge;
+    const judge = fetchedCase?.judge;
     const clientPosition = fetchedCase?.clientPosition
       ? fetchedCase?.clientPosition
       : null;
@@ -308,10 +309,10 @@ const RequestEditPage = () => {
 
   const displayCopy =
     state === "ny"
-      ? docEditCopy.NewYork
+      ? docEditCopy?.NewYork
       : state === "nj"
-      ? docEditCopy.NewJersey
+      ? docEditCopy?.NewJersey
-      : docEditCopy.NewYork;
+      : docEditCopy?.NewYork;
 
   const servingParty =
     fetchedCase?.clientPosition === "Defendant"
@@ -326,13 +327,15 @@ const RequestEditPage = () => {
           <div className="pleading-header">
             INTERROGATORIES AND REQUESTS FOR PRODUCTION
           </div>
-          <div>{outgoingComesNow(state, fetchedCase)}</div>
+          <div className="req-edit-comesnow-box">
+            {outgoingComesNow(state, fetchedCase)}
+          </div>
           {/*displayCopy.prelimaryStatement*/}
           <div className="doc-editing-sub-wrapper row">
             <div className="pleading-header">INSTRUCTIONS</div>
             {rogInstructions?.map((req, i) => (
               <div className="request-text-up-row">
-                <div>{`${i + 1}.`}</div>
+                <div className="request-text-number-col">{`${i + 1}.`}</div>
                 <div>{req?.text}</div>
               </div>
             ))}
@@ -341,7 +344,7 @@ const RequestEditPage = () => {
             <div className="pleading-header">DEFINITIONS</div>
             {rogDefinitions?.map((req, i) => (
               <div className="request-text-up-row">
-                <div>{`${i + 1}.`}</div>
+                <div className="request-text-number-col">{`${i + 1}.`}</div>
                 <div>{req?.text}</div>
               </div>
             ))}
@@ -350,16 +353,25 @@ const RequestEditPage = () => {
             <div className="pleading-header">INTERROGATORIES</div>
             {requests?.map((req, i) => (
               <div className="request-text-up-row">
-                <div>{`${i + 1}.`}</div>
+                <div className="request-text-number-col">{`${i + 1}.`}</div>
                 <div>{req?.text}</div>
               </div>
             ))}
-            <div
+          </div>
-              className="docedit-report-container"
+          <div className="doc-editing-sub-wrapper">
-              onClick={() => handleConfirmReport()}
+            <div className="pleading-header">REQUESTS FOR PRODUCTION</div>
-            >
+            {standardProd?.map((req, i) => (
-              <div className="docedit-report-link">Report an issue</div>
+              <div className="request-text-up-row">
-            </div>
+                <div className="request-text-number-col">{`${i + 1}.`}</div>
+                <div>{req?.text}</div>
+              </div>
+            ))}
+          </div>
+          <div
+            className="docedit-report-container"
+            onClick={() => handleConfirmReport()}
+          >
+            <div className="docedit-report-link">Report an issue</div>
           </div>
         </div>
       </>

src/Constants/Copy/docEditCopy.js

@@ -59,15 +59,15 @@ export const docEditCopy = {
 
 export const outgoingComesNow = (state, fetchedCase) => {
   let copyString;
-  const position = fetchedCase.clientPosition;
+  const position = fetchedCase?.clientPosition;
   const parties =
-    fetchedCase.clientPosition === "Plaintiff"
+    fetchedCase?.clientPosition === "Plaintiff"
-      ? fetchedCase.plaintiffParties
+      ? fetchedCase?.plaintiffParties
-      : fetchedCase.defendantParties;
+      : fetchedCase?.defendantParties;
   const adversary =
-    fetchedCase.clientPosition === "Plaintiff"
+    fetchedCase?.clientPosition === "Plaintiff"
-      ? fetchedCase.defendantParties
+      ? fetchedCase?.defendantParties
-      : fetchedCase.plaintiffParties;
+      : fetchedCase?.plaintiffParties;
 
   if (state === "ny") {
     copyString = `COMES NOW, ${position}, ${parties}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${adversary}, to be answered under oath, in writing, in accordance with NY CPLR 3120 - 3130.`;

src/Constants/Copy/reqEditCopy.js

@@ -99,3 +99,58 @@ export const foundationRogs = [
     text: "If you are aware of any other case or proceeding involving the incident identified in Plaintiff's Complaint including, but not limited to, civil, criminal or administrative actions, identify the case or action by tribunal, case number, docket number or citation number, the date of any hearing, and indicate any pleas in the case(s) and the disposition of the matter(s).",
   },
 ];
+
+export const standardProd = [
+  {
+    id: "e0863692-c5da-4516-b85c-233a7f811a34",
+    text: "All documents identified, directly or indirectly, in your answers to Interrogatories.",
+  },
+  {
+    id: "0d648f06-b6f9-4264-bcf2-c3111fe3f976",
+    text: "All written reports of all expert witnesses with whom you or your attorneys have consulted, including, of course, those persons you expect to call as an expert witness at trial.",
+  },
+  {
+    id: "8c8573de-1a5c-4828-ba99-d51f610136a5",
+    text: "All documents upon which any expert witness upi intend to call at trial relied upon in formulating an opinion about the subject matter of this action.",
+  },
+  {
+    id: "63ab0999-c877-4ebc-9094-6d343294411d",
+    text: "The most recent curriculum vitae of each expert whom you expect to call as an expert witness at trial.",
+  },
+  {
+    id: "5b3ac105-c026-4f37-b335-2ab83adb6658",
+    text: "All notes, correspondence, bills, invoices, diagrams, photographs, or other documents prepared or reviewed by each person whom you expect to call as an expertwitness at trial.",
+  },
+  {
+    id: "eb382a63-1c0b-4a78-9bba-d67380bb6367",
+    text: "All invoices generated by expert witnesses generated for performing all expert witness services to you, including but not limited to, fees for the medical examination, the records review, the pretrial preparation, any telephone conference, any trial testimony anticipated and any other fee paid for expert fees.",
+  },
+  {
+    id: "a07bbc03-2f14-4837-965b-67ee261f25e4",
+    text: "Any and all written, recorded, or signed statements of any party, including the plaintiff, defendant, witnesses, investigators, or agent, representative or employee of the parties concerning the subject matter of this action.",
+  },
+  {
+    id: "495b094d-36f2-4a83-971e-54b1b5312515",
+    text: "All documents, photographs, videotapes or audio tapes, recordings in any medium, diagnostic images, diagrams, records, surveys or other graphic representations of information concerning the subject matter of this action.",
+  },
+  {
+    id: "cdcc44cf-13b2-4011-adb5-ed435156a0f8",
+    text: "Any documents which afforded, descirbed or pertained to liability insurance coverage for the occurrences which are the subject matter of the complaint.",
+  },
+  {
+    id: "7b85bf1d-ce31-4cb5-baac-b678f3afb418",
+    text: "Any documents identified in any other parties’ answers to Interrogatories in your possession, if any.",
+  },
+  {
+    id: "5b2033f9-2d14-49d4-848a-8c3630bb78d8",
+    text: "Any documents received pursuant to a subpoena request in this case.",
+  },
+  {
+    id: "fe9ce1d8-265f-4ebc-9856-99715cbb23ee",
+    text: "Any document prepared during the regular course of business as a result of the occurrence complained of in the complaint.",
+  },
+  {
+    id: "0012041e-8618-4864-b084-9c354261731a",
+    text: "Copies of any treaties, standards in the industry, legal authority, rule, case, statute, or code that will be relied upon in the defense of this case.",
+  },
+];

src/styles/docedit-page.scss

@@ -328,8 +328,13 @@
   margin-top: 6px;
   padding: 0px 5px;
   text-align: justify;
+  line-height: 2;
 }
 
+.request-text-number-col {
+  min-width: 24px;
+  margin-right: 6px;
+}
 .outer-div {
   border: 1px solid #a9a9a9;
   padding: 0px 5px;
@@ -353,6 +358,9 @@
   line-height: 2;
   text-align: justify;
 }
+.req-edit-comesnow-box {
+  margin-bottom: 18px;
+}
 
 .scroll-button {
   position: fixed;