diff --git a/back/backend/migrations/0007_merge_20190213_2318.py b/back/backend/migrations/0007_merge_20190213_2318.py new file mode 100644 index 0000000..aa0cb2c --- /dev/null +++ b/back/backend/migrations/0007_merge_20190213_2318.py @@ -0,0 +1,14 @@ +# Generated by Django 2.1.5 on 2019-02-14 07:18 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('backend', '0006_auto_20190213_1719'), + ('backend', '0006_auto_20190213_2113'), + ] + + operations = [ + ] diff --git a/back/backend/views.py b/back/backend/views.py index 452ee82..04fc6dd 100644 --- a/back/backend/views.py +++ b/back/backend/views.py @@ -157,59 +157,60 @@ def report_detail(request, report_pk): def section(request, report_pk, section_pk): for key in request.data: - update_field = Field.objects.get(section_id=section_pk, field_name=key) + # get the matching field object + update = Field.objects.get(section_id=section_pk, field_name=key) - if update_field.type == "boolean": + if update.field_type == "boolean": # flight check if request.data[key] == "on": - update_field.data_bool = True + update.data_bool = True elif request.data[key] == "off": - update_field.data_bool = False + update.data_bool = False # everything else else: - update_field.data_bool = request.data[key] + update.data_bool = request.data[key] - if update_field.type == "decimal": + if update.field_type == "decimal": # initialize to 0 if ( request.data[key] == "" or request.data[key] is None ): - update_field.data_decimal = 0.0 + update.data_decimal = 0.0 else: - update_field.data_decimal = request.data[key] + update.data_decimal = request.data[key] - if update_field.type == "date": + if update.field_type == "date": # initialize to today's date if ( request.data[key] == "" or request.data[key] is None ): - # update_field.data_date = datetime.date.today() - update_field.data_date = None + update.data_date = None else: - update_field.data_date = request.data[key] + update.data_date = request.data[key] - if update_field.type == "file": - update_field.data_file = request.data[key] + if update.field_type == "file": + update.data_file = request.data[key] - if update_field.type == "string": - update_field.data_string = request.data[key] + if update.field_type == "string": + update.data_string = request.data[key] - if update_field.type == "integer": + if update.field_type == "integer": # initialize to 0 if ( request.data[key] == "" or request.data[key] is None ): - update_field.data_integer = 0 + update.data_integer = 0 else: - update_field.data_integer = request.data[key] + update.data_integer = request.data[key] - update_field.save() + update.save() data = { "message": "Updated report {0}, section {1}.".format(report_pk, section_pk), + "request_data": request.data } return JsonResponse(data) diff --git a/back/db.sqlite3 b/back/db.sqlite3 index 52e2ecd..df940de 100644 Binary files a/back/db.sqlite3 and b/back/db.sqlite3 differ