add clear button

Author: squirrelo

qiita_pet/handlers/websocket_handlers.py

@@ -91,6 +91,9 @@ def on_message(self, msg):
         elif 'remove_pd' in msginfo:
             data = msginfo['remove_pd']
             default.remove_samples([data['proc_data']])
+        elif 'clear' in msginfo:
+            data = msginfo['clear']
+            default.remove_samples(data['pids'])
         self.write_message(msg)
 
 

qiita_pet/templates/analysis_selected.html

@@ -1,15 +1,30 @@
 {% extends sitebase.html %}
 {% block head %}
+{% from future.utils import viewitems %}
+{% from itertools import chain %}
 <script src="/static/vendor/js/moi.js"></script>
 <script type="text/javascript">
+
 function error(evt) { $('#ws-error').html("<b>Server communication error. Sample removal will not be recorded. Please try again later.</b>"); };
 function check_color() {
   if($('.row').length === 0) {
     $('#dflt-sel-info').removeAttr('style');
     $('#create-button').remove();
+    $('#clear-button').remove();
+  }
+}
+
+function clear() {
+  if(confirm('Are you sure you want to remove all samples?')) {
+    moi.send('clear', {'pids': {% raw [int(p) for p in chain.from_iterable(pid.keys() for sid, pid in viewitems(sel_data))] %} });
   }
 }
 
+function clear_from_html(data) {
+  $.each($('.row'), function(index, value) { value.remove(); });
+  check_color();
+}
+
 function remove_proc_data(pid, sid) {
   if(confirm('Are you sure you want to remove all samples for this processed data?')) {
     moi.send('remove_pd', {'proc_data': pid, 'samples': [], 'sid': sid});
@@ -46,13 +61,14 @@
       moi.init(window.location.host + '/analysis/selected/socket/', null, function(){}, error, error);
       moi.add_callback('remove_pd', remove_pd_from_html);
       moi.add_callback('remove_sample', remove_sample_from_html);
+      moi.add_callback('clear', clear_from_html);
+      $('#clear-button').on('click', clear);
     });
 </script>
 {% end %}
 
 {% block content %}
 {% from qiita_db.study import Study %}
-{% from future.utils import viewitems %}
 {% set static_info = {'data_type', 'processed_date', 'algorithm', 'reference_name', 'reference_version', 'sequence_filepath', 'taxonomy_filepath', 'tree_filepath'}%}
 <h1>Selected Samples</h1>
 <span id="ws-error" style="color:red"></span>
@@ -122,6 +138,9 @@ <h4 class="modal-title" id="myModalLabel">Processed Data {{pid}}</h4>
 <button type="button" class="btn btn-success btn-lg" id="create-button" name="create-button" data-toggle="modal" data-target="#create-analysis-modal-view">
   Create Analysis
 </button>
+<button type="button" class="btn btn-danger btn-lg" id="clear-button" name="clear-button">
+  Clear Selected
+</button>
 {% end %}
 
 <!-- modal view to enter analysis information -->

qiita_pet/templates/list_studies.html

@@ -60,7 +60,7 @@
         function format ( d, row ) {
             // `d` is the original data object for the row
             // create formatted cell with proc data table
-            var proc_data_table = '<h4>Processed Data</h4><table class="table" cellpadding="5" cellspacing="0" border="0" style="padding-left:50px;"><tr><th></th><th>ID</th><th>Data type</th><th>Processed Date</th><th>Algorithm</th><th>Reference</th><th>Samples</th></tr>';
+            var proc_data_table = '<h4>Processed Data</h4><table class="table" cellpadding="5" cellspacing="0" border="0" style="padding-left:50px;width:80%"><tr><th></th><th>ID</th><th>Data type</th><th>Processed Date</th><th>Algorithm</th><th>Reference</th><th>Samples</th></tr>';
             for(i=0;i<d.proc_data_info.length;i++) {
               var proc_data = d.proc_data_info[i];
               proc_data_table += '<tr><td><input type="button" class="btn btn-sm" value="Add" onclick="sel_proc_data('+ row +','+ proc_data.pid +')"></td><td>' + proc_data.pid + '</td><td>' + proc_data.data_type + '</td><td>' + proc_data.processed_date + '</td><td>' + proc_data.algorithm + '</td><td>' + proc_data.reference_name + ' ' + proc_data.reference_version + '</td><td>' + proc_data.samples.length + '</td></tr>';