Changeset ac1aa3 in indico

Timestamp:

03/02/11 14:03:36 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

ddf66a

Parents:

4bd61a

git-author:

Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (01/24/11 17:43:15)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/02/11 14:03:36)

Message:

[FTR] Remove question and keep the results

• Implemented the functionality of removing questions choosing if you want to keep the judgements of the question which you are removing, or you want to remove every previous judgement of that question.

Location:

indico

Files:

• MaKaC/review.py (modified) (3 diffs)
• MaKaC/reviewing.py (modified) (4 diffs)
• MaKaC/services/implementation/reviewing.py (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfModifAbstractReviewingSettings.tpl (modified) (1 diff)
• htdocs/js/indico/Core/Dialogs/Popup.js (modified) (5 diffs)
• htdocs/js/indico/Legacy/Widgets.js (modified) (2 diffs)

indico/MaKaC/review.py

@@ -1121 +1121 @@
             abs.recalculateRating(scaleLower, scaleHigher)
 
+    def removeAnswersOfQuestion(self, questionId):
+        ''' Remove a question results for each abstract '''
+        for abs in self.getAbstractList():
+            abs.removeAnswersOfQuestion(questionId)
 
     def notifyModification(self):
@@ -2374 +2378 @@
             self._rating = "%.2f" % (ratingSum/judNum)
 
+    def removeAnswersOfQuestion(self, questionId):
+        ''' Remove the answers of the question with questionId value '''
+        for track in self.getTrackListSorted():
+            for jud in self.getJudgementsHistoricalByTrack(track):
+                jud.removeAnswer(questionId)
+
 
 
@@ -2470 +2480 @@
         self._totalJudValue = self.calculateAnswersTotalValue()
 
+    def removeAnswer(self, questionId):
+        ''' Remove the current answers of the questionId '''
+        for ans in self._answers:
+            if ans.getQuestionId() == questionId:
+                self._answers.remove(ans)
 
 

indico/MaKaC/reviewing.py

@@ -1114 +1114 @@
         """ Returns the list of questions
         """
-        return self._reviewingQuestions
-
-    def removeReviewingQuestion(self, questionId):
+        # Filter the non visible questions
+        visibleQuestions = []
+        for question in self._reviewingQuestions:
+            if question.getVisible():
+                visibleQuestions.append(question)
+        return visibleQuestions
+
+    def removeReviewingQuestion(self, questionId, keepJud):
         """ Removes a question from the list
         """
@@ -1122 +1127 @@
 
         if question:
-            self._reviewingQuestions.remove(question)
-            self.notifyModification()
+            if keepJud:
+                question.setVisible(False)
+            else:
+                self._reviewingQuestions.remove(question)
+                self.notifyModification()
         else:
             raise MaKaCError("Cannot remove a question which doesn't exist")
@@ -1271 +1279 @@
         self._id = newId
         self._text = text
+        self._visible = True
 
     def getId(self):
@@ -1278 +1287 @@
         return self._text
 
+    def getVisible(self):
+        return self._visible
+
     def setText(self, text):
         self._text = text
+
+    def setVisible(self, value):
+        self._visible = value
 
     def notifyModification(self):

indico/MaKaC/services/implementation/reviewing.py

@@ -947 +947 @@
         AbstractReviewingBase._checkParams(self)
         self._value = self._params.get("value") # value is the question id
-
-    def _getAnswer(self):
-        self._confAbstractReview.removeReviewingQuestion(self._value)
+        self._keepJud = self._params.get("keepJud") # keep the previous judgements of the question
+
+    def _getAnswer(self):
+        # remove the question
+        self._confAbstractReview.removeReviewingQuestion(self._value, self._keepJud)
+        if not self._keepJud:
+            # Purge all the judgements already exist with answers of this question
+            self._conf.getAbstractMgr().removeAnswersOfQuestion(self._value)
+            self._conf.getAbstractMgr().recalculateAbstractsRating(self._confAbstractReview.getScaleLower(), self._confAbstractReview.getScaleHigher())
         reviewingQuestions = self._confAbstractReview.getReviewingQuestions()
+        # Build the answer
         fossils = []
         for question in reviewingQuestions:

indico/MaKaC/webinterface/tpls/ConfModifAbstractReviewingSettings.tpl

@@ -45 +45 @@
         'edit': 'reviewing.abstractReviewing.editQuestion'},
         {conference: '<%= abstractReview.getConference().getId() %>'},'question',
-        'Add the questions that the abstract reviewers must answer'));
+        'Add the questions that the abstract reviewers must answer', true));
 
 

indico/htdocs/js/indico/Core/Dialogs/Popup.js

