From 8d5e6ebc7ced6b22b5c58a6e2df55896b17ee384 Mon Sep 17 00:00:00 2001 From: Daniel Conrad Date: Fri, 21 Jun 2019 12:47:24 -0500 Subject: [PATCH 1/3] Adds emails to checkin pages --- .../templates/dashboard/session-check-in-mentors.html | 4 +++- coderdojochi/templates/dashboard/session-check-in.html | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/coderdojochi/templates/dashboard/session-check-in-mentors.html b/coderdojochi/templates/dashboard/session-check-in-mentors.html index e799330c..ef07769d 100644 --- a/coderdojochi/templates/dashboard/session-check-in-mentors.html +++ b/coderdojochi/templates/dashboard/session-check-in-mentors.html @@ -70,7 +70,8 @@

Attended Mentors {{ active_orders.count }} - Mentor Name + Name + Email Age Gender {% if active_session %}Action{% endif %} @@ -84,6 +85,7 @@

Attended Mentors {{ active_orders.count }} {{ order.mentor.user.first_name }} {{ order.mentor.user.last_name }} + {{ order.mentor.user.email }} - - {% if active_session %} diff --git a/coderdojochi/templates/dashboard/session-check-in.html b/coderdojochi/templates/dashboard/session-check-in.html index 85b9ce07..6acf77ec 100644 --- a/coderdojochi/templates/dashboard/session-check-in.html +++ b/coderdojochi/templates/dashboard/session-check-in.html @@ -186,7 +186,8 @@

Attended Students {{ active_orders.count } Student Name Age - Guardian + Guardian Name + Guardian Email School {% if not active_session %}Checkin Date{% endif %} # A @@ -215,6 +216,13 @@

Attended Students {{ active_orders.count } {% endif %} {% endif %} + + {% if order.alternate_guardian %} + - + {% else %} + {{ order.guardian.user.email }} + {% endif %} + {{ order.student.school_name }} From 77270a87ace0b645cdf4cc5ca2a6dec9914f8022 Mon Sep 17 00:00:00 2001 From: Daniel Conrad Date: Fri, 21 Jun 2019 12:48:51 -0500 Subject: [PATCH 2/3] Always shows email for guardian on checkin --- coderdojochi/templates/dashboard/session-check-in.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/coderdojochi/templates/dashboard/session-check-in.html b/coderdojochi/templates/dashboard/session-check-in.html index 6acf77ec..800c9400 100644 --- a/coderdojochi/templates/dashboard/session-check-in.html +++ b/coderdojochi/templates/dashboard/session-check-in.html @@ -217,11 +217,7 @@

Attended Students {{ active_orders.count } {% endif %} - {% if order.alternate_guardian %} - - - {% else %} - {{ order.guardian.user.email }} - {% endif %} + {{ order.guardian.user.email }} {{ order.student.school_name }} From d0208287c2c4f668c615e2256e0306d6e55e9e28 Mon Sep 17 00:00:00 2001 From: Daniel Conrad Date: Fri, 21 Jun 2019 12:54:49 -0500 Subject: [PATCH 3/3] Adds phone to checkin pages --- .../templates/dashboard/session-check-in-mentors.html | 2 ++ coderdojochi/templates/dashboard/session-check-in.html | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/coderdojochi/templates/dashboard/session-check-in-mentors.html b/coderdojochi/templates/dashboard/session-check-in-mentors.html index ef07769d..1226d6f4 100644 --- a/coderdojochi/templates/dashboard/session-check-in-mentors.html +++ b/coderdojochi/templates/dashboard/session-check-in-mentors.html @@ -72,6 +72,7 @@

Attended Mentors {{ active_orders.count }} Name Email + Phone Age Gender {% if active_session %}Action{% endif %} @@ -86,6 +87,7 @@

Attended Mentors {{ active_orders.count }} {{ order.mentor.user.first_name }} {{ order.mentor.user.last_name }} {{ order.mentor.user.email }} + {{ order.mentor.phone }} - - {% if active_session %} diff --git a/coderdojochi/templates/dashboard/session-check-in.html b/coderdojochi/templates/dashboard/session-check-in.html index 800c9400..c4db1f80 100644 --- a/coderdojochi/templates/dashboard/session-check-in.html +++ b/coderdojochi/templates/dashboard/session-check-in.html @@ -188,6 +188,7 @@

Attended Students {{ active_orders.count } Age Guardian Name Guardian Email + Guardian Phone School {% if not active_session %}Checkin Date{% endif %} # A @@ -219,6 +220,9 @@

Attended Students {{ active_orders.count } {{ order.guardian.user.email }} + + {{ order.guardian.phone }} + {{ order.student.school_name }}