diff --git a/README.md b/README.md index 6a07259..19f3d58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # reimbursinator -Open source expense management solution +An open source expense management solution, written in python. Daniel Dupriest, Logan Miller, Jack, Joe Arriaga, Preston, Rupika, Liang Shuaiyi diff --git a/back/backend/views.py b/back/backend/views.py index 8331b9f..a34a661 100644 --- a/back/backend/views.py +++ b/back/backend/views.py @@ -87,6 +87,10 @@ def get_fields(s_id): def generate_named_fields_for_section(fields): + ''' + Converts a section's field data into key-value pairs + for use in policy rule lambda functions. + ''' result = {} for field in fields: key = field['field_name'] @@ -145,10 +149,22 @@ def reports(request): return JsonResponse(report_set) +def user_owns_report(user, report): + ''' + Returns true if the specified user is owner of the report + ''' + report_to_check = Report.objects.filter(id=report) + if len(report_to_check) < 1: + return False + return report_to_check[0].user_id == user # actions for an individual report @api_view(['GET', 'PUT', 'DELETE']) def report_detail(request, report_pk): + # Check that the user owns the report + if not user_owns_report(user=request.user, report=report_pk): + return JsonResponse({"message": "Current user does not own the specified report."}, status=401) + # view the report if request.method == 'GET': data = get_reports(report_pk) @@ -176,10 +192,22 @@ def report_detail(request, report_pk): r.delete() return JsonResponse({"message": "Deleted report: {0}.".format(title)}) +def user_owns_section(user, section): + ''' + Returns true if the specified user is owner of the section + ''' + section_to_check = Section.objects.filter(id=section) + if len(section_to_check) < 1: + return False + report_to_check = section_to_check[0].report_id + return report_to_check.user_id == user # update a section with new data @api_view(['PUT']) def section(request, report_pk, section_pk): + # Check that the user owns the report + if not user_owns_section(user=request.user, section=section_pk): + return JsonResponse({"message": "Current user does not own the specified section."}, status=401) for key in request.data: # get the matching field object @@ -250,15 +278,18 @@ def section(request, report_pk, section_pk): s = Section.objects.get(id=section_pk) if complete: s.completed = True - s.save() else: s.completed = False + s.save() + # get section and field details data = { - "message": "Updated report {0}, section {1}.".format(report_pk, section_pk), - "section completion": s.completed, - "request_data": "{}".format(request.data) + "id": s.id, + "completed": s.completed, + "title": s.title, + "html_description": s.html_description, } + data.update(get_fields(s.id)) return JsonResponse(data) # function checks if a field is complete diff --git a/back/db.sqlite3 b/back/db.sqlite3 index e74167e..fe6298f 100644 Binary files a/back/db.sqlite3 and b/back/db.sqlite3 differ diff --git a/front/static/edit_report.html b/front/static/edit_report.html index b252cd5..9cf6b27 100644 --- a/front/static/edit_report.html +++ b/front/static/edit_report.html @@ -8,6 +8,7 @@ + Reimbursinator diff --git a/front/static/js/viewHistory.js b/front/static/js/viewHistory.js index 180db7e..13e9b03 100644 --- a/front/static/js/viewHistory.js +++ b/front/static/js/viewHistory.js @@ -97,6 +97,18 @@ function createFormGroup(sectionIdStr, field) { formGroup.appendChild(div); break; case "date": + input.type = "date"; + input.placeholder = "mm-dd-yyyy"; + if (field.value === "None") { + input.value = ""; + } else { + input.value = field.value; + } + input.classList.add("form-control"); + formGroup.appendChild(label); + div.appendChild(input) + formGroup.appendChild(div); + break; case "string": input.type = "text"; input.value = field.value; @@ -107,7 +119,11 @@ function createFormGroup(sectionIdStr, field) { break; case "decimal": input.type = "text"; - input.value = field.value; + if (field.value === "0.00") { + input.value = ""; + } else { + input.value = field.value; + } input.classList.add("form-control"); input.pattern = "\\d+(\\.\\d{2})?"; formGroup.appendChild(label); @@ -116,7 +132,11 @@ function createFormGroup(sectionIdStr, field) { break; case "integer": input.type = "number"; - input.value = field.value; + if (field.value === 0) { + input.value = ""; + } else { + input.value = field.value; + } input.classList.add("form-control"); input.step = 1; input.min = 0; @@ -463,6 +483,16 @@ if (newReportForm) { }); } +document.addEventListener("input", function(event) { + if (event.target.type === "date") { + if (!moment(event.target.value, "YYYY-MM-DD", true).isValid()) { + event.target.setCustomValidity("Invalid date format"); + } else { + event.target.setCustomValidity(""); + } + } +}); + document.addEventListener("submit", function(event) { if (event.target.classList.contains("section-form")) { event.preventDefault(); diff --git a/front/static/login.html b/front/static/login.html index a09051e..5e7b130 100644 --- a/front/static/login.html +++ b/front/static/login.html @@ -25,7 +25,7 @@
- +
diff --git a/front/static/new_report.html b/front/static/new_report.html index daf4c54..dc9ca28 100644 --- a/front/static/new_report.html +++ b/front/static/new_report.html @@ -8,6 +8,7 @@ + Reimbursinator @@ -47,7 +48,7 @@
- +
diff --git a/front/static/signup.html b/front/static/signup.html index 12b1119..ac2668c 100644 --- a/front/static/signup.html +++ b/front/static/signup.html @@ -25,7 +25,7 @@