Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimized "check_section" function to invoke field.completed boolean

Browse source
This commit is contained in:
Rupika 2019-02-15 15:28:39 -08:00
parent e48a67b988
commit 6bc9171e7e
1 changed files with 23 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
back/backend/views.py
View file

@ -71,6 +71,7 @@ def get_fields(s_id):
# function that gets the corresponding datatype # function that gets the corresponding datatype
value = Field.get_datatype(i) value = Field.get_datatype(i)
data = { data = {
"completed": i.completed,
"field_name": i.field_name, "field_name": i.field_name,
"label": i.label, "label": i.label,
"field_type": i.field_type, "field_type": i.field_type,
@ -192,6 +193,7 @@ def section(request, report_pk, section_pk):
update.data_bool = True update.data_bool = True
elif request.data[key] == "false": elif request.data[key] == "false":
update.data_bool = False update.data_bool = False
update.completed = True
if update.field_type == "decimal": if update.field_type == "decimal":
# initialize to 0 # initialize to 0
@ -201,6 +203,7 @@ def section(request, report_pk, section_pk):
): ):
update.data_decimal = 0.0 update.data_decimal = 0.0
else: else:
update.completed = True
update.data_decimal = request.data[key] update.data_decimal = request.data[key]
if update.field_type == "date": if update.field_type == "date":
@ -211,13 +214,25 @@ def section(request, report_pk, section_pk):
): ):
update.data_date = None update.data_date = None
else: else:
update.completed = True
update.data_date = request.data[key] update.data_date = request.data[key]
if update.field_type == "file": if update.field_type == "file":
update.data_file = request.data[key] if not(
request.data[key] == "" or
request.data[key] is None
):
update.completed = True
update.data_file = request.data[key]
if update.field_type == "string": if update.field_type == "string":
update.data_string = request.data[key] if not(
request.data[key] == "" or
request.data[key] is None
):
update.completed = True
update.data_string = request.data[key]
if update.field_type == "integer": if update.field_type == "integer":
# initialize to 0 # initialize to 0
@ -227,6 +242,7 @@ def section(request, report_pk, section_pk):
): ):
update.data_integer = 0 update.data_integer = 0
else: else:
update.completed = True
update.data_integer = request.data[key] update.data_integer = request.data[key]
update.save() update.save()
@ -247,52 +263,13 @@ def section(request, report_pk, section_pk):
} }
return JsonResponse(data) return JsonResponse(data)
# function checks if a field is filled and # function checks if a field is complete
# returns boolean accordingly
def section_complete(section_pk): def section_complete(section_pk):
# grab field set # grab field set
check_fields = Field.objects.filter(section_id=section_pk) check_fields = Field.objects.filter(section_id=section_pk)
# return true if any field is filled # return true if any field is complete
for i in check_fields: for i in check_fields:
if i.field_type == "boolean": if i.completed:
if not( return True
i.data_bool == "" or return False
i.data_bool is None
):
return True
elif i.field_type == "decimal":
if not(
i.data_decimal == 0.0 or
i.data_decimal == "" or
i.data_decimal is None
):
return True
elif i.field_type == "date":
if not(
i.data_date == "" or
i.data_date is None
):
return True
elif i.field_type == "file":
if not(
i.data_file == "" or
i.data_file is None
):
return True
elif i.field_type == "string":
if not(
i.data_string == "" or
i.data_string is None
):
return True
elif i.field_type == "integer":
if not(
i.data_integer == 0 or
i.data_integer == "" or
i.data_integer is None
):
return True
# return false if no field is filled
return False