Merge lp:~cprov/uci-engine/webui-reviews-signoff into lp:uci-engine

[Celso Providelo]

[lp:~cprov/uci-engine/webui-reviews-signoff]

888. By Celso Providelo on 2014-11-06

Adding 'Review Status' column to the ticket list.

889. By Celso Providelo on 2014-11-06

typo

Unmerged revisions

=== modified file 'webui/common/static/common/webui.css'
--- webui/common/static/common/webui.css	2014-11-06 02:50:14 +0000
+++ webui/common/static/common/webui.css	2014-11-06 17:15:07 +0000
@@ -308,26 +308,54 @@
   font-size: small;
   font-weight: bold;
   display: inline-block;
-  width: 6em;
 }
 
 .yui3-inlinereview-content label.pending {
   background-image: url('/static/common/pencil-black.png');
 }
 
-.yui3-inlinereview-content label.complete {
+.yui3-inlinereview-content label.approved {
   background-image: url('/static/common/check.svg');
 }
 
+.yui3-inlinereview-content label.disapproved {
+  background-image: url('/static/common/cross.svg');
+}
+
+.yui3-inlinereview-content a.pending {
+  color: black;
+}
+
+.yui3-inlinereview-content a.approved {
+  color: green;
+}
+
+.yui3-inlinereview-content a.disapproved {
+  color: red;
+}
+
 .yui3-inlinereview-content button {
   font-size: small;
   font-weight: normal;
+  margin-top: 10px;
 }
 
 .yui3-inlinereview-content .error {
-    color: red;
-    font-weight: bold;
-    padding-left: 1em;
+  color: red;
+  font-weight: bold;
+  padding-left: 1em;
+}
+
+.yui3-inlinereview-content div.yui3-overlay-content {
+  background-color: #FBFBFB;
+  border: 1px solid #DEDEDE;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;
+  box-shadow: 0 2px 2px 0 #C2C2C2;
+  padding: 10px;
+  text-align: left;
 }
 
 /* General links decorators. */

=== modified file 'webui/tickets/static/tickets/webui.js'
--- webui/tickets/static/tickets/webui.js	2014-11-06 02:31:24 +0000
+++ webui/tickets/static/tickets/webui.js	2014-11-06 17:15:07 +0000
@@ -8,7 +8,7 @@
     /**
      * InlineReview widget.
      *
-     * Allows reviews to be 'completed' inline via TS JSON-XHR.
+     * Allows reviews to be edited inline via TS JSON-XHR.
      *
      */
     var InlineReview = function () {
@@ -23,6 +23,10 @@
 
             review: {
                 value: {}
+            },
+
+            readonly: {
+                value: false
             }
 
         }
@@ -32,33 +36,80 @@
     Y.extend(InlineReview, Y.Widget, {
 
         renderUI: function() {
+            var review = this.get('review');
+
+            // Empty previous content.
             this.get('srcNode').empty();
 
+            // Review label.
             var label = Y.Node.create('<label>')
-                .set('text', this.get('review').review_type);
+                .set('text', review.review_type)
+                .addClass(this.get('review').status.toLowerCase());
             this.get('srcNode').appendChild(label);
-            if (this.get('review').completed) {
-                label.addClass('complete');
-                return;
-            } else {
-                label.addClass('pending');
-            }
-
-            var button = Y.Node.create('<button>')
-                .set('text', 'Review');
-            this.get('srcNode').appendChild(button);
+
+            // Only render the review label if the widget is readonly.
+            if (this.get('readonly')) { return; }
+
+            // Link that will render the review overlay options.
+            var overlay_link = Y.Node.create('<a>')
+                .set('id', 'review-link-' + review.id)
+                .set('href', '#')
+                .addClass('edit-link')
+                .set('title', 'Review');
+            this.get('srcNode').appendChild(overlay_link);
+
+            // Overlay content with review options as links.
+            var overlay_content = Y.Node.create('<div>')
+                .set('id', 'review-options-' + review.id)
+                .addClass('hidden');
+            var statuses = ['Approved', 'Disapproved', 'Pending'];
+            statuses.forEach(function (s) {
+                var choice = Y.Node.create('<a>')
+                    .set('text', s)
+                    .set('href', '#')
+                    .addClass(s.toLowerCase())
+                    .addClass('review-choice')
+                if (s === review.status) {
+                    choice.addClass('current');
+                }
+                overlay_content.appendChild(choice);
+                overlay_content.appendChild('<hr>');
+            });
+            this.get('srcNode').appendChild(overlay_content);
+
+            // Overlay widget.
+            Y.Base.mix(Y.Overlay, [Y.WidgetAutohide]);
+            var overlay = new Y.Overlay({
+                srcNode: '#review-options-' + review.id,
+                align: {
+                    node:'#review-link-' + review.id,
+                    points: [
+                        Y.WidgetPositionAlign.TL,
+                        Y.WidgetPositionAlign.BR
+                    ]
+                },
+                hideOn: [{eventName: 'clickoutside'}],
+                visible: false,
+                render: true
+            });
+
+            // Hook the overlay link.
+            overlay_link.on('click', function (e) {
+                e.preventDefault();
+                overlay.show();
+            });
+
         },
 
         bindUI: function() {
+            var review = this.get('review');
+            var trigger = this.get('srcNode').all('a.review-choice');
             var self = this;
-            this.get('srcNode').all('button').on('click', function(e) {
-                var review = self.get('review');
+            trigger.on('click', function(e) {
+                e.halt();
+                review.status = e.currentTarget.get('text');
                 var data = {
-                    reviews: [{
-                        'id': review.id,
-                        'workflow_step': review.workflow_step,
-                        'completed': true
-                    }]
+                    reviews: [review]
                 };
                 // Issue a PATCH TS-request to update the review and
                 // update the widget accordingly.
@@ -73,7 +124,6 @@
                             self.get('srcNode').all('.error').remove(true);
                         },
                         success: function(tx, r) {
-                            review.completed = true;
                             self.renderUI();
                             self.bindUI();
                         },
@@ -657,7 +707,7 @@
                     }
                 } else {
                     // Steps yet to come are empty.
-                    return;
+                    value = '';
                 }
 
                 // Render a placeholder for related reviews recording
@@ -703,8 +753,12 @@
                             node.getAttribute('row-id'));
                         var record = e.currentTarget.getRecord(row_id);
                         Y.Array.each(record.get('reviews'), function (r) {
-                            var w = new InlineReview(
-                                {boundingBox: node, review: r});
+                            var w = new InlineReview({
+                                boundingBox: node,
+                                review: r,
+                                readonly: (ticket.current_workflow_step !==
+                                           r.workflow_step)
+                            });
                             w.render();
                         });
                     });
@@ -1020,4 +1074,4 @@
     Y.webui.get_workflow_steps();
     Y.webui.get_workflow_statuses();
 }, '0.0.1', {requires: ['datatable', 'datatype-number', 'io', 'json-parse',
-                       'json-stringify']});
+                       'json-stringify', 'overlay', 'widget-autohide']});

=== modified file 'webui/tickets/static/tickets/webuiforms.js'
--- webui/tickets/static/tickets/webuiforms.js	2014-10-30 04:57:56 +0000
+++ webui/tickets/static/tickets/webuiforms.js	2014-11-06 17:15:07 +0000
@@ -142,7 +142,7 @@
 
             // Hijack the default (www-urlencoded) form submission and
             // submit its content as JSON.
-            f.getField('create-button').on('click', function(e) {
+            Y.one('input[name="create-button"]').on('click', function(e) {
                 e.halt();
                 if (!f._runValidation()) {
                     return 1;
@@ -256,7 +256,7 @@
                     .set('href', '.')
             );
 
-            f.getField('edit-button').on('click', function(e) {
+            Y.one('input[name="edit-button"]').on('click', function(e) {
                 e.halt();
                 if (!f._runValidation()) {
                     return 1;