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
...@@ -47,5 +64,5 @@ def submit(): ...@@ -47,5 +64,5 @@ 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);
......
This diff is collapsed.
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