delete sample template

Author: antgonza

qiita_db/metadata_template/base_metadata_template.py

@@ -761,21 +761,36 @@ def delete(cls, id_):
         conn_handler = SQLConnectionHandler()
 
         # Delete the sample template filepaths
-        conn_handler.execute(
-            "DELETE FROM qiita.sample_template_filepath WHERE "
-            "study_id = %s", (id_, ))
+        queue = "delete_sample_template_%d" % id_
+        conn_handler.create_queue(queue)
 
-        conn_handler.execute(
-            "DROP TABLE qiita.{0}".format(table_name))
-        conn_handler.execute(
+        conn_handler.add_to_queue(
+            queue,
+            "DELETE FROM qiita.sample_template_filepath WHERE study_id = %s",
+            (id_, ))
+
+        conn_handler.add_to_queue(
+            queue,
+            "DROP TABLE IF EXISTS qiita.{0}".format(table_name))
+
+        conn_handler.add_to_queue(
+            queue,
+            "DROP TABLE IF EXISTS qiita.{0}".format(table_name))
+
+        conn_handler.add_to_queue(
+            queue,
             "DELETE FROM qiita.{0} where {1} = %s".format(cls._table,
                                                           cls._id_column),
             (id_,))
-        conn_handler.execute(
+
+        conn_handler.add_to_queue(
+            queue,
             "DELETE FROM qiita.{0} where {1} = %s".format(cls._column_table,
                                                           cls._id_column),
             (id_,))
 
+        conn_handler.execute_queue(queue)
+
     @classmethod
     def exists(cls, obj_id):
         r"""Checks if already exists a MetadataTemplate for the provided object

qiita_pet/handlers/study_handlers/description_handlers.py

@@ -640,6 +640,33 @@ def display_template(self, study, user, msg, msg_level, full_access,
                     sub_tab=sub_tab,
                     prep_tab=prep_tab)
 
+    def delete_sample_template(self, study, user, callback):
+        """Delete sample template
+
+        Parameters
+        ----------
+        study : Study
+            The current study object
+        user : User
+            The current user object
+        callback : function
+            The callback function to call with the results once the processing
+            is done
+        """
+        sample_template_id = int(self.get_argument('sample_template_id'))
+
+        try:
+            SampleTemplate.delete(sample_template_id)
+            msg = ("Sample template %d has been deleted from study: "
+                   "<b><i>%s</i></b>" % (sample_template_id, study.title))
+            msg_level = "success"
+        except Exception as e:
+            msg = "Couldn't remove %d raw data: %s" % (sample_template_id,
+                                                       str(e))
+            msg_level = "danger"
+
+        callback((msg, msg_level, 'study_information_tab', None, None))
+
     def delete_raw_data(self, study, user, callback):
         """Delete the selected raw data
 
@@ -781,6 +808,7 @@ def post(self, study_id):
             request_approval=self.request_approval,
             make_sandbox=self.make_sandbox,
             update_investigation_type=self.update_investigation_type,
+            delete_sample_template=self.delete_sample_template,
             delete_raw_data=self.delete_raw_data,
             delete_prep_template=self.delete_prep_template,
             delete_preprocessed_data=self.delete_preprocessed_data,

qiita_pet/templates/study_description.html

@@ -184,6 +184,24 @@
   form.submit();
 }
 
+function delete_sample_template(sample_template_id) {
+  if (confirm('Are you sure you want to delete sample template ID: ' + sample_template_id + '?')) {
+    var form = $("<form>")
+    .attr("action", window.location.href)
+    .attr("method", "post")
+    .append($("<input>")
+    .attr("type", "hidden")
+    .attr("name", "sample_template_id")
+    .attr("value", sample_template_id))
+    .append($("<input>")
+    .attr("type", "hidden")
+    .attr("name", "action")
+    .attr("value", "delete_sample_template"));
+    $("body").append(form);
+    form.submit();
+  }
+}
+
 function delete_raw_data(raw_data_filetype, raw_data_id) {
   if (confirm('Are you sure you want to delete raw data: ' + raw_data_filetype + ' (ID: ' + raw_data_id + ')?')) {
     var form = $("<form>")
@@ -537,7 +555,12 @@ <h2><i>{{study_alias}}</i></h2>
 
 <!-- Nav tabs -->
 <ul class="nav nav-tabs" role="tablist" id="myTab">
-    <li class="active"><a href="#study_information_tab" role="tab" data-toggle="tab">Study information</a></li>
+    <li class="active">
+      <a href="#study_information_tab" role="tab" data-toggle="tab">
+        Study information
+        <button class="close" title="Remove this sample template" type="button" onclick="delete_sample_template({{study.sample_template}})">&nbsp; ×</button>
+      </a>
+    </li>
   {% if show_data_tabs %}
     <li><a href="#raw_data_tab" role="tab" data-toggle="tab">Raw data</a></li>
     <li><a href="#preprocessed_data_tab" role="tab" data-toggle="tab">Preprocessed data</a></li>

qiita_pet/templates/study_description_templates/study_information_tab.html

@@ -43,10 +43,12 @@
 
   <table>
     <tr>
+      {% if not sample_templates %}
       <td>
         <a class="btn btn-primary" onclick="process_sample_template();">Process sample template</a>
       </td>
       <td>&nbsp; &nbsp;</td>
+      {% end %}
       {% if sample_templates %}
       <td>
         <a class="btn btn-primary" onclick="update_sample_template();">Update sample template</a>