[Stack-cvs] diag index.php,1.10,1.11

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

Update of /cvsroot/stack/diag
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4011

Modified Files:
	index.php 
Log Message:


Index: index.php
===================================================================
RCS file: /cvsroot/stack/diag/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.php	1 Sep 2010 13:19:32 -0000	1.10
--- index.php	1 Sep 2010 16:03:25 -0000	1.11
***************
*** 4,8 ****
  
  $STACK_LOC='../stack-dev';
! $STACK_LOC='../stem';
  
  require_once($STACK_LOC.'/config.php');
--- 4,8 ----
  
  $STACK_LOC='../stack-dev';
! //$STACK_LOC='../stem';
  
  require_once($STACK_LOC.'/config.php');
***************
*** 13,17 ****
  require_once $root.'/lib/database/StackDBADOdb.php';
  require_once $root.'/lib/database/StackDBKeywords.php';
! require_once('SkillsResources.php');
  
  $skills = new SkillsResources($STACK_LOC);
--- 13,17 ----
  require_once $root.'/lib/database/StackDBADOdb.php';
  require_once $root.'/lib/database/StackDBKeywords.php';
! require_once($root.'/lib/reporting/SkillsResources.php');
  
  $skills = new SkillsResources($STACK_LOC);
***************
*** 47,50 ****
--- 47,53 ----
  	$action = $_GET['q'];
  }
+ if (array_key_exists('t',$_GET)) {
+ 	$testLevel = $_GET['t'];
+ }
  
  switch(true) {
***************
*** 55,59 ****
        echo "<p>This page gives an inventory of questions associated with the STEM project <a href=\"http://stack.bham.ac.uk/wiki/index.php/Diagnostic_tests\">Stimulating Techniques in Entry-level Mathematics (STEM) with the STACK computer aided assessment (CAA) system</a>.</p>";
  
!       echo "<ul><li>Generate the <a href='index.php?q=wiki'>wiki page</a> code or <a href='index.php?q=LaTeX'>LaTeX</a> (view source).</li><li>See a list of all deployed <a href='index.php?q=stem'>question stems</a>.  Useful for putting questions into quizzes.</ul><hr />";
  
        echo  $skills->generateSkillsTable();
--- 58,64 ----
        echo "<p>This page gives an inventory of questions associated with the STEM project <a href=\"http://stack.bham.ac.uk/wiki/index.php/Diagnostic_tests\">Stimulating Techniques in Entry-level Mathematics (STEM) with the STACK computer aided assessment (CAA) system</a>.</p>";
  
!       echo "<ul><li>Generate the <a href='index.php?q=wiki'>wiki page</a> code or <a href='index.php?q=LaTeX'>LaTeX</a> (view source).</li><li>See a list of all deployed <a href='index.php?q=stem'>question stems</a>.  Useful for putting questions into quizzes.</ul>";
!       echo "The three tests are: <ol><li><a href='index.php?q=test&t=1'>Foundation</a></li><li><a href='index.php?q=test&t=2'>AS maths</a> or A-level C,D,E</li><li><a href='index.php?q=test&t=3'>A-level grade A or B</a></li></ol>";
!       echo "<hr />";
  
        echo  $skills->generateSkillsTable();
***************
*** 97,104 ****
      echo "Return to the <a href='index.php'>main page</a>.<p><hr /></p>";
  
!     $test = array('DIAGNOSTIC_background','Diagnostic_ALG-FEQ_2');
  
      echo  $skills->generateTestedSkillsPage($test);
  
      echo '</body></html>';
      break;
--- 102,126 ----
      echo "Return to the <a href='index.php'>main page</a>.<p><hr /></p>";
  
!     $test = array();
!     switch(true) {
!         case ($testLevel === '1'):
!         // Foundation level test
!         $test = array('Diagnostic_background','Diagnostic_NUM-REL_3','Diagnostic_NUM-REL_4','Diagnostic_NUM-RTP_3','Diagnostic_WRP_1','Diagnostic_GRP_1','Diagnostic_EQN-LIN_3','Diagnostic_ART-SUB_1','Diagnostic_NUM-REL_1','Diagnostic_NUM-REL_2','Diagnostic_NUM-RTP_2','Diagnostic_EST-RND_2','Diagnostic_EQN-LIN_2','Diagnostic_ALG-FEQ_2','Diagnostic_EQN-QUD_1','Diagnostic_GEO-CRC_1','Diagnostic_LOG_1');
!         break;
! 
!         case ($testLevel === '2'):
!         // AS-level
!         $test = array('Diagnostic_background','Diagnostic_WRP_1','Diagnostic_GRP_1','Diagnostic_NUM-REL_2','Diagnostic_NUM-RTP_2','Diagnostic_EST-RND_2','Diagnostic_SEQ-ART_1','Diagnostic_EQN-LIN_2','Diagnostic_ALG-FEQ_2','Diagnostic_FNC-CMP_1','Diagnostic_FNC-INV_1','Diagnostic_EQN-QUD_1','Diagnostic_GEO-ANM_1','Diagnostic_GEO-CRC_1','Diagnostic_LGE-LLG_1','Diagnostic_DIF-MXN_1','Diagnostic_DIF-EXP_1','Diagnostic_INT-TRG_1','Diagnostic_LOG_1');
!         break;
! 
!         case ($testLevel === '3'):
!         // A-level test
!         $test = array('Diagnostic_background','Diagnostic_EST-RND_2','Diagnostic_SEQ-ASM_1','Diagnostic_WRP_1','Diagnostic_GEO-EQL_1','Diagnostic_GEO-TFN_1','Diagnostic_GRP_1','Diagnostic_ALG-RPF_1','Diagnostic_FNC-INV_1','Diagnostic_LGE-LLG_1','Diagnostic_EQN-LIN_2','Diagnostic_DIF-MXN_1','Diagnostic_DIF-PRD_1','Diagnostic_DIF-POL_1','Diagnostic_INT-AUC_1','Diagnostic_INT-SUB_1','Diagnostic_INT-PRT_2','Diagnostic_EQN-SIM_1','Diagnostic_LOG_1');
!         break;
!     }
  
      echo  $skills->generateTestedSkillsPage($test);
  
+ 
      echo '</body></html>';
      break;