Skip to content

General Fixes #11

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
mbillow merged 4 commits into from
Apr 16, 2018
Merged

General Fixes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc88c4f
Integrate Themeswitcher
mxmeinhold Apr 9, 2018
d0b137c
Prevent DataTables String/Int Problems
mbillow Apr 16, 2018
ac91ff2
Checking to see if the applicant has been reviewed by 4 people
devinmatte Apr 16, 2018
065bc55
Merge pull request #12 from devinmatte/develop
mbillow Apr 16, 2018
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
5 changes: 3 additions & 2 deletions selections/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def main(info=None):
avg += phone_r.score
averages[application.id] = avg
else:
averages[application.id] = "N/A"
averages[application.id] = 0
reviewers[application.id] = []

if member and member.team or is_evals or is_rtp:
Expand All @@ -79,7 +79,8 @@ def main(info=None):
applications = [{
"id": a.id,
"gender": a.gender,
"reviewed": a.id in reviewed_apps} for a in applicant.query.filter_by(team=member.team).all()]
"reviewed": a.id in reviewed_apps,
"review_count": submission.query.filter_by(application=a.id).count()} for a in applicant.query.filter_by(team=member.team).all()]

return render_template(
'index.html',
Expand Down
4 changes: 1 addition & 3 deletions selections/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
crossorigin="anonymous">
<link rel="stylesheet"
href="https://s3.csh.rit.edu/csh-material-bootstrap/4.0.0/dist/csh-material-bootstrap.min.css"
media="screen">
<link rel="stylesheet" href="https://themeswitcher.csh.rit.edu/api/get" media="screen">

<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/>

Expand Down
2 changes: 1 addition & 1 deletion selections/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h4 class="card-title">Pending Applications</h4>
</thead>
<tbody>
{% for person in applications %}
{% if not person.reviewed %}
{% if not person.reviewed and person.review_count < 4%}
<tr>
<th>
<a href="/application/{{ person.id }}">
Expand Down