Skip to content

Commit 8d8830b

Browse files
devinmattedevinmatte
authored
Merge pull request #39 from devinmatte/frontend_lift
Packet Frontend Cleanup
2 parents e80583d + 5927e4a commit 8d8830b

File tree

7 files changed

+50
-25
lines changed

7 files changed

+50
-25
lines changed

‎frontend/scss/components/buttons.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
.sign-packet {
22
float: right;
33
text-align: right;
4-
}
4+
}
5+
6+
.sign-button {
7+
float: right;
8+
}

‎frontend/scss/components/signatures.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.signature-count {
2+
float: right;
3+
}

‎frontend/scss/packet.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ $csh-pink: #b0197e;
55
@import "components/switches";
66
@import "components/datatables";
77
@import "components/buttons";
8+
@import "components/signatures";

‎packet/routes/shared.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
def freshman_packet(uid, info=None):
1515
freshman = Freshman.query.filter_by(rit_username=uid).first()
1616
signatures = get_signatures(uid)
17+
signed_dict = get_number_signed(uid)
1718
required = sum(get_number_required(uid).values())
18-
signed = sum(get_number_signed(uid).values())
19+
signed = sum(signed_dict.values())
1920

2021
upperclassmen_required = get_number_required(uid)
2122
del upperclassmen_required['freshmen']
@@ -29,7 +30,8 @@ def freshman_packet(uid, info=None):
2930

3031
packet_signed = signed_packet(info['uid'], uid)
3132
return render_template("packet.html", info=info, signatures=signatures, uid=uid, required=required, signed=signed,
32-
freshman=freshman, packet_signed=packet_signed, upperclassmen_percent=upperclassmen_percent)
33+
freshman=freshman, packet_signed=packet_signed, upperclassmen_percent=upperclassmen_percent,
34+
signed_dict=signed_dict)
3335

3436

3537
@app.route("/packets")

