Commit daf52650 authored by Arman Sobhi's avatar Arman Sobhi

Merge branch 'master' of gitlab.com:asobhi/GAS-site

parents 752b02b6 c10a8b63
This diff is collapsed.
"""
This file is part of GAS-site.
Copyright (C) 2016 Saikiran Srirangapalli <saikiran1096@gmail.com>
GAS-site is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
GAS-site is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GAS-site. If not, see <http://www.gnu.org/licenses/>.
"""
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
import re import re
...@@ -22,7 +39,7 @@ class ExecutionError(Exception): ...@@ -22,7 +39,7 @@ class ExecutionError(Exception):
class GASResponse(object): class GASResponse(object):
""" GAS advising information """ """ GAS advising information """
_missing_class_re = r'hasNotTaken\({},([a-z]+[1-4][0-9V][0-9][0-9])\)' _missing_class_re = r'hasNotTaken\({},([a-z]+[1-4][0-9V][0-9][0-9])\)'
_missing_hours_re = r'needsHours\({},([a-zA-Z]+),([0-9]+)\)' _missing_hours_re = r'needsHours\({},([^)]+),([0-9]+)\)'
_missing_electives_re = r'needsElectiveHours\({},([0-9]+)\)' _missing_electives_re = r'needsElectiveHours\({},([0-9]+)\)'
_grad = r'ableToGraduate\({}\)' _grad = r'ableToGraduate\({}\)'
......
"""
This file is part of GAS-site.
Copyright (C) 2016 Saikiran Srirangapalli <saikiran1096@gmail.com>
GAS-site is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
GAS-site is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GAS-site. If not, see <http://www.gnu.org/licenses/>.
"""
import gradaudit.util as util import gradaudit.util as util
import gradaudit.extract as extract import gradaudit.extract as extract
import re import re
...@@ -48,4 +65,4 @@ def submit(): ...@@ -48,4 +65,4 @@ def submit():
@app.errorhandler(500) @app.errorhandler(500)
def exc(err): def exc(err):
error_list = str(err).split("\n") error_list = str(err).split("\n")
return render_template('GASErrorTemplate.html',error_message = error_list) return render_template('GASErrorTemplate.html', error_message=error_list)
Subproject commit 5f8c28d719d551f92e420e911aba409ee1bffde2 Subproject commit 676d111d7b3dcc3d690d9587751aa16ca9f14e9a
...@@ -10,12 +10,8 @@ function degreeSelectHandler(degree) { ...@@ -10,12 +10,8 @@ function degreeSelectHandler(degree) {
var specializationList = document.getElementById('SpecializationOfDegree'); var specializationList = document.getElementById('SpecializationOfDegree');
removeOptions(yearList); removeOptions(yearList);
removeOptions(specializationList); removeOptions(specializationList);
if(degree.value == 'bio') {
addOption("2015","2015",yearList);
addOption("None","none",specializationList);
}
else if (degree.value=='cs') { if (degree.value=='cs') {
addOption("2014","2014",yearList); addOption("2014","2014",yearList);
addOption("2015","2015",yearList); addOption("2015","2015",yearList);
addOption("None","none",specializationList); addOption("None","none",specializationList);
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<input name="transcriptPDF" type="file" accept="application/pdf" class="upload_field"></input> <input name="transcriptPDF" type="file" accept="application/pdf" class="upload_field"></input>
<br> <br>
<input type="submit" class="upload_field">Click here to fill out the forms automatically.</button> <input type="submit" class="upload_field">Click here to fill out the forms automatically.</button>
</div> </div>
</form> </form>
<br> <br>
<div class="student_info"> <div class="student_info">
<form action="/submit" method="post"> <form action="/submit" method="post">
<br> <br>
<div> <div>
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
<label for="Major">Major</label> <label for="Major">Major</label>
<select name="MajorList" onchange="degreeSelectHandler(this)" required> <select name="MajorList" onchange="degreeSelectHandler(this)" required>
<option value="">Please Select Your Major</option> <option value="">Please Select Your Major</option>
<option value="bio">Biology</option>
<option value="cs">Computer Science</option> <option value="cs">Computer Science</option>
<option value="math">Mathematics</option> <option value="math">Mathematics</option>
<option value="me">Mechanical Engineering</option> <option value="me">Mechanical Engineering</option>
...@@ -59,9 +58,9 @@ ...@@ -59,9 +58,9 @@
<option value="infoAssurance">Software Engineering-Information Assurance</option> <option value="infoAssurance">Software Engineering-Information Assurance</option>
<option value="HumanCompInteraction">Software Engineering-Human-Computer Interaction</option> <option value="HumanCompInteraction">Software Engineering-Human-Computer Interaction</option>
<option value="networks">Software Engineering-Networks</option> <option value="networks">Software Engineering-Networks</option>
</select> </select>
</div> </div>
<div> <div>
<br> <br>
<label for="classesTaken">Type in your class number (ex: cs1336), and hit the "Add Class" button to enter it.</label> <label for="classesTaken">Type in your class number (ex: cs1336), and hit the "Add Class" button to enter it.</label>
<input list="classes-datalist" type="text" name="classes" id="classes" > <input list="classes-datalist" type="text" name="classes" id="classes" >
...@@ -2106,18 +2105,22 @@ ...@@ -2106,18 +2105,22 @@
</datalist> </datalist>
<button type="button" onclick="addClass()">Add class</button> <button type="button" onclick="addClass()">Add class</button>
</div> </div>
<br> <br>
<div> <div>
<label for="showClasses">Classes Taken</label> <label for="showClasses">Classes Taken</label>
<textarea name="classesTaken" id="classesTaken" rows="6" cols="60">{{ classes }}</textarea> <textarea name="classesTaken" id="classesTaken" rows="6" cols="60">{{ classes }}</textarea>
<div class="button"> <div class="button">
<input type="submit"></button> <input type="submit"></button>
</div> </div>
</div> </div>
</form> </form>
<p>Source code for GAS can be found <a href="https://gitlab.com/saikiran1096/gradaudit">here</a><br>Please email any bugs or feature requests to <a href="mailto:ars140330@utdallas.edu">ars140330@utdallas.edu</a> or <a href="mailto:sai@utdallas.edu">sai@utdallas.edu</a> <p>Source code for GAS can be found <a href="https://gitlab.com/saikiran1096/gradaudit">here.</a>
</div> <br>
Source code for this website can be found <a href="https://gitlab.com/asobhi/GAS-site">here.</a>
<br>
Please email any bugs or feature requests to <a href="mailto:ars140330@utdallas.edu">ars140330@utdallas.edu</a> or <a href="mailto:sai@utdallas.edu">sai@utdallas.edu.</a>
</div>
</div> </div>
...@@ -2125,13 +2128,13 @@ ...@@ -2125,13 +2128,13 @@
</html> </html>
<style> <style>
.site{ .site{
text-align: center; text-align: center;
background-color: #778899; background-color: #778899;
color:white; color:white;
} }
.upload,.student_info,.result { .upload,.student_info,.result {
border-style:solid; border-style:solid;
border-color:black; border-color:black;
display:inline-block; display:inline-block;
...@@ -2140,13 +2143,13 @@ ...@@ -2140,13 +2143,13 @@
margin:5px; margin:5px;
background-color:#586674; background-color:#586674;
} }
.important{ .important{
font-weight: bold; font-weight: bold;
} }
input,select,textarea { input,select,textarea {
background:#b6bfc8; background:#b6bfc8;
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment