Skip to content

Commit abad77f

Browse files
committed
Set form intaken and pending args on template context data
1 parent a587072 commit abad77f

File tree

1 file changed

+41
-10
lines changed

1 file changed

+41
-10
lines changed

tally_ho/apps/tally/views/intake.py

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -429,20 +429,51 @@ def get(self, *args, **kwargs):
429429
tally_id = kwargs['tally_id']
430430
pk = self.request.session.get('result_form')
431431
result_form = get_object_or_404(ResultForm, pk=pk, tally__id=tally_id)
432+
tally = result_form.tally
433+
center = result_form.center
434+
station_number = result_form.station_number
435+
432436
encoded_start_time = self.request.session.get(
433437
'encoded_result_form_intake_start_time')
434-
# Track intake clerks result form processing time
435-
save_result_form_processing_stats(
436-
self.request, encoded_start_time, result_form)
438+
if encoded_start_time:
439+
save_result_form_processing_stats(
440+
self.request, encoded_start_time, result_form)
441+
442+
pending_station_forms = ResultForm.objects.none()
443+
intaken_station_forms = ResultForm.objects.none()
444+
pending_center_forms = ResultForm.objects.none()
445+
intaken_center_forms = ResultForm.objects.none()
446+
447+
if center:
448+
pending_station_forms = ResultForm.get_pending_intake_for_station(
449+
tally, center, station_number
450+
)
451+
intaken_station_forms = ResultForm.get_intaken_for_station(
452+
tally, center, station_number
453+
)
454+
pending_center_forms = ResultForm.get_pending_intake_for_center(
455+
tally, center
456+
)
457+
intaken_center_forms = ResultForm.get_intaken_for_center(
458+
tally, center
459+
)
460+
461+
if 'result_form' in self.request.session:
462+
del self.request.session['result_form']
437463

438-
del self.request.session['result_form']
464+
context = self.get_context_data(
465+
result_form=result_form,
466+
header_text=_('Intake Successful'),
467+
next_step=_('Data Entry 1'),
468+
start_url='intake',
469+
tally_id=tally_id,
470+
pending_station_count=pending_station_forms.count(),
471+
intaken_station_count=intaken_station_forms.count(),
472+
pending_center_forms=pending_center_forms,
473+
intaken_center_forms=intaken_center_forms,
474+
)
439475

440-
return self.render_to_response(
441-
self.get_context_data(result_form=result_form,
442-
header_text=_('Intake'),
443-
next_step=_('Data Entry 1'),
444-
start_url='intake',
445-
tally_id=tally_id))
476+
return self.render_to_response(context)
446477

447478

448479
class IntakePrintedView(LoginRequiredMixin,

0 commit comments

Comments
 (0)