Skip to content

Commit 985bb53

Browse files
xcompassxcompass
committed
Merge branch 'hotfix'
2 parents 36d3e58 + d80948d commit 985bb53

File tree

7 files changed

+50
-37
lines changed

7 files changed

+50
-37
lines changed

‎app/config/core.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
$CWL['applicationID'] = '';
343343
$CWL['applicationPassword'] = '';
344344

345-
define('IPEER_VERSION', '3.0.2');
345+
define('IPEER_VERSION', '3.0.3');
346346

347347

348348
/**

‎app/controllers/components/evaluation.php

+13-15
Original file line numberDiff line numberDiff line change
@@ -285,18 +285,18 @@ function saveSimpleEvaluation($params=null, $groupEvent=null, $evaluationSubmiss
285285
}
286286

287287
// if no submission exists, create one
288-
$grpEvent = $groupEvent['GroupEvent']['id'];
289-
$event = $groupEvent['GroupEvent']['event_id'];
290-
$evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $grpEvent;
291-
$evaluationSubmission['EvaluationSubmission']['event_id'] = $event;
292-
$evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
293-
// save evaluation submission
294-
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
295-
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
296-
if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
297-
return false;
288+
$sub = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($grpEvent, $evaluator);
289+
if (empty($sub)) {
290+
$evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $grpEvent;
291+
$evaluationSubmission['EvaluationSubmission']['event_id'] = $event;
292+
$evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
293+
// save evaluation submission
294+
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
295+
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
296+
if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
297+
return false;
298+
}
298299
}
299-
300300
//checks if all members in the group have submitted
301301
//the number of submission equals the number of members
302302
//means that this group is ready to review
@@ -1685,10 +1685,8 @@ function saveSurveyEvaluation($params=null)
16851685
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
16861686
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
16871687
$evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
1688-
} else {
1689-
//if existing record, just update the time submitted
1690-
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
1691-
}
1688+
}
1689+
16921690
$surveyInput = array();
16931691
$surveyInput['SurveyInput']['user_id'] = $userId;
16941692
$surveyInput['SurveyInput']['event_id'] = $eventId;

‎app/controllers/evaluations_controller.php

+23-19
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,7 @@ function _makeRubricEvaluation ($event, $groupId)
668668
$groupId = $this->params['form']['group_id'];
669669

670670
$courseId = $this->params['form']['course_id'];
671+
671672
if (!$this->validRubricEvalComplete($this->params['form'])) {
672673
$this->Session->setFlash(__('validRubricEvalCompleten failure', true));
673674
$this->redirect('/evaluations/makeEvaluation/'.$eventId.'/'.$groupId);
@@ -726,15 +727,17 @@ function completeEvaluationRubric ()
726727
// if no submission exists, create one
727728
//Get the target event submission
728729
$evaluationSubmission = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($groupEventId, $evaluator);
729-
$this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
730-
$evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
731-
$evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
732-
$evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
733-
// save evaluation submission
734-
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
735-
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
736-
if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
737-
$status = false;
730+
if (empty($evaluationSubmission)) {
731+
$this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
732+
$evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
733+
$evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
734+
$evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
735+
// save evaluation submission
736+
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
737+
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
738+
if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
739+
$status = false;
740+
}
738741
}
739742

740743

@@ -893,16 +896,17 @@ function completeEvaluationMixeval ()
893896
// if no submission exists, create one
894897
//Get the target event submission
895898
$evaluationSubmission = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($groupEventId, $evaluator);
896-
$this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
897-
898-
$evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
899-
$evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
900-
$evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
901-
// save evaluation submission
902-
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
903-
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
904-
if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
905-
$status = false;
899+
if (empty($evaluationSubmission)) {
900+
$this->EvaluationSubmission->id = $evaluationSubmission['EvaluationSubmission']['id'];
901+
$evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEventId;
902+
$evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
903+
$evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
904+
// save evaluation submission
905+
$evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
906+
$evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
907+
if (!$this->EvaluationSubmission->save($evaluationSubmission)) {
908+
$status = false;
909+
}
906910
}
907911

908912
//checks if all members in the group have submitted

‎app/webroot/css/ipeer.css

+4
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,10 @@ textarea.question-title-textarea, textarea.question-descriptor {
13061306
width: 97%;
13071307
}
13081308

1309+
.question-descriptor {
1310+
overflow: auto;
1311+
}
1312+
13091313
.descriptor-title {
13101314
margin: 0.5em 0;
13111315
width: 150px;

‎app/webroot/js/evaleditor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var EvalEditor = Class.create({
3131
this.options = Object.extend(defaults, arguments[2] || { });
3232

3333
this.container = $(container);
34-
this.max_order = 0;
34+
this.max_order = 1;
3535
this.descriptor_indexes = new Array();
3636

3737
// set the zero mark control

‎readme.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
iPeer 3.0.2
2+
----------------------------
3+
This is a maintenance release. It is recommended to upgrade to this version as it fixes a one critical bug.
4+
* Fix incorrect question number in mixeval
5+
* Using student first submission timestamp as late penalty criteria
6+
* Fix mixeval descriptor overflow issue
7+
18
iPeer 3.0.2
29
----------------------------
310
This is a maintenance release. It is recommended to upgrade to this version as it fixes a few critical bugs.

‎version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.2
1+
3.0.3

0 commit comments

Comments
 (0)