From e8147d7a49fccf632beeaaab1f24087b6891c431 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 22:05:10 -0500 Subject: [PATCH] more --- src/Components/Document/DocEditPage.js | 8 +- .../Document/captionHeaders/floridaCaption.js | 1 - .../captionHeaders/michiganCaption.js | 71 +++++ .../Document/captionHeaders/newYorkCaption.js | 1 - src/Components/Modals/CreateModal.js | 4 +- src/Components/Modals/UploadModal.js | 4 +- src/Constants/Fields/CreateCaseFields.js | 249 +++++------------- src/pageElements/TextInput.js | 6 +- 8 files changed, 146 insertions(+), 198 deletions(-) create mode 100644 src/Components/Document/captionHeaders/michiganCaption.js diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 12680cb..9a818ce 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -11,14 +11,8 @@ import Button from "../../pageElements/Button"; import ConfirmModal from "../Modals/ConfirmModal"; import LoadingSpinner from "../../pageElements/LoadingSpinner"; import { docEditCopy } from "../../Constants/Copy/docEditCopy.js"; +import { doc, getDoc, updateDoc, increment } from "firebase/firestore"; import "../../styles/docedit-page.scss"; -import { - doc, - getDoc, - updateDoc, - onSnapshot, - increment, -} from "firebase/firestore"; const DocEditPage = (props) => { const navigate = useNavigate(); diff --git a/src/Components/Document/captionHeaders/floridaCaption.js b/src/Components/Document/captionHeaders/floridaCaption.js index 851bc08..8b48f26 100644 --- a/src/Components/Document/captionHeaders/floridaCaption.js +++ b/src/Components/Document/captionHeaders/floridaCaption.js @@ -1,4 +1,3 @@ -import { useState } from "react"; import Scrollbutton from "react-bootstrap/Button"; import { ArrowUp, ArrowDown } from "react-bootstrap-icons"; import "../../../styles/captions.scss"; diff --git a/src/Components/Document/captionHeaders/michiganCaption.js b/src/Components/Document/captionHeaders/michiganCaption.js new file mode 100644 index 0000000..21fc913 --- /dev/null +++ b/src/Components/Document/captionHeaders/michiganCaption.js @@ -0,0 +1,71 @@ +import Scrollbutton from "react-bootstrap/Button"; +import { ArrowUp, ArrowDown } from "react-bootstrap-icons"; + +const MichiganCaption = (props) => { + const { fetchedCase, displayCopy, onScrollClick } = props; + + return ( + <> +
+
+
+ STATE OF MICHIGAN + + IN THE CIRCUIT COURT FOR THE COUNTY OF{" "} + {fetchedCase?.venu.split(" ")[0]} + +
+
+ -----------------------------------------------------------------------X +
+
+
+
+
+
+
+
Edit Document
+
+
+
+ {fetchedCase?.caption ? fetchedCase?.caption : <>}, +
+
+
+
+
Plaintiff(s),
+
+ Index no. {fetchedCase?.caseNumber} +
+
+
+
+
{displayCopy.versusText}
+
Judge: {fetchedCase?.judge}
+
+
+ {fetchedCase?.captionTwo ? fetchedCase?.captionTwo : <>}, +
+
+
+
Defendant(s)
+
+
+
+ ----------------------------------------------------------------------------X +
+
+
+
+
+ + Scroll + +
+
+
+ + ); +}; + +export default MichiganCaption; diff --git a/src/Components/Document/captionHeaders/newYorkCaption.js b/src/Components/Document/captionHeaders/newYorkCaption.js index c8ecae0..44ec8c9 100644 --- a/src/Components/Document/captionHeaders/newYorkCaption.js +++ b/src/Components/Document/captionHeaders/newYorkCaption.js @@ -1,4 +1,3 @@ -import { useState } from "react"; import Scrollbutton from "react-bootstrap/Button"; import { ArrowUp, ArrowDown } from "react-bootstrap-icons"; diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js index 5137e9e..330e09c 100644 --- a/src/Components/Modals/CreateModal.js +++ b/src/Components/Modals/CreateModal.js @@ -41,7 +41,7 @@ const CreateModal = ({ setShowModal, caseData }) => { const [data, setData] = useState( getFormDataDefaults(fields, isEditing ? caseData : undefined) ); - console.log("state in create modal", state); + const courtsList = state === "mi" ? michiganCourts : floridaCourts; function selectVenueValues(data) { const result = courtsList.filter((court) => { @@ -58,7 +58,7 @@ const CreateModal = ({ setShowModal, caseData }) => { const handleChangeInput = (e, name) => { let venArr; const newData = handleFormDataChange(e, name, data, fields); - if (state === "fl") { + if (state === "fl" || state === "mi") { venArr = selectVenueValues(newData); } diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index c2791c5..8deb4d6 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -236,8 +236,8 @@ const UploadModal = (props) => {

- Select a .pdf file for upload, then 1. enter title, and 2. choose - document type (other fields optional). + 1, Enter document title, (i.e. Plaintiff's Interrogatories). 2. + Click or drag and drop the .psf file.

The document created will be associated with{" "} diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js index 183af3c..c559944 100644 --- a/src/Constants/Fields/CreateCaseFields.js +++ b/src/Constants/Fields/CreateCaseFields.js @@ -122,356 +122,241 @@ export const floridaCourts = [ export const michiganCourts = [ { circuit: "1st", - counties: ["Hillsdale"], + counties: ["Hillsdale County"], }, { circuit: "2nd", - counties: ["Berrien"], + counties: ["Berrien County"], }, { circuit: "3rd", - counties: ["Wayne"], + counties: ["Wayne County"], }, { circuit: "4th", - counties: ["Jackson"], + counties: ["Jackson County"], }, { circuit: "5th", - counties: ["Barry"], + counties: ["Barry County"], }, { circuit: "6th", - counties: ["Oakland"], + counties: ["Oakland County"], }, { circuit: "7th", - counties: ["Genesee"], + counties: ["Genesee County"], }, { circuit: "8th", - counties: ["Ionia", "Montcalm"], + counties: ["Ionia County", "Montcalm County"], }, { circuit: "9th", - counties: ["Kalamazoo"], + counties: ["Kalamazoo County"], }, { circuit: "10th", - counties: ["Saginaw"], + counties: ["Saginaw County"], }, { circuit: "11th", - counties: ["Alger", "Luce", "Mackinac", "Schoolcraft"], + counties: [ + "Alger County", + "Luce County", + "Mackinac County", + "Schoolcraft County", + ], }, { circuit: "12th", - counties: ["Baraga", "Houghton", "Keweenaw"], + counties: ["Baraga County", "Houghton County", "Keweenaw County"], }, { circuit: "13th", - counties: ["Antrim", "Leelanau", "Grand Traverse"], + counties: ["Antrim County", "Leelanau County", "Grand Traverse County"], }, { circuit: "14th", - counties: ["Muskegon"], + counties: ["Muskegon County"], }, { circuit: "15th", - counties: ["Branch"], + counties: ["Branch County"], }, { circuit: "16th", - counties: ["Macomb"], + counties: ["Macomb County"], }, { circuit: "17th", - counties: ["Kent"], + counties: ["Kent County"], }, { circuit: "18th", - counties: ["Bay"], + counties: ["Bay County"], }, { circuit: "19th", - counties: ["Benzie", "Manistee"], + counties: ["Benzie County", "Manistee County"], }, { circuit: "20th", - counties: ["Ottawa"], + counties: ["Ottawa County"], }, { circuit: "21st", - counties: ["Isabella"], + counties: ["Isabella County"], }, { circuit: "22nd", - counties: ["Washtenaw"], + counties: ["Washtenaw County"], }, { circuit: "23rd", - counties: ["Alcona", "Arenac", "Iosco", "Oscoda"], + counties: [ + "Alcona County", + "Arenac County", + "Iosco County", + "Oscoda County", + ], }, { circuit: "24th", - counties: ["Sanilac"], + counties: ["Sanilac County"], }, { circuit: "25th", - counties: ["Marquette"], + counties: ["Marquette County"], }, { circuit: "26th", - counties: ["Alpena", "Montmorency"], + counties: ["Alpena County", "Montmorency County"], }, { circuit: "27th", - counties: ["Lake", "Newaygo"], + counties: ["Lake County", "Newaygo County"], }, { circuit: "28th", - counties: ["Missaukee", "Wexford"], + counties: ["Missaukee County", "Wexford County"], }, { circuit: "29th", - counties: ["Clinton", "Gratiot"], + counties: ["Clinton County", "Gratiot County"], }, { circuit: "30th", - counties: ["Ingham"], + counties: ["Ingham County"], }, { circuit: "31st", - counties: ["St. Clair"], + counties: ["St. Clair County"], }, { circuit: "32nd", - counties: ["Gogebic", "Ontonagon"], + counties: ["Gogebic County", "Ontonagon County"], }, { circuit: "33rd", - counties: ["Charlevoix"], + counties: ["Charlevoix County"], }, { circuit: "34th", - counties: ["Ogemaw", "Roscommon"], + counties: ["Ogemaw County", "Roscommon County"], }, { circuit: "35th", - counties: ["Shiawasee"], + counties: ["Shiawasee County"], }, { circuit: "36th", - counties: ["Van Buren"], + counties: ["Van Buren County"], }, { circuit: "37th", - counties: ["Calhoum"], + counties: ["Calhoum County"], }, { circuit: "38th", - counties: ["Monroe"], + counties: ["Monroe County"], }, { circuit: "39th", - counties: ["Lenawee"], + counties: ["Lenawee County"], }, { circuit: "40th", - counties: ["Lapeer"], + counties: ["Lapeer County"], }, { circuit: "41st", - counties: ["Dickinson", "Iron", "Menominee"], + counties: ["Dickinson County", "Iron County", "Menominee County"], }, { circuit: "42nd", - counties: ["Midland"], + counties: ["Midland County"], }, { circuit: "43rd", - counties: ["Cass"], + counties: ["Cass County"], }, { circuit: "44th", - counties: ["Livingston"], + counties: ["Livingston County"], }, { circuit: "45th", - counties: ["St. Joseph"], + counties: ["St. Joseph County"], }, { circuit: "45th", - counties: ["St. Joseph"], + counties: ["St. Joseph County"], }, { circuit: "46th", - counties: ["Crawford", "Kalkaska", "Otsego"], + counties: ["Crawford County", "Kalkaska County", "Otsego County"], }, { circuit: "47th", - counties: ["Delta"], + counties: ["Delta County"], }, { circuit: "49th", - counties: ["Mecosta", "Osceoloa"], + counties: ["Mecosta County", "Osceoloa County"], }, { circuit: "51st", - counties: ["Mason", "Oceana"], + counties: ["Mason County", "Oceana County"], }, { circuit: "52nd", - counties: ["Huron"], + counties: ["Huron County"], }, { circuit: "53rd", - counties: ["Cheboygan", "Presque Isle"], + counties: ["Cheboygan County", "Presque Isle County"], }, { circuit: "55th", - counties: ["Tuscola"], + counties: ["Tuscola County"], }, { circuit: "55th", - counties: ["Clare", "Gladwin"], + counties: ["Clare County", "Gladwin County"], }, { circuit: "56th", - counties: ["Eaton"], + counties: ["Eaton County"], }, { circuit: "57th", - counties: ["Emmet"], + counties: ["Emmet County"], }, { circuit: "50th", - counties: ["Chippewa"], - }, - - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], + counties: ["Chippewa County"], }, ]; diff --git a/src/pageElements/TextInput.js b/src/pageElements/TextInput.js index e165339..e70501e 100644 --- a/src/pageElements/TextInput.js +++ b/src/pageElements/TextInput.js @@ -16,7 +16,7 @@ const TextInput = (props) => { type, disabled, } = props; - const isFlorida = state === "fl"; + const isObject = state === "fl" || state === "mi"; return (

{ onChange={onChange} > @@ -54,7 +54,7 @@ const TextInput = (props) => { className={`select-option`} key={`item${i}`} > - {isFlorida ? `${item.circuit} Judicial Circuit` : item} + {isObject ? `${item.circuit} Judicial Circuit` : item} )) ) : (