Skip to content

Commit aa1a61d

Browse files
avppsavpps
committed
historyRunDetails available
unharcoded urls
1 parent 1a2be26 commit aa1a61d

File tree

12 files changed

+45
-35
lines changed

12 files changed

+45
-35
lines changed

‎.vs/VSWorkspaceState.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"\\simulator\\templates\\simulator",
99
"\\simulator\\views"
1010
],
11-
"SelectedNode": "\\history_files",
11+
"SelectedNode": "\\simulator\\views\\viewsMain.py",
1212
"PreviewInSolutionExplorer": false
1313
}

‎.vs/groupsimulator/v15/.suo‎

5.5 KB
Binary file not shown.

‎.vs/slnx.sqlite‎

0 Bytes
Binary file not shown.

‎simulator/__pycache__/urls.cpython-36.pyc‎

-44 Bytes
Binary file not shown.

‎simulator/templates/simulator/base.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ <h5></h5>
125125
var pass2 = document.getElementById("password2").value;
126126
if (pass1 == pass2) {
127127
$.ajax({
128-
url: 'ajax/validatepassword',
128+
url: '{% url "simulator:validatePassword" %}',
129129
data: {
130130
'password': pass1
131131
},
@@ -134,7 +134,7 @@ <h5></h5>
134134
if (data.is_valid) {
135135
var username = $("#user_name").val();
136136
$.ajax({
137-
url: 'ajax/validate_username',
137+
url: '{% url "simulator:validate_username" %}',
138138
data: {
139139
'username': username
140140
},
@@ -145,7 +145,7 @@ <h5></h5>
145145
} else {
146146
var usermail = $(user_mail).val();
147147
$.ajax({
148-
url: 'ajax/validateemail',
148+
url: '{% url "simulator:validateEmail" %}',
149149
data: {
150150
'email': usermail
151151
},
@@ -174,7 +174,7 @@ <h5></h5>
174174
function checkName() {
175175
var username = $("#user_name").val();
176176
$.ajax({
177-
url: 'ajax/validate_username',
177+
url: '{% url "simulator:validate_username" %}',
178178
data: {
179179
'username': username
180180
},
@@ -192,7 +192,7 @@ <h5></h5>
192192
function checkEmail() {
193193
var usermail = $(user_mail).val();
194194
$.ajax({
195-
url: 'ajax/validateemail',
195+
url: '{% url "simulator:validateEmail" %}',
196196
data: {
197197
'email': usermail
198198
},

‎simulator/templates/simulator/simulationhistory.html‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,52 @@
1313
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.bundle.min.js"></script>
1414
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
1515

16-
<h2 style='text-align:center'>Run history for simulation: {{ simulation_id }}</h2>
17-
<div class='flex-container'>
18-
<div class="flex-item1">
19-
<nav class="vertical-menu">
20-
21-
<p style='text-align:center'>Step:</p>
22-
<select id="step">
23-
<option style='width:150px;' value=None>select</option>
24-
{% for step in steps_list %}
25-
<option style='width:150px;' value={{ step }}>{{ step }}</option>
26-
{% endfor %}
27-
</select>
28-
</nav>
29-
</div>
30-
<div class="flex-item2">
31-
32-
</div>
16+
<h2 style='text-align:left'>Run history for simulation: {{ simulation_id }}
17+
<select id="step">
18+
<option style='width:150px;' value=None>select</option>
19+
{% for step in steps_list %}
20+
<option style='width:150px;' value={{ step }}>{{ step }}</option>
21+
{% endfor %}
22+
</select>
23+
24+
25+
<div class="flex-item2">
26+
<table id="history">
27+
<tr><th style='text-align:left;font-style:normal;font-size:10px'><code>val</code><th></tr>
28+
</table>
3329
</div>
34-
30+
3531
<script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
3632
<script src="{% static 'js/app.js' %}"></script>
3733

3834
<script>
3935
$('#step').change(function () {
36+
var simulation_id = {{ simulation_id }};
4037
var step = $(this).val();
41-
console.log(step)
4238
$.ajax({
43-
url: 'ajax/simulationHistoryRequest',
39+
url: '{% url "simulator:simulationHistoryRequest" %}',
4440
data: {
41+
'simulation_id': simulation_id,
4542
'step': step,
4643
},
4744
dataType: 'json',
4845
success: function (data) {
49-
console.log('1451')
46+
console.log('---1---1--')
47+
content = "";
48+
temp = "<tr><th style='text-align:left;te'><code>val</code><th></tr>";
49+
history = data.history;
50+
for (var i in data.history) {
51+
content += temp.replace(/val/g, data.history[i]);
52+
};
53+
document.getElementById("history").innerHTML = content
5054
},
5155
});
5256
});
5357

5458
</script>
5559

56-
{% endblock %}
60+
{% endblock %}
61+
62+
63+
64+

‎simulator/templates/simulator/simulationstat.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@
9090
dataType: 'json',
9191
success: function (data) {
9292
content = "";
93-
temp = "<option style='width:150px;' value=val>val</option>"
93+
temp = "<option style='width:150px;' value=val>val</option>";
9494
sim_dict = data.simulation_list;
9595
content += temp.replace(/val/g, 'simulation');
9696
for (var key in sim_dict) {
9797
content += temp.replace(/val/g, sim_dict[key]);
98-
}
98+
};
9999
document.getElementById("chartRequest" + {{ no }}).innerHTML = content
100100
}
101101
});

‎simulator/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
name='simulationStat'),
2727
url(r'^simulationhistory/(?P<simulation_id>[0-9]+)/$', views.simulationHistory,
2828
name='simulationHistory'),
29-
url(r'^simulationhistory/(?P<simulation_id>[0-9]+)/ajax/simulationHistoryRequest/$',
29+
url(r'^ajax/simulationHistoryRequest/$',
3030
views.simulationHistoryRequest,
3131
name='simulationHistoryRequest'),
3232

‎simulator/views/__pycache__/simulationRun.cpython-36.pyc‎

9 Bytes
Binary file not shown.

‎simulator/views/__pycache__/viewsMain.cpython-36.pyc‎

247 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)