Update of /cvsroot/stack/stack-dev/lib/reporting
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26098/lib/reporting
Modified Files:
Tag: question_reporting
StackReport.php json.php
Log Message:
Adjusted StackDBReporting.php to account for the question lines feature.
Index: StackReport.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/reporting/StackReport.php,v
retrieving revision 1.22.2.19
retrieving revision 1.22.2.20
diff -C2 -d -r1.22.2.19 -r1.22.2.20
*** StackReport.php 22 Nov 2010 23:05:52 -0000 1.22.2.19
--- StackReport.php 24 Nov 2010 11:33:51 -0000 1.22.2.20
***************
*** 215,219 ****
students = {fields: [], list: []};
students.list = '
! . json_encode($db->studentList())
. ';
students.fields = [
--- 215,219 ----
students = {fields: [], list: []};
students.list = '
! . json_encode($db->appendTwoFields($db->studentList()))
. ';
students.fields = [
***************
*** 228,232 ****
questions= {fields: [], list: []};
questions.list = '
! . json_encode($db->questionList())
. ';
questions.fields = [
--- 228,232 ----
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.6.2
retrieving revision 1.2.6.3
diff -C2 -d -r1.2.6.2 -r1.2.6.3
*** json.php 22 Nov 2010 23:05:52 -0000 1.2.6.2
--- json.php 24 Nov 2010 11:33:51 -0000 1.2.6.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;
|
