GUI modifications

Author: antgonza

qiita_pet/handlers/analysis_handlers.py

@@ -156,21 +156,54 @@ def get(self, analysis_id):
                 dropped[data_type].append({'study': Study(study).title,
                                            'samples': samples})
 
-        self.render("analysis_results.html",
+        self.render("analysis_results.html", analysis_id=analysis_id,
                     jobres=jobres, aname=analysis.name, dropped=dropped,
                     basefolder=get_db_files_base_dir())
 
+    @authenticated
+    def post(self, analysis_id):
+        analysis_id = int(analysis_id.split("/")[0])
+        analysis_id_sent = int(self.get_argument('analysis_id'))
+        action = self.get_argument('action')
+
+        if analysis_id != analysis_id_sent or action != 'delete_analysis':
+            raise QiitaPetAuthorizationError(
+                self.current_user.id,
+                'analysis/results/%d-delete' % analysis_id)
+
+        analysis = Analysis(analysis_id)
+        check_analysis_access(self.current_user, analysis)
+
+        try:
+            Analysis.delete(analysis_id)
+            msg = ("Analysis <b><i>%s</i></b> has been deleted." % (
+                analysis.title))
+            msg_level = "success"
+        except Exception as e:
+            print e
+            msg = ("Couldn't remove <b><i>%s</i></b> analysis: %s" % (
+                analysis.name, str(e)))
+            msg_level = "danger"
+
+        # redirecting to list of analysis but also passing messages and
+        # we need to change the request.method to GET
+        self.request.method = 'GET'
+        ShowAnalysesHandler(self.application, self.request)._execute(
+            [t(self.request) for t in self.application.transforms],
+            message=msg, msg_level=msg_level)
+
 
 class ShowAnalysesHandler(BaseHandler):
     """Shows the user's analyses"""
     @authenticated
-    def get(self):
+    def get(self, message='', msg_level=''):
         user = self.current_user
 
         analyses = [Analysis(a) for a in
                     user.shared_analyses | user.private_analyses]
 
-        self.render("show_analyses.html", analyses=analyses)
+        self.render("show_analyses.html", analyses=analyses, message=message,
+                    msg_level=msg_level)
 
 
 class ResultsHandler(StaticFileHandler, BaseHandler):

qiita_pet/templates/analysis_results.html

@@ -11,7 +11,16 @@
 
 
 <div class="row">
-  <h1>&nbsp;Analysis: <u>{{aname}}</u></h1>
+    <table border="0">
+      <tr>
+        <td><h1>&nbsp;Analysis: <u>{{aname}}</u></h1></td>
+        <td width="20px"></td>
+        <td>
+          <h1><a class="btn btn-danger glyphicon glyphicon-trash" onclick="delete_analysis();"></a></h1>
+        </td>
+      </tr>
+    </table>
+  </h1>
 </div>
 
 
@@ -74,4 +83,27 @@ <h3 style="color:red">ERROR</h3>
       <iframe id="resframe" name="resframe" width="100%" height="900" frameBorder=0></iframe>
   </div>
 </div>
+
+
+<script>
+
+function delete_analysis() {
+  if (confirm('Are you sure you want to delete analysis: {{aname}}?')) {
+    var form = $("<form>")
+    .attr("action", window.location.href)
+    .attr("method", "post")
+    .append($("<input>")
+    .attr("type", "hidden")
+    .attr("name", "analysis_id")
+    .attr("value", {{analysis_id}}))
+    .append($("<input>")
+    .attr("type", "hidden")
+    .attr("name", "action")
+    .attr("value", "delete_analysis"));
+    $("body").append(form);
+    form.submit();
+  }
+}
+
+</script>
 {%end%}