Commit eec46f81 authored by Jack Otto's avatar Jack Otto
Browse files

Merge branch 'master' of https://gitlab.bucknell.edu/tjs030/bucknellscheduler

 Conflicts:
	scheduler/templates/calendar.html
parents e7e8a68a 0b610926
runtime: python39
\ No newline at end of file
#!/bin/bash
cd ~/
git clone https://gitlab.bucknell.edu/jno003/479schedulebuilder.git
cd ~\\
git clone https://gitlab.bucknell.edu/tjs030/bucknellscheduler.git
cd ~\\479schedulebuilder\\
cd ~\\bucknellscheduler
python3 -m venv venv
\\venv\\Scripts\\activate
......
<<<<<<< HEAD
=======
l23a53l8gg9pel1mi31552ivjg
eae8pmckboerkq4ebijrv5tkd8
mlu0dd8s33253co765c05f6h64
crjtn4lh659rtivdn1t39le1kk
2016a8qe310ar0hh3jej2hasr4
ni86mp276dfuu6qrtpt2vankmo
ceeotc55frla4kuqs0udmj152s
q7055g2tlu1pbqkiv9k38dn47c
2me7ip5iirh6e954dbi61v1dk8
2khr4la2vb1m702rou7n9hp4f8
a1hp1se4kok7cli7bi21be7et4
0mjo32dk2q4o6o1rsndmj6t738
9f07idkg4c2lh7eo6avvs3du8o
7t3dfn4ptctbdpsom3af3qs5cc
q1la4cta2tcj97fjuibia18nto
tu1b4gb6d1a3uthocme8i14pl4
7keq7utmed95n5mdmehoieko8c
n78o85043rulntm6bbds7ult0s
kpe0vfr0f53ocl1vae07k2gsgo
r8g350cgo5cqn9suva2ool05qs
in82qvv4pibj1pst2nuil8m458
b13jntr5b2eoe4r3137i8pe7gc
s70022p19sen8pod78c4g71hu4
52hiq167hc4mf1c90tgvdkjs10
7o244gbf63306doof3u02g56ig
h460qkucpmem9ukhu3sff1hqi8
md7r5a9qmqk3iovnll4ekub7j4
tas8io57es2fle77b3fthpbc7o
ovl656ladcmc2t7mrhleru1088
7n0ves8lme8qiiemmle0h60ojk
5rp64aqbe0g1s6u1hg2u0eq8c8
j5jodhmpi8fk4579mk9jhar9d8
8k1bvcm27mfn4o5qgbivr9lfg4
so899qv5d6bm3lsm5g7uhpc9e0
09m2s51pj8pcck7rjjai0horb0
oddqkv2mioki19kstc14qsbht0
fa43gnuh6ltpfqqug6g54pvg2o
6o6phn0n7dv2ocsia8g4vdvo5o
p3mqihp93klihi9cn4sm7tp9gk
1de3spbu7ujqoem2lb7aep1cds
l40urgs4dj5b47ug8jl2vvcsdk
imqhvgqjf66fqjh2hkrcpjmpd0
43j6rsdh2hqspvpce742hh85e0
i9f5s5vu7hskt8pf4k85lrept0
hkbgg74ck7gc09j0bpcgljbguc
t031feed6rt1cb9a06vr1o2ihg
1mknh0vnsmpcu71pd0ohtf5u48
i1j5n8oqpo7fon7b4bp32gankg
cdhhjqqki7q0lfj8pvjnahubos
3bmsbgfl9nhvt2qc0vg8l8e6bk
a0jmpihmsb7tgtk6kpjdil81gc
eoqhg5i8ligu3mm5qie6784sqg
j80n2sfqn4vecluff1meu60p80
p2l8vj7mqrercb06pi5m5or4us
tfitk8h8i5n4m201h1oii9i9t8
i10lqre5pqvhf0t8eo5msufgco
vlg30u3b39ivbmqh6f1or0r690
fme7336dipi1kl9ko69eo2po6c
lbr07fl5e5ivkk09jeee84lflg
jfc4ap0oihf8bo5lkdmpge644k
oq1o0r592eha9otq6bdth2uum8
2h5rm20oegno3id653ki56onqg
en7qs9mfs1a16nrhvvlcrd745g
m02qq8p6nlhn4alq5gh9hlde64
dngvj50s5c883ctloar815f3co
7j6l9076lm9f1erlibnaia0fe8
at17o0amq489s7aeus4g1afnrg
qai0km0g3beer6hmivjaueoocc
kh1nfg0p8l0palvvihq5qjeduo
l7rqunnhlglvsll5omqfl7pmn0
phtok2n89r1oqdnil4n0q95kkg
i8798fd7b4ro9n78eipu8cfvko
n4ufmvds27rmucuc1jd3urjrd0
951ktfafvfsdcmb1v9g8h7mqcg
p1fuetcsam9rlsq5vb4ev4mopc
>>>>>>> eae681f99c5bca1da0e473be5bcea5ebaa8f1206
e3o05agqsv4kenstg7hls2rn78
7bjfao0sb8t10ln5k26ntbrfn0
s0mb3ru7llfc93ijkjq67h3814
pq9nl6d9qvs2f55qedd7l0qkik
te41q5070om9ch6saapi9utq4s
s9jef0sf6s35r224u4mqu68hh8
02deajs32uvcj66cibrqpecegs
koip7vmigqulqjte68fnpv0ab0
m98ova4u3sb2isaejggju3kggk
h73gba4pvi8u19cl85pjncsrus
6k4gjqecq2p3ee1nmaitassc34
64vu56nr56f402fahmon0m7ot8
e43k2k96matcom8nn56uuds4sc
ms4qiemse71dqhfcinm69endes
7hmana3r8ud2td7q81inn8ibgg
8sq6edtm12rcjrrkp23i0s4jkg
0qcqr8innmthbosn8dv3p9bm74
kods7saao8h8nt82bdf6kubp0o
bnffp2kmt8asl7o7ear1mubar0
9c2e2q84v8jcent9avlqkkva2k
bmsugpmc60m223dj8d6pjnufv0
981d4dlej5i987k8hebh47vrok
mcnq2t8bgte2thidlnogeivdg0
d65vh03stf8pci1grt2snc9aao
l4mpa9uuocpj02eh2ejh44l534
c1r2ntars76msbit8c32ho74n0
g415gv5rnj062f2ac05al5u38g
4gd7i3a3nk7acvf9al670mh680
sn3mddffgca5jrp099fp54jjj8
ree1s4bm2fd0n7h1u6mq5snuhg
sdemc2admkdgl1uhk7in4cmcm4
0rnfiuof1c5qtmqmr7ndsrilig
5v4shmhe0b6s8gokqt5id3dm6c
45r5eon37hd62v5j9fdih3c0bg
ue8faspm4mrud1aj0lo2tlkri0
3c3a7biksgvhtgd2mh3cg3nir0
rn027tflstt3flufffo5e9kooo
4jvd0hfa1b4romdgucacaann1s
d1v3enmijlqg4lm37nfr0dkb38
9okn4sg8l04hq9ebc9m39q5r6g
2db5vtlr9o2tr2j038a8510cno
1ie12ckq1th6bg75fpcd5c8ar4
snpri687dom5t5m9psopbuiibk
24lqs30l0bavjsgtj8coh082ts
sacc0lr8m0d3r39bn399ue5gs8
tds0tef7p7dtgb6892u2dne15k
g19lekrq7htj86g1fsd920d45g
dcd6o5oo52o26a7f2im1c70g2s
qjd5unb8ru62jjbg8em8d0kg00
aca53nt368hbnd8abao8v1g430
so2f41ifvta3kjg4gr4ne0pbac
nndogfv190k2lqhfecgmd9i1f4
btcqg1emveuufp8f3t4fk53tvk
vji3as6j2i51knabicf5dfjs7o
gu8qtpgfpf46uksrsr09e9rm3o
e80ad7gljar27nd4o6v0ak8psc
rp2eloltv1h42te3ovb8vnlckc
cuhc3qlbbj29onbg6j0gh4bnl0
k6mpp51bf8juio653lie4hg7ac
6eespka1iff90vfcqtiv74fiic
vtjcm1p3rdg2d2bqa6olicno54
gsrmro4nk4jthptnstqgjkr3pk
e5tjlie61d877nuhao1fneeajg
kge3ektfm6p32vl0rm2cql2jok
e9thh3ntci3upp6p68cnrm1kpc
2sa5ijfnp0b6ickh1ndsdvf2d8
rikeojhrra6eb4h6pnis615meo
o8732qdb74fs8aecebnrh3fvvk
rds3mbvd682i8rrkbc2gqor89k
vo69eco1iu447i4suj4e565dj0
tgit1p4eapun4sh036ju9eog7g
623b422k95cevqvomr6fs497s0
ibt9v2k92ml9kc68lv3r0g41i4
u0tmoh5hckrqhto979p29mr050
bap0unet96rbqposi23ltukfk0
body {font-family: Arial, Helvetica, sans-serif;}
/* The Modal (background) */
.modal {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
padding-top: 100px; /* Location of the box */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
}
/* Modal Content */
.modal-content {
background-color: #fefefe;
margin: auto;
padding: 20px;
border: 1px solid #888;
width: 40%;
height: 40%;
text-align: center;
}
/* The Close Button */
.close {
color: #aaaaaa;
float: right;
font-size: 28px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
}
.loader {
border: 16px solid #f3f3f3;
border-radius: 50%;
border-top: 16px solid #3498db;
width: 80px;
height: 80px;
-webkit-animation: spin 2s linear infinite; /* Safari */
animation: spin 2s linear infinite;
position:fixed;
left: 50%;
top: 40%;
margin: -50px 0px 0px -50px;
}
/* Safari */
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
......@@ -116,28 +116,28 @@
<label for="Classroom">Choose a classroom:</label>
<select id="classroom" name="classroom">
<option class="no-option" value="Please select an Option">Please select an Option</option>
<option value="DANA113">DANA113</option>
<option value="DANA115">DANA115</option>
<option value="DANA117">DANA117</option>
<option value="DANA132">DANA132</option>
<option value="DANA134">DANA134</option>
<option value="DANA137">DANA137</option>
<option value="DANA214">DANA214</option>
<option value="DANA221">DANA221</option>
<option value="DANA227">DANA227</option>
<option value="DANA319">DANA319</option>
<option value="DANA325">DANA325</option>
<option value="DANAcc4">DANAcc4</option>
<option value="DANAcc6">DANAcc6</option>
<option value="BREAKIRON65">BREAKIRON65</option>
<option value="BREAKIRON66">BREAKIRON66</option>
<option value="BREAKIRON165">BREAKIRON165</option>
<option value="BREAKIRON166">BREAKIRON166</option>
<option value="BREAKIRON264">BREAKIRON264</option>
<option value="ACADEMIC EAST001">ACADEMIC EAST001</option>
<option value="ACADEMIC EAST009">ACADEMIC EAST009</option>
<option value="ACADEMIC EAST120">ACADEMIC EAST120</option>
<option value="ACADEMIC EAST225">ACADEMIC EAST225</option>
<option value="DANA 113">DANA113</option>
<option value="DANA 115">DANA115</option>
<option value="DANA 117">DANA117</option>
<option value="DANA 132">DANA132</option>
<option value="DANA 134">DANA134</option>
<option value="DANA 137">DANA137</option>
<option value="DANA 214">DANA214</option>
<option value="DANA 221">DANA221</option>
<option value="DANA 227">DANA227</option>
<option value="DANA 319">DANA319</option>
<option value="DANA 325">DANA325</option>
<option value="DANA cc4">DANAcc4</option>
<option value="DANA cc6">DANAcc6</option>
<option value="BREAKIRON 65">BREAKIRON65</option>
<option value="BREAKIRON 66">BREAKIRON66</option>
<option value="BREAKIRON 165">BREAKIRON165</option>
<option value="BREAKIRON 166">BREAKIRON166</option>
<option value="BREAKIRON 264">BREAKIRON264</option>
<option value="ACADEMIC EAST 001">ACADEMIC EAST001</option>
<option value="ACADEMIC EAST 009">ACADEMIC EAST009</option>
<option value="ACADEMIC EAST 120">ACADEMIC EAST120</option>
<option value="ACADEMIC EAST 225">ACADEMIC EAST225</option>
</select>
......
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
.loader {
border: 16px solid #f3f3f3;
border-radius: 50%;
border-top: 16px solid #3498db;
width: 120px;
height: 120px;
-webkit-animation: spin 2s linear infinite; /* Safari */
animation: spin 2s linear infinite;
}
/* Safari */
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
</style>
</head>
<body>
<h2>PLEASE WAIT WHILE OUR OPTIMIZER DEVELOPS A SCHEDULE</h2>
<div class="loader"></div>
</body>
</html>
......@@ -2,51 +2,9 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
body {font-family: Arial, Helvetica, sans-serif;}
/* The Modal (background) */
.modal {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
padding-top: 100px; /* Location of the box */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
}
/* Modal Content */
.modal-content {
background-color: #fefefe;
margin: auto;
padding: 20px;
border: 1px solid #888;
width: 80%;
}
/* The Close Button */
.close {
color: #aaaaaa;
float: right;
font-size: 28px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
}
</style>
<link rel="stylesheet" href="{{ url_for('static', filename='css/popup.css') }}">
<link rel="stylesheet" href="../static/css/popup.css">
</head>
<body>
<!-- Trigger/Open The Modal -->
<button id="generateBtn">Open Modal</button>
......@@ -57,7 +15,10 @@ body {font-family: Arial, Helvetica, sans-serif;}
<!-- Modal content -->
<div class="modal-content">
<span class="close">&times;</span>
<p>Please wait while our optimizer gets to work</p>
<p>Please Wait While Our Optimizer Gets to Work! </p>
<p>It may take a few minutes.</p>
<div class="loader"></div>
</div>
</div>
......
......@@ -50,6 +50,11 @@ def add_hard_constriant():
parse_constraint(request.form)
return render_template("calendar.html")
@app.route("/popup")
def popup():
return render_template("popup.html")
from backend.scheduler import scheduler
from backend.scheduler import tagged_objects
def generate_schedule():
......
Supports Markdown
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