[Stack-cvs] stack-1-0/scripts stackAuthor.php,1.46,1.47 stackFrontend.php,1.5,1.6

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32018/scripts

Modified Files:
	stackAuthor.php stackFrontend.php 
Log Message:


Index: stackAuthor.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackAuthor.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** stackAuthor.php	11 Oct 2005 17:35:38 -0000	1.46
--- stackAuthor.php	14 Oct 2005 15:42:27 -0000	1.47
***************
*** 1288,1292 ****
                 echo "  <td><input type=\"text\" name=\"subject[quizzes][$qn][order]\" size=\"3\" value=\"{$qo}\"  /></td>\n";
                 echo "  <td><input type=\"hidden\" name=\"subject[quizzes][$qn][quizid]\" value=\"{$qID}\"  />$qID</td>\n";
!                echo "  <td>$qname</td>\n  <td>$qkw</td>\n  <td><a href=\"javascript:quizreview($qID,$subjectID);\">Review</a></td>\n</tr>\n";
  
             }
--- 1288,1292 ----
                 echo "  <td><input type=\"text\" name=\"subject[quizzes][$qn][order]\" size=\"3\" value=\"{$qo}\"  /></td>\n";
                 echo "  <td><input type=\"hidden\" name=\"subject[quizzes][$qn][quizid]\" value=\"{$qID}\"  />$qID</td>\n";
!                echo "  <td>$qname</td>\n  <td>$qkw</td>\n  <td><a href=\"javascript:quizreport($qID,$subjectID);\">Review</a></td>\n</tr>\n";
  
             }

Index: stackFrontend.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackFrontend.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** stackFrontend.php	11 Oct 2005 17:35:38 -0000	1.5
--- stackFrontend.php	14 Oct 2005 15:42:27 -0000	1.6
***************
*** 345,348 ****
  
  }
!     
  ?>
--- 345,432 ----
  
  }
! 
! 
! /** 
! * Displays the marksheet 
! * @param int   $subjectID
! * @return void
! */
! function stack_marksheet() {
!     global $stack_root, $stackQuiz;
! 
!     include($stack_root.'/html/quizchoose.html');
!     require_once("{$stack_root}/html/quizjava.html");
!     require_once("{$stack_root}/html/subjectjava.html");
! 
!     $subject_store = stack_db_subject_get();
!     $subject_store = stack_zone_subjects_order($subject_store); 
! 
!     $stack_users   = stack_user_listall();
! 
!     echo "\n<table cellpadding='2' border = '1'>\n";
!     echo "<tr>\n  <th></th>\n";
!         
!     //echo "\n<tr><th>".get_string('stackQuiz_quizName','stack','')."</th><th>".get_string('stackQuiz_quizDescription','stack','')."</th><th>".get_string('FE_quiz_lastmark','stack','')."</th><th>".get_string('stackQuiz_quizDueDate','stack','')."</th>\n</tr>\n";
! 
!     foreach ($subject_store as $key => $subject) {
!         $subjectID = $subject['subjectID'];
!         $subject_store[$key]['quiz_store'] = stack_db_subject_quiz_list_student($subjectID);
!         
!         $quiz_count = count($subject_store[$key]['quiz_store']);
!         echo "<th align='center' colspan = '$quiz_count'>".$subject['subjectName']."</th>";
!         
!     }
!     echo "</tr>\n\n<tr>\n  <th></th>\n";
! 
!     foreach ($subject_store as $key => $subject) {
!         $quiz_store = $subject['quiz_store'];
!         $subjectID = $subject['subjectID'];
!         
!         foreach ($quiz_store as $qs => $quiz) { 
!             $qname = $quiz['quizName'];
!             $qID   = $quiz['quizid'];
!             echo "  <th><a href=\"javascript:quizreport($qID,$subjectID);\">$qname</a></th>\n";
!         }   
!     }
!     echo "</tr>\n\n";
! 
! 
!     foreach ($stack_users as $user) { 
!     $username = $user['name'];
!     $uID      = $user['id'];
! 
!     echo "<tr>\n  <td> $username </td>";
! 
!     foreach ($subject_store as $key => $subject) {
!         $subjectID = $subject['subjectID'];
!  
!         $quiz_store =  $subject['quiz_store'];
!         
!         foreach ($quiz_store as $qs => $quiz) { 
!             $qname = $quiz['quizName'];
!             $qID   = $quiz['quizid'];
!             $mark  = '-';
! 
!             $userinfo = stack_db_quiz_quizattempt_getlast($subjectID,$qID,$uID);
!             if (is_array($userinfo)) {
!                 if (NULL != $userinfo['mark']) {
!                     $mark = round(100*$userinfo['mark']/$userinfo['maxmark'],2);
!                 }
!             }
!             
!             if ('-' == $mark) {           
!                 echo "  <td>{$mark}</td>\n";
!             } else {
!                 echo "  <td><a href=\"javascript:quizreview('$uID','$qID','$subjectID');\">{$mark}</a></td>\n";
!             }
!         }
!     }
!     echo "</tr>\n";
!     }
! 
!     echo "\n</table>\n</p>";
! 
! return NULL;
! }
! 
  ?>