Update of /cvsroot/stack/stack-dev/lib/reporting
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31462/lib/reporting
Modified Files:
StackReport.php json.php
Log Message:
Index: StackReport.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/reporting/StackReport.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** StackReport.php 24 Nov 2010 16:44:26 -0000 1.24
--- StackReport.php 29 Nov 2010 08:21:46 -0000 1.25
***************
*** 87,92 ****
default:
! $xhtml = 'consequence';//$this->interactiveInterface();
! $result = array('a','b','c');
break;
}
--- 87,91 ----
default:
!
break;
}
***************
*** 235,239 ****
students = {fields: [], list: []};
students.list = '
! . json_encode($db->studentList())
. ';
students.fields = [
--- 234,238 ----
students = {fields: [], list: []};
students.list = '
! . json_encode($db->appendTwoFields($db->studentList()))
. ';
students.fields = [
***************
*** 248,252 ****
questions= {fields: [], list: []};
questions.list = '
! . json_encode($db->questionList())
. ';
questions.fields = [
--- 247,251 ----
questions= {fields: [], list: []};
questions.list = '
! . json_encode($db->appendTwoFields($db->questionList()))
. ';
questions.fields = [
Index: json.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/reporting/json.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** json.php 30 Sep 2010 16:56:15 -0000 1.2
--- json.php 29 Nov 2010 08:21:46 -0000 1.3
***************
*** 43,47 ****
case 'questions':
// Formats it in the way datatables likes
! $questions = array('aaData' => $db->listQuestions());
echo json_encode($questions);
break;
--- 43,47 ----
case 'questions':
// Formats it in the way datatables likes
! $questions = array('aaData' => $db->appendTwoFields($db->listQuestions()));
echo json_encode($questions);
break;
***************
*** 70,74 ****
case 'students':
! $students = array('aaData' => $db->listStudents());
echo json_encode($students);
break;
--- 70,74 ----
case 'students':
! $students = array('aaData' => $db->appendTwoFields($db->listStudents()));
echo json_encode($students);
break;
|
