Skip to content

Commit b36da97

Browse files
committed
Fixes from PR 55
integrate joonspk-research#55
1 parent 20beb67 commit b36da97

5 files changed

Lines changed: 19 additions & 11 deletions

File tree

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,10 @@ ENV/
9999
.spyderproject
100100

101101
# Rope project settings
102-
.ropeproject
102+
.ropeproject
103+
104+
# test storage for simulations
105+
environment/frontend_server/storage/test*
106+
107+
# vscode
108+
.vscode/settings.json
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
""

environment/frontend_server/storage/base_the_ville_n25/movement/.keepme

Whitespace-only changes.

environment/frontend_server/templates/base.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@
2020
{% endblock content %}
2121

2222
<!-- Latest compiled and minified JavaScript -->
23-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
24-
<script src="https://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script>
23+
24+
<script src="https://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script>
25+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
2526

2627
{% block js_content %}
2728
{% endblock js_content %}
2829

29-
<script type="text/javascript" id="clustrmaps" src="//clustrmaps.com/map_v2.js?d=Xha1v8a6ENHDAgZ2dJoH85LCl6H1VwpYfgwfbgau8r4&cl=ffffff&w=a"></script>
30-
<style type="text/css">
31-
#clustrmaps-widget-v2 {
32-
display: none !important
33-
}
34-
</style>
30+
<!-- <script type="text/javascript" id="clustrmaps" src="//clustrmaps.com/map_v2.js?d=Xha1v8a6ENHDAgZ2dJoH85LCl6H1VwpYfgwfbgau8r4&cl=ffffff&w=a"></script> -->
31+
<!-- <style type="text/css"> -->
32+
<!-- #clustrmaps-widget-v2 { -->
33+
<!-- display: none !important -->
34+
<!-- } -->
35+
<!-- </style> -->
3536
</body>
3637
</html>
3738

environment/frontend_server/translator/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ def home(request):
106106
f_curr_sim_code = "temp_storage/curr_sim_code.json"
107107
f_curr_step = "temp_storage/curr_step.json"
108108

109-
if not check_if_file_exists(f_curr_step):
109+
if not check_if_file_exists(f_curr_step):
110+
print(f"{f_curr_step} not found, {os.getcwd()}")
110111
context = {}
111112
template = "home/error_start_backend.html"
112113
return render(request, template, context)
@@ -117,7 +118,6 @@ def home(request):
117118
with open(f_curr_step) as json_file:
118119
step = json.load(json_file)["step"]
119120

120-
os.remove(f_curr_step)
121121

122122
persona_names = []
123123
persona_names_set = set()

0 commit comments

Comments
 (0)