Add Committee Meetings to Intro Evals Page Pt. 2#348
Add Committee Meetings to Intro Evals Page Pt. 2#348jabbate19 wants to merge 3 commits intoComputerScienceHouse:developfrom
Conversation
jabbate19
force-pushed
the
list-committees
branch
from
533fb33 to
a99020e
Compare
mxmeinhold
left a comment
mxmeinhold
left a comment
There was a problem hiding this comment.
looks like you did a sed for renaming things. misses a number of variable names, and I'm worried this might break things in unexpected places, since you're renaming strings in some places too.
| all_cm = [{"id": m.id, | ||
| "name": m.committee, | ||
| "name": m.directorship, | ||
| "dt_obj": m.timestamp, | ||
| "date": m.timestamp.strftime("%a %m/%d/%Y"), | ||
| "attendees": get_meeting_attendees(m.id), | ||
| "type": "cm" |
There was a problem hiding this comment.
any plan to update all_cm or "type": "cm"?
| @@ -414,13 +414,13 @@ def get_seminar_attendees(meeting_id): | |||
| TechnicalSeminar.timestamp > start_of_year(), | |||
| TechnicalSeminar.approved).all()] | |||
| pend_cm = [{"id": m.id, | |||
| @attendance_bp.route('/attendance/alter/cm/<cid>', methods=['POST']) | ||
| @auth.oidc_auth | ||
| @get_user | ||
| def alter_committee_attendance(cid, user_dict=None): |
There was a problem hiding this comment.
cid as in committee [meeting] id?
| @attendance_bp.route('/attendance/ts/<sid>', methods=['GET', 'DELETE']) | ||
| @auth.oidc_auth | ||
| @get_user | ||
| def get_cm_attendees(sid, user_dict=None): |
There was a problem hiding this comment.
this is technical seminar attendance?
| @@ -552,28 +552,28 @@ def get_ts_attendees(cid, user_dict=None): | |||
| attendees = [{"value": a.uid, | |||
There was a problem hiding this comment.
and this is cm attendance, (and you didn't change the route name), they're reversed
| new_acct.eval_date = acct.eval_date | ||
|
|
||
| db.session.add(new_acct) | ||
| for fca in FreshmanCommitteeAttendance.query.filter(FreshmanCommitteeAttendance.fid == fid): |
| spring['committee_meetings'] = len(c_meetings) | ||
| spring['req_meetings'] = req_cm(user_dict['account']) | ||
| h_meetings = [(m.meeting_id, m.attendance_status) for m in get_hm(user_dict['account'])] | ||
| c_meetings = get_directorship_meetings(user_dict['account']) |
|
|
||
| cm_review = len(CommitteeMeeting.query.filter( | ||
| CommitteeMeeting.approved == False).all()) # pylint: disable=singleton-comparison | ||
| cm_review = len(DirectorshipMeeting.query.filter( |
| freshman['status'] = freshman_data.freshman_eval_result | ||
| # number of committee meetings attended | ||
| # number of directorship meetings attended | ||
| c_meetings = [m.meeting_id for m in |
|
|
||
| def get_cm(member): | ||
| def get_directorship_meetings(member): | ||
| c_meetings = [{ |
mxmeinhold
left a comment
mxmeinhold
left a comment
There was a problem hiding this comment.
I think the models changes are breaking
| def upgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.rename_table('freshman_committee_attendance', 'freshman_directorship_attendance') | ||
| op.rename_table('committee_meetings', 'directorship_meetings') | ||
| op.rename_table('member_committee_attendance', 'member_directorship_attendance') | ||
| # ### end Alembic commands ### | ||
|
|
||
|
|
||
| def downgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.rename_table('freshman_directorship_attendance', 'freshman_committee_attendance') | ||
| op.rename_table('directorship_meetings', 'committee_meetings') | ||
| op.rename_table('member_directorship_attendance', 'member_committee_attendance') | ||
| # ### end Alembic commands ### |
There was a problem hiding this comment.
notably, it looks like this doesn't rename the enum? or any of the column names?
|
@jabbate19 There's great progress on this PR, but it's currently unreviewable, Do you want to fix the merge conflicts, and we can re-review this? If not, there's significant progress that another member might want to use. We will close the PR, but leave the branch open and link it to a feature request |
|
For future editors: Committee meetings are just a really old form of directorship meetings |
3 participants
Would keep all information an evals director would want on the intro evals page. Everything else for an intro member's requirements are shown in the table view except for their committee meetings.
Unfucked the old PR, this time featuring screenshots!