Skip to content
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

Add mentor application system #9

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
db9da26
Change placeholder width
Sep 19, 2019
cf0341c
Add animation to the voting UI
Sep 20, 2019
a386297
Fixed a bug that the placeholder don't have enough width in method on…
Sep 21, 2019
41b95ac
Create a new app mentors
Oct 21, 2019
6563745
Add a new css file for form submission
Oct 21, 2019
242c5fc
Add a new column for mentor application
Oct 21, 2019
21d7369
Add matching simulation
Nov 10, 2019
b72e8c2
change css
Nov 10, 2019
f3ab2cc
Fix bugs in the simualtion round
Nov 11, 2019
8773fff
Fix bugs in the simualtion round
Nov 12, 2019
afe7e87
bug fixed
Nov 13, 2019
f665a64
bug fixed
Nov 13, 2019
8ef8037
fix bugs of form
Nov 13, 2019
c112c6b
Redirect the matching result to the HTML page
Nov 14, 2019
976c131
Add feature sliders that can be modified by the prof
Nov 16, 2019
c16058a
Change the student application form to multipage
Nov 16, 2019
2e54887
add new js for mentor system
Nov 19, 2019
3e462ce
add new css for mentor system
Nov 19, 2019
8024e84
Visual Changes & Time slots
Nov 21, 2019
76c0cf3
changes
Nov 21, 2019
ebd6d5f
changes
Nov 21, 2019
72e294b
Add new app crispy form
Nov 22, 2019
999bb88
updated readme
starwarswii Nov 22, 2019
a31a5c2
Update README.md
starwarswii Nov 22, 2019
694db98
added a basic banner on the main page
starwarswii Nov 22, 2019
425fd28
Merge branch 'master' of https://github.com/ReedyChen/opra
starwarswii Nov 22, 2019
30572e3
Link mentor app to each account
Nov 23, 2019
01f1ede
Link mentor app to each account
Nov 23, 2019
11f76f2
Merge branch 'master' of https://github.com/ReedyChen/opra
Nov 23, 2019
2867b1b
Reverse Changes
Nov 23, 2019
5bf17c3
Visual Changes
Nov 23, 2019
c4ff16a
change cache
Nov 23, 2019
740e64d
changes
Nov 23, 2019
a607483
Add page lock to prevent form crash
Nov 24, 2019
52dfd9c
Bugs fix
Nov 24, 2019
7930935
Change csv file update from local
Nov 25, 2019
d4e9e5c
Bug fixed
Nov 25, 2019
19574cf
Finalize
Nov 25, 2019
1636005
Finalize
Nov 25, 2019
7d4569d
Add junming to admin
Nov 25, 2019
8e796b0
Merge branch 'master' into master
tomjmwang Nov 25, 2019
a700b9b
Make new migrations
Nov 25, 2019
ad184ca
Make new migrations
Nov 25, 2019
67f0805
Make another migrations
Nov 25, 2019
015796b
Migration change
Nov 25, 2019
f19cff7
change admin
Nov 25, 2019
5a37ef9
updated match.py to fix bug
starwarswii Dec 18, 2019
86ce88c
removed match_change.py
starwarswii Dec 18, 2019
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
Prev Previous commit
Next Next commit
Fixed a bug that the placeholder don't have enough width in method on…
…ecol
Yiwei Chen committed Sep 21, 2019
commit a386297e8511ac650e8757a1faaae1d15e4efb0d
17 changes: 11 additions & 6 deletions compsocsite/static/js/voting.js
Original file line number Diff line number Diff line change
@@ -888,16 +888,21 @@ $( document ).ready(function() {
placeholder: "col-placeHolder",
handle: ".tier",
//items: "ul",
change: function(e, ui) {
if (method == 1) { $(".col-placeHolder").css("width", "550px"); }
else if (method == 2) { $(".col-placeHolder").css("width", "800px"); }
},
revert:'invalid',
start: function(e, ui){
$(".col-placeHolder").hide(animOffset); // add animation for placeholder
$(".col-placeHolder").hide();
},
change: function (e,ui){
$(".col-placeHolder").hide().show(animOffset);// add animation for placeholder
$(".col-placeHolder").hide().show(animOffset, function(){
if (method == 1) {
$(".col-placeHolder").css("width", "550px");
}
else if (method == 2) {
$(".col-placeHolder").css("width", "800px");
}
$(".li-placeHolder").css({ "float": "none", "height": "40px", "margin": "0px 0px" });
});
changeCSS();
},
stop: function(e, ui) {
checkAll();