Member Submission of Attendance #116
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbillow
force-pushed
the
mbr-sbmt-attend
branch
from
f7da300 to
d4d0bb3
Compare
liam-middlebrook
requested changes
Jan 22, 2017
| return "must be eboard", 403 | ||
|
|
||
| approved = ldap_is_eboard(account) | ||
| print(str(approved) + "IS AN EBAORD MEMBER") |
| @@ -383,7 +371,7 @@ def alter_house_excuse(uid, hid): | |||
| def attendance_history(): | |||
|
|
|||
|
|
|||
| def get_meeting_attendees(meeting_id): | |||
| def get_comm_attendees(meeting_id): | |||
There was a problem hiding this comment.
we should really change this to use the term directorship eventually
| @@ -395,6 +383,18 @@ def get_meeting_attendees(meeting_id): | |||
| FreshmanAccount.id == freshman).first().name) | |||
| return attendees | |||
|
|
|||
| def get_sem_attendees(meeting_id): | |||
There was a problem hiding this comment.
I really don't think we need to abbreviate function names
| @@ -459,12 +476,87 @@ def alter_committee_attendance(cid): | |||
| db.session.commit() | |||
| return jsonify({"success": True}), 200 | |||
|
|
|||
| @attendance_bp.route('/attendance/cm/<cid>', methods=['GET', 'DELETE']) | |||
|
|
|||
| @attendance_bp.route('/attendance/alter/ts/<cid>', methods=['POST']) | |||
There was a problem hiding this comment.
cid only made sense when this was referring to committee meetings
| @@ -58,7 +58,8 @@ def display_dashboard(): | |||
| c_meetings = [m.meeting_id for m in | |||
| MemberCommitteeAttendance.query.filter( | |||
| MemberCommitteeAttendance.uid == member.uid | |||
| )] | |||
| ) if CommitteeMeeting.query.filter( | |||
There was a problem hiding this comment.
we have a bunch of oddities for SQL queries, but I think we could do a fancy statement with a single query.
There was a problem hiding this comment.
I am not sure the sacrifice in readability is worth the four or five milliseconds you would save on load time. I looked back at the query I wrote for the housing queue and had to turn my monitor upside just trying to remember why I did what I did.
mbillow
force-pushed
the
mbr-sbmt-attend
branch
from
d4d0bb3 to
6ca77df
Compare
mbillow
force-pushed
the
mbr-sbmt-attend
branch
from
6ca77df to
2028a8c
Compare
csssuf
reviewed
Jan 23, 2017
| @@ -4,6 +4,60 @@ | |||
| {% endblock %} | |||
| {% block body %} | |||
| <div class="container main"> | |||
| {% if pending_cm|length != 0 and current_page == 1 %} | |||
| <h3 class="page-title">Pending Submittions</h3> | |||
csssuf
reviewed
Jan 23, 2017
| <div class="modal-content"> | ||
| <div class="modal-header"> | ||
| <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> | ||
| <h4 class="modal-title" id="editMeetingTitle">Review Submittion</h4> |
|
@csssuf I code good... but spell good is hard. |
|
Has anyone had a chance to test this? |
mbillow
added a commit
that referenced
this pull request
Jan 25, 2017
* Fix Eboard Check and Frsmn Migration * Add Approved Field and Migration Titles * Committee Meeting Submtn and Review * Technical Seminar Atnd Smbtn * Spelling is hard. * Display Seminars on History Page
mbillow
added a commit
that referenced
this pull request
Jan 25, 2017
* Member Submission of Attendance (#116) * Fix Eboard Check and Frsmn Migration * Add Approved Field and Migration Titles * Committee Meeting Submtn and Review * Technical Seminar Atnd Smbtn * Spelling is hard. * Display Seminars on History Page * removed initial attendance submission warning (#118) * Fix Dashboard for those with no housing info
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #107
Allows members to submit attendance for Committee Meetings and Seminars. This attendance is then added to a queue for Eboard Approval.