Merge pull request #12 from kwheelan/dev

Update main branch to reflect recent changes
CityOfDetroit · Jul 8, 2024 · 97981c5 · 97981c5
2 parents e365f15 + d6269fd
commit 97981c5
Show file tree

Hide file tree

Showing 69 changed files with 1,896 additions and 1,577 deletions.
diff --git a/archive/05_nonpersonnel.html b/archive/05_nonpersonnel.html
diff --git a/assets/city-of-detroit-logo.png b/assets/city-of-detroit-logo.png
diff --git a/css/common.css b/css/common.css
@@ -1,4 +1,5 @@
 :root {
+    /* colors */
     --orange: #FB6523;
     --yellow: #D99733;
     --blue: #43748E;
@@ -11,20 +12,15 @@
     --citygreen: #004445;
     --spiritgreen: #279989;
     --palegreen: #9FD5B3;
+    --verypalegreen: #DFF5E3;
     --accentyellow: #feb70d;
     --nearblack: #18252a;
-    font-family: 'Clear Sans', 'Helvetica Neue', Arial, sans-serif;
+    /* fonts */
+    font-family: 'Nunito', sans-serif;
     font-size: 14px;
-}
-
-/* Every page */
-
-/* start by hiding everything */
-#welcome-page{display: none;}
-#prompt-div{display: none;}
-
-body {
-    margin: 10px;
+    /* spacing */
+    --header-height : 125px;
+    --sidebar-width: 250px;
 }
 
 /* Button styling */
@@ -33,41 +29,29 @@ body {
     cursor: pointer;
     padding: 10px;
     margin-top: 5px;
+    margin-right : 2px;
+    margin-left: 2px;
     border-radius: 10px;
     background-color: gray;
     color: white; 
 }
 
-/* Action buttons */
-
-.action-btns {
-    text-align: center;
-}
-
-.delete {
-    background-color: #ee9286;
-}
-.delete .btn-delete, .keep .btn-carryover, .supp .btn-supplemental {
-    background-color: #373A37;
-}
-.keep {
-    background-color: #90ee90;
-}
-.supp {
-    background-color: #e0b472;
-}
-
-.btn-delete {background-color: var(--orange);}
-.btn-supplemental { background-color: var(--yellow);}
-.btn-carryover {background-color: var(--green);}
-
-
-.error-message {
-    color: red;
-}
+/* Font application for all text  */
+body, button, input, textarea, select, .sidebar, table {
+    font-family: var(--font-family), sans-serif;
+  }
 
-/* confirm button */
-.confirm-btn:hover {
-    background-color: var(--green);
+#main-panel {
+    /* display: flex; */
+    /* flex-direction: column; */
+    justify-content: center; /* This will center content vertically */
+    min-height: calc(100vh - var(--header-height)) ; 
+    /* max-width: calc(100vw - var(--sidebar-width));  */
+    padding-top: 25px;
+    padding-bottom: 25px;
+    margin: 0;
 }
 
+div.row {
+    margin: 0px;
+}
diff --git a/data/law_dept_sample/funds.json b/data/law_dept_sample/funds.json
@@ -0,0 +1,6 @@
+[
+    { "ID" : "1000",
+      "Name" : "General Fund"},
+    { "ID" : "29320",
+      "NAme" : "Sample Grant Fund"}
+]
diff --git a/data/law_dept_sample/nonpersonnel_data.json b/data/law_dept_sample/nonpersonnel_data.json
@@ -0,0 +1,29 @@
+[
+    {
+        "Vendor": "Law Firm LLC",
+        "CPA #" : "765421",
+        "Account String": "1000-29320-320010",
+        "Object Name": "Consulting",
+        "End of Contract": "12/31/2024",
+        "Amount Remaining" : 50000,
+        "FY26 Request": 100000
+    },
+    {
+        "Vendor": "Office Supplier",
+        "CPA #" : "1234567",
+        "Account String": "1000-29320-320010",
+        "Object Name": "Office Supplies",
+        "End of Contract": "12/31/2026",
+        "Amount Remaining" : 500000,
+        "FY26 Request": 10000
+    },
+    {
+        "Vendor": "Software Co.",
+        "CPA #" : "9876543",
+        "Account String": "1000-29320-320010",
+        "Object Name": "Information Technology",
+        "End of Contract": "6/1/2025",
+        "Amount Remaining" : 30000,
+        "FY26 Request": 30000
+    }
+]
diff --git a/data/law_dept_sample/personnel_data.json b/data/law_dept_sample/personnel_data.json
@@ -1,26 +1,23 @@
 [
     {
-        "Job Name": "Deputy Counsel",
+        "Job Name (Type)": "Deputy Counsel (Regular)",
         "Account String": "1000-29320-320010",
-        "Current FTEs (FY25)": 1,
-        "Baseline FTEs": 0,
-        "Supplemental FTEs": 0,
-        "Current Average Salary": "150000"
+        "Service" : "Appeals",
+        "FY26 FTEs": 1,
+        "Average Projected Salary": "150000"
     },
     {
-        "Job Name": "Legal Secretary",
+        "Job Name (Type)": "Legal Secretary (Regular)",
         "Account String": "1000-29320-320010",
-        "Current FTEs (FY25)": 5,
-        "Baseline FTEs": 0,
-        "Supplemental FTEs": 0,
-        "Current Average Salary": "55000"
+        "Service" : "FOIA",
+        "FY26 FTEs": 2,
+        "Average Projected Salary": "55000"
     },
     {
-        "Job Name": "Assistant Counsel",
+        "Job Name (Type)": "Assistant Counsel (Regular)",
         "Account String": "1000-29320-320010",
-        "Current FTEs (FY25)": 10,
-        "Baseline FTEs": 0,
-        "Supplemental FTEs": 0,
-        "Current Average Salary": "80000"
+        "Service" : "Appeals",
+        "FY26 FTEs": 10,
+        "Average Projected Salary": "80000"
     }
 ]