Skip to content

Commit 1c94076

Browse files
omega-coderomega-coder
committed
Adds total time display in template
1 parent 8d1ece3 commit 1c94076

File tree

1 file changed

+68
-62
lines changed

1 file changed

+68
-62
lines changed

‎templates/index.html‎

Lines changed: 68 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,42 @@
77
<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css')}}" />
88
<script src="{{ url_for('static', filename='js/plotly-latest.min.js') }}"></script>
99
<script src="{{ url_for('static', filename='js/d3.min.js') }}"></script>
10-
<link href="data:image/x-icon;base64,AAABAAEAEBACAAAAAACwAAAAFgAAACgAAAAQAAAAIAAAAAEAAQAAAAAAQAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAA4EAAAOBAAB7vQAA858AAOfPAADP5wAAn/MAAJ/zAACf8wAAn/MAAJ/zAADP5wAA588AAPAfAAD4PwAA" rel="icon" type="image/x-icon" />
10+
<link
11+
href="data:image/x-icon;base64,AAABAAEAEBACAAAAAACwAAAAFgAAACgAAAAQAAAAIAAAAAEAAQAAAAAAQAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAA4EAAAOBAAB7vQAA858AAOfPAADP5wAAn/MAAJ/zAACf8wAAn/MAAJ/zAADP5wAA588AAPAfAAD4PwAA"
12+
rel="icon" type="image/x-icon" />
1113
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
1214
</head>
1315

