Update html template to use the js periodic check of results

Author: Bachibouzouk

app/projects/views.py

@@ -749,6 +749,7 @@ def scenario_review(request, proj_id, scen_id, step_id=4, max_step=5):
             simulation = qs.first()
             context.update(
                 {
+                    "sim_id": simulation.id,
                     "simulation_status": simulation.status,
                     "secondsElapsed": simulation.elapsed_seconds,
                     "rating": simulation.user_rating,
@@ -905,8 +906,10 @@ def sensitivity_analysis_create(request, scen_id, sa_id=None, step_id=5):
         if sa_id is not None:
             sa_item = get_object_or_404(SensitivityAnalysis, id=sa_id)
             sa_form = SensitivityAnalysisForm(scen_id=scen_id, instance=sa_item)
+            sa_status = sa_item.status
         else:
             sa_item = None
+            sa_status = None
             sa_form = SensitivityAnalysisForm(
                 scen_id=scen_id,
             )
@@ -924,7 +927,8 @@ def sensitivity_analysis_create(request, scen_id, sa_id=None, step_id=5):
                 "max_step": 5,
                 "MVS_SA_GET_URL": MVS_SA_GET_URL,
                 "sa_form": sa_form,
-                "sa_item": sa_item,
+                "sa_status": sa_status,
+                "sa_id": sa_id,
             },
         )
 

app/templates/scenario/scenario_step4.html

@@ -39,18 +39,14 @@
 
                 <div class="row">
                     {% if simulation_status == "DONE" %}
-                        <a class="btn btn--medium" style="display:none;" href="{% url 'update_simulation_results' proj_id scen_id %}" >{% translate "Update results" %} </a>
                         <a class="btn btn--medium" href="{% url 'scenario_visualize_results' scen_id %}" >{% translate "Check results dashboard" %} </a>
                     {% elif simulation_status == "ERROR" %}
                         <p>{{ simulation_error_msg }}</p>
                         <a class="btn btn--medium" href="{% url 'view_mvs_data_input' scen_id %}" >{% translate "Proof parameters JSON file" %} </a>
                         <a class="btn btn--medium" href="" >{% translate "Link to send bug report automatically" %} </a>
 
                     {% elif simulation_status == "PENDING" %}
-                        <form method="post" action="{% url 'check_simulation_status' scen_id %}">
-                            {% csrf_token %}
-                            <button class="btn btn--medium" type="submit" > {% translate "Check status" %}</button>
-                        </form>
+                        The simulation <a href="{{ MVS_GET_URL }}{{ mvs_token }}">{{ mvs_token }}</a> has been started, its status is <span>{{ simulation_status }}</span>
                     {% endif %}
                 </div>
                 <div class="row">
@@ -72,9 +68,13 @@
 
 
 {% block end_body_scripts %}
+{% if simulation_status == "PENDING" %}
 <script>
-
+    const checkSimulationUrl = `{% url 'fetch_simulation_results' sim_id %}`;
+    console.log(checkSimulationUrl);
 </script>
+<script src="{% static 'js/simulation_requests.js' %}"></script>
+{% endif %}
 
 {% endblock end_body_scripts %}
 

app/templates/scenario/sensitivity_analysis.html

@@ -22,11 +22,11 @@
     <section class="dashboard">
         <div>
 
-            {% if sa_item %}
+            {% if sa_status %}
                 <div class="row">
 
-                    {% if sa_item.status != "MODIFIED" %}
-                    The simulation <a href="{{ MVS_SA_GET_URL }}{{ sa_item.mvs_token }}">{{ sa_item.mvs_token }}</a> has been started, its status is <span>{{ sa_item.status }}</span>
+                    {% if sa_status != "MODIFIED" %}
+                    The simulation <a href="{{ MVS_SA_GET_URL }}{{ sa_item.mvs_token }}">{{ sa_item.mvs_token }}</a> has been started, its status is <span>{{ sa_status }}</span>
                     {% else %}
                     The parameters of the scenario linked to the simulation <a href="{{ MVS_GET_URL }}{{ mvs_token }}">{{ mvs_token }}</a> have been changed, you can rerun the simulation to update the results, please note that existing results will be erased only if the simulation does not have errors
                     {% endif %}
@@ -56,9 +56,15 @@
 
 
 {% block end_body_scripts %}
-<script>
 
+
+{% if sa_status == "PENDING" %}
+<script>
+    const checkSimulationUrl = `{% url 'fetch_sensitivity_analysis_results' sa_id %}`;
+    console.log(checkSimulationUrl);
 </script>
+<script src="{% static 'js/simulation_requests.js' %}"></script>
+{% endif %}
 
 {% endblock end_body_scripts %}