Skip to content

Commit 1086094

Browse files
devinmattedevinmatte
authored
Merge pull request #76 from devinmatte/essay_update
Essay update
2 parents b359f26 + abdafe3 commit 1086094

File tree

6 files changed

+86
-69
lines changed

6 files changed

+86
-69
lines changed

‎frontend/scss/partials/_base.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ body {
1212
display: flex;
1313
justify-content: space-between;
1414
}
15+
16+
.right-align {
17+
float: right;
18+
}

‎packet/routes/freshmen.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flask import redirect, render_template, request
22

33
from packet import auth, app, db
4-
from packet.models import Packet
4+
from packet.packet import get_current_packet
55
from packet.utils import before_request
66

77

@@ -16,7 +16,7 @@ def index(info=None):
1616
@auth.oidc_auth
1717
@before_request
1818
def essays(info=None):
19-
packet = Packet.query.filter_by(freshman_username=info['uid']).first()
19+
packet = get_current_packet(info['uid'])
2020
return render_template("essays.html", info=info, packet=packet)
2121

2222

@@ -25,7 +25,7 @@ def essays(info=None):
2525
@before_request
2626
def submit_essay(info=None):
2727
formdata = request.form
28-
packet = Packet.query.filter_by(freshman_username=info['uid']).first()
28+
packet = get_current_packet(info['uid'])
2929

3030
packet.info_eboard = formdata['info_eboard']
3131
packet.info_events = formdata['info_events']

