From d3629dcb5c00fa056dd462861c9b10dc09af6bc9 Mon Sep 17 00:00:00 2001
From: Ryan Herbert <ryan.herbert@inria.fr>
Date: Wed, 30 Nov 2016 14:52:06 +0100
Subject: [PATCH] sample_set* some minor refactoring

passing the helper to the view instead of the type in order to call some
helper functions from the view. Notably to fix the add button which only
worked for generic.
---
 .../applications/vidjil/controllers/sample_set.py      |  2 +-
 server/web2py/applications/vidjil/models/SampleSet.py  |  6 ++++++
 server/web2py/applications/vidjil/models/patient.py    |  3 +++
 server/web2py/applications/vidjil/models/run.py        |  3 +++
 .../applications/vidjil/views/sample_set/all.html      | 10 +++++-----
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/web2py/applications/vidjil/controllers/sample_set.py b/server/web2py/applications/vidjil/controllers/sample_set.py
index 5a8215a72..5b0b06686 100644
--- a/server/web2py/applications/vidjil/controllers/sample_set.py
+++ b/server/web2py/applications/vidjil/controllers/sample_set.py
@@ -201,7 +201,7 @@ def all():
 
     return dict(query = result,
                 fields = fields,
-                type = type,
+                helper = helper,
                 isAdmin = isAdmin,
                 reverse = False,
                 step = step,
diff --git a/server/web2py/applications/vidjil/models/SampleSet.py b/server/web2py/applications/vidjil/models/SampleSet.py
index 25e2f13b6..d19e1c86d 100644
--- a/server/web2py/applications/vidjil/models/SampleSet.py
+++ b/server/web2py/applications/vidjil/models/SampleSet.py
@@ -3,6 +3,9 @@ class SampleSet(object):
     def __init__(self, type):
         self.type = type
 
+    def get_type(self):
+        return self.type
+
     def __getitem__(self, key):
         return getattr(self, key, None)
 
@@ -71,6 +74,9 @@ class SampleSet(object):
             row['string'] = [row['name'], row['confs'], row['groups'], str(row['info'])]
         return filter(lambda row : vidjil_utils.advanced_filter(row['string'], filter_str), data)
 
+    def get_add_route(self):
+        return 'sample_set/add'
+
     def get_info_dict(self, data):
         return dict(name = "sample_set : %s" % db.sample_set[data.sample_set_id].sample_type,
                 filename = "sample_set_%d" % data.id,
diff --git a/server/web2py/applications/vidjil/models/patient.py b/server/web2py/applications/vidjil/models/patient.py
index 65234387b..c4f23fcf6 100644
--- a/server/web2py/applications/vidjil/models/patient.py
+++ b/server/web2py/applications/vidjil/models/patient.py
@@ -29,5 +29,8 @@ class Patient(SampleSet):
                     info = data.info
                     )
 
+    def get_add_route(self):
+        return 'patient/add'
+
     def get_data(self, sample_set_id):
         return db(db.patient.sample_set_id == sample_set_id).select()[0]
diff --git a/server/web2py/applications/vidjil/models/run.py b/server/web2py/applications/vidjil/models/run.py
index a2c59026f..6e0d66d30 100644
--- a/server/web2py/applications/vidjil/models/run.py
+++ b/server/web2py/applications/vidjil/models/run.py
@@ -28,5 +28,8 @@ class Run(SampleSet):
                     info = data.info
                     )
 
+    def get_add_route(self):
+        return 'run/add'
+
     def get_data(self, sample_set_id):
         return db(db.run.sample_set_id == sample_set_id).select()[0]
diff --git a/server/web2py/applications/vidjil/views/sample_set/all.html b/server/web2py/applications/vidjil/views/sample_set/all.html
index 5af73c5d0..f14fe514d 100644
--- a/server/web2py/applications/vidjil/views/sample_set/all.html
+++ b/server/web2py/applications/vidjil/views/sample_set/all.html
@@ -8,16 +8,16 @@
 <div class="db_block">
     <div class="db_block_left">
         search
-        <input id="db_filter_input" type="text" value="{{=request.vars["filter"]}}"  onchange="db.call('sample_set/all', {'type': '{{=type}}', 'filter' : this.value} )">
+        <input id="db_filter_input" type="text" value="{{=request.vars["filter"]}}"  onchange="db.call('sample_set/all', {'type': '{{=helper.get_type()}}', 'filter' : this.value} )">
     </div>
     <div class="db_block_right">
         page:
         {{ if page > 0: }}
-            <div class="button" onclick="db.call('sample_set/all', {'type': '{{=type}}', 'page': {{=page-1}}})"><</div>
+            <div class="button" onclick="db.call('sample_set/all', {'type': '{{=helper.get_type()}}', 'page': {{=page-1}}})"><</div>
         {{ pass }}
 	{{= page + 1 }}
         {{if len(query) > step : }}
-            <div class="button" onclick="db.call('sample_set/all', {'type': '{{=type}}', 'page': {{=page+1}}})">></div>
+            <div class="button" onclick="db.call('sample_set/all', {'type': '{{=helper.get_type()}}', 'page': {{=page+1}}})">></div>
         {{ pass }}
     </div>
 </div>
@@ -56,7 +56,7 @@
 {{if isAdmin:}} <td onclick="db.call('sample_set/permission', {'id' :'{{=data.id}}'} )" > <i class="icon-key" title="set permissions"></i> </td> {{else:}} <td></td> {{pass}}
                 {{if data.has_permission:}}
 		<td onclick="db.call('sample_set/edit', {'id' :'{{=data.id}}'} )" > <i class="icon-pencil-2" title="{{='edit %s information' % 'sample_set'}}"></i> </td>
-		<td onclick="db.call('sample_set/confirm', {'id' :'{{=data.id}}'} )" > <i class="icon-erase" title="{{='delete %s' % type}}"></i> </td>
+		<td onclick="db.call('sample_set/confirm', {'id' :'{{=data.id}}'} )" > <i class="icon-erase" title="{{='delete %s' % helper.get_type()}}"></i> </td>
                 {{else:}}  <td></td><td></td>{{pass}}
             </tr>
         {{pass}}
@@ -69,7 +69,7 @@
     <div class="db_block_left">
 
 {{if auth.can_create_patient():}}
-<span class="button2" onclick="db.call('sample_set/add')"> + new {{=type}} </span>
+<span class="button2" onclick="db.call('{{=helper.get_add_route()}}')"> + new {{=helper.get_type()}} </span>
 <span class="button2" onclick="db.call('sample_set/custom', {'filter': '{{=request.vars['filter']}}' })"> compare samples/patients </span>
 {{else:}}
 <!-- <span class="button2 inactive" onclick="db.call('sample_set/add')" title="you don't have permission to create new {{=type}}"> add sample_set </span> -->
-- 
GitLab