edit expenses to expenditures

CityOfDetroit · Jul 18, 2024 · e27fb08 · e27fb08
1 parent 469e306
commit e27fb08
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 25 deletions.
diff --git a/src/index.html b/src/index.html
@@ -119,7 +119,7 @@ <h6 id="section-header"><strong>Baseline</strong></h6>
                 <span class="stat"></span>
             </div>
             <div class='sidebar-stat-line' id="baseline-revenue">
-                <span class="stat-label">Projected revenue:</span> 
+                <span class="stat-label">Projected revenues:</span> 
                 <span class="stat"></span>
             </div>
             <div class='sidebar-stat-line' id="baseline-personnel">
@@ -139,11 +139,11 @@ <h6 id="section-header"><strong>Baseline</strong></h6>
         <h6 id="section-header"><strong>Supplemental</strong></h6>
         <div id="supp-stats">
             <div class='sidebar-stat-line' id="supp-revenue">
-                <span class="stat-label">Estimated revenue:</span> 
+                <span class="stat-label">Estimated revenues:</span> 
                 <span class="stat"></span>
             </div>
             <div class='sidebar-stat-line' id="supp-expenses">
-                <span class="stat-label">Esimated expenses:</span> 
+                <span class="stat-label">Esimated expenditures:</span> 
                 <span class="stat"></span>
             </div>
             <div class='sidebar-stat-line' id="supp-total">

diff --git a/src/js/components/accordion/accordion.js b/src/js/components/accordion/accordion.js
@@ -20,13 +20,13 @@ function redirectForEdit(){
         const lineItem = row.querySelector('.line-item').textContent;
         // visit the correct page for editing
         switch(lineItem){
-            case 'Personnel Expenses':
+            case 'Personnel Expenditures':
                 visitPage('personnel');
                 break;
-            case 'Non-Personnel Expenses':
+            case 'Non-Personnel Expenditures':
                 visitPage('nonpersonnel');
                 break;
-            case 'Revenue':
+            case 'Revenues':
                 visitPage('revenue');
                 break;
             default:
@@ -61,24 +61,24 @@ const ExpenseTable = {
         this.createNewCell(formatCurrency(number), new_row, 'cost');
         // create Edit button 
         var button = '';
-        if (row_name != 'Net Expenses (Revenues)'){
+        if (row_name != 'Net Expenditures (Revenues)'){
             button = Table.Buttons.Edit.html;
         }
         this.createNewCell(button, new_row);
     },
     fillFromFund(fund) {
         this.init(fund);
         const fundObject = new Fund(fund);
-        this.addRow(fund, 'Personnel Expenses', fundObject.getPersonnelCost());
-        this.addRow(fund, 'Non-Personnel Expenses', fundObject.getNonPersonnelCost());
-        this.addRow(fund, 'Revenue', fundObject.getRevenue());
-        this.addRow(fund, 'Net Expenses (Revenues)', fundObject.getTotal());
+        this.addRow(fund, 'Personnel Expenditures', fundObject.getPersonnelCost());
+        this.addRow(fund, 'Non-Personnel Expenditures', fundObject.getNonPersonnelCost());
+        this.addRow(fund, 'Revenues', fundObject.getRevenue());
+        this.addRow(fund, 'Net Expenditures (Revenues)', fundObject.getTotal());
     },
     fillFromInit(program) {
         this.init(program.name);
-        this.addRow(program.name, 'Expenses', program.expenses());
-        this.addRow(program.name, 'Revenue', program.revenue());
-        this.addRow(program.name, 'Net Expenses (Revenues)', program.net());
+        this.addRow(program.name, 'Expenditures', program.expenses());
+        this.addRow(program.name, 'Revenues', program.revenue());
+        this.addRow(program.name, 'Net Expenditures (Revenues)', program.net());
     }
 }
 

diff --git a/src/js/views/04_personnel/helpers.js b/src/js/views/04_personnel/helpers.js
@@ -65,7 +65,7 @@ export async function initializePersonnelTable(){
         Table.Buttons.Edit.init(personnelRowOnEdit, updateDisplayandTotals);
         initializeRowAddition();
     } else {
-        Prompt.Text.update('No personnel expenses for this fund.')
+        Prompt.Text.update('No personnel expenditures for this fund.')
     }
 }
 

diff --git a/src/js/views/05_overtime/helpers.js b/src/js/views/05_overtime/helpers.js
@@ -64,7 +64,7 @@ export async function initializeOTTable(){
         // activate edit buttons
         Table.Buttons.Edit.init(OTRowOnEdit, updateDisplayandTotals);
     } else {
-        Prompt.Text.update('No overtime expenses for this fund.')
+        Prompt.Text.update('No overtime expenditures for this fund.')
     }
 }
 

diff --git a/src/js/views/06_nonpersonnel/helpers.js b/src/js/views/06_nonpersonnel/helpers.js
@@ -5,14 +5,6 @@ import Body from "../../components/body/body.js";
 import NavButtons from "../../components/nav_buttons/nav_buttons.js";
 import Subtitle from "../../components/header/header.js";
 
-// "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
-
 const nonPersonnelColumns = [
     { title: 'FY26 Request', className: 'request', isCost: true },
     { title: 'Amount Remaining on Contract', className: 'remaining', isCost: true },
@@ -51,7 +43,7 @@ export async function initializeNonpersonnelTable(){
         // enable editing
         Table.Buttons.Edit.init(nonPersonnelRowOnEdit, Table.save);
     } else {
-        Prompt.Text.update('No personnel expenses for this fund.')
+        Prompt.Text.update('No non-personnel expenditures for this fund.')
     }
 }