-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30 from kwheelan/17-summary-page-edits
Edit sidebar and summary data presentation
- Loading branch information
Showing
29 changed files
with
8,203 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| # Ignore all .xlsx files | ||
| # *.xlsx | ||
|
|
||
| # powershell | ||
| .ps1 | ||
|
|
||
| # Logs | ||
| logs | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <!doctype html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Demo Budget Form</title><link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" crossorigin="anonymous"><link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet"><script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" crossorigin="anonymous"></script><script defer="defer" src="bundle.js"></script></head><body><header><img src="d027d45141f87dc014af.png" alt="City of Detroit Logo" id="logo"><h1>FY2026 Budget Form</h1><h2 id="subtitle"></h2></header><div id="main-panel"><div id="welcome-page"><button class="btn step" id="step-upload">1. Upload your Excel data</button> <button class="btn step" id="step-revenue">2. Baseline request</button> <button class="btn step" id="step-initiatives">3. Name any new initiatives</button> <button class="btn step" id="step-finish">4. Confirm and finish</button></div><div id="prompt-div"><h3 id="prompt"></h3><br><button class="btn" id="option1"></button> <button class="btn" id="option2"></button></div><div class="table-container"><table class="table table-bordered mt-3" id="main-table"><thead class="thead-dark"></thead><tbody></tbody></table></div><div class="row"><div id="add-btn-div"><button class="btn btn-add" id="add-btn"></button></div></div><div class="row"><div class="col-md-12"><div id="nav-btns"><button class="btn" id="btn-last"><strong><< Previous</strong></button> <button class="btn" id="btn-next"><strong>Continue >></strong></button></div></div></div></div><div id="sidebar-panel"><div class="sidebar-content"><br><h4 id="sidebar-title">Summary</h4><br><h6 id="section-header"><strong>Baseline</strong></h6><div id="baseline-stats"><div class="sidebar-stat-line" id="target"><span class="stat-label">FY26 target:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-revenue"><span class="stat-label">Projected revenue:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-personnel"><span class="stat-label">Personnel cost:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-nonpersonnel"><span class="stat-label">Non-personnel cost:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-total"><span class="stat-label">Total baseline:</span> <span class="stat"></span></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 class="modal fade" id="main-modal" tabindex="-1"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="modal-title"></h5><button type="button" id="modal-close-x" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button></div><div class="modal-body" id="modal-body"></div></div></div></div></body></html> | ||
| <!doctype html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Demo Budget Form</title><link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"><link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet"><script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.17.4/xlsx.full.min.js"></script><script defer="defer" src="bundle.js"></script></head><body><header><img src="d027d45141f87dc014af.png" alt="Logo" id="logo"><h1>FY2026 Budget Form</h1><h2 id="subtitle"></h2></header><div id="main-panel"><div id="welcome-page"><button class="btn step" id="step-upload">1. Upload your Excel data</button> <button class="btn step" id="step-revenue">2. Complete your baseline request</button> <button class="btn step" id="step-initiatives">3. Propose new initiatives</button> <button class="btn step" id="step-finish">4. Review and download submission</button></div><div id="accordion-div"><div id="baseline-accordion"><h3 id="baseline-title" class="accordion-title">Baseline</h3><div class="accordion summary-accordion"></div></div><div id="supp-accordion"><h3 id="supp-title" class="accordion-title">Suplemental</h3><div class="accordion summary-accordion"></div></div></div><div id="prompt-div"><h3 id="prompt"></h3><br><input type="file" id="file-input" accept=".xls,.xlsx"/> <button class="btn" id="option1"></button> <button class="btn" id="option2"></button></div><div class="table-container"><table class="table table-bordered mt-3" id="main-table"><thead class="thead-dark"></thead><tbody></tbody></table></div><div class="row"><div id="add-btn-div"><button class="btn btn-add" id="add-btn"></button></div></div><div class="row"><div class="col-md-12"><div id="nav-btns"><button class="btn" id="btn-last"><strong><< Previous</strong></button> <button class="btn" id="btn-next"><strong>Continue >></strong></button></div></div></div></div><div id="sidebar-panel"><div class="sidebar-content"><br><h4 id="sidebar-title">Summary</h4><br><h6 id="section-header"><strong>Baseline</strong></h6><div id="baseline-stats"><div class="sidebar-stat-line" id="target"><span class="stat-label">FY26 target:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-revenue"><span class="stat-label">Projected revenue:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-personnel"><span class="stat-label">Personnel cost:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-nonpersonnel"><span class="stat-label">Non-personnel cost:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="baseline-total"><span class="stat-label">Total baseline:</span> <span class="stat"></span></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">Estimated Revenue:</span> <span class="stat"></span></div><div class="sidebar-stat-line" id="supp-expenses"><span class="stat-label">Esimated Expenses:</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 class="modal fade" id="main-modal" tabindex="-1"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="modal-title"></h5><button type="button" id="modal-close-x" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button></div><div class="modal-body" id="modal-body"></div></div></div></div></body></html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <title>Demo Budget Form</title> | ||
|
|
||
| <!-- Bootstrap --> | ||
| <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> | ||
| <!-- Google fonts --> | ||
| <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet"> | ||
|
|
||
| <link rel="stylesheet" href="css/common.css"> | ||
| <!-- Component CSS --> | ||
| <link rel="stylesheet" href="js/components/accordion/accordion.css"> | ||
| <link rel="stylesheet" href="js/components/body/body.css"> | ||
| <link rel="stylesheet" href="js/components/welcome/welcome.css"> | ||
| <link rel="stylesheet" href="js/components/header/header.css"> | ||
| <link rel="stylesheet" href="js/components/prompt/prompt.css"> | ||
| <link rel="stylesheet" href="js/components/nav_buttons/nav_buttons.css"> | ||
| <link rel="stylesheet" href="js/components/modal/modal.css"> | ||
| <link rel="stylesheet" href="js/components/form/form.css"> | ||
| <link rel="stylesheet" href="js/components/sidebar/sidebar.css"> | ||
| <link rel="stylesheet" href="js/components/table/table.css"> | ||
| <link rel="stylesheet" href="js/components/file_upload/file_upload.css"> | ||
|
|
||
| <!-- Bootstrap JS and its dependencies (jQuery & Popper.js) --> | ||
| <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" crossorigin="anonymous"></script> | ||
| <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" crossorigin="anonymous"></script> | ||
| <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script> | ||
|
|
||
| <!-- JS excel library --> | ||
| <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.17.4/xlsx.full.min.js"></script> | ||
|
|
||
| <!-- My javascript entrypoint --> | ||
| <script src="js/init.js" type="module"></script> | ||
|
|
||
| </head> | ||
| <body> | ||
|
|
||
| <!-- Page header --> | ||
| <header> | ||
| <!-- City of Detroit logo --> | ||
| <img src="assets/city-of-detroit-logo.png" alt="Logo" id="logo"> | ||
| <!-- Title and subtitle --> | ||
| <h1>FY2026 Budget Form</h1> | ||
| <h2 id="subtitle"></h2> | ||
| </header> | ||
|
|
||
| <!-- Main content --> | ||
| <div id="main-panel"> | ||
|
|
||
| <!-- Welcome page buttons --> | ||
| <div id="welcome-page"> | ||
| <button class="btn step" id="step-upload"> | ||
| 1. Upload your Excel data | ||
| </button> | ||
| <button class="btn step" id="step-revenue"> | ||
| 2. Complete your baseline request | ||
| </button> | ||
| <button class="btn step" id="step-initiatives"> | ||
| 3. Propose new initiatives | ||
| </button> | ||
| <button class="btn step" id="step-finish"> | ||
| 4. Review and download submission | ||
| </button> | ||
| </div> | ||
|
|
||
| <!-- Summary page accordion --> | ||
| <div id='accordion-div'> | ||
| <div id='baseline-accordion'> | ||
| <h3 id="baseline-title" class="accordion-title">Baseline</h3> | ||
| <div class="accordion summary-accordion"></div> | ||
| </div> | ||
| <div id="supp-accordion"> | ||
| <h3 id="supp-title" class="accordion-title">Suplemental</h3> | ||
| <div class="accordion summary-accordion"></div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <!-- Space for an initial prompt and response buttons --> | ||
| <div id="prompt-div"> | ||
| <h3 id="prompt"></h3> | ||
| <br> | ||
| <!-- File upload --> | ||
| <input type="file" id="file-input" accept=".xls,.xlsx" /> | ||
| <!-- Prompt buttons --> | ||
| <button class="btn" id="option1"></button> | ||
| <button class="btn" id="option2"></button> | ||
| </div> | ||
|
|
||
| <!-- Table --> | ||
| <div class="table-container"> | ||
| <!-- <form id="table-form"> --> | ||
| <table class="table table-bordered mt-3" id="main-table"> | ||
| <thead class="thead-dark"></thead> | ||
| <tbody></tbody> | ||
| </table> | ||
| <!-- </form> --> | ||
| </div> | ||
|
|
||
| <!-- Add new row button --> | ||
| <div class="row"> | ||
| <div id='add-btn-div'> | ||
| <button class="btn btn-add" id="add-btn"></button> | ||
| </div> | ||
| </div> | ||
|
|
||
| <!-- Navigation buttons --> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <div id="nav-btns"> | ||
| <button class="btn" id="btn-last"> | ||
| <strong><< Previous</strong> | ||
| </button> | ||
| <button class="btn" id="btn-next"> | ||
| <strong>Continue >></strong> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <!-- Sidebar --> | ||
| <div id="sidebar-panel"> | ||
| <div class="sidebar-content"> | ||
| <br> | ||
| <h4 id="sidebar-title">Summary</h4> | ||
| <br> | ||
| <h6 id="section-header"><strong>Baseline</strong></h6> | ||
| <div id="baseline-stats"> | ||
| <div class='sidebar-stat-line' id="target"> | ||
| <span class="stat-label">FY26 target:</span> | ||
| <span class="stat"></span> | ||
| </div> | ||
| <div class='sidebar-stat-line' id="baseline-revenue"> | ||
| <span class="stat-label">Projected revenue:</span> | ||
| <span class="stat"></span> | ||
| </div> | ||
| <div class='sidebar-stat-line' id="baseline-personnel"> | ||
| <span class="stat-label">Personnel cost:</span> | ||
| <span class="stat"></span> | ||
| </div> | ||
| <div class='sidebar-stat-line' id="baseline-nonpersonnel"> | ||
| <span class="stat-label">Non-personnel cost:</span> | ||
| <span class="stat"></span> | ||
| </div> | ||
| <div class='sidebar-stat-line' id="baseline-total"> | ||
| <span class="stat-label">Total baseline:</span> | ||
| <span class="stat"></span> | ||
| </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> | ||
|
|
||
| <!-- Modal for form or info --> | ||
| <div class="modal fade" id="main-modal" tabindex="-1"> | ||
| <div class="modal-dialog"> | ||
| <div class="modal-content"> | ||
| <div class="modal-header"> | ||
| <h5 class="modal-title" id="modal-title"></h5> | ||
| <button type="button" id="modal-close-x" class="close" data-dismiss="modal" aria-label="Close"> | ||
| <span aria-hidden="true">×</span> | ||
| </button> | ||
| </div> | ||
| <div class="modal-body" id="modal-body"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </body> | ||
| </html> |
Oops, something went wrong.