1416
<body>
15-
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
16-
<a class="navbar-brand" href="#"><strong>Flowshop</strong>Scheduling Solver.</a>
17-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
18-
<span class="navbar-toggler-icon"></span>
17+
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
18+
<a class="navbar-brand" href="#"><strong>Flowshop</strong>Scheduling Solver.</a>
19+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
20+
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
21+
<span class="navbar-toggler-icon"></span>
22+
</button>
23+
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
24+
<div class="navbar-nav">
25+
<a class="nav-item nav-link active" href="{{ url_for('index')}}">Home<span class="sr-only">(current)</span></a>
26+
<button class="btn btn-danger nav-item" id="gantt_toggle">Toggle Gantt</button>
27+
<!-- Button trigger modal -->
28+
<button type="button" class="btn btn-primary nav-item" data-toggle="modal" data-target="#problem_info_modal">
29+
Solve Problem
1930
</button>
20-
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
21-
<div class="navbar-nav">
22-
<a class="nav-item nav-link active" href="{{ url_for('index')}}">Home<span class="sr-only">(current)</span></a>
23-
<button class="btn btn-danger nav-item" id="gantt_toggle">Toggle Gantt</button>
24-
<!-- Button trigger modal -->
25-
<button type="button" class="btn btn-primary nav-item" data-toggle="modal" data-target="#problem_info_modal">
26-
Solve Problem
27-
</button>
28-
</div>
29-
</div>
30-
</nav>
31+
</div>
32+
</div>
33+
</nav>
3134
<div class="container-fluid">
3235
<div class="row justify-content-md-center">
33-
<div class="col col-md-4">
34-
<span class="text-muted">Optimal Jobs sequence</span><br>
35-
<span id='sequence'>{{ seq }}</span>
36-
</div>
37-
<div class="col-md-4">
38-
<span class="text-muted">Optimal makespan: </span><span id="opt_makespan">{{ opt_makespan }}</span>
39-
</div>
36+
<div class="col col-md-4">
37+
<span class="text-muted">Optimal Jobs sequence</span><br>
38+
<span id='sequence'>{{ seq }}</span>
39+
</div>
40+
<div class="col-md-4">
41+
<span class="text-muted">Optimal makespan: </span><span id="opt_makespan">{{ opt_makespan }}</span>
42+
</div>
43+
<div class="col col-md-4">
44+
<span class="text-muted">Running Time: </span><span id="time">{{ time }}</span>
45+
</div>
4046
</div>
4147
<div class="row">
4248
<div class="col col-md-8">
@@ -62,50 +68,50 @@ <h5 class="modal-title" id="exampleModalLabel">Submit Problem Details</h5>
6268
</div>
6369
<div class="modal-body">
6470
<div class="row">
65-
<div class="col-md-12">
66-
<div class="form-group">
67-
<label for="algorithm"><span class="text-muted">Algorithm</span></label>
68-
<select id="algorithm" name="algorithm" class="form-control">
69-
<optgroup label="Exact algorithms">
70-
<option value="johnson">Johnson (2 machines only)</option>
71-
<option value="bruteforce">bruteforce</option>
72-
</optgroup>
73-
<optgroup label="Heuristic algorithms">
74-
<option value="palmer">Palmer's Heuristic</option>
75-
<option value="cds">CDS</option>
76-
<option value="neh">NEH</option>
77-
</optgroup>
78-
<optgroup label="Metaheuristic Algorithms">
79-
<option value="genetic-algorithm">Genetic Algorithm</option>
80-
</optgroup>
81-
</select>
82-
</div>
71+
<div class="col-md-12">
72+
<div class="form-group">
73+
<label for="algorithm"><span class="text-muted">Algorithm</span></label>
74+
<select id="algorithm" name="algorithm" class="form-control">
75+
<optgroup label="Exact algorithms">
76+
<option value="johnson">Johnson (2 machines only)</option>
77+
<option value="bruteforce">bruteforce</option>
78+
</optgroup>
79+
<optgroup label="Heuristic algorithms">
80+
<option value="palmer">Palmer's Heuristic</option>
81+
<option value="cds">CDS</option>
82+
<option value="neh">NEH</option>
83+
</optgroup>
84+
<optgroup label="Metaheuristic Algorithms">
85+
<option value="genetic-algorithm">Genetic Algorithm</option>
86+
</optgroup>
87+
</select>
8388
</div>
89+
</div>
8490
</div>
8591
<div class="row">
86-
<div class="col col-md-6">
87-
<div class="form-group">
88-
<label for="nb_machines">Number of machines</label>
89-
<input type="number" name="nb_machines" id="nb_machines" class="form-control" value="2">
90-
</div>
91-
</div>
92-
<div class="col col-md-6">
93-
<div class="form-group">
94-
<label for="nb_jobs">Number of jobs</label>
95-
<input type="number" name="nb_jobs" id="nb_jobs" class="form-control" value="3">
96-
</div>
97-
</div>
92+
<div class="col col-md-6">
93+
<div class="form-group">
94+
<label for="nb_machines">Number of machines</label>
95+
<input type="number" name="nb_machines" id="nb_machines" class="form-control" value="2">
96+
</div>
97+
</div>
98+
<div class="col col-md-6">
99+
<div class="form-group">
100+
<label for="nb_jobs">Number of jobs</label>
101+
<input type="number" name="nb_jobs" id="nb_jobs" class="form-control" value="3">
102+
</div>
103+
</div>
98104
</div>
99105
<div class="row">
100-
<div class="col col-md-12">
101-
<div class="form-group">
102-
<label for="data"><span class="text-muted">Problem Data</span></label>
103-
<textarea id="data" name="data" cols="30" rows="5" class="form-control"
104-
placeholder="Put data here"></textarea>
105-
<button class="btn btn-danger btn-block" id="gen_random">Generate random data</button>
106-
</div>
106+
<div class="col col-md-12">
107+
<div class="form-group">
108+
<label for="data"><span class="text-muted">Problem Data</span></label>
109+
<textarea id="data" name="data" cols="30" rows="5" class="form-control"
110+
placeholder="Put data here"></textarea>
111+
<button class="btn btn-danger btn-block" id="gen_random">Generate random data</button>
107112
</div>
108-
</div>
113+
</div>
114+
</div>
109115
</div>
110116
<div class="modal-footer">
111117
<button type="button" class="btn btn-primary btn-block" id="solve">Solve</button>
@@ -119,4 +125,4 @@ <h5 class="modal-title" id="exampleModalLabel">Submit Problem Details</h5>
119125
<script src="{{ url_for('static', filename='js/main.js')}}"></script>
120126
</body>
121127

122-
</html>
128+
</html>

0 commit comments

Comments
 (0)