From cc233e0223606d83323f88467905150b72d79323 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Thu, 28 Jan 2021 18:37:41 +0000
Subject: [PATCH] Some template cleanup

---
 RIGS/templates/calendar.html             | 36 +++++++++++-------------
 RIGS/templates/event_form.html           | 19 ++-----------
 RIGS/templates/risk_assessment_form.html |  7 +----
 assets/templates/asset_audit.html        |  6 +---
 assets/templates/asset_audit_list.html   |  4 +--
 assets/templates/asset_list.html         | 10 +++----
 users/templates/profile_detail.html      |  2 +-
 7 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/RIGS/templates/calendar.html b/RIGS/templates/calendar.html
index b0b46471..30d4d496 100644
--- a/RIGS/templates/calendar.html
+++ b/RIGS/templates/calendar.html
@@ -11,14 +11,6 @@
     <script src="{% static 'js/moment.js' %}"></script>
     <script src="{% static 'js/main.min.js' %}"></script>
     <script>
-        function getUrlVars() {
-            var vars = {};
-            var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
-            vars[key] = value;
-            });
-            return vars;
-        }
-
         viewToUrl = {
             'timeGridWeek':'week',
             'timeGridDay':'day',
@@ -78,7 +70,7 @@
                                     'url': $(this).attr('url')
                                 }
 
