Changeset 6602514 in iPeer


Ignore:
Timestamp:
2012-12-16T02:01:22-08:00 (6 years ago)
Author:
Compass <pan.luo@…>
Branches:
3.1.x, dev, hotfix, master, pagodabox, ticket463
Children:
a0781ef
Parents:
4b4b150
git-author:
Compass <pan.luo@…> (12/16/2012 02:00:28 AM)
git-committer:
Compass <pan.luo@…> (12/16/2012 02:01:22 AM)
Message:

Change the styles for evaluation result pages

Location:
app
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed
  • app/controllers/events_controller.php

    r4b4b150 r6602514  
    258258            $modelName = 'Rubric';
    259259            break;
    260         case 3:
     260        case 4:
    261261            $modelName = 'Mixeval';
    262262        }
  • app/views/elements/evaluations/student_view_mixeval_details.ctp

    r4b4b150 r6602514  
    11<?php
    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;
    6     $color = array("", "#FF3366","#ff66ff","#66ccff","#66ff66","#ff3333","#00ccff","#ffff33");
     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;
     6$color = array("", "#FF3366","#ff66ff","#66ccff","#66ff66","#ff3333","#00ccff","#ffff33");
    77
    8     $pos = 1;
     8$pos = 1;
    99?>
    10 <br/><br/>
    11 <table class="standardtable">
    12         <tr>
    13     <td width="100" valign="top" colspan="<?php echo ($mixeval['Mixeval']["lickert_question_max"]+1)?>"><?php __('Section One')?>:</td>
     10<table class="standardtable" style="margin-top: 2em;">
     11    <tr><td width="100" colspan="<?php echo ($mixeval['Mixeval']["lickert_question_max"]+1)?>"><?php __('Section One')?>:</td></tr>
     12    <tr>
     13        <th width="100"><?php __('Person Being Evaluated')?></th>
     14        <?php for ($i=1; $i<=$mixeval['Mixeval']["lickert_question_max"]; $i++):?>
     15            <?php if (isset($mixevalQuestion[$i])): ?>
     16                <th><?php echo $i.' '.$mixevalQuestion[$i]['title'] ?></th>
     17                <?php $pos++; ?>
     18            <?php endif; ?>
     19        <?php endfor; ?>
    1420    </tr>
    15         <tr>
    16     <td width="100" valign="top"><?php __('Person Being Evaluated')?></td>
    17     <?php
    18       for ($i=1; $i<=$mixeval['Mixeval']["lickert_question_max"]; $i++) {
    19         if (isset($mixevalQuestion[$i])) { ?>
    20                 <td>
    21                 <?php echo $i.' '.$mixevalQuestion[$i]['title'] ?>
    22                 </td>
    23                 <?php $pos++;
    24         }
    25         }
    26     ?>
    27     </tr>
    28  <?php
    29 if (!$gradeReleased && !$commentReleased) {
     21    <?php if (!$gradeReleased && !$commentReleased) {
    3022    $cols = $mixeval['Mixeval']["lickert_question_max"]+1; ?>
    3123    <tr><td colspan="<?php echo $cols ?>">
    32     <font color="red"><?php __('Comments/Grades Not Released Yet.', true) ?></font></td></tr>
    33 <?php } else if ($gradeReleased || $commentReleased) {
     24    <font color="red"><?php __('Comments/Grades Not Released Yet.') ?></font></td></tr>
     25    <?php } else if ($gradeReleased || $commentReleased) {
    3426    //Retrieve the individual mixeval detail
    3527    if (isset($evalResult[$userId])) {
     
    4133
    4234        if ($scoreRecords == null) { // renders self evaluation
    43             $member = $membersAry[$memberMixeval['evaluatee']];
     35            $member = $membersAry[$memberMixeval['evaluatee']];
    4436        } else { // renders evaluations from peers
    4537            $member = $membersAry[$memberMixeval['evaluator']];
    4638        } ?>
    47         <tr id='details'>
     39        <tr>
    4840        <?php if (isset($scoreRecords)) { ?>
    4941        <td width='15%'><?php echo User::get('full_name') ?></td>
     
    6961        <?php if ($gradeReleased && isset($mixevalDet)) {
    7062            $lom = $mixevalDet['grade'];
    71                 $empty = $mixeval["Question"][$i-1]["multiplier"];
    72                 for ($v = 0; $v < $lom; $v++) {
    73                         echo $html->image('evaluations/circle.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle'));
    74                         $empty--;
    75                 }
    76                 for ($t=0; $t < $empty; $t++) {
    77                         echo $html->image('evaluations/circle_empty.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle_empty'));
    78                 } ?>
    79                 <br />
     63            $empty = $mixeval["Question"][$i-1]["multiplier"];
     64            for ($v = 0; $v < $lom; $v++) {
     65                echo $html->image('evaluations/circle.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle'));
     66                $empty--;
     67            }
     68            for ($t=0; $t < $empty; $t++) {
     69                echo $html->image('evaluations/circle_empty.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle_empty'));
     70            } ?>
     71            <br />
    8072        <?php } else { ?>
    81                 n/a<br />
     73            n/a<br />
    8274        <?php } ?>
    8375
     
    9991 ?>
    10092</table>
    101 <br/><br/>
    102 <table class="standardtable">
    103         <tr>
    104     <td width="100" valign="top" colspan="<?php echo ($mixeval['Mixeval']["prefill_question_max"]+1)?>"><?php __('Section Two')?>:</td>
    105     </tr>
    106         <tr>
    107     <td width="100" valign="top"><?php __('Person Being Evaluated')?></td>
    108     <?php
    109       for ($i=$pos; $i<=$mixeval['Mixeval']["total_question"]; $i++) {
    110         if (isset($mixevalQuestion[$i-1])) { ?>
    111                 <td>
    112                 <?php echo $i.' '.$mixevalQuestion[$i-1]['title'] ?>
    113                 </td>
    114         <?php }
    115         }
    116     ?>
     93
     94<table class="standardtable" style="margin-top: 2em;">
     95    <tr><td width="100" colspan="<?php echo ($mixeval['Mixeval']["prefill_question_max"]+1)?>"><?php __('Section Two')?>:</td></tr>
     96    <tr>
     97    <th width="100"><?php __('Person Being Evaluated')?></th>
     98    <?php for ($i=$pos; $i<=$mixeval['Mixeval']["total_question"]; $i++): ?>
     99        <?php if (isset($mixevalQuestion[$i-1])): ?>
     100            <th><?php echo $i.' '.$mixevalQuestion[$i-1]['title'] ?></th>
     101        <?php endif; ?>
     102    <?php endfor; ?>
    117103    </tr>
    118104<?php
    119105if (!$gradeReleased && !$commentReleased) {
    120106  $cols = $mixeval['Mixeval']["prefill_question_max"]+1; ?>
    121   <tr><td colspan="<?php $cols ?>">
    122   <font color="red"><?php __('Comments/Grades Not Released Yet.', true) ?></font></td></tr>
     107  <tr><td colspan="<?php echo $cols ?>"><font color="red"><?php __('Comments/Grades Not Released Yet.') ?></font></td></tr>
    123108<?php }else if ($gradeReleased || $commentReleased) {
    124109    if (isset($evalResult[$userId])) {
     
    136121     } ?>
    137122
    138      <tr id='details'>
     123     <tr>
    139124     <?php if (isset($scoreRecords)) { ?>
    140125       <td width='15%'><?php echo User::get('full_name') ?></td>
     
    148133        if (isset($memberMixeval['details'][$i-1])) {
    149134          $mixevalDet = $memberMixeval['details'][$i-1]['EvaluationMixevalDetail']; ?>
    150           <td valign="middle">
    151 
    152135          <!-- Comments -->
    153           <br/><strong><?php echo __('Comment', true)?>: </strong>
    154           <?php if ($commentReleased && isset($mixevalDet)) {
    155                 echo $mixevalDet["question_comment"];
    156           } else { ?>
    157                 n/a<br />
    158           <?php } ?>
    159           <br />
    160 
     136          <td>
     137            <strong><?php echo __('Comment', true)?>: </strong>
     138            <?php echo ($commentReleased && isset($mixevalDet) ? $mixevalDet["question_comment"] : 'n/a');?>
    161139          </td>
    162140      <?php }
  • app/views/elements/evaluations/student_view_rubric_details.ctp

    r4b4b150 r6602514  
    11<?php
    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;
     2$isReview = isset($isReview) && $isReview;
     3$gradeReleased = $isReview || (isset($scoreRecords[User::get('id')])? $scoreRecords[User::get('id')]['grade_released']: 1);
     4$commentReleased = $isReview || (isset($scoreRecords[User::get('id')])? $scoreRecords[User::get('id')]['comment_released']: 1);
    45$color = array("", "#FF3366","#ff66ff","#66ccff","#66ff66","#ff3333","#00ccff","#ffff33");
    56?>
    6 <table class="standardtable">
     7<table class="standardtable" style="margin-top: 1em;">
    78    <tr>
    8     <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 endforeach; ?>
     9        <th width="100"><?php __('Person Being Evaluated')?></th>
     10        <?php foreach ($rubricCriteria as $criteria): ?>
     11        <th><?php echo $criteria['criteria']?></th>
     12        <?php endforeach; ?>
    1213    </tr>
    13     <?php if (!$gradeReleased && !$commentReleased) {
    14         $cols = $rubric['Rubric']["criteria"]+1; ?>
    15     <tr id='details' align="center">
     14    <?php if (!$gradeReleased && !$commentReleased):?>
     15        <?php $cols = $rubric['Rubric']["criteria"]+1; ?>
     16    <tr>
    1617        <td colspan="<?php echo $cols ?>">
    17             <font color="red"><?php __('Comments/Grades Not Released Yet.') ?></font>
     18            <font color="red"><?php echo ($isReview ? '':__('Comments/Grades Not Released Yet.', true)) ?></font>
    1819        </td>
    1920    </tr>
    20     <?php } else if ($gradeReleased || $commentReleased) {
    21         if (isset($evalResult[$userId])) {
     21    <?php else: ?>
     22        <?php if (isset($evalResult[$userId])) {
    2223        //Retrieve the individual rubric detail
    2324            $memberResult = $evalResult[$userId];
     
    2728        foreach ($memberResult AS $row):
    2829            $memberRubric = $row['EvaluationRubric']; ?>
    29     <tr id='details'>
    30         <?php if (User::get('id')!=$row['EvaluationRubric']['creator_id']) { ?>
     30    <tr>
     31        <?php if (User::get('id')!=$row['EvaluationRubric']['evaluator']) { ?>
    3132            <td width='15%'><?php echo User::get('full_name') ?></td>
    3233        <?php } else {
    3334            $member = $membersAry[$memberRubric['evaluatee']]; ?>
    34             <td width='15%'><?php echo $member['User']['first_name'].' '.$member['User']['last_name'] ?></td>
     35            <td width='15%' rowspan="2"><?php echo $member['User']['first_name'].' '.$member['User']['last_name'] ?></td>
    3536        <?php }
    3637        $resultDetails = $memberRubric['details'];
    37         foreach ($resultDetails AS $detail) : $rubDet = $detail['EvaluationRubricDetail']; ?>
     38        foreach ($resultDetails as $detail) : $rubDet = $detail['EvaluationRubricDetail']; ?>
    3839            <td valign="middle"><br />
    3940                <!-- Points Detail -->
     
    6667     </tr>
    6768     <!-- General Comment -->
    68      <tr id='details'>
    69         <td></td>
     69     <tr>
    7070        <?php $col = $rubric['Rubric']['criteria'] + 1; ?>
    7171        <td colspan="<?php echo $col ?>">
     
    7676    <?php endforeach;
    7777        }
    78 }
    79  ?>
     78?>
     79<?php endif; ?>
    8080</table>
  • app/views/elements/evaluations/view_event_info.ctp

    r4b4b150 r6602514  
    1 <table class='event-detail full-size'>
    2   <tr class="tableheader"><td colspan="4" align="center"><?php __('Evaluation Event Detail')?></td></tr>
     1<table class="standardtable">
     2  <tr><th colspan="4"><?php __('Evaluation Event Detail')?></th></tr>
    33  <tr>
    44    <td width="15%"><?php __('Group')?>:</td>
     
    1414  </tr>
    1515  <tr>
    16     <td><?php __('Description')?>:&nbsp;</td>
     16    <td><?php __('Description')?>:</td>
    1717    <td colspan="3"><?php echo $event['Event']['description'] ?></td>
    1818  </tr>
  • app/views/evaluations/student_view_mixeval_evaluation_results.ctp

    r4b4b150 r6602514  
    1 <h2><?php __('Evaluation Result Detail')?></h2>
    2 <!-- Event Details Table -->
     1<?php echo $html->script('ricobase')?>
     2<?php echo $html->script('ricoeffects')?>
     3<?php echo $html->script('ricoanimation')?>
     4<?php echo $html->script('ricopanelcontainer')?>
     5<?php echo $html->script('ricoaccordion')?>
    36
    4 <table class="standardtable">
    5 <tr>
    6     <th><?php __('Event Name')?></th>
    7     <th><?php __('Evaluated By')?></th>
    8     <th><?php __('Due Date')?></th>
    9     <th><?php __('Self-Evaluation')?></th>
    10 </tr>
    11 <tr>
    12     <td><?php echo $event['Event']['title'] ?></td>
    13     <td><?php echo $event['Group']['group_name'] ?></td>
    14     <td><?php echo Toolkit::formatDate(date("Y-m-d H:i:s", strtotime($event['Event']['due_date']))) ?></td>
    15     <td><?php echo ($event['Event']['self_eval']) ? 'Yes' : 'No' ?></td>
    16 </tr>
    17 </table>
    18 
    19 <table class="standardtable">
    20 <tr>
    21     <th><?php __('Description')?></th>
    22 </tr>
    23 <tr>
    24     <td><?php echo $event['Event']['description'] ?></td>
    25 </tr>
    26 </table>
     7<?php echo $this->element('evaluations/view_event_info', array('controller'=>'evaluations', 'event'=>$event));?>
    278
    289<h2><?php __('Summary')?></h2>
     
    5233</table>
    5334
    54 <table width="100%"  border="0" cellpadding="8" cellspacing="0" bgcolor="#FFFFFF">
    55   <tr>
    56     <td>
    57 <?php echo $html->script('ricobase')?>
    58 <?php echo $html->script('ricoeffects')?>
    59 <?php echo $html->script('ricoanimation')?>
    60 <?php echo $html->script('ricopanelcontainer')?>
    61 <?php echo $html->script('ricoaccordion')?>
    62         <?php echo empty($params['data']['Evaluation']['id']) ? null : $html->hidden('Evaluation/id'); ?>
    63     <!-- Render Event Info table -->
    64           <?php
    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'];
    68           } else {
    69           $receviedAvePercent = 0;
    70           $releaseStatus = array();
    71         }
    72     ?>
     35<?php echo empty($params['data']['Evaluation']['id']) ? null : $html->hidden('Evaluation/id'); ?>
     36<!-- Render Event Info table -->
     37<?php
     38    if (isset($memberScoreSummary[User::get('id')])) {
     39        $receviedAvePercent = $memberScoreSummary[User::get('id')]['received_ave_score'] / $mixeval['Mixeval']['total_marks'] * 100;
     40        $releaseStatus = $scoreRecords[User::get('id')]['grade_released'];
     41    } else {
     42        $receviedAvePercent = 0;
     43        $releaseStatus = array();
     44    }
     45?>
    7346<div id='mixeval_result'>
    7447
     
    10275                                <br><br-->
    10376
    104 <table width="100%" border="0" align="center" cellpadding="4" cellspacing="2">
    105         <tr>
    106                 <td>
    10777<div id="accordion">
    10878    <!-- Panel of Evaluations Results -->
    109                 <div id="panelResults">
    110                   <div id="panelResultsHeader" class="panelheader">
    111                         <?php echo __('Evaluation Results From Your Teammates. (Randomly Ordered)       ', true);
    112                         if ( !$gradeReleased && !$commentReleased) {
    113           echo '<font color="red">'.__('Comments/Grades Not Released Yet.', true).'</font>';
    114                         }       else if ( !$gradeReleased) {
    115                           echo '<font color="red">'.__('Grades Not Released Yet.', true).'</font>';
    116         }       else if ( !$commentReleased) {
    117                           echo '<font color="red">'.__('Comments Not Released Yet.', true).'</font>';
    118         }
    119 ?>
    120                   </div>
    121                   <div style="height: 200px;" id="panelResultsContent" class="panelContent">
    122           <?php
    123     $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
    124     echo $this->element('evaluations/student_view_mixeval_details', $params);
    125     ?>
    126 
    127                   </div>
    128                 </div>
     79    <div id="panelResults">
     80        <div id="panelResultsHeader" class="panelheader">
     81            <?php echo __('Evaluation Results From Your Teammates. (Randomly Ordered)', true);
     82                if ( !$gradeReleased && !$commentReleased) {
     83                echo '<font color="red">'.__('Comments/Grades Not Released Yet.', true).'</font>';
     84                } else if ( !$gradeReleased) {
     85                    echo '<font color="red">'.__('Grades Not Released Yet.', true).'</font>';
     86                } else if ( !$commentReleased) {
     87                    echo '<font color="red">'.__('Comments Not Released Yet.', true).'</font>';
     88                }
     89            ?>
     90        </div>
     91        <div style="height: 200px;text-align: center;" id="panelResultsContent" class="panelContent">
     92            <?php
     93            $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
     94            echo $this->element('evaluations/student_view_mixeval_details', $params);
     95            ?>
     96        </div>
     97    </div>
    12998    <!-- Panel of Evaluations Reviews -->
    130                 <div id="panelReviews">
    131                   <div id="panelReviewsHeader" class="panelheader">
    132                         <?php echo __('Review Evaluations From You.', true)?>
    133                   </div>
    134                   <div style="height: 200px;" id="panelReviewsContent" class="panelContent">
    135 
    136           <?php
    137     $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>User::get('id'), 'scoreRecords'=>null);
    138     echo $this->element('evaluations/student_view_mixeval_details', $params);
    139     ?>
    140                   </div>
    141                 </div>
     99    <div id="panelReviews">
     100        <div id="panelReviewsHeader" class="panelheader">
     101            <?php echo __('Review Evaluations From You.', true)?>
     102        </div>
     103        <div style="height: 200px;" id="panelReviewsContent" class="panelContent">
     104            <?php
     105            $params = array('controller'=>'evaluations', 'mixeval'=>$mixeval, 'mixevalQuestion'=>$mixevalQuestion, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>User::get('id'), 'scoreRecords'=>null);
     106            echo $this->element('evaluations/student_view_mixeval_details', $params);
     107            ?>
     108        </div>
     109    </div>
    142110</div>
    143                 </td>
    144         </tr>
    145 
    146 </table>
    147         <script type="text/javascript"> new Rico.Accordion( 'accordion',
    148                                                                 {panelHeight:500,
    149                                                                  hoverClass: 'mdHover',
    150                                                                  selectedClass: 'mdSelected',
    151                                                                  clickedClass: 'mdClicked',
    152                                                                  unselectedClass: 'panelheader'});
    153 
    154         </script>
    155111</div>
    156112
    157         </td>
    158   </tr>
    159 </table>
     113<script type="text/javascript"> new Rico.Accordion( 'accordion',
     114        {panelHeight:500,
     115            hoverClass: 'mdHover',
     116            selectedClass: 'mdSelected',
     117            clickedClass: 'mdClicked',
     118            unselectedClass: 'panelheader'});
     119
     120</script>
  • app/views/evaluations/student_view_rubric_evaluation_results.ctp

    r4b4b150 r6602514  
    1 <h2><?php __('Evaluation Result Detail')?></h2>
    2 <!-- Event Details Table -->
    3 <table class="standardtable">
    4 <tr>
    5     <th><?php __('Event Name')?></th>
    6     <th><?php __('Evaluated By')?></th>
    7     <th><?php __('Due Date')?></th>
    8     <th><?php __('Self-Evaluation')?></th>
    9 </tr>
    10 <tr>
    11     <td><?php echo $event['Event']['title'] ?></td>
    12     <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>
    14     <td><?php echo ($event['Event']['self_eval']) ? 'Yes' : 'No' ?></td>
    15 </tr>
    16 </table>
     1<?php echo $this->element('evaluations/view_event_info', array('controller'=>'evaluations', 'event'=>$event));?>
     2
     3<h2><?php __('Summary')?></h2>
    174
    185<table class="standardtable">
    19 <tr>
    20     <th><?php __('Description')?></th>
    21 </tr>
    22 <tr>
    23     <td><?php echo $event['Event']['description'] ?></td>
    24 </tr>
    25 </table>
    26 
    27 <h2><?php __('Summary')?></h2>
    28 <table class="standardtable">
    29 <tr>
    30     <th><?php __('Rating')?></th>
    31 </tr>
     6<tr><th><?php __('Rating')?></th></tr>
    327<tr>
    338    <td>
     
    4015
    4116            echo number_format($memberScoreSummary[User::get('id')]['received_ave_score'], 2).$stringAddOn;
    42             $ratingPenalty > 0 ? $penaltyNote = '&nbsp &nbsp &nbsp &nbsp &nbsp ( )'.'<font color=\'red\'>*</font>'.' : '.$studentResult['penalty'].
     17            $ratingPenalty > 0 ? $penaltyNote = '&nbsp &nbsp &nbsp &nbsp &nbsp ( )'.'<font color=\'red\'>*</font>'.' : '.$penalty.
    4318                '% late penalty.' : $penaltyNote = '';
    4419            echo $penaltyNote;
     
    5126</table>
    5227
    53 <table width="100%"  border="0" cellpadding="8" cellspacing="0" bgcolor="#FFFFFF">
    54   <tr>
    55     <td>
    5628<?php echo $html->script('ricobase')?>
    5729<?php echo $html->script('ricoeffects')?>
     
    6032<?php echo $html->script('ricoaccordion')?>
    6133<?php echo empty($params['data']['Evaluation']['id']) ? null : $html->hidden('Evaluation/id'); ?>
    62 <div id='rubric_result'>
    6334
    6435<?php
     
    8859                                <br><br-->
    8960
    90 <table width="100%" border="0" align="center" cellpadding="4" cellspacing="2">
    91         <tr>
    92                 <td>
    9361<div id="accordion">
    9462    <!-- Panel of Evaluations Results -->
    95                 <div id="panelResults">
    96                   <div id="panelResultsHeader" class="panelheader">
    97                         <?php echo __('Evaluation Results From Your Teammates. (Randomly Ordered)       ', true);
    98                         if ( !$gradeReleased && !$commentReleased) {
    99                 echo '<font color="red">'.__('Comments/Grades Not Released Yet.', true).'</font>';
    100                         } else if ( !$gradeReleased) {
    101                             echo '<font color="red">'.__('Grades Not Released Yet.', true).'</font>';
     63    <div id="panelResults">
     64        <div id="panelResultsHeader" class="panelheader">
     65            <?php echo __('Evaluation Results From Your Teammates. (Randomly Ordered)', true);?>
     66            <font color="red">
     67            <?php if ( !$gradeReleased && !$commentReleased) {
     68                echo __('Comments/Grades Not Released Yet.', true);
     69            } else if ( !$gradeReleased) {
     70                echo __('Grades Not Released Yet.', true);
    10271            } else if ( !$commentReleased) {
    103                             echo '<font color="red">'.__('Comments Not Released Yet.', true).'</font>';
     72                echo __('Comments Not Released Yet.', true);
    10473            }
    10574            ?>
    106                   </div>
    107                   <div style="height: 200px;" id="panelResultsContent" class="panelContent">
    108           <?php
    109     $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
    110     echo $this->element('evaluations/student_view_rubric_details', $params);
    111     ?>
     75            </font>
     76        </div>
     77        <div style="height: 200px;" id="panelResultsContent" class="panelContent">
     78            <?php
     79            $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$evalResult, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
     80            echo $this->element('evaluations/student_view_rubric_details', $params);
     81            ?>
     82        </div>
     83    </div>
     84    <!-- Panel of Evaluations Reviews -->
     85    <div id="panelReviews">
     86        <div id="panelReviewsHeader" class="panelheader">
     87            <?php echo 'Review Evaluations From You.'?>
     88        </div>
     89        <div style="height: 200px;" id="panelReviewsContent" class="panelContent">
     90            <?php
     91            $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords, 'isReview' => true);
     92            echo $this->element('evaluations/student_view_rubric_details', $params);
     93            ?>
     94        </div>
     95    </div>
     96</div>
    11297
    113                   </div>
    114                 </div>
    115     <!-- Panel of Evaluations Reviews -->
    116                 <div id="panelReviews">
    117                   <div id="panelReviewsHeader" class="panelheader">
    118                         <?php echo 'Review Evaluations From You.'?>
    119                   </div>
    120                   <div style="height: 200px;" id="panelReviewsContent" class="panelContent">
     98<script type="text/javascript">
     99    new Rico.Accordion( 'accordion',
     100            {panelHeight:500,
     101            hoverClass: 'mdHover',
     102            selectedClass: 'mdSelected',
     103            clickedClass: 'mdClicked',
     104            unselectedClass: 'panelheader'});
    121105
    122           <?php
    123     $params = array('controller'=>'evaluations', 'rubric'=>$rubric, 'rubricCriteria'=>$rubricCriteria, 'membersAry'=>$groupMembers, 'evalResult'=>$reviewEvaluations, 'userId'=>User::get('id'), 'scoreRecords'=>$scoreRecords);
    124     echo $this->element('evaluations/student_view_rubric_details', $params);
    125     ?>
    126                   </div>
    127                 </div>
    128 </div>
    129                 </td>
    130         </tr>
    131 
    132 </table>
    133         <script type="text/javascript"> new Rico.Accordion( 'accordion',
    134                                                                 {panelHeight:500,
    135                                                                  hoverClass: 'mdHover',
    136                                                                  selectedClass: 'mdSelected',
    137                                                                  clickedClass: 'mdClicked',
    138                                                                  unselectedClass: 'panelheader'});
    139 
    140         </script>
    141 
    142 
    143         </td>
    144   </tr>
    145 </table>
    146 </div>
     106</script>
  • app/views/evaluations/view_mixeval_evaluation_results.ctp

    r4b4b150 r6602514  
    2727<!-- Render Event Info table -->
    2828<?php echo $this->element('evaluations/view_event_info', array('controller'=>'evaluations', 'event'=>$event));?>
     29<?php echo $this->element('evaluations/summary_info', array('controller'=>'evaluations', 'event'=>$event));?>
    2930
    30 <div class="event-summary">
    31     <span class="instruction-icon"><?php __('Summary:')?> ( <?php echo $this->Html->link(__('Basic', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Basic")?> |
    32     <?php echo $html->link(__('Detail', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Detail")?> )</span>
    33     <font size = "1" face = "arial" color = "red" >*Numerics in red denotes late submission penalty.</font>
    34         <?php if (!$allMembersCompleted): ?>
    35         <div class="incompleted">
    36               <?php __('These people have not yet submit their evaluations:')?>
    37             <ul>
    38                     <?php foreach($inCompletedMembers as $row): $user = $row['User']; ?>
    39                         <li><?php echo $user['first_name']." ".$user['last_name'] . ($row['Role']['role_id']==4 ? ' (TA)' : ' (student)');?></li>
    40                 <?php endforeach; ?>
    41             </ul>
    42         </div>
    43     <?php endif; ?>
    44 </div>
    45 
    46 <table class="eval-result full-size">
    47     <tr class="tableheader">
    48         <td valign="middle"><?php __('Student Name:')?></td>
    49         <td> <?php __('Total:')?>( /<?php echo number_format($mixeval['Mixeval']['total_marks'], 2)?>)</td>
     31<h3><?php __('Evaluation Results')?></h3>
     32<table class="standardtable">
     33    <tr>
     34        <th valign="middle"><?php __('Student Name:')?></th>
     35        <th> <?php __('Total:')?>( /<?php echo number_format($mixeval['Mixeval']['total_marks'], 2)?>)</th>
    5036    </tr>
    5137
     
    5945    </tr>
    6046    <?php if ($allMembersCompleted): ?>
    61     <tr class="tablecell2" align="center">
     47    <tr align="center">
    6248      <form name="evalForm" id="evalForm" method="POST" action="<?php echo $html->url('markEventReviewed') ?>">
    6349              <input type="hidden" name="event_id" value="<?php echo $event['Event']['id']?>" />
  • app/views/evaluations/view_mixeval_evaluation_results_detail.ctp

    r4b4b150 r6602514  
    1919
    2020<?php echo $this->element('evaluations/view_event_info', array('controller'=>'evaluations', 'event'=>$event));?>
    21 
    22 <div class="event-summary">
    23     <span class="instruction-icon"><?php __('Summary:')?> ( <?php echo $this->Html->link(__('Basic', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Basic")?> |
    24     <?php echo $html->link(__('Detail', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Detail")?> )</span>
    25     <font size = "1" face = "arial" color = "red" >*Numerics in red denotes late submission penalty.</font>
    26     <?php if (!$allMembersCompleted): ?>
    27         <div class="incompleted">
    28           <?php __('These people have not yet submit their evaluations:')?>
    29             <ul>
    30                 <?php foreach($inCompletedMembers as $row): $user = $row['User']; ?>
    31                     <li><?php echo $user['first_name']." ".$user['last_name'] . ($row['Role']['role_id']==4 ? ' (TA)' : ' (student)');?></li>
    32                 <?php endforeach; ?>
    33             </ul>
    34         </div>
    35     <?php endif; ?>
    36 </div>
     21<?php echo $this->element('evaluations/summary_info', array('controller'=>'evaluations', 'event'=>$event));?>
     22
    3723
    3824<!-- summary table -->
     
    133119    if ($groupMembersNoTutors) {
    134120        foreach ($groupMembersNoTutors as $member) {
    135             echo '<tr class="tablecell2" cellpadding="4" cellspacing="2" >';
     121            echo '<tr cellpadding="4" cellspacing="2" >';
    136122            $membersAry[$member['User']['id']]['member'] = $member;
    137123            echo '<td width="25%" class="group-members">' . $member['User']['first_name']." ".$member['User']['last_name'] . '</td></tr>' . "\n";
     
    150136<!-- end of summary table -->
    151137<tr><td>  </td></tr>    <!-- adding space between the submit button and the table -->
    152     <tr class="tablecell2" align="center"><td colspan="<?php echo ($mixeval['Mixeval']["lickert_question_max"] +2); ?>">
     138    <tr align="center"><td colspan="<?php echo ($mixeval['Mixeval']["lickert_question_max"] +2); ?>">
    153139        <form name="evalForm" id="evalForm" method="POST" action="<?php echo $html->url('markEventReviewed') ?>">
    154140            <input type="hidden" name="event_id" value="<?php echo $event['Event']['id']?>" />
     
    167153    </tr>
    168154</table>
    169 <table width="100%" border="0" align="center" cellpadding="4" cellspacing="2">
    170     <tr>
    171         <td align="center">
    172             <div id="accordion">
    173                     <?php $i = 0;
    174                 foreach($groupMembersNoTutors as $row):
    175                     $user = $row['User']; ?>
    176                     <div id="panel<?php echo $user['id']?>">
    177                     <div id="panel<?php echo $user['id']?>Header" class="panelheader">
    178                     <?php echo 'Evaluatee: '.$user['first_name']." ".$user['last_name']?>
    179                     </div>
    180                     <div style="height: 200px;" id="panel1Content" class="panelContent">
    181                     <br><b><?php
    182                         $deduction = number_format($membersAry[$user['id']]['received_total_score'] * $penalties[$user['id']]/100, 2);
    183                         $scaled = number_format($membersAry[$user['id']]['received_total_score'] * (1 - $penalties[$user['id']]/100), 2);
    184                         $percent = number_format($scaled/$mixeval['Mixeval']['total_marks'] * 100);
    185                         $ave_deduction = number_format($membersAry[$user['id']]['received_ave_score'] * $penalties[$user['id']]/100, 2);
    186                         $ave_scaled = number_format($membersAry[$user['id']]['received_ave_score'] * (1 - $penalties[$user['id']]/100), 2);
    187                         echo __("(Number of Evaluator(s): ",true).$membersAry[$user['id']]['received_count'].")<br/>";
    188                         echo __("Final Total: ",true).number_format($membersAry[$user['id']]['received_total_score'], 2);
    189                         $penalties[$user['id']] > 0 ? $penaltyAddOn = ' - '."<font color=\"red\">".$deduction."</font> = ".$scaled :
    190                             $penaltyAddOn = '';
    191                         echo $penaltyAddOn.' ('.$percent.'%)';
    192 
    193                         if (isset($membersAry[$user['id']]['received_ave_score'])) {
    194                             $memberAve = number_format($membersAry[$user['id']]['received_ave_score'], 2);
    195                             $memberAvePercent = number_format($ave_scaled * 100);
     155
     156<h3><?php __('Evaluation Results')?></h3>
     157
     158<div id="accordion">
     159    <?php $i = 0;
     160    foreach($groupMembersNoTutors as $row):
     161        $user = $row['User']; ?>
     162        <div id="panel<?php echo $user['id']?>">
     163        <div id="panel<?php echo $user['id']?>Header" class="panelheader">
     164        <?php echo 'Evaluatee: '.$user['first_name']." ".$user['last_name']?>
     165        </div>
     166        <div style="height: 200px;text-align: center;" id="panel1Content" class="panelContent">
     167        <br><b><?php
     168            $deduction = number_format($membersAry[$user['id']]['received_total_score'] * $penalties[$user['id']]/100, 2);
     169            $scaled = number_format($membersAry[$user['id']]['received_total_score'] * (1 - $penalties[$user['id']]/100), 2);
     170            $percent = number_format($scaled/$mixeval['Mixeval']['total_marks'] * 100);
     171            $ave_deduction = number_format($membersAry[$user['id']]['received_ave_score'] * $penalties[$user['id']]/100, 2);
     172            $ave_scaled = number_format($membersAry[$user['id']]['received_ave_score'] * (1 - $penalties[$user['id']]/100), 2);
     173            echo __("(Number of Evaluator(s): ",true).$membersAry[$user['id']]['received_count'].")<br/>";
     174            echo __("Final Total: ",true).number_format($membersAry[$user['id']]['received_total_score'], 2);
     175            $penalties[$user['id']] > 0 ? $penaltyAddOn = ' - '."<font color=\"red\">".$deduction."</font> = ".$scaled :
     176                $penaltyAddOn = '';
     177            echo $penaltyAddOn.' ('.$percent.'%)';
     178
     179            if (isset($membersAry[$user['id']]['received_ave_score'])) {
     180                $memberAve = number_format($membersAry[$user['id']]['received_ave_score'], 2);
     181                $memberAvePercent = number_format($ave_scaled * 100);
     182            } else {
     183                $memberAve = '-';
     184                $memberAvePercent = '-';
     185            }
     186            $penalties[$user['id']] > 0 ? $ave_penaltyAddOn = ' - '."<font color=\"red\">".$ave_deduction."</font> = ".$ave_scaled :
     187                $ave_penaltyAddOn = '';
     188            $memberAverageAve = number_format($membersAry[$user['id']]['received_total_score'], 2);
     189            if ($memberAverageAve == $groupAve) {
     190                echo "&nbsp;&nbsp;<< ".__('Same Mark as Group Average', true)." >>";
     191            } else if ($memberAverageAve < $groupAve) {
     192                echo "&nbsp;&nbsp;<font color='#cc0033'><< ".__('Below Group Average', true)." >></font>";
     193            } else if ($memberAverageAve > $groupAve) {
     194                echo "&nbsp;&nbsp;<font color='#000099'><< ".__('Above Group Average', true)." >></font>";
     195            }
     196            ?> </b><br>
     197            <?php echo __("Average Percentage Per Question: ", true);
     198            echo $memberAve.$ave_penaltyAddOn;
     199            echo ' ('.$memberAvePercent .'%)';
     200
     201            $penalties[$user['id']] > 0 ? $penaltyNotice = '<br>'.__('NOTE: ', true).'<font color=\'red\'>'.$penalties[$user['id']].
     202                '%</font>'.__(' Late Penalty', true) : $penaltyNotice = '';
     203            echo $penaltyNotice;
     204            ?>
     205            <br><br>
     206    <!-- Section One -->
     207    <table class="standardtable">
     208        <tr>
     209            <td colspan="<?php echo $mixeval['Mixeval']["lickert_question_max"]+1 ?>"><b> <?php __('Section One:')?> </b></td>
     210        </tr>
     211        <tr align="center">
     212            <th width="100" valign="top"><?php __('Evaluator')?></th>
     213            <?php
     214                for ($i=0; $i<$mixeval['Mixeval']["lickert_question_max"]; $i++) {
     215                    echo "<th><strong><font color=" . $color[ ($i+1) % sizeof($color) ] . ">" . ($i+1) . ". "  . "</font></strong>";
     216                    echo $mixevalQuestion[$i+1]['title'];
     217                    echo "</th>";
     218                }
     219            ?>
     220        </tr>
     221        <?php
     222        //Retrieve the individual mixeval detail
     223        if (isset($evalResult[$user['id']])) {
     224            $memberResult = $evalResult[$user['id']];
     225                foreach ($memberResult AS $row): $memberMixeval = $row['EvaluationMixeval'];
     226                    $evalutor = $withTutorsAry[$memberMixeval['evaluator']];
     227                    echo "<tr class=\"tablecell2\">";
     228                    echo "<td width='15%'>".$evalutor['member']['User']['first_name']." ".$evalutor['member']['User']['last_name']."</td>";
     229                    $width = 85 / $mixeval['Mixeval']['lickert_question_max'];
     230                    $resultDetails = $memberMixeval['details'];
     231                    for ($j = 1; $j <= $mixeval['Mixeval']["lickert_question_max"]; $j++) {
     232                        $rubDet = $resultDetails[$j-1]['EvaluationMixevalDetail'];
     233                        echo '<td valign="middle" width="'.$width.'%">';
     234                        //Point Description Detail
     235                        if (isset($mixevalQuestion[$j-1]['Description'][$rubDet['selected_lom']-1]['descriptor'])) {
     236                            echo $mixevalQuestion[$j-1]['Description'][$rubDet['selected_lom']-1]['descriptor'];
     237                        }
     238                        echo "<br />";
     239
     240                        //Points Detail
     241                        echo "<strong>".__('Points:', true)."</strong>";
     242                        if (isset($rubDet)) {
     243                            $lom = $rubDet["grade"];
     244                            $empty = $mixevalQuestion[$i-1]['multiplier'];
     245                            for ($v = 0; $v < $lom; $v++) {
     246                                echo $html->image('evaluations/circle.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle'));
     247                                $empty--;
     248                            }
     249                            for ($t=0; $t < $empty; $t++) {
     250                                echo $html->image('evaluations/circle_empty.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'cicle_empty'));
     251                            }
     252                            echo "<br />";
    196253                        } else {
    197                             $memberAve = '-';
    198                             $memberAvePercent = '-';
    199                         }
    200                         $penalties[$user['id']] > 0 ? $ave_penaltyAddOn = ' - '."<font color=\"red\">".$ave_deduction."</font> = ".$ave_scaled :
    201                             $ave_penaltyAddOn = '';
    202                         $memberAverageAve = number_format($membersAry[$user['id']]['received_total_score'], 2);
    203                         if ($memberAverageAve == $groupAve) {
    204                             echo "&nbsp;&nbsp;<< ".__('Same Mark as Group Average', true)." >>";
    205                         } else if ($memberAverageAve < $groupAve) {
    206                             echo "&nbsp;&nbsp;<font color='#cc0033'><< ".__('Below Group Average', true)." >></font>";
    207                         } else if ($memberAverageAve > $groupAve) {
    208                             echo "&nbsp;&nbsp;<font color='#000099'><< ".__('Above Group Average', true)." >></font>";
    209                         }
    210                         ?> </b><br>
    211                         <?php echo __("Average Percentage Per Question: ", true);
    212                         echo $memberAve.$ave_penaltyAddOn;
    213                         echo ' ('.$memberAvePercent .'%)';
    214 
    215                         $penalties[$user['id']] > 0 ? $penaltyNotice = '<br>'.__('NOTE: ', true).'<font color=\'red\'>'.$penalties[$user['id']].
    216                             '%</font>'.__(' Late Penalty', true) : $penaltyNotice = '';
    217                         echo $penaltyNotice;
    218                         ?>
    219                                     <br><br>
    220                 <!-- Section One -->
    221                 <table width="95%" border="0" align="center" cellpadding="4" cellspacing="2">
    222                     <tr>
    223                         <td colspan="<?php echo $mixeval['Mixeval']["lickert_question_max"] ?>"><b> <?php __('Section One:')?> </b></td>
    224                     </tr>
    225                     <tr class="tableheader" align="center">
    226                         <td width="100" valign="top"><?php __('Evaluator')?></td>
    227                         <?php
    228                             for ($i=0; $i<$mixeval['Mixeval']["lickert_question_max"]; $i++) {
    229                                 echo "<td><strong><font color=" . $color[ ($i+1) % sizeof($color) ] . ">" . ($i+1) . ". "  . "</font></strong>";
    230                                 echo $mixevalQuestion[$i+1]['title'];
    231                                 echo "</td>";
    232                             }
    233                         ?>
    234                     </tr>
    235                     <?php
    236                     //Retrieve the individual mixeval detail
    237                     if (isset($evalResult[$user['id']])) {
    238                         $memberResult = $evalResult[$user['id']];
    239                             foreach ($memberResult AS $row): $memberMixeval = $row['EvaluationMixeval'];
    240                                 $evalutor = $withTutorsAry[$memberMixeval['evaluator']];
    241                                 echo "<tr class=\"tablecell2\">";
    242                                 echo "<td width='15%'>".$evalutor['member']['User']['first_name']." ".$evalutor['member']['User']['last_name']."</td>";
    243                                 $width = 85 / $mixeval['Mixeval']['lickert_question_max'];
    244                                 $resultDetails = $memberMixeval['details'];
    245                                 for ($j = 1; $j <= $mixeval['Mixeval']["lickert_question_max"]; $j++) {
    246                                     $rubDet = $resultDetails[$j-1]['EvaluationMixevalDetail'];
    247                                     echo '<td valign="middle" width="'.$width.'%">';
    248                                     //Point Description Detail
    249                                     if (isset($mixevalQuestion[$j-1]['Description'][$rubDet['selected_lom']-1]['descriptor'])) {
    250                                         echo $mixevalQuestion[$j-1]['Description'][$rubDet['selected_lom']-1]['descriptor'];
    251                                     }
    252                                     echo "<br />";
    253 
    254                                     //Points Detail
    255                                     echo "<strong>".__('Points:', true)."</strong>";
    256                                     if (isset($rubDet)) {
    257                                         $lom = $rubDet["grade"];
    258                                         $empty = $mixevalQuestion[$i-1]['multiplier'];
    259                                         for ($v = 0; $v < $lom; $v++) {
    260                                             echo $html->image('evaluations/circle.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'circle'));
    261                                             $empty--;
    262                                         }
    263                                         for ($t=0; $t < $empty; $t++) {
    264                                             echo $html->image('evaluations/circle_empty.gif', array('align'=>'middle', 'vspace'=>'1', 'hspace'=>'1','alt'=>'cicle_empty'));
    265                                         }
    266                                         echo "<br />";
    267                                     } else {
    268                                         echo "n/a<br />";
    269                                     }
    270 
    271                                     //Grade Detail
    272                                     echo "<strong>".__('Grade', true).": </strong>";
    273                                     if (isset($rubDet)) {
    274                                         echo $rubDet["grade"] . " / " . $mixevalQuestion[$j]['multiplier'] . "<br />";
    275                                     } else {
    276                                         echo "n/a<br />";
    277                                     }
    278 
    279                                     echo "<br /><br /></td>";
    280                                 }
    281                             echo "</tr>";
    282 
    283                         endforeach;
    284                     } ?>
    285             </table>
     254                            echo "n/a<br />";
     255                        }
     256
     257                        //Grade Detail
     258                        echo "<strong>".__('Grade', true).": </strong>";
     259                        if (isset($rubDet)) {
     260                            echo $rubDet["grade"] . " / " . $mixevalQuestion[$j]['multiplier'] . "<br />";
     261                        } else {
     262                            echo "n/a<br />";
     263                        }
     264
     265                        echo "<br /><br /></td>";
     266                    }
     267                echo "</tr>";
     268
     269            endforeach;
     270        } ?>
     271</table>
    286272            <!-- Section Two -->
    287             <table width="95%" border="0" align="center" cellpadding="4" cellspacing="2">
     273            <table class="standardtable">
    288274                <tr>
    289275                    <td colspan="<?php echo $mixeval['Mixeval']["total_question"] ?>"><b> Section Two: </b></td>
    290276                </tr>
    291                 <tr class="tableheader" align="center">
    292                     <td width="100" valign="top"><?php __('Evaluator')?></td>
     277                <tr align="center">
     278                    <th width="100" valign="top"><?php __('Evaluator')?></th>
    293279                    <?php
    294280                    for ($i=$numerical_index; $i<=$mixeval['Mixeval']["total_question"]; $i++) {
    295281                        if (isset($mixevalQuestion[$i-1])) {
    296                             echo "<td><strong><font color=" . $color[ $i % sizeof($color) ] . ">" . ($i) . ". "  . "</font></strong>";
     282                            echo "<th><strong><font color=" . $color[ $i % sizeof($color) ] . ">" . ($i) . ". "  . "</font></strong>";
    297283                            echo $mixevalQuestion[$i-1]['title'];
    298                             echo "</td>";
     284                            echo "</th>";
    299285                        }
    300286                    }
     
    351337    <?php $i++;?>
    352338<?php endforeach; ?>
    353 </div></td></tr></table>
    354         <script type="text/javascript"> new Rico.Accordion( 'accordion',
    355                                                                 {panelHeight:500,
    356                                                                  hoverClass: 'mdHover',
    357                                                                  selectedClass: 'mdSelected',
    358                                                                  clickedClass: 'mdClicked',
    359                                                                  unselectedClass: 'panelheader'});
    360 
    361         </script>
    362339</div>
     340
     341<script type="text/javascript"> new Rico.Accordion( 'accordion',
     342            {panelHeight:500,
     343            hoverClass: 'mdHover',
     344            selectedClass: 'mdSelected',
     345            clickedClass: 'mdClicked',
     346            unselectedClass: 'panelheader'});
     347
     348</script>
     349</div>
  • app/views/evaluations/view_rubric_evaluation_results.ctp

    r4b4b150 r6602514  
    1 <h3><?php __('Evaluation Event Detail')?></h3>
    2 <!-- Event Details Table -->
    3 <table class="standardtable">
    4 <tr>
    5     <th><?php __('Event Name')?></th>
    6     <th><?php __('Group')?></th>
    7     <th><?php __('Due Date')?></th>
    8     <th><?php __('Self-Evaluation')?></th>
    9 </tr>
    10 <tr>
    11     <td><?php echo $event['Event']['title'] ?></td>
    12     <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>
    14     <td><?php echo ($event['Event']['self_eval']) ? 'Yes' : 'No'?></td>
    15 </tr>
    16 </table>
    17 
    18 <table class="standardtable">
    19 <tr>
    20     <th><?php __('Description')?></th>
    21 </tr>
    22 
    23 <tr>
    24     <td><?php echo $event['Event']['description'] ?></td>
    25 </tr>
    26 </table>
    27 
    28 <h3><?php __('Summary')?>
    29  :(<?php echo $this->Html->link(__('Basic', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Basic")?> |
    30     <?php echo $html->link(__('Detail', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Detail")?> )</h3>
    31 
    32 <!-- Users who haven't done the evaluation yet table -->
    33 <table class="standardtable">
    34 <?php
    35 if (!$allMembersCompleted) {
    36     echo $html -> tableHeaders(array(__('These people have not yet submitted their evaluations', true)), null, array('class' => 'red'));
    37     $incompletedMembersArr = array();
    38     $users = array();
    39     foreach ($inCompletedMembers as $row) {
    40         $user = $row['User'];
    41         array_push($incompletedMembersArr, $user['first_name'] . " " . $user['last_name']);
    42         $users[] = array($user['first_name'] . " " . $user['last_name'] . ($row['Role']['role_id'] == 4 ? ' (TA)' : ' (student)'));
    43     }
    44     echo $html -> tableCells($users);
    45 }
    46 ?>
    47 </table>
     1<?php echo $this->element('evaluations/view_event_info', array('controller'=>'evaluations', 'event'=>$event));?>
     2<?php echo $this->element('evaluations/summary_info', array('controller'=>'evaluations', 'event'=>$event));?>
    483
    494<!-- Show Evaluation Reuslts - Basic -->
    50  <h3><?php __('Evaluation Results')?></h3>
     5<h3><?php __('Evaluation Results')?></h3>
    516
    527<table class='standardtable'>
  • app/views/evaluations/view_rubric_evaluation_results_detail.ctp

    r4b4b150 r6602514  
    88<!-- Render Event Info table -->
    99<?php echo $this->element('evaluations/view_event_info', array('controller'=>'evaluations', 'event'=>$event));?>
    10 
    11 <div class="event-summary">
    12     <span class="instruction-icon"><?php __('Summary:')?> ( <?php echo $this->Html->link(__('Basic', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Basic")?> |
    13     <?php echo $html->link(__('Detail', true), "/evaluations/viewEvaluationResults/".$event['Event']['id']."/".$event['Group']['id']."/Detail")?> )</span>
    14     <font size = "1" face = "arial" color = "red" >*Numerics in red denotes late submission penalty.</font>
    15     <?php if (!$allMembersCompleted): ?>
    16         <div class="incompleted">
    17           <?php __('These people have not yet submit their evaluations:')?>
    18             <ul>
    19                 <?php foreach($inCompletedMembers as $row): $user = $row['User']; ?>
    20                     <li><?php echo $user['first_name']." ".$user['last_name'] . ($row['Role']['role_id']==4 ? ' (TA)' : ' (student)');?></li>
    21                 <?php endforeach; ?>
    22             </ul>
    23         </div>
    24     <?php endif; ?>
    25 </div>
    26 
     10<?php echo $this->element('evaluations/summary_info', array('controller'=>'evaluations', 'event'=>$event));?>
     11
     12<h3><?php __('Evaluation Results')?></h3>
    2713<div id='rubric_result'>
    2814
     
    160146    </tr>
    161147</table>
    162 <table width="100%" border="0" align="center" cellpadding="4" cellspacing="2">
    163     <tr>
    164         <td align="center">
     148
    165149<div id="accordion">
    166150    <?php $i = 0;
     
    171155            <?php echo __('Evaluatee: ', true).$user['first_name']." ".$user['last_name']?>
    172156        </div>
    173         <div style="height: 200px;" id="panel1Content" class="panelContent">
     157        <div style="height: 200px;text-align: center;" id="panel1Content" class="panelContent">
    174158            <br><b><?php
    175159                $scaled = $membersAry[$user['id']]['received_ave_score'] * (1 - ($penalties[$user['id']] / 100));
     
    208192                ?> </b>
    209193            <br><br>
    210         <table width="95%" border="0" align="center" cellpadding="4" cellspacing="2">
    211             <tr class="tableheader" align="center">
    212                 <td width="100" valign="top"><?php __('Evaluator')?></td>
    213                 <?php
    214                 for ($i=1; $i<=$rubric['Rubric']["criteria"]; $i++) {
    215                     echo "<td><strong><font color=" . $color[ $i % sizeof($color) ] . ">" . ($i) . ". "  . "</font></strong>";
    216                     echo $rubricCriteria[$i-1]['criteria'];
    217                     echo "</td>";
    218                 }
    219                 ?>
     194        <table class="standardtable">
     195            <tr>
     196                <th width="100" valign="top"><?php __('Evaluator')?></th>
     197                <?php for ($i=1; $i<=$rubric['Rubric']["criteria"]; $i++): ?>
     198                    <th><strong><font color="<?php echo $color[ $i % sizeof($color) ]?>">(<?php echo $i?>)</font></strong>
     199                        <?php echo $rubricCriteria[$i-1]['criteria'];?>
     200                    </th>
     201                <?php endfor; ?>
    220202            </tr>
    221203            <?php
     
    304286    <?php endforeach; ?>
    305287</div>
    306     </td>
    307     </tr>
    308 </table>
    309288
    310289<script type="text/javascript"> new Rico.Accordion( 'accordion',
  • app/webroot/css/ipeer.css

    r4b4b150 r6602514  
    1717    font-size: 100%;
    1818    font: inherit;
    19     vertical-align: baseline;
    2019}
    2120/* html5 display-role reset for older browsers */
Note: See TracChangeset for help on using the changeset viewer.