diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index 89e3bc83b..a96d6aeea 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -175,7 +175,10 @@ def private_index(request, year): nominee_positions = [np for np in nominee_positions if np.questionnaires] positions = Position.objects.get_by_nomcom(nomcom=nomcom) - stats = [{'position__name':p.name,'position__id':p.pk} for p in positions] + stats = [ { 'position__name':p.name, + 'position__id':p.pk, + 'position': p, + } for p in positions] states = list(NomineePositionStateName.objects.values('slug', 'name')) + [{'slug': questionnaire_state, 'name': u'Questionnaire'}] positions = set([ n.position for n in all_nominee_positions.order_by('position__name') ]) for s in stats: @@ -198,6 +201,9 @@ def private_index(request, year): else: totals[state['slug']] = all_nominee_positions.filter(state=state['slug']).count() totals['comments'] = Feedback.objects.filter(nomcom=nomcom, type='comment').count() + totals['open'] = nomcom.position_set.filter(is_open=True).count() + totals['accepting_nominations'] = nomcom.position_set.filter(accepting_nominations=True).count() + totals['accepting_feedback'] = nomcom.position_set.filter(accepting_feedback=True).count() unique_totals = dict() unique_totals['nominees'] = Person.objects.filter(nominee__nomcom=nomcom).distinct().count() diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html index e766dff34..d224a6b33 100644 --- a/ietf/templates/nomcom/private_index.html +++ b/ietf/templates/nomcom/private_index.html @@ -9,16 +9,19 @@
Position | +Position | +Open | +Accepting Nominations |
+ Accepting Feedback |
Nominations | Unique Nominees | Accepted | Declined | Pending | -Questionnaire responses | +Questionnaire Responses |
Comments |
---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ item.position__name }} | +{{ item.position.is_open|yesno:"Yes,No,No" }} | +{{ item.position.accepting_nominations|yesno:"Yes,No,No" }} | +{{ item.position.accepting_feedback|yesno:"Yes,No,No" }} | {{ item.nominations }} | {{ item.nominees }} | {{ item.accepted }} | @@ -39,6 +45,9 @@||||||
Totals | +{{ totals.open }} | +{{ totals.accepting_nominations }} | +{{ totals.accepting_feedback }} | {{ totals.nominations }} | {{ totals.nominees }} | {{ totals.accepted }} | @@ -50,6 +59,9 @@||||||
Unique Nominee Totals | - | +- | +- | +- | {{ unique_totals.nominees }} | {{ unique_totals.accepted }} | {{ unique_totals.declined }} |