sample_set* refactoring the list view

Making things as generic as possible. The view now relies on a set of
methods provided by the model in order to generate each row in the table

server/web2py/applications/vidjil/controllers/sample_set.py

@@ -195,6 +195,11 @@ def all():
     list.load_anon_permissions()
     result = list.get_values()
 
+    try:
+        headers = result[0].get_fields()
+    except IndexError:
+        headers = get_default_fields()
+
     ##sort result
     reverse = False
     if request.vars["reverse"] == "true" :
@@ -219,6 +224,7 @@ def all():
 
 
     return dict(query = result,
+                headers = headers,
                 type = type,
                 isAdmin = isAdmin,
                 reverse = False)

server/web2py/applications/vidjil/models/SampleSet.py

@@ -58,6 +58,16 @@ class SampleSet(object):
     def get_files(self):
         return '%d (%s)' % (self.file_count, vidjil_utils.format_size(self.size))
 
+    def get_fields(self):
+        fields = []
+        fields.append({'name': 'name', 'sort': 'name', 'call': self.get_name, 'width': 200, 'public': True})
+        fields.append({'name': 'info', 'sort': 'info', 'call': self.get_info, 'width': None, 'public': True})
+        fields.append({'name': 'results', 'sort': 'configs', 'call': self.get_config_urls, 'width': None, 'public': True})
+        fields.append({'name': 'groups', 'sort': 'groups', 'call': self.get_groups_string, 'width': 100, 'public': False})
+        fields.append({'name': 'creator', 'sort': 'creator', 'call': self.get_creator, 'width': 100, 'public': False})
+        fields.append({'name': 'files', 'sort': 'files', 'call': self.get_files, 'width': 100, 'public': True})
+        return fields
+
     def get_sequence_count(self):
         if self.sequence_count is None:
             self.sequence_count = db( (db.sequence_file.id == db.sample_set_membership.sequence_file_id)
@@ -76,3 +86,13 @@ class SampleSet(object):
 def get_sample_set(id):
     data = db.sample_set[id]
     return SampleSet(data)
+
+def get_default_fields():
+    fields = []
+    fields.append({'name': 'name', 'sort': 'name', 'width': 200, 'public': True})
+    fields.append({'name': 'info', 'sort': 'info', 'width': None, 'public': True})
+    fields.append({'name': 'results', 'sort': 'configs', 'width': None, 'public': True})
+    fields.append({'name': 'groups', 'sort': 'groups', 'width': 100, 'public': False})
+    fields.append({'name': 'creator', 'sort': 'creator', 'width': 100, 'public': False})
+    fields.append({'name': 'files', 'sort': 'files', 'width': 100, 'public': True})
+    return fields

server/web2py/applications/vidjil/views/sample_set/all.html

@@ -17,19 +17,15 @@
 
 
         <thead>
-            <tr><td class="column_200 pointer" onclick="db.call('sample_set/list', {'sort' :'last_name', 'filter' : '{{=request.vars["filter"]}}'"
-                  {{if not reverse and request.vars["sort"]=="name" :}} , 'reverse' : true {{pass}} })"> name </td>
-                <td class="pointer" onclick="db.call('sample_set/list', {'sort' :'info', 'filter' : '{{=request.vars["filter"]}}'
-                  {{if not reverse and request.vars["sort"]=="info" :}} , 'reverse' : true {{pass}} })"> info </td>
-                <td class="pointer" onclick="db.call('sample_set/list', {'sort' :'configs', 'filter' : '{{=request.vars["filter"]}}'
-                  {{if not reverse and request.vars["sort"]=="configs" :}} , 'reverse' : true {{pass}} })"> results </td>
-{{if isAdmin:}} <td class="column_100 pointer" onclick="db.call('sample_set/list', {'sort' :'groups', 'filter' : '{{=request.vars["filter"]}}'
-                  {{if not reverse and request.vars["sort"]=="groups" :}} , 'reverse' : true {{pass}} })"> groups </td> {{pass}}
-{{if isAdmin:}} <td class="column_100 pointer" onclick="db.call('sample_set/list', {'sort' :'creator', 'filter' : '{{=request.vars["filter"]}}'
-                  {{if not reverse and request.vars["sort"]=="creator" :}} , 'reverse' : true {{pass}} })"> creator </td> {{pass}}
-                <td class="column_100 pointer" onclick="db.call('sample_set/list', {'sort' :'files', 'filter' : '{{=request.vars["filter"]}}'
-                  {{if not reverse and request.vars["sort"]=="files" :}} , 'reverse' : true {{pass}} })"> files </td>
-                
+		{{ for header in headers: }}
+		    {{if isAdmin or header['public']:}}
+		        <td class="{{if header['width']:}}column_{{=header['width']}}{{pass}} pointer"
+	 	            onclick="db.call('sample_set/all', {'sort' : '{{=header['sort']}}', 'filter' : '{{=request.vars["filter"]}}'
+		            {{if not reverse and request.vars["sort"]==header['sort'] :}} , 'reverse' : true {{pass}} })">
+			        {{=header['name']}}
+		        </td>
+		    {{ pass }}
+		{{ pass }}
                 
                 <td class="column5"> </td>
                 <td class="column5"> </td>
@@ -40,26 +36,11 @@
         
        {{for data in query :}}
            <tr class="pointer" onclick="db.call('sample_set/index', {'id' :'{{=data.id}}' , 'config_id' : {{=data.most_used_conf}} } )" >
-                <td>
-		     {{= data.get_name()}}
-                </td>
-                <td> {{=data.get_info()}} </td>
-                <td>
-                  {{ configs = [] }}
-                  {{for conf in data.conf_list :}}
-                    {{filename = patient_name + " (" + conf['name'] + ")"}}
-                    {{if conf['fused_file'] is not None :}}
-                      {{ configs.append(str(A(conf['name'], _href="index.html?sample_set=" + str(row['id']) + "&config=" + str(conf['id']), _type="text/html",
-                            _onclick="event.preventDefault();event.stopPropagation();if( event.which == 2 ) { window.open(this.href); } else { db.load_data( { 'sample_set' : '" + str(data.id) + "' , 'config' : " + str(conf['id']) + " }, '" + filename + "' ); }"))) }}
-                    {{else:}}
-                      {{ configs.append(conf['name']) }}
-                    {{pass}}
-                  {{pass}}
-                  {{= XML(", ".join(configs)) }}
-                </td>
-{{if isAdmin:}} <td> {{=data.groups}}</td>{{pass}}
-{{if isAdmin:}} <td> {{=data.creator}}</td>{{pass}}
-                <td> {{=data.file_count}} ({{=vidjil_utils.format_size(data.size)}}) </td>
+               {{ for field in data.get_fields(): }}
+  		   <td>
+		       {{= field['call']()}}
+                   </td>
+               {{ pass }}
             {{ total_file_count += data.file_count ; total_size += data.size }}
                
 {{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}}