From fa83ec0406ebb2667eae8a03a129e0d3a7a7fa6e Mon Sep 17 00:00:00 2001
From: Ryan Herbert <ryan.herbert@inria.fr>
Date: Thu, 10 Nov 2016 16:23:42 +0100
Subject: [PATCH] sample_set add sample type to view

In order to make it more clear what kind of sample set is being viewed
---
 .../web2py/applications/vidjil/controllers/sample_set.py  | 1 +
 .../web2py/applications/vidjil/views/sample_set/all.html  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/web2py/applications/vidjil/controllers/sample_set.py b/server/web2py/applications/vidjil/controllers/sample_set.py
index 6550925b6..8f4b5f6c3 100644
--- a/server/web2py/applications/vidjil/controllers/sample_set.py
+++ b/server/web2py/applications/vidjil/controllers/sample_set.py
@@ -219,6 +219,7 @@ def all():
 
 
     return dict(query = result,
+                type = type,
                 isAdmin = isAdmin,
                 reverse = False)
 
diff --git a/server/web2py/applications/vidjil/views/sample_set/all.html b/server/web2py/applications/vidjil/views/sample_set/all.html
index d54bcf471..4f46a43a0 100644
--- a/server/web2py/applications/vidjil/views/sample_set/all.html
+++ b/server/web2py/applications/vidjil/views/sample_set/all.html
@@ -65,7 +65,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' % 'sample_set'}}"></i> </td>
+		<td onclick="db.call('sample_set/confirm', {'id' :'{{=data.id}}'} )" > <i class="icon-erase" title="{{='delete %s' % type}}"></i> </td>
                 {{else:}}  <td></td><td></td>{{pass}}
             </tr>
         {{pass}}
@@ -78,15 +78,15 @@
     <div class="db_block_left">
 
 {{if auth.can_create_patient():}}
-<span class="button2" onclick="db.call('sample_set/add')"> + new sample_set </span>
+<span class="button2" onclick="db.call('sample_set/add')"> + new {{=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 patient"> add sample_set </span> -->
+<!-- <span class="button2 inactive" onclick="db.call('sample_set/add')" title="you don't have permission to create new {{=type}}"> add sample_set </span> -->
 {{pass}}
 
   </div>
   <div class="db_block_right">
   <br />
-  {{ =len(query) }} sample_set, {{ =total_file_count }} files ({{ =vidjil_utils.format_size(total_size) }})
+  {{ =len(query) }} {{=type}}s, {{ =total_file_count }} files ({{ =vidjil_utils.format_size(total_size) }})
   </div>
 </div>
-- 
GitLab