From de2e2005515a626c6eb0ab27ba30b24f25e28d2f Mon Sep 17 00:00:00 2001
From: Joshua Rubingh <j.g.rubingh@rug.nl>
Date: Tue, 19 May 2020 15:24:08 +0200
Subject: [PATCH] Fix correct labeling and added mouse pointers for table
 sorting

---
 .../static/RUG_template/css/base.css          |  4 ++
 .../templates/schedule/schedule_new.html      | 41 ++++++++-----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css b/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css
index 6d048f3..b3fb220 100644
--- a/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css
+++ b/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css
@@ -31,6 +31,10 @@ table {
     width: 100%;
 }
 
+.pointer {
+    cursor: pointer;
+}
+
 form#new_schedule_form input:not([type=checkbox]) {
     width: 100%
 }
diff --git a/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html b/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html
index 1b5c7d6..e0cdb1e 100644
--- a/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html
+++ b/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html
@@ -106,19 +106,6 @@
             <small id="specialisatie_aantal_kamers_0Help" class="form-text text-muted">Aantal behandelkamers dat beschikbaar is per specialisatie</small>
           </td>
         </tr>
-<!--
-        <tr>
-          <th>
-            <label for="specialisatie_aantal_behandelingen_0">Aantal verschillende soorten behandelingen</label>
-          </th>
-        </tr>
-        <tr>
-          <td>
-            <input type="number" class="form-control" min="0" max="100" id="specialisatie_aantal_behandelingen_0" name="specialisatie_aantal_behandelingen_0" aria-describedby="specialisatie_aantal_behandelingen_0Help" required>
-            <small id="specialisatie_aantal_behandelingen_0Help" class="form-text text-muted"></small>
-          </td>
-        </tr>
--->
         <tr>
           <th>
             <label>Werktijden <small class="text-danger" style="display:none"> Nog niet volledig</small></label>
@@ -350,12 +337,12 @@
   <table id="tabel_behandelingen">
     <thead>
       <tr>
-        <th>Naam behandeling</th>
-        <th>Duur (in minuten)</th>
-        <th>Specialisatie</th>
-        <th>Methode</th>
-        <th>Normaal aantal</th>
-        <th>Gewenst als op 30%</th>
+        <th class="pointer">Naam behandeling</th>
+        <th class="pointer">Duur (in minuten)</th>
+        <th class="pointer">Specialisatie</th>
+        <th class="pointer">Methode</th>
+        <th class="pointer">Normaal aantal</th>
+        <th class="pointer">Gewenst als op 30%</th>
       </tr>
     </thead>
     <tbody>
@@ -486,13 +473,18 @@
           element = jQuery(element);
           var nr = counter; // We are starting with 0 so the amount is the new number
           element.find('label').first().text('Specialisatie ' + (nr + 1));
-          element.find('select,input').each(function(index,selectitem){
+          element.find('select,input,label').each(function(index,selectitem){
               selectitem = jQuery(selectitem);
-              selectitem.prop('name',selectitem.prop('name').replace(/_\d+$/,'_' + nr));
-              selectitem.prop('id',selectitem.prop('id').replace(/_\d+$/,'_' + nr));
+              if (selectitem.is('label')) {
+                selectitem.prop('for',selectitem.prop('for').replace(/_\d+$/,'_' + nr));
+              } else {
+                //console.log(selectitem,selectitem.prop('name'),selectitem.prop('id') );
+                selectitem.prop('name',selectitem.prop('name').replace(/_\d+$/,'_' + nr));
+                selectitem.prop('id',selectitem.prop('id').replace(/_\d+$/,'_' + nr));
 
-              if (selectitem.attr('aria-describedby')) {
-                  selectitem.attr('aria-describedby',selectitem.attr('aria-describedby').replace(/_\d+Help$/,'_' + nr + 'Help'));
+                if (selectitem.attr('aria-describedby')) {
+                    selectitem.attr('aria-describedby',selectitem.attr('aria-describedby').replace(/_\d+Help$/,'_' + nr + 'Help'));
+                }
               }
           });
         }
@@ -1000,6 +992,7 @@
         return false;
       });
 
+      updateBehandelingen();
       load_clone_data();
   });
 </script>