@@ -505 +505 @@
              var self = this;
 
-             var okButton = Html.input('button', {style:{marginRight: pixels(3)}}, $T('OK'));
+             var okButton = Html.input('button', {style:{marginRight: pixels(3)}}, $T(this.buttonTitle));
              okButton.observeClick(function(){
                  self.close();
@@ -523 +523 @@
     },
 
-    function(title, content, handler) {
+    function(title, content, handler, buttonTitle) {
         var self = this;
 
+        if (buttonTitle) {
+            this.buttonTitle = buttonTitle;
+        } else {
+            this.buttonTitle = 'OK';
+        }
         this.content = content;
         this.handler = handler;
@@ -578 +583 @@
 
 /**
- * Works exactly the same as the ConfirmPopup, but includes a parametermanager to perform checks when pressing OK
- */
-type("ConfirmPopupWithPM", ["ExclusivePopupWithButtons"],
-        {
-             draw: function() {
-                 var self = this;
-
-                 var okButton = Html.input('button', {style:{marginRight: pixels(3)}}, $T('OK'));
-                 okButton.observeClick(function(){
-                     checkOK = self.parameterManager.check();
-                     if(checkOK){
-                         self.handler(true);
-                     }
-                 });
-
-                 var cancelButton = Html.input('button', {style:{marginLeft: pixels(3)}}, $T('Cancel'));
-                 cancelButton.observeClick(function(){
-                     self.close();
-                     self.handler(false);
-                 });
-
-                 return this.ExclusivePopupWithButtons.prototype.draw.call(this,
-                         this.content,
-                         Html.div({}, okButton, cancelButton));
-             }
-        },
-
-        function(title, content, handler) {
-            var self = this;
-
-            this.content = content;
-            this.handler = handler;
-            this.parameterManager = new IndicoUtil.parameterManager();
-            this.ExclusivePopupWithButtons(Html.div({style:{textAlign: 'center'}}, title), function(){
-                self.handler(false);
-                return true;
-            });
-        }
-    );
-
- * It will have a title, a close button, an SAVE button and a Cancel button.
+ * Utility function to display a three buttons popup.
+ * The difference with ConfirmButton is the existence of a third button.
+ * Apart from the title and close button, the three buttons display, two of them configurables and Cancel
  * @param {Html or String} title The title of the error popup.
  * @param {Element} content Anything you want to put inside.
- * @param {function} handler A function that will be called with a boolean as argument:
- *                   true if the user pressers "Save", or false if the user presses "Cancel"
- */
-type("SavePopup", ["ExclusivePopupWithButtons"],
+ * @param {function} handler A function that will be called with an Integer as argument:
+ *                   1 if the user press button1, 2 for button2, 0 for "Cancel"
+ */
+type("SpecialRemovePopup", ["ExclusivePopupWithButtons"],
     {
          draw: function() {
              var self = this;
 
-             var saveButton = Html.input('button', {style:{marginRight: pixels(3)}}, $T('Save'));
-             saveButton.observeClick(function(){
-                 self.close();
-                 self.handler(true);
+             var button1 = Html.input('button', {style:{marginRight: pixels(3)}}, $T(this.buttonTitle1));
+             button1.observeClick(function(){
+                 self.close();
+                 self.handler(1);
+             });
+
+             var button2 = Html.input('button', {style:{marginLeft: pixels(3), marginRight: pixels(3)}}, $T(this.buttonTitle2));
+             button2.observeClick(function(){
+                 self.close();
+                 self.handler(2);
              });
 
@@ -638 +611 @@
              cancelButton.observeClick(function(){
                  self.close();
+                 self.handler(0);
              });
 
              return this.ExclusivePopupWithButtons.prototype.draw.call(this,
                      this.content,
-                     Html.div({}, saveButton, cancelButton));
+                     Html.div({}, button1, button2, cancelButton));
          }
     },
 
-    function(title, content, handler) {
+    function(title, content, handler, buttonTitle1, buttonTitle2) {
         var self = this;
 
+        this.buttonTitle1 = buttonTitle1;
+        this.buttonTitle2 = buttonTitle2;
         this.content = content;
         this.handler = handler;
         this.ExclusivePopupWithButtons(Html.div({style:{textAlign: 'center'}}, title), function(){
+            self.handler(0);
             return true;
         });
     }
 );
+
 
 /**
@@ -710 +688 @@
     }
 );
+
 
 type("WarningPopup", ["AlertPopup"],

indico/htdocs/js/indico/Legacy/Widgets.js

@@ -1209 +1209 @@
         @param methods: get, add, remove, edit
         @param kindOfElement: Title of the element that you want to manage. Example 'question'
-        @param header: Header for the table of elements
+        @param header: Header text for the table of elements
+        @param specialRemove: Shows if is necessary a special way to remove items
         @return result (return of request): list of items with the fields 'text': content of the item, 'id': element id.
         @return the content of the component. Table with list of elements and input and button to add new elements to the list
       */
-        manageListOfElements: function(methods, attributes, kindOfElement, header) {
+        manageListOfElements: function(methods, attributes, kindOfElement, header, specialRemove) {
 
             var widgetContent = Html.div();
@@ -1262 +1263 @@
             };
 
-        // Draw the list of current questions added
-        var drawListOfElements = function(result) {
-            // Initialize the i counter
-            this.i = 0;
-            self = this;
-
-            // Remove previous elements
-            if ($E('elementsDiv')) {
-                widgetContent.remove($E('elementsDiv'));
-            }
-
-            if (result.length) {
-                var content = Html.div({id:'elementsDiv'});
-                var table = Html.table({className:'infoQuestionsTable', cellspacing:'0'});
-                content.append(table);
-
-                // Create the table with the required data
-                var tr;
-                var spanRemoveList = [];
-                var spanEditList = [];
-                var tdEdit;
-                var tdRemove;
-
-                for (var i=0; i < result.length ; i++) {
-                    tr = Html.tr({className: 'infoTR'});
-                    tdElement = Html.td({className: 'questionContent'}, result[i].text);
-                    tdElement.dom.id = "TEID_"+result[i].id;
-
-                    // 'Edit' elements and functionality
-                    tdEdit = Html.td({className: 'content'});
-                    var spanEdit = Html.span({className: 'link'},'Edit');
-                    spanEdit.dom.id = "QEID_"+result[i].id; // Set the span id with the question id included
-                    spanEdit.dom.name = result[i].text;
-                    spanEditList.push(spanEdit);
-                    tdEdit.append(spanEdit);
-
-                    spanEditList[i].observeClick(function(event) {
-                        var spanId = event.target.id.split('_')[1];
-                        var previousText = $E('TEID_'+spanId).dom.textContent;
-                        var popupContent = Html.textarea({id:'modifyArea', cols:'40', rows:'7'}, previousText);
-                        var popup = new SavePopup('Edit '+kindOfElement, popupContent,
-                                function(event) {
-                                    var attr = attributes;
-                                    attr['id'] = spanId;
-                                    attr['text'] = popupContent.dom.value;
-                                    indicoRequest(methods.edit,
-                                        attr,
-                                        function(result, error){
-                                            if (!error) {
-                                                widgetContent.append(drawListOfElements(result));
-                                                widgetContent.append(drawFooter());
+                // Draw the list of current questions added
+                var drawListOfElements = function(result) {
+                    // Initialize the i counter
+                    this.i = 0;
+                    self = this;
+
+                    // Remove previous elements
+                    if ($E('elementsDiv')) {
+                        widgetContent.remove($E('elementsDiv'));
+                    }
+
+                    if (result.length) {
+                        var content = Html.div({id:'elementsDiv'});
+                        var table = Html.table({className:'infoQuestionsTable', cellspacing:'0'});
+                        content.append(table);
+
+                        // Create the table with the required data
+                        var tr;
+                        var spanRemoveList = [];
+                        var spanEditList = [];
+                        var tdEdit;
+                        var tdRemove;
+
+                        for (var i=0; i < result.length ; i++) {
+                            tr = Html.tr({className: 'infoTR'});
+                            tdElement = Html.td({className: 'questionContent'}, result[i].text);
+                            tdElement.dom.id = "TEID_"+result[i].id;
+
+                            // 'Edit' elements and functionality
+                            tdEdit = Html.td({className: 'content'});
+                            var spanEdit = Html.span({className: 'link'},'Edit');
+                            spanEdit.dom.id = "QEID_"+result[i].id; // Set the span id with the question id included
+                            spanEdit.dom.name = result[i].text;
+                            spanEditList.push(spanEdit);
+                            tdEdit.append(spanEdit);
+
+                            spanEditList[i].observeClick(function(event) {
+                                var spanId = event.target.id.split('_')[1];
+                                var previousText = $E('TEID_'+spanId).dom.textContent;
+                                var popupContent = Html.textarea({id:'modifyArea', cols:'40', rows:'7'}, previousText);
+                                var popup = new ConfirmPopup('Edit '+kindOfElement, popupContent,
+                                        function(action) {
+                                        if (action) {
+                                                    var attr = attributes;
+                                                    attr['id'] = spanId;
+                                                    attr['text'] = popupContent.dom.value;
+                                                    indicoRequest(methods.edit,
+                                                        attr,
+                                                        function(result, error){
+                                                            if (!error) {
+                                                                widgetContent.append(drawListOfElements(result));
+                                                                widgetContent.append(drawFooter());
+                                                            }
+                                                        });
+                                            }
+                                        }, 'Save');
+                                popup.open();
+                            });
+
+                            // 'Remove' elements and functionality
+                            tdRemove = Html.td({className: 'content'});
+                            var spanRemove = Html.span({className: 'link'},'Remove');
+                            spanRemove.dom.id = "QRID_"+result[i].id; // Set the span id with the question id included
+                            spanRemoveList.push(spanRemove);
+                            tdRemove.append(spanRemove);
+
+                            spanRemoveList[i].observeClick(function(event){
+                                var spanId = event.target.id.split('_')[1];
+
+                                var attr = attributes;
+                                attr['value'] = spanId;
+                                if (!specialRemove) {
+                                        var popupContent = Html.span({}, 'Are you sure you want to remove the element?');
+                                        var popup = new ConfirmPopup('Remove '+kindOfElement, popupContent,
+                                                function(action) {
+                                            if (action) {
+                                                            var attr = attributes;
+                                                            attr['id'] = spanId;
+                                                            indicoRequest(methods.remove,
+                                                                attr,
+                                                                function(result, error){
+                                                                    if (!error) {
+                                                                        widgetContent.append(drawListOfElements(result));
+                                                                        widgetContent.append(drawFooter());
+                                                                        }
+                                                                });
+                                                }
+                                                }, 'Remove');
+                                } else {
+                                        var popupContent = Html.span({}, 'Do you want to keep the ratings of the judgements of this question (if they exist)?');
+                                        // For this popup we need two handlers
+                                        var popup = new SpecialRemovePopup('Remove '+kindOfElement, popupContent,
+                                    function(option) {
+                                                        if (option == 0) {
+                                                // close popup option
+                                                null;
                                             }
-                                        });
-                                    });
-                        popup.open();
-                    });
-
-                    // 'Remove' elements and functionality
-                    tdRemove = Html.td({className: 'content'});
-                    var spanRemove = Html.span({className: 'link'},'Remove');
-                    spanRemove.dom.id = "QRID_"+result[i].id; // Set the span id with the question id included
-                    spanRemoveList.push(spanRemove);
-                    tdRemove.append(spanRemove);
-
-                    spanRemoveList[i].observeClick(function(event){
-                        var spanId = event.target.id.split('_')[1];
-
-                        var attr = attributes;
-                        attr['value'] = spanId;
-
-                        var popupContent = Html.span({}, 'Are you sure you want to remove the element?');
-                        var popup = new SavePopup('Remove '+kindOfElement, popupContent,
-                                function(event) {
-                                    var attr = attributes;
-                                    attr['id'] = spanId;
-                                    indicoRequest(methods.remove,
-                                        attr,
-                                        function(result, error){
-                                            if (!error) {
-                                                widgetContent.append(drawListOfElements(result));
-                                                widgetContent.append(drawFooter());
-                                                }
-                                        });
-                                });
-                        popup.open();
-                    });
-
-
-                    table.append(tr);
-                    tr.append(tdElement);
-                    tr.append(tdEdit);
-                    tr.append(tdRemove);
-                }
-            }
-            return content;
-
-          };
+                                            if (option == 1) {
+                                                // Keep ratings handler
+                                                            var attr = attributes;
+                                                            attr['id'] = spanId;
+                                                            attr['keepJud'] = true;
+                                                            indicoRequest(methods.remove,
+                                                                attr,
+                                                                function(result, error){
+                                                                    if (!error) {
+                                                                        widgetContent.append(drawListOfElements(result));
+                                                                        widgetContent.append(drawFooter());
+                                                                        }
+                                                                });
+                                                }
+                                            if (option == 2) {
+                                                // Remove ratings handler
+                                                var attr = attributes;
+                                                attr['id'] = spanId;
+                                                            attr['keepJud'] = false;
+                                                            indicoRequest(methods.remove,
+                                                                attr,
+                                                                function(result, error){
+                                                                    if (!error) {
+                                                                        widgetContent.append(drawListOfElements(result));
+                                                                        widgetContent.append(drawFooter());
+                                                                        }
+                                                                });
+                                                }
+                                                }, 'Keep ratings', 'Remove ratings');
+                                }
+                                popup.open();
+                            });
+
+
+                            table.append(tr);
+                            tr.append(tdElement);
+                            tr.append(tdEdit);
+                            tr.append(tdRemove);
+                        }
+                    }
+                    return content;
+
+                  };
 
           return widgetContent;