-                                if($(this).attr('is_rig')==true || $(this).attr('status') == "Cancelled"){
+                                if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){
                                     thisEvent['color'] = colours[$(this).attr('status')];
                                 }else{
                                     thisEvent['color'] = colours['non-rig'];
@@ -95,31 +87,35 @@
                     $('#calendar-header').text(view.title);
 
                     // Enable/Disable "Today" button as required
+                    let $today = $('#today-button');
                     if(moment().isBetween(view.currentStart, view.currentEnd)){
                         //Today is within the current view
-                        $('#today-button').prop('disabled', true);
+                        $today.prop('disabled', true);
                     }else{
-                        $('#today-button').prop('disabled', false);
+                        $today.prop('disabled', false);
                     }
 
                     // Set active view select button
+                    let $month = $('#month-button');
+                    let $week = $('#week-button');
+                    let $day = $('#day-button');
                     switch(view.type){
                         case 'dayGridMonth':
-                            $('#month-button').addClass('active');
-                            $('#week-button').removeClass('active');
-                            $('#day-button').removeClass('active');
+                            $month.addClass('active');
+                            $week.removeClass('active');
+                            $day.removeClass('active');
                             break;
 
                         case 'timeGridWeek':
-                            $('#month-button').removeClass('active');
-                            $('#week-button').addClass('active');
-                            $('#day-button').removeClass('active');
+                            $month.removeClass('active');
+                            $week.addClass('active');
+                            $day.removeClass('active');
                             break;
 
                         case 'timeGridDay':
-                            $('#month-button').removeClass('active');
-                            $('#week-button').removeClass('active');
-                            $('#day-button').addClass('active');
+                            $month.removeClass('active');
+                            $week.removeClass('active');
+                            $day.addClass('active');
                             break;
                     }
                     history.replaceState(null,null,"{% url 'web_calendar' %}"+viewToUrl[view.type]+'/'+moment(view.currentStart).format('YYYY-MM-DD')+'/');
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index c35314c4..d1b9dc1e 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -30,21 +30,6 @@
     {% include 'partials/datetime-fix.html' %}
 
     <script>
-        function setTime23Hours() {
-            $('#{{ form.end_time.id_for_label }}').val('23:00');
-        }
-
-        function setTime02Hours() {
-            var id_start = "{{ form.start_date.id_for_label }}";
-            var id_end_date = "{{ form.end_date.id_for_label }}";
-            var id_end_time = "{{ form.end_time.id_for_label }}";
-            if ($('#'+id_start).val() == $('#'+id_end_date).val()) {
-                var end_date = new Date($('#'+id_end_date).val());
-                end_date.setDate(end_date.getDate() + 1);
-                $('#'+id_end_date).val(end_date.getISOString());
-            }
-            $('#'+id_end_time).val('02:00');
-        }
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
         $(document).ready(function () {
             dur = matches ? 0 : 500;
@@ -53,14 +38,14 @@
                     $('.form-is_rig').slideUp(dur);
                 });
             {% elif not object.pk and form.errors %}
-                if ($('#{{form.is_rig.auto_id}}').attr('checked') != 'checked') {
+                if ($('#{{form.is_rig.auto_id}}').attr('checked') !== 'checked') {
                     $('.form-is_rig').hide();
                 }
             {% endif %}
             {% if not object.pk %}
                 $('#is_rig-selector button').on('click', function () {
                     $('.form-non_rig').slideDown(dur);
-                    if ($(this).data('is_rig') == 1) {
+                    if ($(this).data('is_rig') === 1) {
                         $('#{{form.is_rig.auto_id}}').prop('checked', true);
                         if ($('.form-non_rig').is(':hidden')) {
                             $('.form-is_rig').show();
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index e2936cdd..2171a584 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -27,12 +27,7 @@
 
     <script>
         function parseBool(str) {
-            if (str.toLowerCase() == 'true') {
-                return true
-            }
-            else {
-                return false
-            }
+            return str.toLowerCase() == 'true';
         }
         $('input[type=radio][name=big_power]').change(function() {
             $('#{{ form.power_mic.id_for_label }}').prop('required', parseBool(this.value));
diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html
index ca48a08a..3a0277b7 100644
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -14,11 +14,7 @@
       $('#' + String(ID)).val(CSA);
   }
   function checkIfCableHidden() {
-    if (document.getElementById("id_is_cable").checked) {
-      document.getElementById("cable-table").hidden = false;
-    } else {
-      document.getElementById("cable-table").hidden = true;
-    }
+    document.getElementById("cable-table").hidden = !document.getElementById("id_is_cable").checked;
   }
   checkIfCableHidden();
 </script>
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index d3017596..0db7f0f8 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -4,7 +4,7 @@
 {% load widget_tweaks %}
 
 {% block js %}
-    <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
+    <script src="{% static 'js/jquery-ui.js' %}"></script>
     <script src="{% static "js/interaction.js" %}"></script>
     <script src="{% static "js/modal.js" %}"></script>
     <script>
@@ -23,7 +23,7 @@
                 success: function(){
                     $link = $(this);
                     // Anti modal inception
-                    if ($link.parents('#modal').length == 0) {
+                    if ($link.parents('#modal').length === 0) {
                         modaltarget = $link.data('target');
                         modalobject = "";
                         $('#modal').load(url, function (e) {
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 2b325428..8210f0ee 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -30,19 +30,19 @@
 	        //Get query string value
 	        var searchUrl=location.search;
 
-	        if(key!="") {
+	        if(key!=="") {
 		        oldValue = getParameterByName(key);
 		        removeVal=key+"="+oldValue;
-		        if(searchUrl.indexOf('?'+removeVal+'&')!= "-1") {
+		        if(searchUrl.indexOf('?'+removeVal+'&')!== "-1") {
 			        urlValue=urlValue.replace('?'+removeVal+'&','?');
 		        }
-		        else if(searchUrl.indexOf('&'+removeVal+'&')!= "-1") {
+		        else if(searchUrl.indexOf('&'+removeVal+'&')!== "-1") {
 			        urlValue=urlValue.replace('&'+removeVal+'&','&');
 		        }
-		        else if(searchUrl.indexOf('?'+removeVal)!= "-1") {
+		        else if(searchUrl.indexOf('?'+removeVal)!== "-1") {
 			        urlValue=urlValue.replace('?'+removeVal,'');
 		        }
-		        else if(searchUrl.indexOf('&'+removeVal)!= "-1") {
+		        else if(searchUrl.indexOf('&'+removeVal)!== "-1") {
 			        urlValue=urlValue.replace('&'+removeVal,'');
 		        }
 	        }
diff --git a/users/templates/profile_detail.html b/users/templates/profile_detail.html
index a7f9970c..c31515b3 100644
--- a/users/templates/profile_detail.html
+++ b/users/templates/profile_detail.html
@@ -16,7 +16,7 @@
 				    param = $(value).val();
 				    val = $(value).prop('checked');
 
-				    if(val != defaultVal){
+				    if(val !== defaultVal){
 					    url = url+param+"="+val+"&";
 					}
 				});