server: file info view, split info from sequence file and from run/config

server/web2py/applications/vidjil/views/patient/info.html

@@ -18,12 +18,12 @@ patient = db.patient[request.vars["id"]]
     
     <h3>{{=patient.last_name + " " + patient.first_name}}  ({{=request.vars["id"]}})</h3>
     
-    <div class="db_top">
-        <div class="db_top_left">
+    <div class="db_block">
+        <div class="db_block_left">
             file list
         </div>
         
-        <div class="db_top_right">
+        <div class="db_block_right">
             choose config 
             <span>
                 <select id="choose_config" name="config" onchange="db.call('patient/info', {'id' :'{{=request.vars['id']}}', 'config_id' : this.value})">
@@ -72,11 +72,21 @@ patient = db.patient[request.vars["id"]]
             ) 
 
             for row in query :}}
+            
+                {{if row.sequence_file.data_file is None :}}
+                    {{filename = ''}}
+                {{else:}}
+                    {{(filename, str) = db.sequence_file.data_file.retrieve(row.sequence_file.data_file)}}
+                {{pass}} 
+            
                  <tr>
-                    <td> {{ (filename, str) = db.sequence_file.data_file.retrieve(row.sequence_file.data_file)}} {{=filename}}</td>
+                    <td id="sequence_file_{{=row.sequence_file.id}}"> {{=filename}}</td>
                     <td> {{=row.sequence_file.sampling_date}} </td>
                     <td> {{=row.sequence_file.info}} </td>
-                    <td> <a href="{{=URL('download', scheme='http', args=row.sequence_file.data_file)}}" >dl</a> </td>
+                    <td> {{if filename != '':}}
+                        <a href="{{=URL('download', scheme='https', args=row.sequence_file.data_file)}}" >dl</a> 
+                        {{pass}}
+                    </td>
                     <td onclick="db.call('file/edit', {'id' :'{{=row.sequence_file.id}}', 'patient_id' :'{{=request.vars['id']}}'} )" > e </td>
                     <td onclick="db.call('file/confirm', {'id' :'{{=row.sequence_file.id}}', 'patient_id' :'{{=request.vars['id']}}'} )" > X </td>
                      
@@ -95,10 +105,20 @@ patient = db.patient[request.vars["id"]]
     </table>
     <table class="db_table" id="db_fixed_header"></table>
 </div>
-    
-<span class="button" onclick="db.call('patient/index')"> back to list </span>
-<span class="button" onclick="db.call('file/add', { 'id' : '{{=request.vars["id"]}}' } )"> add file </span>
-<span class="button" onclick="db.load_data( { 'patient_id' : '{{=request.vars["id"]}}' , 'config_id' : {{=config_id}} } )" > see result </span>
+
+<div class="db_block">
+    <div class="db_block_left">
+        <span class="button" onclick="db.call('patient/index')"> back to list </span>
+        <span class="button" onclick="db.call('file/add', { 'id' : '{{=request.vars["id"]}}' } )"> add file </span>
+    </div>
+
+    <div class="db_block_right">
+        <span class="button" onclick="db.load_data( { 'patient_id' : '{{=request.vars["id"]}}' , 'config_id' : {{=config_id}} } )" > see result </span>
+        <span class="button" onclick="" > get .data </span>
+        <span class="button" onclick="" > get .analysis </span>
+    </div>
+</div>
+
 </div>
 
 {{elif 'content' in globals():}}