From 9f19ab53a70244b258e72cf1a9a171179ddda5c6 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 20:29:38 -0600 Subject: [PATCH 1/3] more --- src/Components/Document/ReqEditPage.js | 46 ++++++++++++++------------ src/styles/docedit-page.scss | 15 ++++++++- src/styles/edit-element.scss | 3 +- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/Components/Document/ReqEditPage.js b/src/Components/Document/ReqEditPage.js index 7589510..5347e0d 100644 --- a/src/Components/Document/ReqEditPage.js +++ b/src/Components/Document/ReqEditPage.js @@ -60,19 +60,6 @@ const RequestEditPage = () => { ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - const headerString = - documentType === "interrogatories" ? ( - "Response to Interrogatories" - ) : documentType === "admissions" ? ( - "Response to Request for Admissions" - ) : documentType === "production" ? ( - "Response to Request for Production" - ) : documentType === "combined-numbered" ? ( - "Response to Interrogatories and Request for Production" - ) : ( - <> - ); - useEffect(() => { if (!appUserId || !docId) { setDocument(null); @@ -92,16 +79,15 @@ const RequestEditPage = () => { } getOutgoingRequests(documentId) .then((data) => { - const resp = data[0].requests.map((item, index) => { + const merged = [...foundationRogs, ...data[0].requests]; + const resp = merged.map((item, index) => { // NEVER CHANGE THIS: return { showInputEle: false, text: item.text, index: index }; }); - const merged = [...foundationRogs, ...resp]; - setRequests(merged); + setRequests(resp); }) .catch((err) => console.log(err)); }, [documentId]); - async function getCase(parentCaseId) { try { const docRef = doc(db, "cases", `${parentCaseId}`); @@ -349,16 +335,32 @@ const RequestEditPage = () => { ))} -
+
INTERROGATORIES
{requests?.map((req, i) => ( -
-
{`${i + 1}.`}
-
{req?.text}
+
+ 1 + ? // NEVER CHANGE THIS + req.text + : null + } + setShowInputEle={setShowInputEle} + showInputEle={ + requests && requests.length > 1 + ? requests[i].showInputEle + : null + } + handleFocus={handleFocus} + handleEditValue={handleEditValue} + handleBlur={handleBlur} + i={i} + />
))}
-
+
REQUESTS FOR PRODUCTION
{standardProd?.map((req, i) => (
diff --git a/src/styles/docedit-page.scss b/src/styles/docedit-page.scss index d4f9b28..a632757 100644 --- a/src/styles/docedit-page.scss +++ b/src/styles/docedit-page.scss @@ -35,6 +35,16 @@ margin-bottom: 25px; } +.req-editing-sub-wrapper { + display: flex; + flex-direction: column; + justify-content: center; + margin-left: auto; + margin-right: auto; + margin-bottom: 25px; + min-width: 700px; +} + .doc-editing-instructions-header { font-family: Roboto; text-decoration: underline; @@ -335,8 +345,11 @@ min-width: 24px; margin-right: 6px; } + .outer-div { - border: 1px solid #a9a9a9; + border: 1px solid #d1d1d1; + border-radius: 5px; + border-radius: 10px; padding: 0px 5px; } diff --git a/src/styles/edit-element.scss b/src/styles/edit-element.scss index 8a7c9b1..81ea3bc 100644 --- a/src/styles/edit-element.scss +++ b/src/styles/edit-element.scss @@ -1,5 +1,6 @@ .outer-div { - border: 1px solid black; + border: 1px solid rgb(220, 220, 220); + border-radius: 5px; } .outer-div-after { From e4515f440d4f15a84b4e29ae24c99d8bb4c991c7 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 20:34:23 -0600 Subject: [PATCH 2/3] more --- src/Components/Document/ReqEditPage.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/Document/ReqEditPage.js b/src/Components/Document/ReqEditPage.js index 5347e0d..8f3877a 100644 --- a/src/Components/Document/ReqEditPage.js +++ b/src/Components/Document/ReqEditPage.js @@ -249,11 +249,13 @@ const RequestEditPage = () => { }; const handleEditValue = (e, i) => { + console.log("e,i ", e, i); const editingRes = requests?.map((r) => { if (r.index === i) { + console.log("r.inex", r.index); return { ...r, - resp: e.target.value, + text: e.target.value, }; } return r; @@ -348,9 +350,7 @@ const RequestEditPage = () => { } setShowInputEle={setShowInputEle} showInputEle={ - requests && requests.length > 1 - ? requests[i].showInputEle - : null + requests && requests.length > 1 ? req.showInputEle : null } handleFocus={handleFocus} handleEditValue={handleEditValue} From 5e10aad5fb79c2f320a58c25aa85972a9cc06e0b Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 20:36:47 -0600 Subject: [PATCH 3/3] more --- src/styles/edit-element.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/edit-element.scss b/src/styles/edit-element.scss index 81ea3bc..3b86b55 100644 --- a/src/styles/edit-element.scss +++ b/src/styles/edit-element.scss @@ -15,6 +15,7 @@ min-height: 200px; resize: none; text-align: justify; + line-height: 2; } textarea {