- Notifications
You must be signed in to change notification settings - Fork 34
Co-Op Submission Page#138
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Conversation
| padding-left: 10px; | ||
| } | ||
| .radio-inlineinput[type='radio'], .radioinput[type='radio'], input[type='radio']{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not how this should be selected. It also makes the linter unhappy.
I will figure this out later. (or if someone wants to fix it, I am also fine with that)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed 👍
conditional/blueprints/co_op.py Outdated
| logger=structlog.get_logger() | ||
| @co_op_bp.route('/co_op/') | ||
| defdisplay_conditionals(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change name
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I totally didn't copy and paste that... 😜 haha
conditional/blueprints/co_op.py Outdated
| @co_op_bp.route('/co_op/submit', methods=['POST']) | ||
| defsubmit_major_project(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change name
6faf36d to 3028102Compareconditional/util/member.py Outdated
| voting_list= [uidforuidin [member.uidformemberinldap_get_active_members()] | ||
| ifuidnotin [member.uidformemberinldap_get_intro_members()]] | ||
| ifuidnotin [member.uidformemberinldap_get_intro_members()] and | ||
| uidnotin [member.uidformemberinCurrentCoops.query.filter( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this would be a good place for us to use a filter and a lambda function.
Something where we get the relevant lists before and then just do a quick comparator seems more elegant.
conditional/blueprints/co_op.py Outdated
| db.session.commit() | ||
| returnjsonify({"success": True}), 200 | ||
No newline at end of file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EOF!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Github is reporting no newline at the end of the file.
mbillowMay 24, 2017 • edited
Loading Uh oh!
There was an error while loading. Please reload this page.
edited
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Line 55 looks a lot like a newline to me. Also it passed that portion of the linter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's because you have trailing whitespace there. So it's not just a '\n'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The amount of effort I just put into convincing my IDE that there was whitespace there was a little asinine. Should be all good now.
conditional/templates/co_op.html Outdated
| <inputtype="submit" role="button" class="btn btn-raised btn-primary" style="width:100%;" value="Submit Form"/> | ||
| </form> | ||
| {% else %} | ||
| <pclass="align-center">Thanks for submitting this form. Good luck on your{{on_coop.semester}} co-op!</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Plans change; we should allow people to change their co-op report (up to a certain cutoff perhaps? would be a simple date comparison)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am fine with changing it up to a certain point. What I was trying to avoid with this was people having the ability to go on hour long "co-ops" during house meetings.
I will spend some time (probably later today) fleshing out the best way to do this. If you have ideas, feel free to pass them on.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yep, that's definitely a valid concern. In that case we could define self-service windows that would only allow changes outside of when school is in session.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The more that I think about it, the more I am in favor of keeping it like it is. We can add a table to member management for listing who is on co-op and the evals director can just clear it if a mistake was made.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added better language to point those whose need to change their submission towards the Evals Director.
| CurrentCoops.date_created>start_of_year(), | ||
| CurrentCoops.semester==semester).all()) | ||
| voting_list=list(active_members-intro_members-on_coop) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh I didn't realize you could do that with lists in python, weird.
mbillow commented May 28, 2017
|
liam-middlebrook left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm

Add a page where user's can report their co-op block. This then properly updates voting counts and attendance for house meeting.
Fixes#80