From b076eae02b1dc05c8383f34af638eed255721c12 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Mon, 4 Feb 2019 01:39:42 -0800 Subject: [PATCH 1/4] Add new report functionality --- front/static/edit_report.html | 2 +- front/static/js/newReport.js | 56 +++++++++++++++++++++++++ front/static/js/viewHistory.js | 76 ++++++++++++++++++++++++---------- front/static/new_report.html | 24 ++++++++++- 4 files changed, 133 insertions(+), 25 deletions(-) create mode 100644 front/static/js/newReport.js diff --git a/front/static/edit_report.html b/front/static/edit_report.html index 80d39df..5c7afc8 100644 --- a/front/static/edit_report.html +++ b/front/static/edit_report.html @@ -71,7 +71,7 @@ -
+
diff --git a/front/static/js/newReport.js b/front/static/js/newReport.js new file mode 100644 index 0000000..f0d84bf --- /dev/null +++ b/front/static/js/newReport.js @@ -0,0 +1,56 @@ + +let newReport = { + "title": "2018 Portland trip", + "date_created": "2018-05-22T14:56:28.000Z", + "submitted": false, + "date_submitted": "0000-00-00T00:00:00.000Z", + "sections": [{ + "id": 1, + "completed": false, + "title": "Flight Info", + "html_description": "

Enter flight details here.

", + "fields": { + "international": { + "label": "International flight", + "type": "boolean", + "value": "" + }, + "travel_date": { + "label": "Travel start date", + "type": "date", + "value": "" + }, + "fare": { + "label": "Fare", + "type": "decimal", + "value": "" + }, + "lowest_fare_screenshot": { + "label": "Lowest fare screenshot", + "type": "file", + "value": "" + }, + "plane_ticket_invoice": { + "label": "Plane ticket invoice PDF", + "type": "file", + "value": "" + } + }, + "rule_violations": [] + }, + { + "id": 2, + "completed": false, + "title": "Hotel info", + "html_description": "

If you used a hotel, please enter the details.

", + "fields": { + "total": { + "label": "Total cost", + "type": "decimal", + "value": "" + } + }, + "rule_violations": [] + } + ] +} diff --git a/front/static/js/viewHistory.js b/front/static/js/viewHistory.js index 7e7a88c..a6b61d2 100644 --- a/front/static/js/viewHistory.js +++ b/front/static/js/viewHistory.js @@ -4,7 +4,7 @@ function getEndpointDomain() { } // Make a GET request to url and pass response to callback function -function getDataFromEndpoint(url, callback) { +function getDataFromEndpoint(url, callback, optional) { const token = localStorage.getItem("token"); const xhr = new XMLHttpRequest(); @@ -16,8 +16,8 @@ function getDataFromEndpoint(url, callback) { if (this.status === 200) { console.log("GET SUCCESS!"); console.log("Server response:\n" + this.response); - parsedData = JSON.parse(this.response); - callback(parsedData); + let parsedData = JSON.parse(this.response); + optional === undefined ? callback(parsedData) : callback(parsedData, optional); } else { console.error("GET FAILURE!"); console.error("Server status: " + this.status); @@ -118,10 +118,13 @@ function createCollapsibleCard(key, sectionTitle) { return card; } -function createCollapsibleCardBody(key, form, sectionDescription, sectionCompleted) { +function createCollapsibleCardBody(key, form, type, sectionDescription, sectionCompleted) { // Create wrapper div const div = document.createElement("div"); + div.id = "collapse" + key; const sectionAlert = document.createElement("div"); + const cardBody = document.createElement("div"); + cardBody.classList.add("card-body"); if (sectionCompleted) { div.classList.add("collapse"); @@ -133,12 +136,13 @@ function createCollapsibleCardBody(key, form, sectionDescription, sectionComplet sectionAlert.innerHTML = "This section is not complete"; } - div.setAttribute("data-parent", "#editReportAccordion"); - div.id = "collapse" + key; + if (type === reportType.EDIT) { + div.setAttribute("data-parent", "#editReportAccordion"); + } else { + div.setAttribute("data-parent", "#newReportAccordion"); + } // Create card body. Append form to body, body to wrapper div - const cardBody = document.createElement("div"); - cardBody.classList.add("card-body"); cardBody.appendChild(sectionAlert); cardBody.insertAdjacentHTML("beforeend", sectionDescription); cardBody.appendChild(form); @@ -147,9 +151,23 @@ function createCollapsibleCardBody(key, form, sectionDescription, sectionComplet return div; } -function createEditReportForm(parsedData) { - const modalBody = document.querySelector(".modal-body"); - const modalLabel = document.querySelector("#editReportModalLabel"); +function createReportForm(parsedData, type) { + let modalBody; + let modalLabl; + const accordion = document.createElement("div"); + accordion.classList.add("accordion"); + + if (type === reportType.EDIT) { + modalBody = document.querySelector("#editReportModalBody"); + modalLabel = document.querySelector("#editReportModalLabel"); + accordion.id = "editReportAccordion"; + } else if (type === reportType.NEW) { + modalBody = document.querySelector("#newReportModalBody"); + modalLabel = document.querySelector("#newReportModalLabel"); + accordion.id = "newReportAccordion"; + } else { + return; + } while (modalBody.firstChild) { modalBody.removeChild(modalBody.firstChild); @@ -160,11 +178,6 @@ function createEditReportForm(parsedData) { const dateCreated = new Date(parsedData.date_created).toLocaleDateString("en-US"); modalLabel.innerHTML = reportTitle + " " + dateCreated; - // Create accordion - const accordion = document.createElement("div"); - accordion.classList.add("accordion"); - accordion.id = "editReportAccordion"; - // Traverse the report's sections array const sections = parsedData.sections; for (let key in sections) { @@ -198,7 +211,7 @@ function createEditReportForm(parsedData) { form.appendChild(saveButton); // Create collapsible card body, append form to it, append card to accordion - let cardBody = createCollapsibleCardBody(key, form, section.html_description, section.completed); + let cardBody = createCollapsibleCardBody(key, form, type, section.html_description, section.completed); collapsibleCard.appendChild(cardBody); accordion.appendChild(collapsibleCard); } @@ -265,15 +278,32 @@ function displayListOfReports(parsedData) { } document.addEventListener("DOMContentLoaded", function(event) { - const url = getEndpointDomain() + "api/v1/reports"; - getDataFromEndpoint(url, displayListOfReports); + if (window.location.pathname === "/edit_report.html") { + const url = getEndpointDomain() + "api/v1/reports"; + getDataFromEndpoint(url, displayListOfReports); + } }); +const reportType = { + EDIT : 1, + VIEW : 2, + NEW : 3 +}; + document.addEventListener("click", function(event) { - if (event.target && event.target.classList.contains("edit-report-button")) { - console.log("Edit button clicked"); - const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid; - getDataFromEndpoint(url, createEditReportForm); + if (event.target) { + if (event.target.classList.contains("edit-report-button")) { + console.log("Edit button clicked"); + console.log(event); + const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid; + const type = reportType.EDIT; + getDataFromEndpoint(url, createReportForm, type); + } else if (event.target.classList.contains("new-report-button")) { + //const url = getEndpointDomain() + "api/v1/report"; + const type = reportType.NEW; + //getDataFromEndpoint(url, createReportForm, type); + createReportForm(newReport, type); + } } // TODO: Add view report diff --git a/front/static/new_report.html b/front/static/new_report.html index 6f0506b..8a57c71 100644 --- a/front/static/new_report.html +++ b/front/static/new_report.html @@ -7,6 +7,7 @@ + Reimbursinator @@ -36,8 +37,29 @@
-

Create a new report

+ +
+ + + From da50627f51fc8abebcb03823899ca2ba7a475d73 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Sat, 9 Feb 2019 22:23:08 -0800 Subject: [PATCH 2/4] Add loading message and modal fade --- front/static/edit_report.html | 16 ++++++++++++++-- front/static/js/viewHistory.js | 18 ++++++++---------- front/static/new_report.html | 6 ++++++ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/front/static/edit_report.html b/front/static/edit_report.html index 2714d66..264b251 100644 --- a/front/static/edit_report.html +++ b/front/static/edit_report.html @@ -62,7 +62,7 @@
-