From c07c6311ca2879e5a0ed50e1bc7d7664bf470ef8 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 3 Nov 2017 12:37:26 +0100
Subject: [PATCH] reload only on selected pages

Doesn't refresh page when a form has been edited
---
 rowers/templates/async_tasks.html      |  5 +++++
 rowers/templates/list_graphs.html      |  4 ++++
 rowers/templates/monitorjobs.html      | 30 ++++++++++++++++++++++++++
 rowers/templates/otwrankings.html      |  4 ++++
 rowers/templates/rankings.html         |  3 +++
 rowers/templates/workflow.html         |  5 +++++
 rowers/templates/workout_comments.html |  4 ++++
 rowers/templates/workout_form.html     | 12 +++++++++--
 rowers/templates/workout_view.html     |  3 +++
 templates/basebase.html                | 27 +----------------------
 10 files changed, 69 insertions(+), 28 deletions(-)
 create mode 100644 rowers/templates/monitorjobs.html

diff --git a/rowers/templates/async_tasks.html b/rowers/templates/async_tasks.html
index dedf883d..9dbfeebc 100644
--- a/rowers/templates/async_tasks.html
+++ b/rowers/templates/async_tasks.html
@@ -51,6 +51,11 @@
 </script>
 {% endblock %}
 
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
+
+    
 {% block content %}
 
   
diff --git a/rowers/templates/list_graphs.html b/rowers/templates/list_graphs.html
index dc05fc5e..70339c9e 100644
--- a/rowers/templates/list_graphs.html
+++ b/rowers/templates/list_graphs.html
@@ -4,6 +4,10 @@
 
 {% block title %}Rowsandall Recent Graphs{% endblock %}
 
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
+
 {% block content %}
 <h1>Recent Graphs</h1>
 
diff --git a/rowers/templates/monitorjobs.html b/rowers/templates/monitorjobs.html
new file mode 100644
index 00000000..6cebfa20
--- /dev/null
+++ b/rowers/templates/monitorjobs.html
@@ -0,0 +1,30 @@
+<script type='text/javascript'
+        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+    
+<script>
+  var previous = null;
+  var current = null;
+  var formNotChanged = true;
+  (function checkJobs() {
+  console.log('polling');
+  console.log(formNotChanged)
+  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/list-jobs/', function(json) {
+  current = JSON.stringify(json);
+  $('form').each(function() {
+     $(this).change(function() {
+        formNotChanged = false;
+        console.log("Form Changed");
+        console.log(formNotChanged)
+     });
+  });
+  if (previous && current && previous !== current && formNotChanged) {
+      console.log('refresh');
+      location.reload();
+  };
+  previous = current;
+  });
+  setTimeout(checkJobs, 15000);
+  }());
+  
+</script>
diff --git a/rowers/templates/otwrankings.html b/rowers/templates/otwrankings.html
index 35c6069d..84d78408 100644
--- a/rowers/templates/otwrankings.html
+++ b/rowers/templates/otwrankings.html
@@ -2,6 +2,10 @@
 {% load staticfiles %}
 {% load rowerfilters %}
 
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
+
 {% block title %}Workouts{% endblock %}
 
 {% block content %}
diff --git a/rowers/templates/rankings.html b/rowers/templates/rankings.html
index dc3ac9a6..e5625f95 100644
--- a/rowers/templates/rankings.html
+++ b/rowers/templates/rankings.html
@@ -3,6 +3,9 @@
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
 
 {% block content %}
 
diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html
index 87bae1e9..af5e31ed 100644
--- a/rowers/templates/workflow.html
+++ b/rowers/templates/workflow.html
@@ -23,6 +23,11 @@
 {% endfor %}
 {% endblock %}
 
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
+
+
 {% block content %}
 <div id="page" class="grid_12 alpha">
   <div class="grid_10 prefix_2 alpha">
diff --git a/rowers/templates/workout_comments.html b/rowers/templates/workout_comments.html
index d806ef63..c8e82ed1 100644
--- a/rowers/templates/workout_comments.html
+++ b/rowers/templates/workout_comments.html
@@ -3,6 +3,10 @@
 {% load rowerfilters %}
 {% load tz %}
 
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
+
 {% block title %}Change Workout {% endblock %}
 
 {% block content %}
diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 3aa03f88..d4e2985b 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -13,6 +13,13 @@
 {% block og_description %}{{ workout.name }}
 {{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
 
+{% block scripts %}
+{% include "monitorjobs.html" %}
+<script type='text/javascript'
+        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+{% endblock %}
+
 {% block content %}
 <div id="workouts" class="grid_6 alpha">
 
@@ -89,8 +96,9 @@
     </tr>
   </table>
   </div>
-  <div class="grid_6 alpha">
-  <form enctype="multipart/form-data" action="" method="post">
+  <div id="form-div" class="grid_6 alpha">
+    <form id="importantform"
+          enctype="multipart/form-data" action="" method="post">
     <table width=100%>
       {{ form.as_table }}
     </table>
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index 00b070f5..cba3ccce 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -1,6 +1,9 @@
 {% extends "base.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
+{% block scripts %}
+{% include "monitorjobs.html" %}
+{% endblock %}
 
 {% block title %}{{ workout.name }} {% endblock %}
 {% block og_title %}{{ workout.name }} {% endblock %}
diff --git a/templates/basebase.html b/templates/basebase.html
index f3ca6ebb..ec85bb4f 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -9,32 +9,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
   <head>
-    <script type='text/javascript'
-      src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
-    </script>
-    
-    <script type="text/javascript">
-      window.jQuery || document.write('<script src="/static/js/jquery-3.1.0.js"><' + '/script>');
-      </script>
-
-
-    <script>
-    var previous = null;
-var current = null;
-(function checkJobs() {
-    console.log('polling');
-    $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/list-jobs/', function(json) {
-        current = JSON.stringify(json);
-        if (previous && current && previous !== current) {
-            console.log('refresh');
-            location.reload();
-        };
-        previous = current;
-    });
-    setTimeout(checkJobs, 15000);
-}());
-  
-</script>
+    {% block scripts %} {% endblock %}
 
     <script src="/static/cookielaw/js/cookielaw.js"></script>
     {% analytical_head_top %}