From a393eaed05989ffdb3e4cd0d59954b4220dddb12 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 15:10:00 -0600 Subject: [PATCH 1/4] more --- src/Components/Document/DocEditPage.js | 8 ++++++++ src/pageElements/Cards.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 6fe23a6..4566a79 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -45,6 +45,7 @@ const DocEditPage = () => { ); const [index, setIndex] = useState(0); const [isBusy, setIsBusy] = useState(false); + const fbUserId = group ? group.fbAuthUid : null; // For document generation: const state = group?.state[0] ? group.state[0].code : "ny"; const lawFirm = group ? group?.firm : null; @@ -287,6 +288,7 @@ const DocEditPage = () => { }); setResponses(result); updateRespGenerationCount(documentId); + updateUserAccountDocsGenerated(fbUserId); setIsLoading(false); }) .catch((err) => console.log(err)); @@ -449,6 +451,12 @@ const DocEditPage = () => { } } + async function updateUserAccountDocsGenerated(fbUserId) { + await updateDoc(doc(db, "users", fbUserId), { + docsGenerated: increment(1), + }); + } + async function updateRespGenerationCount(docId) { await updateDoc(doc(db, "documents", docId), { responseGenerations: increment(1), diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js index 78eb275..d7e7ed6 100644 --- a/src/pageElements/Cards.js +++ b/src/pageElements/Cards.js @@ -281,7 +281,7 @@ export const DocCard = (props) => { const now = new Date().getTime(); const uploadedAt = new Date(createdAtTime * 1000); const isReportable = Math.round((now - uploadedAt) / 60 / 1000) > 15; - + console.log("responseGenerations", responseGenerations); const disabled = docType ? false : true; const tooltipText = "Parsing is taking a bit longer than usual. This usually resolves within 15 minutes. If it does not, click “report” and support will address the issue within 24 hours."; From 51ce38435b4fd37458031a516981184fed709709 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 15:19:17 -0600 Subject: [PATCH 2/4] more --- src/pageElements/Radiogroup.js | 20 ++++++++++++++++++-- src/styles/radio-group.scss | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/pageElements/Radiogroup.js b/src/pageElements/Radiogroup.js index 39228d7..cd5cf83 100644 --- a/src/pageElements/Radiogroup.js +++ b/src/pageElements/Radiogroup.js @@ -1,4 +1,4 @@ -import { CircleFill, Circle } from "react-bootstrap-icons"; +import { CircleFill, Circle, ExclamationTriangle } from "react-bootstrap-icons"; const Radiogroup = (props) => { const { @@ -19,7 +19,23 @@ const Radiogroup = (props) => { return (
- {title &&
{title}
} +
+ {title === "Document type" ? ( +
+ +
+ ) : ( + <> + )} + {title &&
{title}
} +
+
{options && options?.length && diff --git a/src/styles/radio-group.scss b/src/styles/radio-group.scss index c2c8226..34aaa41 100644 --- a/src/styles/radio-group.scss +++ b/src/styles/radio-group.scss @@ -27,6 +27,20 @@ border-radius: 6px; box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; } + +.radio-group-title-box { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; +} + +.checkbox-title-icon-box { + margin-top: 3px; + margin-left: 2px; + margin-right: 1px; +} + .checkbox-option-div { display: flex; flex-direction: row; From 99735fe71b933486e6ef9b9f3b1340dd2be611dd Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 15:37:05 -0600 Subject: [PATCH 3/4] more --- src/Components/Document/DocEditPage.js | 4 ++++ src/styles/radio-group.scss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 4566a79..07b6e24 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -458,6 +458,10 @@ const DocEditPage = () => { } async function updateRespGenerationCount(docId) { + console.log("updaeeResponseGenerationCount fired"); + if (!docId) { + return; + } await updateDoc(doc(db, "documents", docId), { responseGenerations: increment(1), }); diff --git a/src/styles/radio-group.scss b/src/styles/radio-group.scss index 34aaa41..f3c45c3 100644 --- a/src/styles/radio-group.scss +++ b/src/styles/radio-group.scss @@ -32,7 +32,7 @@ display: flex; flex-direction: row; align-items: center; - justify-content: center; + justify-content: left; } .checkbox-title-icon-box { From 4fc6971efd642b36585f3ff4267756c86cf84fb2 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 15:47:25 -0600 Subject: [PATCH 4/4] more --- src/Components/Document/DocEditPage.js | 2 ++ src/pageElements/Cards.js | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 07b6e24..da4e9ac 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -462,6 +462,8 @@ const DocEditPage = () => { if (!docId) { return; } + + console.log("updaeeResponseGenerationCount past if block"); await updateDoc(doc(db, "documents", docId), { responseGenerations: increment(1), }); diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js index d7e7ed6..60c94c2 100644 --- a/src/pageElements/Cards.js +++ b/src/pageElements/Cards.js @@ -282,6 +282,7 @@ export const DocCard = (props) => { const uploadedAt = new Date(createdAtTime * 1000); const isReportable = Math.round((now - uploadedAt) / 60 / 1000) > 15; console.log("responseGenerations", responseGenerations); + console.log("docType", docType); const disabled = docType ? false : true; const tooltipText = "Parsing is taking a bit longer than usual. This usually resolves within 15 minutes. If it does not, click “report” and support will address the issue within 24 hours."; @@ -297,9 +298,9 @@ export const DocCard = (props) => { const isOutbound = docType === "interrogatories-out"; const buttonText = - docType === "interrogatories-out" + docType === "interrogatories" && responseGenerations > 0 ? "Edit Request" - : responseGenerations > 1 + : docType === "interrogatories-out" ? "Edit Response" : "Generate Response"; return (