diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index a73618f..3cc5290 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -1,4 +1,11 @@ -import { useContext, useEffect, useState, useRef } from "react"; +import { + useContext, + useEffect, + useState, + useRef, + useFocusEffect, + useCallback, +} from "react"; import { useNavigate } from "react-router-dom"; import { AppContext } from "../../Hooks/useContext/appContext"; import SelectDropdown from "../../pageElements/SelectDropdown"; @@ -27,11 +34,15 @@ const DocumentListPage = ({ perPage }) => { const [showDeleteModal, setShowDeleteModal] = useState(false); const [selectedDocumentId, setSelectedDocumentId] = useState(null); const [allDocs, setAllDocs] = useState(null); + const [respDocs, setRespDocs] = useState(null); + const [reqDocs, setReqDocs] = useState(null); const { appState } = useContext(AppContext); const [totalPages, setTotalPages] = useState(1); const { group } = appState; const [page, setPage] = useState(1); const [order, setOrder] = useState("parentCaseName"); + const [lowerOrder, setLowerOrder] = useState("parentCaseName"); + const [upperOrder, setUpperOrder] = useState("parentCaseName"); const appUserId = group ? group.appUserId : null; const [isBusy, setIsBusy] = useState(false); const [selectedDocumentType, setSelectedDocumentType] = useState(); @@ -69,30 +80,26 @@ const DocumentListPage = ({ perPage }) => { ...doc.data(), documentId: doc.id, })); - if (order === "parentCaseName") { - data.sort((a, b) => { - return a.parentCaseName.toLowerCase() > b.parentCaseName.toLowerCase() - ? 1 - : -1; - }); - } else if (order === "parentCaseName2") { - data.sort((a, b) => { - return a.parentCaseName.toLowerCase() < b.parentCaseName.toLowerCase() - ? 1 - : -1; - }); - } + const pages = Math.ceil(data.length / perPage); if (page > pages) { setPage(pages); } setTotalPages(pages); setAllDocs(data); + const temp = allDocs?.filter((doc) => { + return doc.docType != "interrogatories-out"; + }); + const temp2 = allDocs?.filter((doc) => { + return doc.docType === "interrogatories-out"; + }); + setRespDocs(temp); + setReqDocs(temp2); }); return unsub; } - useEffect(getDocuments, [appUserId, order]); + useEffect(getDocuments, [appUserId, order, respDocs, reqDocs]); async function deleteFromDb(documentId) { if (isBusy) { @@ -186,13 +193,114 @@ const DocumentListPage = ({ perPage }) => {
{group.firm}
{allDocs === null ?
Loading...
: null} +
+
+
+
+
Discovery Responses
+
+
+
+
+ +
+
+
+
+ {respDocs && respDocs.length > 0 ? ( + respDocs.map((doc, i) => ( + + )) + ) : ( + <> + )} +
+
+
+
+
+
+
Discovery Requests
+
+
+
+
+ +
+
+
+
+ {reqDocs && reqDocs.length > 0 ? ( + reqDocs.map((doc, i) => ( + + )) + ) : ( + <> + )} +
+
+ {showDeleteModal && selectedDocumentId !== null ? ( + + ) : null} + + ); + }; + return isMobile ? : ; +}; + +export default DocumentListPage; + +/* + + {allDocs !== null ? (
{allDocs.length > 0 ? (
-
Discovery Requests
+
Discovery Responses
@@ -209,8 +317,8 @@ const DocumentListPage = ({ perPage }) => { <> )}
- {allDocs.length > 0 ? ( - allDocs + {respDocs && respDocs.length > 0 ? ( + respDocs .slice((page - 1) * perPage, page * perPage) .map((doc, i) => ( { ) : null}
) : null} - {showDeleteModal && selectedDocumentId !== null ? ( - - ) : null} - - ); - }; - return isMobile ? : ; -}; - -export default DocumentListPage; - -/*
{" "}