Merge branch 'hotfix'

ubc · Feb 13, 2013 · 985bb53 · 985bb53
2 parents 36d3e58 + d80948d
commit 985bb53
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 37 deletions.
diff --git a/app/config/core.php b/app/config/core.php
@@ -342,7 +342,7 @@
   $CWL['applicationID'] = '';
   $CWL['applicationPassword'] = '';
 
-  define('IPEER_VERSION', '3.0.2');
+  define('IPEER_VERSION', '3.0.3');
 
 
 /**

diff --git a/app/controllers/components/evaluation.php b/app/controllers/components/evaluation.php
@@ -285,18 +285,18 @@ function saveSimpleEvaluation($params=null, $groupEvent=null, $evaluationSubmiss
         }
 
         // if no submission exists, create one
-        $grpEvent = $groupEvent['GroupEvent']['id'];
-        $event = $groupEvent['GroupEvent']['event_id'];
-        $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $grpEvent;
-        $evaluationSubmission['EvaluationSubmission']['event_id'] = $event;
-        $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
-        // save evaluation submission
-        $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
-        $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
-        if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
-            return false;
+        $sub = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($grpEvent, $evaluator);
+        if (empty($sub)) {       
+            $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $grpEvent;
+            $evaluationSubmission['EvaluationSubmission']['event_id'] = $event;
+            $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
+            // save evaluation submission
+            $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
+            $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
+            if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
+                return false;
+            }
         }
-
         //checks if all members in the group have submitted
         //the number of submission equals the number of members
         //means that this group is ready to review
@@ -1685,10 +1685,8 @@ function saveSurveyEvaluation($params=null)
             $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
             $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
             $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
-        } else {
-            //if existing record, just update the time submitted
-            $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
-        }
+        } 
+
         $surveyInput = array();
         $surveyInput['SurveyInput']['user_id'] = $userId;
         $surveyInput['SurveyInput']['event_id'] = $eventId;

diff --git a/app/controllers/evaluations_controller.php b/app/controllers/evaluations_controller.php
@@ -668,6 +668,7 @@ function _makeRubricEvaluation ($event, $groupId)
             $groupId = $this->params['form']['group_id'];
 
             $courseId = $this->params['form']['course_id'];
+
             if (!$this->validRubricEvalComplete($this->params['form'])) {
                 $this->Session->setFlash(__('validRubricEvalCompleten failure', true));
                 $this->redirect('/evaluations/makeEvaluation/'.$eventId.'/'.$groupId);
@@ -726,15 +727,17 @@ function completeEvaluationRubric ()
         // if no submission exists, create one
         //Get the target event submission
         $evaluationSubmission = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($groupEventId, $evaluator);
-        $this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
-        $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
-        $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
-        $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
-        // save evaluation submission
-        $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
-        $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
-        if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
-            $status = false;
+        if (empty($evaluationSubmission)) {
+            $this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
+            $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
+            $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
+            $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
+            // save evaluation submission
+            $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
+            $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
+            if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
+                $status = false;
+            }
         }
 
 
@@ -893,16 +896,17 @@ function completeEvaluationMixeval ()
         // if no submission exists, create one
         //Get the target event submission
         $evaluationSubmission = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($groupEventId, $evaluator);
-        $this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
-
-        $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
-        $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
-        $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
-        // save evaluation submission
-        $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
-        $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
-        if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
-            $status = false;
+        if (empty($evaluationSubmission)) {
+            $this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
+            $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
+            $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
+            $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
+            // save evaluation submission
+            $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
+            $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
+            if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
+                $status = false;
+            }
         }
 
         //checks if all members in the group have submitted

diff --git a/app/webroot/css/ipeer.css b/app/webroot/css/ipeer.css
@@ -1306,6 +1306,10 @@ textarea.question-title-textarea, textarea.question-descriptor {
     width: 97%;
 }
 
+.question-descriptor {
+    overflow: auto;
+}
+
 .descriptor-title {
     margin: 0.5em 0;
     width: 150px;

diff --git a/app/webroot/js/evaleditor.js b/app/webroot/js/evaleditor.js
@@ -31,7 +31,7 @@ var EvalEditor = Class.create({
     this.options = Object.extend(defaults, arguments[2] || { });
 
     this.container = $(container);
-    this.max_order = 0;
+    this.max_order = 1;
     this.descriptor_indexes = new Array();
 
     // set the zero mark control

diff --git a/readme.md b/readme.md
@@ -1,3 +1,10 @@
+iPeer 3.0.2
+----------------------------
+This is a maintenance release. It is recommended to upgrade to this version as it fixes a one critical bug.
+* Fix incorrect question number in mixeval
+* Using student first submission timestamp as late penalty criteria
+* Fix mixeval descriptor overflow issue
+
 iPeer 3.0.2
 ----------------------------
 This is a maintenance release. It is recommended to upgrade to this version as it fixes a few critical bugs.

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.0.2
+3.0.3