From 55dadbf2df691e4766658d23b1f890d9a6dd83f6 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 9 Mar 2024 16:03:58 -0600 Subject: [PATCH 1/6] More --- src/Constants/Copy/reqEditCopy.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Constants/Copy/reqEditCopy.js b/src/Constants/Copy/reqEditCopy.js index 87feb1d..01c6019 100644 --- a/src/Constants/Copy/reqEditCopy.js +++ b/src/Constants/Copy/reqEditCopy.js @@ -108,12 +108,12 @@ export const standardProd = [ }, { 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.", + text: "All written reports of all expert witnesses with whom you or your attorneys have consulted, including but not limited to those you expect to and/or have identified as persons you will call as expert witnesses at any trial of this action.", index: 1, }, { 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.", + text: "All documents upon which any expert witness you intend to call at trial relied upon in formulating an opinion about the subject matter of this action.", index: 2, }, { @@ -128,7 +128,7 @@ export const standardProd = [ }, { 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.", + text: "All invoices generated by expert witnesses for performing expert witness services to you, including but not limited to fees for medical examination, records review, pretrial preparation, any telephone conference, any trial testimony anticipated and any other fee paid to experts.", index: 5, }, { @@ -138,7 +138,7 @@ export const standardProd = [ }, { 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.", + text: "All documents, photographs, videotapes or audio tapes, digital recordings or recordings in any medium, diagnostic images, diagrams, records, surveys or other graphic representations of information concerning the subject matter/occurrences that form the basis of this action.", index: 7, }, { @@ -148,12 +148,12 @@ export const standardProd = [ }, { id: "7b85bf1d-ce31-4cb5-baac-b678f3afb418", - text: "Any documents identified in any other parties’ answers to Interrogatories in your possession, if any.", + text: "Any documents identified or described in any other parties' answers to Interrogatories that are in your possession, custody or control.", index: 9, }, { id: "5b2033f9-2d14-49d4-848a-8c3630bb78d8", - text: "Any documents received pursuant to a subpoena request in this case.", + text: "Any documents received pursuant to a subpoena duces tecum or a request under the Freedom of Information Act in this case.", index: 10, }, { @@ -163,7 +163,7 @@ export const standardProd = [ }, { 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.", + text: "Copies of any treaties, standards in the industry, legal authority, rule, case, statute, or code that will be relied upon in the prosecution of this action.", index: 12, }, ]; From 4a0c8cdfce02d631eab35506d84465624bdfe442 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 9 Mar 2024 19:28:38 -0600 Subject: [PATCH 2/6] more --- src/Components/Case/CaseDetailsPage.js | 49 +++++++++++++++++++------- src/Components/Modals/UploadModal.js | 1 + 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index c9d6793..bd78cb8 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -28,6 +28,7 @@ const CaseDetailsPage = () => { const [docsAllowed, setDocsAllowed] = useState(null); const [docsGenerated, setDocsGenerated] = useState(null); const [docTypeUploaded, setDocTypeUploaded] = useState(); + const [document, setDocument] = useState(null); const { appState } = useContext(AppContext); const { group } = appState; const appUserId = group ? group.appUserId : null; @@ -39,11 +40,30 @@ const CaseDetailsPage = () => { ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; + async function generateResponsiveDocuments( + docId, + radioValue, + clientPosition + ) { + console.log("generateResponsiveDocuments"); + try { + const response = await fetch( + `${apiUrl}/v1/generate-outgoing-disc-req/${docId}/${radioValue}/${clientPosition}`, + { + method: "POST", + } + ); + const res = response; + return res; + } catch (err) { + console.log("error", err); + } + } + const handleNavigate = (docId, caseId) => { - //documentId, responseGenerations, caseId, documentType console.log("handle navigate fired docId", docId); - let docType = "interrogatories"; - navigate(`/documents/${docId}/${docType}/${caseId}`); + const responseGenerations = 1; + navigate(`/docedit/${docId}/${responseGenerations}/${caseId}`); }; const handleNavEdit = (documentId, caseId) => { @@ -81,6 +101,7 @@ const CaseDetailsPage = () => { const response = await getDoc(docRef).then(function (doc) { if (doc.exists) { const data = doc.data(); + console.log("data", data); setDocsAllowed(data.docsAllowedPerMonth); setDocsGenerated(data.docsGenerated); return data; @@ -96,6 +117,7 @@ const CaseDetailsPage = () => { }, [fbUserId]); const handleUploadDoc = () => { + console.log("docAllowed, docsGenewrated", docsAllowed, docsGenerated); if (docsAllowed - docsGenerated > 0) { setShowUploadModal(true); } else { @@ -120,10 +142,11 @@ const CaseDetailsPage = () => { async function generateOutgoingDiscoveryRequests( docId, radioValue, - clientPosition + clientPosition, + isComplaint ) { const response = await fetch( - `${apiUrl}/v1/make-outgoing-requests/${docId}/${radioValue}/${clientPosition}`, + `${apiUrl}/v1/make-outgoing-requests/${docId}/${radioValue}/${clientPosition}/${isComplaint}`, { method: "POST", } @@ -134,19 +157,21 @@ const CaseDetailsPage = () => { async function handleSuccess(docId, docType, radioValue) { setShowUploadModal(false); + const clientPosition = subCase.clientPosition; console.log( - " handle success in main pagedocId, docType, radioValue", - docId, - docType, - radioValue + "handle success in main page ~~~~~~~~~> radioValue, docType", + radioValue, + docType ); + if (docType === "complaint") { - const clientPosition = subCase.clientPosition; + const isComplaint = true; generateOutgoingDiscoveryRequests(docId, radioValue, clientPosition); setTimeout(handleNavEdit, 60000, docId, caseId); } else { - // try to kick off parsing here - setTimeout(handleNavigate, 40000, docId, caseId); + const isComplaint = false; + generateResponsiveDocuments(docId, radioValue, clientPosition); + setTimeout(handleNavigate, 60000, docId, caseId); } } diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 48585d3..9651fad 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -189,6 +189,7 @@ const UploadModal = (props) => { const response = await processFile(); saveToDb(response.uuidName); const docId = response.uuidName; + console.log("radioValue in modal", radioValue); setTimeout(handleSuccess, 10000, docId, radioValue); return; } catch (err) { From f78bd5d2c585eea1b5a4fd202f8739aef6f70187 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 10 Mar 2024 17:42:13 -0500 Subject: [PATCH 3/6] more --- src/Constants/Copy/reqEditCopy.js | 5 ++++- src/styles/doclist-page.scss | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Constants/Copy/reqEditCopy.js b/src/Constants/Copy/reqEditCopy.js index 01c6019..cc4ed55 100644 --- a/src/Constants/Copy/reqEditCopy.js +++ b/src/Constants/Copy/reqEditCopy.js @@ -35,6 +35,9 @@ export const rogInstructions = [ ]; export const rogDefinitions = [ + { + text: '"And" and "or" have both conjunctive and disjunctive meanings as necessary to bring within the scope of each request all documents and information that might otherwise be construed to be outside its scope."', + }, { id: "545bff8d-66de-47fd-9f01-26c945ba8db3", text: "'You' refers to the party to whom the requests are addressed and any additional parties or entities as described in the foregoing instructions and these definitions.", @@ -45,7 +48,7 @@ export const rogDefinitions = [ }, { id: "dda1376c-3d42-471f-9cb8-4a1ecb9c10cc", - text: "“Document” means and includes all written and graphic matter of every kind and description, whether printed or produced by any process or by hand, whether final draft or reproduction, whether in the actual or constructive possession, custody or control of the respondent to a given interrogatory, including any and all written letters, correspondence, memoranda, notes, statements, transcripts, files, charters, articles of incorporation, securities, bonds, stocks, certificates of deposit, evidences of debt, contracts, agreements, licenses, memoranda or notes of telephone or personal conversations, work papers, tapes, charts, reports, books, ledgers, telegrams, sound recordings, books of account, customer account statements, financial statements, catalogs, checks, check stubs, and written statements of witnesses or other persons having knowledge pertaining to the pertinent facts requested or relating to the interrogatory or subpart thereof, whether or not these documents are claimed to be privileged against disclosure.", + text: "“Document” means and includes all written and graphic matter of every kind and description, whether printed or produced by any mechanical, digital or other process, or by hand, whether final draft or reproduction, whether in the actual or constructive possession, custody or control of the respondent to a given interrogatory. This includes any and all written letters, correspondence, memoranda, notes, statements, transcripts, files, charters, articles of incorporation, securities, bonds, stocks, certificates of deposit, evidences of debt, contracts, agreements, licenses, memoranda or notes of telephone or personal conversations, work papers, tapes, charts, reports, books, ledgers, telegrams, sound recordings, books of account, customer account statements, financial statements, catalogs, checks, check stubs, and written statements of witnesses or other persons having knowledge pertaining to the pertinent facts requested or relating to the interrogatory or subpart thereof, whether or not these documents are claimed to be privileged against disclosure.", }, { id: "05970162-1b13-4f98-ac73-91da0c8f0bf4", diff --git a/src/styles/doclist-page.scss b/src/styles/doclist-page.scss index d73ff10..f31e5e7 100644 --- a/src/styles/doclist-page.scss +++ b/src/styles/doclist-page.scss @@ -125,7 +125,7 @@ .user-name-container { margin-top: 8px; - margin-left: 7px; + margin-left: 7px !important; color: var(--font-light); font-weight: 500; } From 233a2ea27617faa0faf741ff81deb5fc67493c36 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 10 Mar 2024 19:02:03 -0500 Subject: [PATCH 4/6] more --- src/Components/Case/CaseDetailsPage.js | 115 ++++++++++++------------- src/Components/Modals/UploadModal.js | 2 +- 2 files changed, 56 insertions(+), 61 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index bd78cb8..57bf4e9 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -40,15 +40,11 @@ const CaseDetailsPage = () => { ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - async function generateResponsiveDocuments( - docId, - radioValue, - clientPosition - ) { - console.log("generateResponsiveDocuments"); + async function generateOutgoingDiscReq(docId, radioValue, clientPosition) { + console.log("generateOutgoingDiscReq-------------------"); try { const response = await fetch( - `${apiUrl}/v1/generate-outgoing-disc-req/${docId}/${radioValue}/${clientPosition}`, + `${apiUrl}/v1/generate-outgoing-disc-req/${docId}/${clientPosition}`, { method: "POST", } @@ -60,25 +56,40 @@ const CaseDetailsPage = () => { } } - const handleNavigate = (docId, caseId) => { - console.log("handle navigate fired docId", docId); - const responseGenerations = 1; - navigate(`/docedit/${docId}/${responseGenerations}/${caseId}`); - }; - - const handleNavEdit = (documentId, caseId) => { - if (!documentId || !caseId) { - return; - } - console.log( - "hit handleNavEdit----------------------------------------------------------" + async function generateRespIncomingDiscReq( + docId, + clientPosition, + isComplaint + ) { + const response = await fetch( + `${apiUrl}/v1/generate-disc-responses/${docId}/${clientPosition}`, + { + method: "POST", + } ); - navigate(`/reqedit/${documentId}/interrogatories-out/${caseId}`); - }; + const res = response; + return res; + } - const handleBack = () => { - navigate("/cases"); - }; + async function handleSuccess(docId, docType, radioValue) { + setShowUploadModal(false); + const clientPosition = subCase.clientPosition; + console.log( + "handle success in main page ~~~~~~~~~> radioValue, docType", + radioValue, + docType + ); + + if (docType === "complaint") { + const isComplaint = true; + generateOutgoingDiscReq(docId, isComplaint, clientPosition); + setTimeout(handleNavEdit, 60000, docId, caseId); + } else { + const isComplaint = false; + generateRespIncomingDiscReq(docId, isComplaint, clientPosition); + setTimeout(handleNavigate, 60000, docId, caseId); + } + } function getCase() { const docRef = doc(db, "cases", caseId); @@ -125,6 +136,26 @@ const CaseDetailsPage = () => { } }; + const handleNavigate = (docId, caseId) => { + console.log("handle navigate fired docId", docId); + const responseGenerations = 1; + navigate(`/docedit/${docId}/${responseGenerations}/${caseId}`); + }; + + const handleNavEdit = (documentId, caseId) => { + if (!documentId || !caseId) { + return; + } + console.log( + "hit handleNavEdit----------------------------------------------------------" + ); + navigate(`/reqedit/${documentId}/interrogatories-out/${caseId}`); + }; + + const handleBack = () => { + navigate("/cases"); + }; + const handleConfirmDocType = (docType) => { setShowConfirmModal(true); }; @@ -139,42 +170,6 @@ const CaseDetailsPage = () => { navigate(`/signup/${isUpgrade}/${currentPlan}`); }; - async function generateOutgoingDiscoveryRequests( - docId, - radioValue, - clientPosition, - isComplaint - ) { - const response = await fetch( - `${apiUrl}/v1/make-outgoing-requests/${docId}/${radioValue}/${clientPosition}/${isComplaint}`, - { - method: "POST", - } - ); - const res = response; - return res; - } - - async function handleSuccess(docId, docType, radioValue) { - setShowUploadModal(false); - const clientPosition = subCase.clientPosition; - console.log( - "handle success in main page ~~~~~~~~~> radioValue, docType", - radioValue, - docType - ); - - if (docType === "complaint") { - const isComplaint = true; - generateOutgoingDiscoveryRequests(docId, radioValue, clientPosition); - setTimeout(handleNavEdit, 60000, docId, caseId); - } else { - const isComplaint = false; - generateResponsiveDocuments(docId, radioValue, clientPosition); - setTimeout(handleNavigate, 60000, docId, caseId); - } - } - const ButtonContent = () => { return (
diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 9651fad..b4b7c8b 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -124,7 +124,7 @@ const UploadModal = (props) => { try { if (radioValue.toLowerCase() === "complaint") { - const response = await fetch(`${apiUrl}/v1/gen-disc-request-out`, { + const response = await fetch(`${apiUrl}/v1/parse-new-compdoc`, { method: "POST", body: file, }); From c73ebfd92c2c530bbd932cce5f9518c37bf107f9 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 10 Mar 2024 19:15:08 -0500 Subject: [PATCH 5/6] more --- src/Components/Case/CaseDetailsPage.js | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 57bf4e9..875784b 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -40,8 +40,8 @@ const CaseDetailsPage = () => { ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - async function generateOutgoingDiscReq(docId, radioValue, clientPosition) { - console.log("generateOutgoingDiscReq-------------------"); + // NEVER CHANGE THESE ARGS + async function generateOutgoingDiscReq(docId, clientPosition) { try { const response = await fetch( `${apiUrl}/v1/generate-outgoing-disc-req/${docId}/${clientPosition}`, @@ -52,23 +52,23 @@ const CaseDetailsPage = () => { const res = response; return res; } catch (err) { - console.log("error", err); + console.log("generate out error", err); } } - - async function generateRespIncomingDiscReq( - docId, - clientPosition, - isComplaint - ) { - const response = await fetch( - `${apiUrl}/v1/generate-disc-responses/${docId}/${clientPosition}`, - { - method: "POST", - } - ); - const res = response; - return res; + // NEVER CHANGE THESE ARGS + async function generateRespIncomingDiscReq(docId, clientPosition) { + try { + const response = await fetch( + `${apiUrl}/v1/generate-disc-responses/${docId}/${clientPosition}`, + { + method: "POST", + } + ); + const res = response; + return res; + } catch (err) { + console.log("gen resp err", err); + } } async function handleSuccess(docId, docType, radioValue) { From 486ac83716d00608de0676f7ccafaac1b33bda95 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 10 Mar 2024 19:19:23 -0500 Subject: [PATCH 6/6] more --- src/Components/Case/CaseDetailsPage.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 875784b..3f0a799 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -40,7 +40,7 @@ const CaseDetailsPage = () => { ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - // NEVER CHANGE THESE ARGS + // isComplaint = true - NEVER CHANGE THESE ARGS async function generateOutgoingDiscReq(docId, clientPosition) { try { const response = await fetch( @@ -55,7 +55,7 @@ const CaseDetailsPage = () => { console.log("generate out error", err); } } - // NEVER CHANGE THESE ARGS + // isComplaint = false - NEVER CHANGE THESE ARGS async function generateRespIncomingDiscReq(docId, clientPosition) { try { const response = await fetch( @@ -74,11 +74,7 @@ const CaseDetailsPage = () => { async function handleSuccess(docId, docType, radioValue) { setShowUploadModal(false); const clientPosition = subCase.clientPosition; - console.log( - "handle success in main page ~~~~~~~~~> radioValue, docType", - radioValue, - docType - ); + console.log("handle success in details page ~~~~~~~~~> docType", docType); if (docType === "complaint") { const isComplaint = true;