‎packet/templates/active_packets.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,17 @@ <h3 class="page-title">Active Packets</h3>
3131
<a href="/packet/{{ packet.freshman.rit_username }}">
3232
<img class="eval-user-img"
3333
alt="{{ packet.freshman.name }}"
34-
src="https://profiles.csh.rit.edu/image/{{ packet.freshman.rit_username }}"
35-
width="30"
36-
height="30"/> {{ get_freshman_name(packet.freshman.rit_username) }}
34+
src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
35+
width="25"
36+
height="25"/> {{ get_freshman_name(packet.freshman.rit_username) }}
3737
</a>
3838
</td>
3939
<td>
40-
{{ packet.total_signatures }}/{{ packet.required_signatures }}
40+
{% if packet.total_signatures == packet.required_signatures %}
41+
💯 {# 100% emoji #}
42+
{% else %}
43+
{{ packet.total_signatures }}/{{ packet.required_signatures }}
44+
{% endif %}
4145
</td>
4246
{% if (info.onfloor and info.uid != packet.freshman.rit_username) or info.realm == "csh" %}
4347
<td class="sign-packet" align="right">

‎packet/templates/packet.html‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ <h3>{{ freshman.name }}</h3>
1010
<div class="col">
1111
{% if (info.onfloor and info.uid != freshman.rit_username) or info.realm == "csh" %}
1212
{% if not packet_signed %}
13-
<button class="btn btn-primary sign-button alignright"
13+
<button class="btn btn-primary sign-button"
1414
data-freshman_uid="{{ freshman.rit_username }}"
1515
data-freshman_name="{{ freshman.name }}">Sign
1616
</button>
1717
{% else %}
18-
<button class="btn btn-primary alignright" disabled="disabled"><i
18+
<button class="btn btn-primary" disabled="disabled"><i
1919
class="fa fa-check"></i>&nbsp;Signed
2020
</button>
2121
{% endif %}
@@ -30,19 +30,22 @@ <h5>Signatures: {{ signed }}/{{ required }}</h5>
3030
<div class="card card-body">
3131
<div class="row justify-content-between">
3232
<div class="col">
33+
<b class="signature-count">{{ '%0.2f' % (signed/required * 100) }}%</b>
3334
<h5>Total Score</h5>
3435
<div class="progress">
3536
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
3637
aria-valuenow="{{ signed/required * 100 }}" aria-valuemin="0" aria-valuemax="100"
3738
style="width: {{ signed/required * 100 }}%"></div>
3839
</div>
40+
<b class="signature-count">{{ '%0.2f' % upperclassmen_percent }}%</b>
3941
<h5>Upperclassmen Score</h5>
4042
<div class="progress">
4143
<div class="progress-bar bg-warning progress-bar-striped progress-bar-animated"
4244
role="progressbar"
4345
aria-valuenow="{{ upperclassmen_percent }}" aria-valuemin="0" aria-valuemax="100"
4446
style="width: {{ upperclassmen_percent }}%"></div>
4547
</div>
48+
4649
</div>
4750
</div>
4851
</div>
@@ -52,6 +55,7 @@ <h5>Upperclassmen Score</h5>
5255
<div class="card mb-3">
5356
<div class="card-header">
5457
<b>EBoard Signatures</b>
58+
<b class="signature-count">{{ signed_dict.eboard }}/{{ signatures.eboard.count() }}</b>
5559
</div>
5660
<div class="card-body table-fill">
5761
<div class="table-responsive">
@@ -73,13 +77,13 @@ <h5>Upperclassmen Score</h5>
7377
{% endif %}
7478
<img class="eval-user-img" alt="{{ m['member'] }}"
7579
src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
76-
width="30"
77-
height="30"/> {{ get_display_name(m.member) }}
80+
width="25"
81+
height="25"/> {{ get_display_name(m.member) }}
7882
{% if info.realm == "csh" %}
7983
</a>
8084
{% endif %}
8185
</td>
82-
<td>
86+
<td width="15%">
8387
{% if m.signed %}
8488
<i class="fas fa-check"></i>
8589
{% else %}
@@ -96,6 +100,7 @@ <h5>Upperclassmen Score</h5>
96100
<div class="card mb-2">
97101
<div class="card-header">
98102
<b>On-Floor Upperclassmen Signatures</b>
103+
<b class="signature-count">{{ signed_dict.upperclassmen }}/{{ signatures.upperclassmen.count() }}</b>
99104
</div>
100105
<div class="card-body table-fill">
101106
<div class="table-responsive">
@@ -117,13 +122,13 @@ <h5>Upperclassmen Score</h5>
117122
{% endif %}
118123
<img class="eval-user-img" alt="{{ m['member'] }}"
119124
src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
120-
width="30"
121-
height="30"/> {{ get_display_name(m.member) }}
125+
width="25"
126+
height="25"/> {{ get_display_name(m.member) }}
122127
{% if info.realm == "csh" %}
123128
</a>
124129
{% endif %}
125130
</td>
126-
<td>
131+
<td width="15%">
127132
{% if m.signed %}
128133
<i class="fas fa-check"></i>
129134
{% else %}
@@ -140,6 +145,7 @@ <h5>Upperclassmen Score</h5>
140145
<div class="card mb-2">
141146
<div class="card-header">
142147
<b>On-Floor Freshmen Signatures</b>
148+
<b class="signature-count">{{ signed_dict.freshmen }}/{{ signatures.freshmen.count() }}</b>
143149
</div>
144150
<div class="card-body table-fill">
145151
<div class="table-responsive">
@@ -158,12 +164,12 @@ <h5>Upperclassmen Score</h5>
158164
<td>
159165
<a href="/packet/{{ m.freshman.rit_username }}">
160166
<img class="eval-user-img" alt="{{ m.freshman.rit_username }}"
161-
src="https://profiles.csh.rit.edu/image/{{ m.freshman.rit_username }}"
162-
width="30"
163-
height="30"/> {{ get_freshman_name(m.freshman.rit_username) }}
167+
src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
168+
width="25"
169+
height="25"/> {{ get_freshman_name(m.freshman.rit_username) }}
164170
</a>
165171
</td>
166-
<td>
172+
<td width="15%">
167173
{% if m.signed %}
168174
<i class="fas fa-check"></i>
169175
{% else %}
@@ -180,6 +186,7 @@ <h5>Upperclassmen Score</h5>
180186
<div class="card mb-2">
181187
<div class="card-header">
182188
<b>Off-Floor Upperclassmen/Alumni/Advisor Signatures</b>
189+
<b class="signature-count">{{ signatures.misc.count() }}/15</b>
183190
</div>
184191
<div class="card-body table-fill">
185192
<div class="table-responsive">
@@ -188,26 +195,30 @@ <h5>Upperclassmen Score</h5>
188195
data-length-changable="true" data-paginated="false">
189196
<thead>
190197
<tr>
198+
<th></th>
191199
<th>Name</th>
192200
<th>Signature</th>
193201
</tr>
194202
</thead>
195203
<tbody>
196204
{% for m in signatures.misc %}
197205
<tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
206+
<td width="5%">
207+
{{ loop.index }}.&nbsp;
208+
</td>
198209
<td>
199210
{% if info.realm == "csh" %}
200211
<a href="/member/{{ m.member }}">
201212
{% endif %}
202213
<img class="eval-user-img" alt="{{ m['member'] }}"
203214
src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
204-
width="30"
205-
height="30"/> {{ get_display_name(m.member) }}
215+
width="25"
216+
height="25"/> {{ get_display_name(m.member) }}
206217
{% if info.realm == "csh" %}
207218
</a>
208219
{% endif %}
209220
</td>
210-
<td>
221+
<td width="15%">
211222
{% if loop.index <= 15 %}
212223
<i class="fas fa-check"></i>
213224
{% else %}

‎packet/templates/upperclassman.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
3131
<img class="eval-user-img"
3232
alt="{{ m.packet.freshman.name }}"
3333
src="https://profiles.csh.rit.edu/image/{{ m.packet.freshman.rit_username }}"
34-
width="30"
35-
height="30"/> {{ get_freshman_name(m.packet.freshman.name) }}
34+
width="25"
35+
height="25"/> {{ get_freshman_name(m.packet.freshman.name) }}
3636
</a>
3737
</td>
38-
<td>
38+
<td width="15%">
3939
{% if m.signed %}
4040
<i class="fas fa-check"></i>
4141
{% else %}

0 commit comments

Comments
 (0)