‎packet/static/js/tables.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $(document).ready(function () {
22

33
$('#active_packets_table').DataTable({
44
"searching": true,
5-
"order": [[2, 'desc']],
5+
"order": [],
66
"paging": false,
77
"info": false,
88
"columnDefs": [

‎packet/templates/active_packets.html‎

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{% extends "extend/base.html" %}
22

3+
{% set can_sign = (info.onfloor and info.uid != packet.freshman.rit_username) or info.realm == "csh" %}
4+
35
{% block body %}
46
<div class="container main">
57
<div class="row mobile-hide">
@@ -12,57 +14,60 @@ <h3 class="page-title">Active Packets</h3>
1214
<div id="eval-table">
1315
<div class="card">
1416
<div class="card-body table-fill">
15-
<div class="card-body table-fill">
16-
<div class="table-responsive">
17-
<table id="active_packets_table" class="table table-striped no-bottom-margin">
18-
<thead>
19-
<tr>
20-
<th>Name</th>
21-
<th>Signatures</th>
17+
<div class="table-responsive">
18+
<table id="active_packets_table" class="table table-striped no-bottom-margin">
19+
<thead>
20+
<tr>
21+
<th>Name</th>
22+
<th>Signatures</th>
23+
{% if can_sign %}
2224
<th>Sign</th>
23-
</tr>
24-
</thead>
25-
<tbody>
26-
{% for packet in packets %}
27-
{% if packet.is_open() %}
28-
<tr {% if packet.did_sign %}style="background-color: #4caf505e" {% endif %}>
29-
<td>
30-
<a href="/packet/{{ packet.freshman.rit_username }}">
31-
<img class="eval-user-img"
32-
alt="{{ packet.freshman.name }}"
33-
src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
34-
width="25"
35-
height="25"/> {{ packet.freshman.name }} ({{ packet.freshman.rit_username }})
36-
</a>
37-
</td>
38-
<td data-sort="{{ packet.total_signatures }}">
39-
{% if packet.total_signatures == packet.required_signatures %}
40-
💯 {# 100% emoji #}
25+
{% endif %}
26+
</tr>
27+
</thead>
28+
<tbody>
29+
{% for packet in packets %}
30+
{% if packet.is_open() %}
31+
<tr {% if packet.did_sign %}style="background-color: #4caf505e" {% endif %}>
32+
<td>
33+
<a href="/packet/{{ packet.freshman.rit_username }}">
34+
<img class="eval-user-img"
35+
alt="{{ packet.freshman.name }}"
36+
src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
37+
width="25"
38+
height="25"/> {{ packet.freshman.name }}
39+
({{ packet.freshman.rit_username }})
40+
</a>
41+
</td>
42+
<td data-sort="{{ packet.total_signatures }}">
43+
{% if packet.total_signatures == packet.required_signatures %}
44+
💯 {# 100% emoji #}
45+
{% else %}
46+
{{ packet.total_signatures }}/
47+
{{ packet.required_signatures }}
48+
{% endif %}
49+
</td>
50+
{% if can_sign %}
51+
<td class="sign-packet" align="right">
52+
{% if not packet.did_sign %}
53+
<button class="btn btn-sm btn-primary sign-button"
54+
data-freshman_uid="{{ packet.freshman.rit_username }}"
55+
data-freshman_name="{{ packet.freshman.name }}">
56+
Sign
57+
</button>
4158
{% else %}
42-
{{ packet.total_signatures }}/{{ packet.required_signatures }}
59+
<button class="btn btn-sm btn-primary signed-button"
60+
disabled="disabled"><i
61+
class="fa fa-check"></i>&nbsp;Signed
62+
</button>
4363
{% endif %}
4464
</td>
45-
{% if (info.onfloor and info.uid != packet.freshman.rit_username) or info.realm == "csh" %}
46-
<td class="sign-packet" align="right">
47-
{% if not packet.did_sign %}
48-
<button class="btn btn-sm btn-primary sign-button"
49-
data-freshman_uid="{{ packet.freshman.rit_username }}"
50-
data-freshman_name="{{ packet.freshman.name }}">
51-
Sign
52-
</button>
53-
{% else %}
54-
<button class="btn btn-sm btn-primary signed-button" disabled="disabled"><i
55-
class="fa fa-check"></i>&nbsp;Signed
56-
</button>
57-
{% endif %}
58-
</td>
59-
{% endif %}
60-
</tr>
61-
{% endif %}
62-
{% endfor %}
63-
</tbody>
64-
</table>
65-
</div>
65+
{% endif %}
66+
</tr>
67+
{% endif %}
68+
{% endfor %}
69+
</tbody>
70+
</table>
6671
</div>
6772
</div>
6873
</div>

‎packet/templates/essays.html‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,29 @@ <h3 class="page-title">Essays</h3>
1010
<div id="eval-blocks">
1111
<div id="eval-table">
1212
<div class="card">
13-
<div class="card-body table-fill">
14-
<form action="/essay" method="post">
15-
<div class="form-group">
16-
<label for="info_eboard">EBoard Members</label>
17-
<textarea class="form-control" name="info_eboard">{{ packet.info_eboard }}</textarea>
13+
14+
<form action="/essay" method="post">
15+
<div class="card-body table-fill">
16+
<div class="form-group card-body">
17+
<label for="info_eboard">Name and list all EBoard Members and their positions</label>
18+
<textarea class="form-control"
19+
name="info_eboard">{{ packet.info_eboard if packet.info_eboard != None }}</textarea>
1820
</div>
19-
<div class="form-group">
20-
<label for="info_events">CSH Events</label>
21-
<textarea class="form-control" name="info_events">{{ packet.info_events }}</textarea>
21+
<div class="form-group card-body">
22+
<label for="info_events">Name some CSH Events that we host yearly (min 3)</label>
23+
<textarea class="form-control"
24+
name="info_events">{{ packet.info_events if packet.info_events != None }}</textarea>
2225
</div>
23-
<div class="form-group">
24-
<label for="info_achieve">Technical Achievements</label>
25-
<textarea class="form-control" name="info_achieve">{{ packet.info_achieve }}</textarea>
26+
<div class="form-group card-body">
27+
<label for="info_achieve">Name some of CSH's Technical Achievements (min 3)</label>
28+
<textarea class="form-control"
29+
name="info_achieve">{{ packet.info_achieve if packet.info_achieve != None }}</textarea>
2630
</div>
31+
</div>
32+
<div class="card-footer mx-auto">
2733
<input type="submit" value="Submit" class="btn btn-primary">
28-
</form>
29-
</div>
34+
</div>
35+
</form>
3036
</div>
3137
</div>
3238
</div>

‎packet/templates/packet.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{% extends "extend/base.html" %}
22

3+
{% set packet_end = freshman.current_packet().end.strftime('%m/%d/%Y') %}
4+
35
{% block body %}
46
<div class="container main">
57
<div class="mb-2">
@@ -26,26 +28,26 @@ <h3>{{ freshman.name }}</h3>
2628
<div class="col">
2729
<h5>Signatures: {{ signed }}/{{ required }}</h5>
2830
</div>
31+
<div class="col">
32+
<h5 class="right-align">Packet Ends: {{ packet_end }}</h5>
33+
</div>
2934
</div>
3035
<div class="card card-body">
3136
<div class="row justify-content-between">
3237
<div class="col">
33-
<b class="signature-count">{{ '%0.2f' % (signed/required * 100) }}%</b>
34-
<h5>Total Score</h5>
38+
<h5>Total Score - {{ '%0.2f' % (signed/required * 100) }}%</h5>
3539
<div class="progress">
3640
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
3741
aria-valuenow="{{ signed/required * 100 }}" aria-valuemin="0" aria-valuemax="100"
3842
style="width: {{ signed/required * 100 }}%"></div>
3943
</div>
40-
<b class="signature-count">{{ '%0.2f' % upperclassmen_percent }}%</b>
41-
<h5>Upperclassmen Score</h5>
44+
<h5>Upperclassmen Score - {{ '%0.2f' % upperclassmen_percent }}%</h5>
4245
<div class="progress">
4346
<div class="progress-bar bg-warning progress-bar-striped progress-bar-animated"
4447
role="progressbar"
4548
aria-valuenow="{{ upperclassmen_percent }}" aria-valuemin="0" aria-valuemax="100"
4649
style="width: {{ upperclassmen_percent }}%"></div>
4750
</div>
48-
4951
</div>
5052
</div>
5153
</div>

0 commit comments

Comments
 (0)