Changeset aee5515 in iPeer


Ignore:
Timestamp:
2012-12-12T13:23:24-08:00 (6 years ago)
Author:
Compass <pan.luo@…>
Branches:
3.1.x, dev, hotfix, master, pagodabox, ticket463
Children:
da4fc1a
Parents:
9df04ef0
Message:

Updated the result pages for missing indexes, also close #406

For #406, it seems all the result pages have grade shown.

Location:
app
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • app/controllers/components/evaluation.php

    r9df04ef0 raee5515  
    799799        $this->User->id = $userId;
    800800
    801         if ($event['group_event_id'] && $userId) {
    802             $rubricResult = $this->EvaluationRubric->getResultsByEvaluator($event['group_event_id'], $userId);
     801        if ($event['GroupEvent']['id'] && $userId) {
     802            $rubricResult = $this->EvaluationRubric->getResultsByEvaluator($event['GroupEvent']['id'], $userId);
    803803
    804804            $evalResult[$userId] = $rubricResult;
     
    13661366        $evalResult = array();
    13671367        $this->User->id = $userId;
    1368         if ($event['group_event_id'] && $userId) {
    1369             $mixevalResult = $this->EvaluationMixeval->getResultsByEvaluator($event['group_event_id'], $userId);
     1368        if ($event['GroupEvent']['id'] && $userId) {
     1369            $mixevalResult = $this->EvaluationMixeval->getResultsByEvaluator($event['GroupEvent']['id'], $userId);
    13701370            $evalResult[$userId] = $mixevalResult;
    13711371
     
    18881888        $studentResult = array();
    18891889
    1890         $results = $this->EvaluationSimple->getResultsByEvaluatee($event['group_event_id'], $this->Auth->user('id'));
     1890        $results = $this->EvaluationSimple->getResultsByEvaluatee($event['GroupEvent']['id'], $this->Auth->user('id'));
    18911891        if ($results !=null) {
    18921892            //Get Grade Release: grade_release will be the same for all evaluatee records
     
    18961896                //Get total mark each member received
    18971897                $receivedTotalScore = $this->EvaluationSimple->getReceivedTotalScore(
    1898                     $event['group_event_id'], $this->Auth->user('id'));
     1898                    $event['GroupEvent']['id'], $this->Auth->user('id'));
    18991899                $totalScore = $receivedTotalScore[0]['received_total_score'];
    19001900                $numMembers=$event['Event']['self_eval'] ?
    1901                     $this->GroupsMembers->find('count', 'group_id='.$event['group_id']) :
    1902                     $this->GroupsMembers->find('count', 'group_id='.$event['group_id']) - 1;
     1901                    $this->GroupsMembers->find('count', 'group_id='.$event['Group']['id']) :
     1902                    $this->GroupsMembers->find('count', 'group_id='.$event['Group']['id']) - 1;
    19031903                $aveScore = $totalScore / $numMembers;
    19041904                $studentResult['numMembers'] = $numMembers;
    19051905                $studentResult['receivedNum'] = count($receivedTotalScore);
    19061906
    1907                 $groupTotal = $this->EvaluationSimple->getGroupResultsByGroupEventId($event['group_event_id']);
    1908                 $groupTotalCount = $this->EvaluationSimple->getGroupResultsCountByGroupEventId($event['group_event_id']);
     1907                $groupTotal = $this->EvaluationSimple->getGroupResultsByGroupEventId($event['GroupEvent']['id']);
     1908                $groupTotalCount = $this->EvaluationSimple->getGroupResultsCountByGroupEventId($event['GroupEvent']['id']);
    19091909                $groupAve = $groupTotal[0]['received_total_score'] / $groupTotalCount[0]['received_total_count'];
    19101910            }
     
    19161916            if ($commentReleaseStatus) {
    19171917                //Comment is released; retrieve all comments
    1918                 $comments = $this->EvaluationSimple->getAllComments($event['group_event_id'], $this->Auth->user('id'));
     1918                $comments = $this->EvaluationSimple->getAllComments($event['GroupEvent']['id'], $this->Auth->user('id'));
    19191919                if (shuffle($comments)) {
    19201920                    $studentResult['comments'] = $comments;
  • app/models/evaluation_simple.php

    r9df04ef0 raee5515  
    371371                //Get total mark each member received
    372372                $receivedTotalScore = $this->getReceivedTotalScore(
    373                     $event['group_event_id'], $userId);
     373                    $event['GroupEvent']['id'], $userId);
    374374                $totalScore = $receivedTotalScore[0][0]['received_total_score'];
    375375                $numMemberSubmissions = $this->find('count', array(
     
    377377                        'EvaluationSimple.evaluatee' => $userId,
    378378                        'EvaluationSimple.event_id' => $event['Event']['id'],
    379                         'EvaluationSimple.grp_event_id' => $event['group_event_id'])));
     379                        'EvaluationSimple.grp_event_id' => $event['GroupEvent']['id'])));
    380380
    381381                $event_info = $this->Event->find(
     
    421421                $tmp_total = 0;
    422422                $avg = $this->find('all', array(
    423                     'conditions' => array('EvaluationSimple.grp_event_id' => $event['group_event_id']),
     423                    'conditions' => array('EvaluationSimple.grp_event_id' => $event['GroupEvent']['id']),
    424424                    'fields' => array('AVG(score) as avg', 'sum(score) as sum', 'evaluatee', 'grp_event_id'),
    425425                    'group' => 'evaluatee'
  • app/views/elements/evaluations/student_view_mixeval_details.ctp

    r9df04ef0 raee5515  
    11<?php
    2     $gradeReleased = isset($scoreRecords[$currentUser['id']]['grade_released']) ?
    3         $scoreRecords[$currentUser['id']]['grade_released'] : 1;
    4     $commentReleased = isset($scoreRecords[$currentUser['id']]['comment_released']) ?
    5         $scoreRecords[$currentUser['id']]['comment_released'] : 1;
     2    $gradeReleased = isset($scoreRecords[User::get('id')]['grade_released']) ?
     3        $scoreRecords[User::get('id')]['grade_released'] : 1;
     4    $commentReleased = isset($scoreRecords[User::get('id')]['comment_released']) ?
     5        $scoreRecords[User::get('id')]['comment_released'] : 1;
    66    $color = array("", "#FF3366","#ff66ff","#66ccff","#66ff66","#ff3333","#00ccff","#ffff33");
    77
     
    4747        <tr id='details'>
    4848        <?php if (isset($scoreRecords)) { ?>
    49         <td width='15%'><?php echo $currentUser['full_name'] ?></td>
     49        <td width='15%'><?php echo User::get('full_name') ?></td>
    5050    <?php } else { ?>
    5151        <td width='15%'><?php echo $member['User']['first_name'].' '.$member['User']['last_name']?></td>
     
    6767        <!-- Points Detail -->
    6868        <strong>Points: </strong>
    69         <?php if ($gradeReleased && isset($mixevalDet)) { 
     69        <?php if ($gradeReleased && isset($mixevalDet)) {
    7070            $lom = $mixevalDet['grade'];
    7171                $empty = $mixeval["Question"][$i-1]["multiplier"];
     
    138138     <tr id='details'>
    139139     <?php if (isset($scoreRecords)) { ?>
    140        <td width='15%'><?php echo $currentUser['full_name'] ?></td>
     140       <td width='15%'><?php echo User::get('full_name') ?></td>
    141141     <?php } else { ?>
    142142       <td width='15%'><?php echo $member['User']['first_name'].' '.$member['User']['last_name']?></td>
  • app/views/elements/evaluations/student_view_rubric_details.ctp

    r9df04ef0 raee5515  
    11<?php
    2 $gradeReleased = isset($scoreRecords[$currentUser['id']])? $scoreRecords[$currentUser['id']]['grade_released']: 1;
    3 $commentReleased = isset($scoreRecords[$currentUser['id']])? $scoreRecords[$currentUser['id']]['comment_released']: 1;
     2$gradeReleased = isset($scoreRecords[User::get('id')])? $scoreRecords[User::get('id')]['grade_released']: 1;
     3$commentReleased = isset($scoreRecords[User::get('id')])? $scoreRecords[User::get('id')]['comment_released']: 1;
    44$color = array("", "#FF3366","#ff66ff","#66ccff","#66ff66","#ff3333","#00ccff","#ffff33");
    55?>
    66<table class="standardtable">
    7         <tr>
     7    <tr>
    88    <td width="100" valign="top"><?php __('Person Being Evaluated')?></td>
    9     <?php foreach ($rubricCriteria as $criteria) { ?>
    10         <td><?php echo $criteria['criteria']?></td>
    11     <?php } ?>
     9    <?php foreach ($rubricCriteria as $criteria): ?>
     10        <td><?php echo $criteria['criteria']?></td>
     11    <?php endforeach; ?>
    1212    </tr>
    13 <?php if (!$gradeReleased && !$commentReleased) {
    14   $cols = $rubric['Rubric']["criteria"]+1; ?>
    15   <tr id='details' align="center"><td colspan="<?php echo $cols ?>">
    16   <font color="red"><?php __('Comments/Grades Not Released Yet.') ?></font></td></tr>
    17 <?php } else if ($gradeReleased || $commentReleased) {
    18   if (isset($evalResult[$userId])) {
    19     //Retrieve the individual rubric detail
    20    $memberResult = $evalResult[$userId];
    21    if (isset($scoreRecords)) {
    22      shuffle($memberResult);
    23    }
    24    foreach ($memberResult AS $row):
    25      $memberRubric = $row['EvaluationRubric']; ?>
    26      <tr id='details'>
    27      <?php if ($currentUser['id']!=$row['EvaluationRubric']['creator_id']) { ?>
    28         <td width='15%'><?php echo $currentUser['full_name'] ?></td>
    29      <?php } else {
    30         $member = $membersAry[$memberRubric['evaluatee']]; ?>
    31         <td width='15%'><?php echo $member['User']['first_name'].' '.$member['User']['last_name'] ?></td>
    32      <?php }
     13    <?php if (!$gradeReleased && !$commentReleased) {
     14        $cols = $rubric['Rubric']["criteria"]+1; ?>
     15    <tr id='details' align="center">
     16        <td colspan="<?php echo $cols ?>">
     17            <font color="red"><?php __('Comments/Grades Not Released Yet.') ?></font>
     18        </td>
     19    </tr>
     20    <?php } else if ($gradeReleased || $commentReleased) {
     21        if (isset($evalResult[$userId])) {
     22        //Retrieve the individual rubric detail
     23            $memberResult = $evalResult[$userId];
     24            if (isset($scoreRecords)) {
     25                shuffle($memberResult);
     26            }
     27        foreach ($memberResult AS $row):
     28            $memberRubric = $row['EvaluationRubric']; ?>
     29    <tr id='details'>
     30        <?php if (User::get('id')!=$row['EvaluationRubric']['creator_id']) { ?>
     31            <td width='15%'><?php echo User::get('full_name') ?></td>
     32        <?php } else {
     33            $member = $membersAry[$memberRubric['evaluatee']]; ?>
     34            <td width='15%'><?php echo $member['User']['first_name'].' '.$member['User']['last_name'] ?></td>
     35        <?php }
     36        $resultDetails = $memberRubric['details'];
     37        foreach ($resultDetails AS $detail) : $rubDet = $detail['EvaluationRubricDetail']; ?>
     38            <td valign="middle"><br />
     39                <!-- Points Detail -->
     40                <strong><?php echo __('Points', true) ?>: </strong>
     41                <?php if ($gradeReleased && isset($rubDet)) {
     42                    for ($v = 0; $v < $rubDet["selected_lom"]; $v++) {
     43                        echo $html->image('evaluations/circle.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle'));
     44                    }
     45                    for ($t=0; $t < $rubric["Rubric"]["lom_max"] - $rubDet["selected_lom"]; $t++) {
     46                        echo $html->image('evaluations/circle_empty.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle_empty'));
     47                    }
     48                } else {
     49                    echo __('n/a', true);
     50                }
    3351
    34      $resultDetails = $memberRubric['details'];
    35      foreach ($resultDetails AS $detail) : $rubDet = $detail['EvaluationRubricDetail']; ?>
    36         <td valign=\"middle\"><br />
    37         <!-- Points Detail -->
    38         <strong><?php echo __('Points', true) ?>: </strong>
    39         <? if ($gradeReleased && isset($rubDet)) {
    40                         $lom = $rubDet["selected_lom"];
    41                 $empty = $rubric["Rubric"]["lom_max"];
    42                 for ($v = 0; $v < $lom; $v++) {
    43                         echo $html->image('evaluations/circle.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle'));
    44                         $empty--;
    45                 }
    46                 for ($t=0; $t < $empty; $t++) {
    47                         echo $html->image('evaluations/circle_empty.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle_empty'));
    48                 } ?>
    49                 <br />
    50         <?php } else { ?>
    51                 n/a<br />
    52         <?php }
    53 
    54         //Grade Detail
    55         /*echo "<strong>Grade: </strong>";
    56         if ($gradeReleased && isset($rubDet)) {
    57           echo $rubDet["grade"] . " / " . $rubricCriteria['criteria_weight_'.$rubDet['criteria_number']] . "<br />";
    58         } else {
    59                 echo "n/a<br />";
    60         }*/
    61         //Comments
    62         ?>
    63         <br/><strong><?php echo __('Comment', true) ?>: </strong>
    64         <?php if ($commentReleased && isset($rubDet)) {
    65                 echo $rubDet["criteria_comment"];
    66         } else { ?>
    67                 n/a<br />
    68         <?php } ?>
    69 
    70         </td>
    71      <?php endforeach; ?>
     52                //Grade Detail
     53                echo "<br/><strong>Grade: </strong>";
     54                if ($gradeReleased && isset($rubDet)) {
     55                    //echo $rubDet["grade"] . " / " . $rubricCriteria['criteria_weight_'.$rubDet['criteria_number']];
     56                    echo $rubDet["grade"];
     57                } else {
     58                    echo __('n/a', true);
     59                }
     60                //Comments
     61                ?>
     62                <br/><strong><?php echo __('Comment', true) ?>: </strong>
     63                <?php echo $commentReleased && isset($rubDet)?$rubDet["criteria_comment"]: __('n/a', true)?>
     64            </td>
     65        <?php endforeach; ?>
    7266     </tr>
    7367     <!-- General Comment -->
    7468     <tr id='details'>
    75      <td></td>
    76      <?php $col = $rubric['Rubric']['criteria'] + 1; ?>
    77      <td colspan="<?php echo $col ?>">
    78      <strong><?php __('General Comment') ?>: </strong><br>
    79      <?php if ($commentReleased) {
    80        echo $memberRubric['general_comment'];
    81      }else { ?>
    82         n/a<br />
    83      <?php } ?>
    84      <br><br></td>
     69        <td></td>
     70        <?php $col = $rubric['Rubric']['criteria'] + 1; ?>
     71        <td colspan="<?php echo $col ?>">
     72            <strong><?php __('General Comment') ?>: </strong><br>
     73            <?php echo ($commentReleased ? $memberRubric['general_comment'] : __('n/a', true))?><br><br>
     74        </td>
    8575     </tr>
    8676    <?php endforeach;
    87     }
     77        }
    8878}
    8979 ?>
  • app/views/evaluations/student_view_mixeval_evaluation_results.ctp

    r9df04ef0 raee5515  
    1111<tr>
    1212    <td><?php echo $event['Event']['title'] ?></td>
    13     <td><?php echo $event['group_name'] ?></td>
     13    <td><?php echo $event['Group']['group_name'] ?></td>
    1414    <td><?php echo Toolkit::formatDate(date("Y-m-d H:i:s", strtotime($event['Event']['due_date']))) ?></td>
    1515    <td><?php echo ($event['Event']['self_eval']) ? 'Yes' : 'No' ?></td>
     
    3333<tr>
    3434    <td>
    35     <?php 
    36     isset($scoreRecords[$currentUser['id']]['grade_released'])? $gradeReleaseStatus = $scoreRecords[$currentUser['id']]['grade_released'] : $gradeReleaseStatus = array();
     35    <?php
     36    isset($scoreRecords[User::get('id')]['grade_released'])? $gradeReleaseStatus = $scoreRecords[User::get('id')]['grade_released'] : $gradeReleaseStatus = array();
    3737    if ($gradeReleaseStatus) {
    38             $finalAvg = $memberScoreSummary[$currentUser['id']]['received_ave_score'] - number_format($avePenalty, 2);
     38            $finalAvg = $memberScoreSummary[User::get('id')]['received_ave_score'] - number_format($avePenalty, 2);
    3939            (number_format($avePenalty, 2) > 0) ? ($stringAddOn = ' - '.'('.'<font color=\'red\'>'.number_format($avePenalty, 2).'</font>'.
    4040                ')'.'<font color=\'red\'>*</font>'.' = '.number_format($finalAvg, 2)) : $stringAddOn = '';
    41                
    42             echo number_format($memberScoreSummary[$currentUser['id']]['received_ave_score'], 2).$stringAddOn;
     41
     42            echo number_format($memberScoreSummary[User::get('id')]['received_ave_score'], 2).$stringAddOn;
    4343            number_format($avePenalty, 2) > 0 ? $penaltyNote = '&nbsp &nbsp &nbsp &nbsp &nbsp ( )'.'<font color=\'red\'>*</font>'.' : '.$studentResult['penalty'].
    4444                '% late penalty.' : $penaltyNote = '';
     
    6363    <!-- Render Event Info table -->
    6464          <?php
    65           if (isset($memberScoreSummary[$currentUser['id']])) {
    66             $receviedAvePercent = $memberScoreSummary[$currentUser['id']]['received_ave_score'] / $mixeval['Mixeval']['total_marks'] * 100;
    67             $releaseStatus = $scoreRecords[$currentUser['id']]['grade_released'];
     65          if (isset($memberScoreSummary[User::get('id')])) {
     66            $receviedAvePercent = $memberScoreSummary[User::get('id')]['received_ave_score'] / $mixeval['Mixeval']['total_marks'] * 100;
     67            $releaseStatus = $scoreRecords[User::get('id')]['grade_released'];
    6868          } else {
    6969          $receviedAvePercent = 0;
     
    8181//unset($scoreRecords[$rdAuth->id]);
    8282
    83 $gradeReleased = !empty($scoreRecords[$currentUser['id']]['grade_released']) ?
    84         $scoreRecords[$currentUser['id']]['grade_released'] :
     83$gradeReleased = !empty($scoreRecords[User::get('id')]['grade_released']) ?
     84        $scoreRecords[User::get('id')]['grade_released'] :
    8585        "No Grades Released";
    86 $commentReleased = !empty($scoreRecords[$currentUser['id']]['comment_released']) ?
    87         $scoreRecords[$currentUser['id']]['comment_released'] :
     86$commentReleased = !empty($scoreRecords[User::get('id')]['comment_released']) ?
     87        $scoreRecords[User::get('id')]['comment_released'] :
    8888        "No Comments Released";
    8989
     
    121121                  <div style="height: 200px;" id="panelResultsContent" class="panelContent">
    122122          <?php
    123     $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>$currentUser['id'], 'scoreRecords'=>$scoreRecords);
     123    $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
    124124    echo $this->element('evaluations/student_view_mixeval_details', $params);
    125125    ?>
     
    135135
    136136          <?php
    137     $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>$currentUser['id'], 'scoreRecords'=>null);
     137    $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>User::get('id'), 'scoreRecords'=>null);
    138138    echo $this->element('evaluations/student_view_mixeval_details', $params);
    139139    ?>
  • app/views/evaluations/student_view_rubric_evaluation_results.ctp

    r9df04ef0 raee5515  
    1010<tr>
    1111    <td><?php echo $event['Event']['title'] ?></td>
    12     <td><?php echo $event['group_name'] ?></td>
     12    <td><?php echo $event['Group']['group_name'] ?></td>
    1313    <td><?php echo Toolkit::formatDate(date("Y-m-d H:i:s", strtotime($event['Event']['due_date']))) ?></td>
    1414    <td><?php echo ($event['Event']['self_eval']) ? 'Yes' : 'No' ?></td>
     
    3232<tr>
    3333    <td>
    34     <?php 
    35     isset($scoreRecords[$currentUser['id']]['grade_released'])? $gradeReleaseStatus = $scoreRecords[$currentUser['id']]['grade_released'] : $gradeReleaseStatus = array();
     34    <?php
     35    isset($scoreRecords[User::get('id')]['grade_released'])? $gradeReleaseStatus = $scoreRecords[User::get('id')]['grade_released'] : $gradeReleaseStatus = array();
    3636    if ($gradeReleaseStatus) {
    37             $finalAvg = $memberScoreSummary[$currentUser['id']]['received_ave_score'] - $ratingPenalty;
     37            $finalAvg = $memberScoreSummary[User::get('id')]['received_ave_score'] - $ratingPenalty;
    3838            ($ratingPenalty > 0) ? ($stringAddOn = ' - '.'('.'<font color=\'red\'>'.$ratingPenalty.'</font>'.
    3939                ')'.'<font color=\'red\'>*</font>'.' = '.number_format($finalAvg, 2)) : $stringAddOn = '';
    40                
    41             echo number_format($memberScoreSummary[$currentUser['id']]['received_ave_score'], 2).$stringAddOn;
     40
     41            echo number_format($memberScoreSummary[User::get('id')]['received_ave_score'], 2).$stringAddOn;
    4242            $ratingPenalty > 0 ? $penaltyNote = '&nbsp &nbsp &nbsp &nbsp &nbsp ( )'.'<font color=\'red\'>*</font>'.' : '.$studentResult['penalty'].
    4343                '% late penalty.' : $penaltyNote = '';
     
    6666$color = array("", "#FF3366","#ff66ff","#66ccff","#66ff66","#ff3333","#00ccff","#ffff33");
    6767$membersAry = array();  //used to format result
    68 $groupAve = 0; 
    69 if (isset($scoreRecords[$currentUser['id']])) {
    70     $gradeReleased = $scoreRecords[$currentUser['id']]['grade_released'];
    71     $commentReleased = $scoreRecords[$currentUser['id']]['comment_released'];
     68$groupAve = 0;
     69if (isset($scoreRecords[User::get('id')])) {
     70    $gradeReleased = $scoreRecords[User::get('id')]['grade_released'];
     71    $commentReleased = $scoreRecords[User::get('id')]['comment_released'];
    7272} else {
    7373    $gradeReleased = 0;
     
    107107                  <div style="height: 200px;" id="panelResultsContent" class="panelContent">
    108108          <?php
    109     $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>$currentUser['id'], 'scoreRecords'=>$scoreRecords);
     109    $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
    110110    echo $this->element('evaluations/student_view_rubric_details', $params);
    111111    ?>
     
    121121
    122122          <?php
    123     $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>$currentUser['id'], 'scoreRecords'=>$scoreRecords);
     123    $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
    124124    echo $this->element('evaluations/student_view_rubric_details', $params);
    125125    ?>
  • app/views/evaluations/student_view_simple_evaluation_results.ctp

    r9df04ef0 raee5515  
    1111    <td><?php echo $event['Event']['title'] ?></td>
    1212    <td><?php echo $event['Group']['group_name'] ?></td>
    13     <td><?php echo Toolkit::formatDate(date("Y-m-d H:i:s", strtotime($event['Event']['due_date']))) ?></td>
     13    <td><?php echo Toolkit::formatDate($event['Event']['due_date']) ?></td>
    1414    <td><?php echo ($event['Event']['self_eval']) ? 'Yes' : 'No' ?></td>
    1515</tr>
     
    6161<table class="standardtable">
    6262    <tr>
    63         <th><?php __('Comments&nbsp;(Randomly Ordered)')?></th>
     63        <th><?php __('Comments')?> (<?php __('Randomly Ordered')?>)</th>
    6464    </tr>
    6565    <?php if (isset($studentResult['comments'])) {
     
    7676    <?php } ?>
    7777</table>
     78<div style="text-align: center;">
     79<input type="button" name="Back" value="Back" onclick="javascript:(history.length > 1 ? history.back() : window.close());">
     80</div>
  • app/views/evaluations/student_view_survey_evaluation_results.ctp

    r9df04ef0 raee5515  
    6363    }
    6464}
    65 echo '<br>';
    6665
    6766function boldSelected($choices, $selected) {
     
    6968    $answers = array();
    7069    $data = array();
    71    
     70
    7271    // grabbing all the choices
    7372    foreach ($choices as $choice) {
     
    7877        $answers[] = $select['SurveyInput']['response_text'];
    7978    }
    80    
     79
    8180    foreach ($options as $option) {
    8281        // option is chosen
     
    8887        }
    8988    }
    90    
     89
    9190    return $data;
    9291}
    9392?>
     93<div style="text-align: center;">
     94<input type="button" name="Back" value="Back" onclick="javascript:(history.length > 1 ? history.back() : window.close());">
    9495</div>
     96</div>
Note: See TracChangeset for help on using the changeset viewer.