[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karbassi merged 1 commit into from
Jul 12, 2019
Merged

[Admin] Updated checkin pages #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 43 additions & 37 deletions coderdojochi/templates/dashboard/session-check-in-mentors.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
col.success { background-color: #dff0d8; }
col.error{ background-color: #f2dede; }
col.warning { background-color: #fcf8e3; }
col.info { background-color: #d9edf7; }
.table tbody > tr > td.vert-align { vertical-align: middle; }

/* to override bootstrap*/
.table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
{% if active_orders.count %}
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
{% endif %}

{% if active_orders.count %}
<div class="container">
<div class="container-fluid">
{% if active_session %}
<h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
{% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
<div class="row">
<div class="col-sm-12">
{% if active_orders.count %}
<table class="table table-striped">
<table class="table table-condensed table-striped">
<thead>
<tr>
<th class="col-sm-1"></th>
<th class="col-sm-2">Name</th>
<th class="col-sm-2">Email</th>
<th class="col-sm-2">Phone</th>
<th class="col-sm-1">Age</th>
<th class="col-sm-1">Gender</th>
<th></th>
<th>Name</th>
<th>Email</th>
<th>Phone</th>
<th>Age</th>
<th>Gender</th>
{% if active_session %}<th class="text-right">Action</th>{% endif %}
<th class="col-sm-2 text-right">Check-in Date</th>
<th class="text-right">Check-in Date</th>
</tr>
</thead>
<tbody>
{% for order in active_orders %}
<tr class="{% if order.check_in and active_session %}success{% endif %}">
<td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
<td class="vert-align">
<td>{{ forloop.counter|stringformat:"02d" }}</td>
<td>
<strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
<td class="vert-align">{{ order.mentor.phone }}</td>
<td class="vert-align">-</td>
<td class="vert-align">-</td>
<td>{{ order.mentor.user.email }}</td>
<td>{{ order.mentor.phone }}</td>
<td>-</td>
<td>-</td>
{% if active_session %}
<td class="vert-align text-right">
<td class="text-right">
<form method="post" action=".">
{% csrf_token %}
<input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
</form>
</td>
{% endif %}
<td class="vert-align text-right">
<td class="text-right">
{% if order.check_in %}
{{ order.check_in }}
{% else %}
-
{% endif %}
</td>
</tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
{% endif %}

{% if active_session != True and no_show_orders %}
<div class="container">
<div class="container-fluid">
<h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
<div class="row">
<div class="col-sm-12">
<table class="table table-striped">
<table class="table table-condensed table-striped">
<thead>
<tr>
<th class="col-sm-1"></th>
<th class="col-sm-4">Mentor Name</th>
<th class="col-sm-2">Name</th>
<th class="col-sm-2">Email</th>
<th class="col-sm-2">Phone</th>
<th class="col-sm-1">Age</th>
<th class="col-sm-1">Gender</th>
<th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
<tbody>
{% for order in no_show_orders %}
<tr>
<td>{{ forloop.counter|stringformat:"02d" }}</td>
<td>
<strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
</td>
<td>-</td>
<td>-</td>
<td class="text-right">{{ order.updated_at }}</td>
<td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
<td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
<td class="vert-align">{{ order.mentor.phone }}</td>
<td class="vert-align">-</td>
<td class="vert-align">-</td>
<td class="vert-align text-right">{{ order.updated_at }}</td>
</tr>
{% endfor %}
</tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
{% endif %}

{% if inactive_orders.count and inactive_orders %}
<div class="container">
<div class="container-fluid">
<h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
<div class="row">
<div class="col-sm-12">
<table class="table table-striped">
<table class="table table-condensed table-striped">
<thead>
<tr>
<th class="col-md-1"></th>
<th class="col-sm-4">Mentor Name</th>
<th class="col-sm-1">Age</th>
<th class="col-sm-1">Gender</th>
<th class="col-sm-2 text-right">Cancelled Date</th>
<th></th>
<th>Mentor Name</th>
<th>Age</th>
<th>Gender</th>
<th class="text-right">Cancelled Date</th>
</tr>
</thead>
<tbody>
Expand Down
88 changes: 44 additions & 44 deletions coderdojochi/templates/dashboard/session-check-in.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
col.success { background-color: #dff0d8; }
col.error{ background-color: #f2dede; }
col.warning { background-color: #fcf8e3; }
col.info { background-color: #d9edf7; }
.table tbody > tr > td.vert-align { vertical-align: middle; }

/* to override bootstrap*/
.table > tbody > tr > td { vertical-align: middle; }
</style>

<!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

{% if active_orders.count %}
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-4">
<div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
{% endif %}

{% if active_orders.count %}
<div class="container">
<div class="container-fluid">
<div class="row">

</div>
</div>
{% endif %}

{% if active_orders.count %}
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
{% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
{% endif %}

{% if active_orders.count %}
<table class="table table-striped">
<table class="table table-condensed table-striped">
<thead>
<tr>
<th class="col-sm-1"></th>
<th class="col-sm-2">Student Name</th>
<th class="col-sm-1 text-right">Age</th>
<th class="col-sm-2">Guardian Name</th>
<th class="col-sm-2">Guardian Email</th>
<th class="col-sm-2">Guardian Phone</th>
<th class="col-sm-3">School</th>
<th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
<th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
<th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
<th></th>
<th>Student Name</th>
<th>Age</th>
<th>Guardian Name</th>
<th>Guardian Email</th>
<th>Guardian Phone</th>
<th>School</th>
<th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
<th class="text-right"><abbr title="Number Attended">#A</abbr></th>
<th class="text-right"><abbr title="Number Missed">#M</abbr></th>
</tr>
</thead>
<tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
{% endif %}
{% endif %}
</td>
<td>
{{ order.guardian.user.email }}
</td>
<td>
{{ order.guardian.phone }}
</td>
<td>
{{ order.student.school_name }}
</td>
<td>{{ order.guardian.user.email }}</td>
<td>{{ order.guardian.phone }}</td>
<td>{{ order.student.school_name }}</td>
<td class="text-right vert-align">
{% if active_session %}
{% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
{% endif %}

{% if active_session != True %}
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
<h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
<table class="table table-condensed">
<table class="table table-condensed table-striped">
<thead>
<tr>
<th></th>
<th class="col-sm-3">Student Name</th>
<th class="col-sm-1 text-right">Age</th>
<th class="col-sm-3">Guardian</th>
<th class="col-sm-2 text-right">Last Update Date</th>
<th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
<th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
<th>Student Name</th>
<th>Age</th>
<th>Guardian</th>
<th>Last Update Date</th>
<th class="text-right"><abbr title="Number Attended">#A</abbr></th>
<th class="text-right"><abbr title="Number Missed">#M</abbr></th>
</tr>
</thead>
<tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
{% endif %}

{% if inactive_orders.count %}
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
<h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
<table class="table table-condensed">
<thead>
<tr>
<th></th>
<th class="col-sm-3">Student Name</th>
<th class="col-sm-1 text-right">Age</th>
<th class="col-sm-3">Guardian</th>
<th class="col-sm-2 text-right">Cancelled Date</th>
<th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
<th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
<th>Student Name</th>
<th>Age</th>
<th>Guardian</th>
<th>Guardian Email</th>
<th>Guardian Phone</th>
<th>School</th>
<th>Cancelled Date</th>
<th class="text-right"><abbr title="Number Attended">#A</abbr></th>
<th class="text-right"><abbr title="Number Missed">#M</abbr></th>
</tr>
</thead>
<tbody>
{% for order in inactive_orders %}
<tr>
<td>{{ forloop.counter|stringformat:"02d" }}</td>
<td>
<strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
</td>
<td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
<td class="text-right">{{ order.student | student_age:session.start_date }}</td>
<td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
<td class="text-right">{{ order.updated_at }}</td>
<td>{{ order.guardian.user.email }}</td>
<td>{{ order.guardian.phone }}</td>
<td>{{ order.student.school_name }}</td>
<td>{{ order.updated_at }}</td>
<td class="text-right">{{ order.num_attended }}</td>
<td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion fixtures/05-coderdojochi-mentororder.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
"pk": 1,
"fields": {
"mentor": 1,
"session": 1,
"session": 2,
"check_in": "2016-05-07T10:00:00-06:00",
"affiliate": "",
"order_number": "",
Expand Down
3 changes: 1 addition & 2 deletions fixtures/05-coderdojochi-order.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
"student": 1,
"is_active": true,
"ip": "",
"check_in": "2016-05-07T10:00:00-06:00",
"alternate_guardian": "",
"affiliate": "",
"order_number": "",
Expand All@@ -25,7 +24,7 @@
"guardian": 1,
"session": 2,
"student": 2,
"is_active": true,
"is_active": false,
"ip": "",
"check_in": "2016-05-07T13:07:35-06:00",
"alternate_guardian": "",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Admin] Updated checkin pages#725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 1 commit into

from

Jul 12, 2019
 Merged


[Admin] Updated checkin pages
#725
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


80 changes: 43 additions & 37 deletions
coderdojochi/templates/dashboard/session-check-in-mentors.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Mentor Check In - We All Code{% endblock %}

{% block extra_head %}
<style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
</style>
{% endblock %}

Expand All@@ -37,7 +39,7 @@

{% block content %}
 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-12">
 <div class="col-xs-12 panel panel-default">
Expand All@@ -56,7 +58,7 @@ <h2 class="title">{{ checked_in_orders.count }} of {{ active_orders.count }}</h2
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 {% if active_session %}
 <h2 class="title">Attending Mentors <span class="badge">{{ active_orders.count }}</span></h2>
 {% else %}
Expand All@@ -66,32 +68,32 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 <div class="row">
 <div class="col-sm-12">
 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th></th>
 <th>Name</th>
 <th>Email</th>
 <th>Phone</th>
 <th>Age</th>
 <th>Gender</th>
 {% if active_session %}<th class="text-right">Action</th>{% endif %}
 <th class="col-sm-2 text-right">Check-in Date</th>
 <th class="text-right">Check-in Date</th>
 </tr>
 </thead>
 <tbody>
 {% for order in active_orders %}
 <tr class="{% if order.check_in and active_session %}success{% endif %}">
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align">
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td>{{ order.mentor.user.email }}</td>
 <td>{{ order.mentor.phone }}</td>
 <td>-</td>
 <td>-</td>
 {% if active_session %}
 <td class="vert-align text-right">
 <td class="text-right">
 <form method="post" action=".">
 {% csrf_token %}
 <input type="hidden" name="order_id" value="{{ order.id }}">
Expand All@@ -103,9 +105,11 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 </form>
 </td>
 {% endif %}
 <td class="vert-align text-right">
 <td class="text-right">
 {% if order.check_in %}
 {{ order.check_in }}
 {% else %}
 -
 {% endif %}
 </td>
 </tr>
Expand All@@ -121,15 +125,17 @@ <h2 class="title">Attended Mentors <span class="badge">{{ active_orders.count }}
 {% endif %}

 {% if active_session != True and no_show_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-2">Name</th>
 <th class="col-sm-2">Email</th>
 <th class="col-sm-2">Phone</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
Expand All@@ -138,13 +144,13 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 <tbody>
 {% for order in no_show_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}
 </td>
 <td>-</td>
 <td>-</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td class="vert-align">{{ forloop.counter|stringformat:"02d" }}</td>
 <td class="vert-align"><strong>{{ order.mentor.user.first_name }}</strong> {{ order.mentor.user.last_name }}</td>
<td class="vert-align">{{ order.mentor.user.email }}</td>
 <td class="vert-align">{{ order.mentor.phone }}</td>
 <td class="vert-align">-</td>
 <td class="vert-align">-</td>
 <td class="vert-align text-right">{{ order.updated_at }}</td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -155,18 +161,18 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count and inactive_orders %}
 <div class="container">
 <div class="container-fluid">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <div class="row">
 <div class="col-sm-12">
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-md-1"></th>
 <th class="col-sm-4">Mentor Name</th>
 <th class="col-sm-1">Age</th>
 <th class="col-sm-1">Gender</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th></th>
 <th>Mentor Name</th>
 <th>Age</th>
 <th>Gender</th>
 <th class="text-right">Cancelled Date</th>
 </tr>
 </thead>
 <tbody>
Expand Down

88 changes: 44 additions & 44 deletions
coderdojochi/templates/dashboard/session-check-in.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,17 @@

{% load i18n humanize coderdojochi_extras %}

{% block title %}We All Code Admin - Check in mentors{% endblock %}
{% block title %}Student Check In - We All Code{% endblock %}

{% block extra_head %}
 <style>
 col.success { background-color: #dff0d8; }
 col.error{ background-color: #f2dede; }
 col.warning { background-color: #fcf8e3; }
 col.info { background-color: #d9edf7; }
 .table tbody > tr > td.vert-align { vertical-align: middle; }

 /* to override bootstrap*/
 .table > tbody > tr > td { vertical-align: middle; }
 </style>

 <!-- Google Charts -->
Expand DownExpand Up@@ -114,7 +116,7 @@
{% block content %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-md-4">
 <div class="panel panel-default">
Expand DownExpand Up@@ -162,15 +164,15 @@ <h4 class="title text-center"></h4>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">

 </div>
 </div>
 {% endif %}

 {% if active_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 {% if active_session %}
Expand All@@ -180,19 +182,19 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_orders.count %}
 <table class="table table-striped">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th class="col-sm-1"></th>
 <th class="col-sm-2">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-2">Guardian Name</th>
 <th class="col-sm-2">Guardian Email</th>
 <th class="col-sm-2">Guardian Phone</th>
 <th class="col-sm-3">School</th>
 <th class="col-sm-2 text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian Name</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th class="text-right">{% if not active_session %}Checkin Date{% endif %}</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -217,15 +219,9 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}
 {% endif %}
 </td>
 <td>
 {{ order.guardian.user.email }}
 </td>
 <td>
 {{ order.guardian.phone }}
 </td>
 <td>
 {{ order.student.school_name }}
 </td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td class="text-right vert-align">
 {% if active_session %}
 {% if not order.check_in %}
Expand DownExpand Up@@ -253,20 +249,20 @@ <h2 class="title">Attended Students <span class="badge">{{ active_orders.count }
 {% endif %}

 {% if active_session != True %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span></h2>
 <table class="table table-condensed">
 <table class="table table-condensed table-striped">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Last Update Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed">#M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Last Update Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
Expand All@@ -291,32 +287,36 @@ <h2 class="title">No Shows <span class="badge">{{ no_show_orders.count }}</span>
 {% endif %}

 {% if inactive_orders.count %}
 <div class="container">
 <div class="container-fluid">
 <div class="row">
 <div class="col-sm-12">
 <h2 class="title">Cancelled Tickets <span class="badge">{{ inactive_orders.count }}</span></h2>
 <table class="table table-condensed">
 <thead>
 <tr>
 <th></th>
 <th class="col-sm-3">Student Name</th>
 <th class="col-sm-1 text-right">Age</th>
 <th class="col-sm-3">Guardian</th>
 <th class="col-sm-2 text-right">Cancelled Date</th>
 <th class="col-sm-1 text-right"><abbr title="Number Attended"># A</abbr></th>
 <th class="col-sm-1 text-right"><abbr title="Number Missed"># M</abbr></th>
 <th>Student Name</th>
 <th>Age</th>
 <th>Guardian</th>
 <th>Guardian Email</th>
 <th>Guardian Phone</th>
 <th>School</th>
 <th>Cancelled Date</th>
 <th class="text-right"><abbr title="Number Attended">#A</abbr></th>
 <th class="text-right"><abbr title="Number Missed">#M</abbr></th>
 </tr>
 </thead>
 <tbody>
 {% for order in inactive_orders %}
 <tr>
 <td>{{ forloop.counter|stringformat:"02d" }}</td>
 <td>
 <strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}
 </td>
 <td><strong>{{ order.student.first_name }}</strong> {{ order.student.last_name }}</td>
 <td class="text-right">{{ order.student | student_age:session.start_date }}</td>
 <td>{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}</td>
 <td class="text-right">{{ order.updated_at }}</td>
 <td>{{ order.guardian.user.email }}</td>
 <td>{{ order.guardian.phone }}</td>
 <td>{{ order.student.school_name }}</td>
 <td>{{ order.updated_at }}</td>
 <td class="text-right">{{ order.num_attended }}</td>
 <td class="text-right {% if order.num_missed >= 3 %}danger{% endif %}">{{ order.num_missed }}</td>
 </tr>
Expand Down

2 changes: 1 addition & 1 deletion
fixtures/05-coderdojochi-mentororder.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
 "pk": 1,
 "fields": {
 "mentor": 1,
 "session": 1,
 "session": 2,
 "check_in": "2016-05-07T10:00:00-06:00",
 "affiliate": "",
 "order_number": "",
Expand Down

3 changes: 1 addition & 2 deletions
fixtures/05-coderdojochi-order.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 "student": 1,
 "is_active": true,
 "ip": "",
 "check_in": "2016-05-07T10:00:00-06:00",
 "alternate_guardian": "",
 "affiliate": "",
 "order_number": "",
Expand All@@ -25,7 +24,7 @@
 "guardian": 1,
 "session": 2,
 "student": 2,
 "is_active": true,
 "is_active": false,
 "ip": "",
 "check_in": "2016-05-07T13:07:35-06:00",
 "alternate_guardian": "",
Expand Down