fixed new inits bug; expanded personnel table

data/law_dept_sample/services.json

@@ -1,4 +1,6 @@
 [
+    { "id" : "",
+      "name" : "Select"},
     { "id" : "Appeals",
       "name" : "Appeals"},
     { "id" : "FOIA",

index.html

@@ -140,40 +140,44 @@ <h6 id="section-header"><strong>Baseline</strong></h6>
                     <div class='sidebar-stat-line' id="target">
                         <span class="stat-label">FY26 target:</span> 
                         <span class="stat"></span>
-                    <div>
+                    </div>
                     <div class='sidebar-stat-line' id="baseline-revenue">
                         <span class="stat-label">Projected revenue:</span> 
                         <span class="stat"></span>
-                    <div>
+                    </div>
                     <div class='sidebar-stat-line' id="baseline-personnel">
                         <span class="stat-label">Personnel cost:</span> 
                         <span class="stat"></span>
-                    <div>
+                    </div>
                     <div class='sidebar-stat-line' id="baseline-nonpersonnel">
                         <span class="stat-label">Non-personnel cost:</span> 
                         <span class="stat"></span>
-                    <div>
+                    </div>
                     <div class='sidebar-stat-line' id="baseline-total">
                         <span class="stat-label">Total baseline:</span> 
                         <span class="stat"></span>
-                    <div>
+                    </div>
                 </div>
                 <br>
                 <h6 id="section-header"><strong>Supplemental</strong></h6>
                 <div id="supp-stats">
                     <div class='sidebar-stat-line' id="supp-revenue">
                         <span class="stat-label">Revenue:</span> 
                         <span class="stat"></span>
+                    </div>
                     <div class='sidebar-stat-line' id="supp-personnel">
                         <span class="stat-label">Personnel cost:</span> 
                         <span class="stat"></span>
+                    </div>
                     <div class='sidebar-stat-line' id="supp-nonpersonnel">
                         <span class="stat-label">Non-personnel cost:</span> 
                         <span class="stat"></span>
+                    </div>
                     <div class='sidebar-stat-line' id="supp-total">
                         <span class="stat-label">Total supplemental:</span> 
                         <span class="stat"></span>
                     </div>
+                </div>
             </div>
         </div>
     </div>

js/init.js

@@ -8,6 +8,7 @@ import { loadPersonnelPage } from './pages/04_personnel/main.js';
 import { addTarget } from './components/sidebar/sidebar.js';
 
 export let DATA_ROOT = '../../../data/law_dept_sample/'
+export let REVENUE = 0;
 
 document.addEventListener('DOMContentLoaded', function () {
 

js/pages/02_new_initiatives/helpers.js

@@ -60,16 +60,19 @@ export function handleFormSubmissions(event){
         modal.addEventListener('submit', function(event) {
             // get answers from form, hide form, show answers in table
             const responses = fetchAllResponses(event);
-
-            // change page view
-            hideModal('main-modal');
-            hidePrompt();
-
-            // add data to table
-            addNewRow('main-table', responses);
-            showTable('main-table');
-            showAddButton();
-            // TODO: save table data
-            // TODO: edit cost to show currency correctly
-        });
+            // make sure it's not an empty response
+            if (Object.values(responses)[0] != ''){
+                // change page view
+                hideModal('main-modal');
+                hidePrompt();
+
+                // add data to table
+                addNewRow('main-table', responses);
+                showTable('main-table');
+                showAddButton();
+                // TODO: save table data
+                // TODO: edit cost to show currency correctly
+                }
+
+        })
 }

js/pages/03_revenue/main.js

@@ -6,7 +6,9 @@ import { showNavButtons } from '../../components/nav_buttons/nav_buttons.js'
 import { loadNewInitiatives } from '../02_new_initiatives/main.js'
 import { hideTable } from '../../components/table/table.js'
 import { hideSideBar } from '../../components/sidebar/sidebar.js'
+import { formatCurrency } from '../../utils/utils.js'
 
+import { REVENUE } from '../../init.js'
 
 export function loadRevenuePage() {
 
@@ -23,7 +25,7 @@ export function loadRevenuePage() {
     // update page text
     updateSubtitle('Revenue Projections');
     // TODO: update to make dynamic
-    updatePrompt('Your revenue projection for FY26 is $0');
+    updatePrompt(`Your revenue projection for FY26 is ${formatCurrency(REVENUE, true)}`);
     updatePromptButtons('Confirm and continue.', "This doesn't look right");
 
     // clicking 'confirm and continue' will also take us to the next page

js/pages/04_personnel/helpers.js

@@ -104,17 +104,20 @@ function initializeConfirmButton(rowToEdit){
     confirm_btn.addEventListener('click', function(event){
         // get current row
         const rowToEdit = event.target.closest('tr');
-        var textboxes = rowToEdit.querySelectorAll('input')
+        var textboxes = rowToEdit.querySelectorAll('input');
         // save all text in textboxes
         textboxes.forEach( textbox => {
             var enteredValue = textbox.value;
             var cell = textbox.parentElement;
             cell.textContent = enteredValue;
             cell.setAttribute('value', enteredValue);
         })
-
+        // set service selection
+        const serviceSelector =  rowToEdit.querySelector('select');
+        var cell = serviceSelector.parentElement;
+        cell.textContent = serviceSelector.value;
         //set service value
-        
+
 
         // update values in sidebar
         updateDisplayandTotals();

js/utils/utils.js

@@ -1,12 +1,15 @@
 // Function to format number as currency
-export const formatCurrency = (amount) => {
+export const formatCurrency = (amount, return_zero = false) => {
     var amount = parseFloat(amount);
     if (amount == NaN){
         return "$ -"
     }
     if (amount < 0){
         return '($' + amount.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,') + ')';
     } else if (amount == 0) {
+        if (return_zero){
+            return '$0';    
+        }
         return "$ -"
     }
     return '$' + amount.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');