".$e->getMessage().'
';
- }
- if ($result->rowCount() > 0) {
- $row = $result->fetch();
- $gibbonCourseClassID = $row['gibbonCourseClassID'];
- }
- }
- if ($gibbonCourseClassID == '') {
- echo ''; - echo 'Manage ATL'; - echo '
'; - echo "";
- echo __('Use the class listing on the right to choose a ATL to edit.');
- echo '
';
- } else {
- //Check existence of and access to this class.
- try {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = 'SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class';
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- echo ''; - echo __('Manage ATL'); - echo '
'; - echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- $row = $result->fetch();
- $page->breadcrumbs->add(__('Manage {courseClass} ATLs', ['courseClass' => $row['course'].'.'.$row['class']]));
-
- if (isset($_GET['deleteReturn'])) {
- $deleteReturn = $_GET['deleteReturn'];
- } else {
- $deleteReturn = '';
- }
- $deleteReturnMessage = '';
- $class = 'error';
- if (!($deleteReturn == '')) {
- if ($deleteReturn == 'success0') {
- $deleteReturnMessage = __('Your request was completed successfully.');
- $class = 'success';
- }
- echo "";
- echo $deleteReturnMessage;
- echo '
';
- }
-
- //Add multiple columns
- echo "";
- echo "get('module')."/atl_manage_add.php&gibbonCourseClassID=$gibbonCourseClassID'>".__('Add Multiple Columns')."![](./themes/".$session->get( "\".__(")
";
- echo '
';
-
- //Get teacher list
- $teaching = false;
- try {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonPerson.gibbonPersonID, title, surname, preferredName, gibbonCourseClassPerson.reportable FROM gibbonCourseClassPerson JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE (role='Teacher' OR role='Assistant') AND gibbonCourseClassID=:gibbonCourseClassID ORDER BY surname, preferredName";
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
- if ($result->rowCount() > 0) {
- echo ''; - echo __('Teachers'); - echo '
'; - echo '- ';
- while ($row = $result->fetch()) {
- if ($row['reportable'] != 'Y') continue;
-
- echo '
- '.Format::name($row['title'], $row['preferredName'], $row['surname'], 'Staff').' '; - if ($row['gibbonPersonID'] == $session->get('gibbonPersonID')) { - $teaching = true; - } - } - echo '
".$e->getMessage().'
';
+ }
+ if ($result->rowCount() > 0) {
+ $row = $result->fetch();
+ $gibbonCourseClassID = $row['gibbonCourseClassID'];
+ }
+ }
+
+ echo ''; + echo __('Manage ATLs'); + echo '
'; + + $courseGateway = $container->get(CourseGateway::class); + $class = $courseGateway->getCourseClassByID($gibbonCourseClassID); + if (empty($class)) { + $page->breadcrumbs->add(__('Manage ATLs')); + echo Format::alert(__('Use the class listing on the right to choose a ATL to edit.'), 'warning'); + } else { + $page->breadcrumbs->add(__('Manage {courseClass} ATLs', ['courseClass' => $class['courseName'].'.'.$class['name']])); + + //Get teacher list + try { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID); + $sql = "SELECT gibbonPerson.gibbonPersonID, title, surname, preferredName, gibbonCourseClassPerson.reportable FROM gibbonCourseClassPerson JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE (role='Teacher' OR role='Assistant') AND gibbonCourseClassID=:gibbonCourseClassID ORDER BY surname, preferredName"; + $result = $connection2->prepare($sql); + $result->execute($data); + } catch (PDOException $e) { + echo "".$e->getMessage().'
';
+ }
+ if ($result->rowCount() > 0) {
+ echo ''; + echo __('Teachers'); + echo '
'; + echo '- ';
+ while ($row = $result->fetch()) {
+ if ($row['reportable'] != 'Y') continue;
+
+ echo '
- '.Format::name($row['title'], $row['preferredName'], $row['surname'], 'Staff').' '; + } + echo '
".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- $class = $result->fetch();
-
- $page->breadcrumbs
- ->add(__('Manage {courseClass} ATLs', ['courseClass' => $class['course'].'.'.$class['class']]), 'atl_manage.php', ['gibbonCourseClassID' => $gibbonCourseClassID])
- ->add(__('Add Multiple Columns'));
-
- if (isset($_GET['return'])) {
- returnProcess($guid, $_GET['return'], null, null);
- }
-
- $form = Form::create('ATL', $session->get('absoluteURL').'/modules/ATL/atl_manage_addProcess.php?gibbonCourseClassID='.$gibbonCourseClassID.'&address='.$session->get('address'));
- $form->addHiddenValue('address', $session->get('address'));
-
- $form->addRow()->addHeading(__('Basic Information'));
-
- $data = array('gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'));
- $sql = "SELECT gibbonYearGroup.name as groupBy, gibbonCourseClassID as value, CONCAT(gibbonCourse.nameShort, '.', gibbonCourseClass.nameShort) AS name FROM gibbonCourseClass JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) JOIN gibbonYearGroup ON (gibbonCourse.gibbonYearGroupIDList LIKE concat( '%', gibbonYearGroup.gibbonYearGroupID, '%' )) WHERE gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourseClass.reportable='Y' ORDER BY gibbonYearGroup.sequenceNumber, name";
-
- $row = $form->addRow();
- $row->addLabel('gibbonCourseClassIDMulti', __('Class'));
- $row->addSelect('gibbonCourseClassIDMulti')
- ->fromQuery($pdo, $sql, $data, 'groupBy')
- ->selectMultiple()
- ->isRequired()
- ->selected($gibbonCourseClassID);
-
- $row = $form->addRow();
- $row->addLabel('name', __('Name'));
- $row->addTextField('name')->isRequired()->maxLength(20);
-
- $row = $form->addRow();
- $row->addLabel('description', __('Description'));
- $row->addTextField('description')->isRequired()->maxLength(1000);
-
- $form->addRow()->addHeading(__('Assessment'));
-
- $data = array('gibbonYearGroupIDList' => $class['gibbonYearGroupIDList'], 'gibbonDepartmentID' => $class['gibbonDepartmentID'], 'rubrics' => __('Rubrics'));
- $sql = "SELECT CONCAT(scope, ' ', :rubrics) as groupBy, gibbonRubricID as value,
- (CASE WHEN category <> '' THEN CONCAT(category, ' - ', gibbonRubric.name) ELSE gibbonRubric.name END) as name
- FROM gibbonRubric
- JOIN gibbonYearGroup ON (FIND_IN_SET(gibbonYearGroup.gibbonYearGroupID, gibbonRubric.gibbonYearGroupIDList))
- WHERE gibbonRubric.active='Y'
- AND FIND_IN_SET(gibbonYearGroup.gibbonYearGroupID, :gibbonYearGroupIDList)
- AND (scope='School' OR (scope='Learning Area' AND gibbonDepartmentID=:gibbonDepartmentID))
- GROUP BY gibbonRubric.gibbonRubricID
- ORDER BY scope, category, name";
-
- $row = $form->addRow();
- $row->addLabel('gibbonRubricID', __('Rubric'));
- $rubrics = $row->addSelect('gibbonRubricID')->fromQuery($pdo, $sql, $data, 'groupBy')->placeholder();
-
- // Look for and select an Approach to Learning rubric
- $rubrics->selected(array_reduce($rubrics->getOptions(), function ($result, $items) {
- foreach ($items as $key => $value) {
- $result = (stripos($value, 'Approach to Learning') === false) ? $result : $key;
- }
- return $result;
- }, false));
-
- $form->addRow()->addHeading(__('Access'));
-
- $row = $form->addRow();
- $row->addLabel('completeDate', __('Go Live Date'))->prepend('1. ')->append(''.__('2. Column is hidden until date is reached.')); - $row->addDate('completeDate'); - - $row = $form->addRow(); - $row->addFooter(); - $row->addSubmit(); - - echo $form->getOutput(); - } - } - //Print sidebar - $session->set('sidebarExtra', sidebarExtra($guid, $connection2, $gibbonCourseClassID, 'manage', 'Manage ATLs_all')); -} +. +*/ + +use Gibbon\Domain\Timetable\CourseGateway; +use Gibbon\Forms\DatabaseFormFactory; +use Gibbon\Forms\Form; +use Gibbon\Services\Format; + +//Module includes +require_once __DIR__ . '/moduleFunctions.php'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_add.php') == false) { + //Acess denied + $page->addError(__('You do not have access to this action.')); +} else { + $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? ''; + if ($gibbonCourseClassID == '') { + $page->addError(__('You have not specified one or more required parameters.')); + } else { + //TODO: Implement this when the function returns reportable, or has reportable flag + //$courseGateway = $container->get(CourseGateway::class); + //$class = $courseGateway->getCourseClassByID($gibbonCourseClassID); + try { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID); + $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID, gibbonCourse.gibbonDepartmentID, gibbonYearGroupIDList FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' ORDER BY course, class"; + $result = $connection2->prepare($sql); + $result->execute($data); + } catch (PDOException $e) { + $page->addError(__('A database error has occured.')); + } + + if ($result->rowCount() != 1) { + $page->addError(__('The selected record does not exist, or you do not have access to it.')); + } else { + $class = $result->fetch(); + + $page->breadcrumbs + ->add(__('Manage {courseClass} ATLs', ['courseClass' => Format::courseClassName($class['course'], $class['class'])]), 'atl_manage.php', ['gibbonCourseClassID' => $gibbonCourseClassID]) + ->add(__('Add Multiple Columns')); + + $form = Form::create('ATL', $session->get('absoluteURL').'/modules/ATL/atl_manage_addProcess.php'); + $form->setFactory(DatabaseFormFactory::create($pdo)); + $form->addHiddenValue('address', $session->get('address')); + $form->addHiddenValue('gibbonCourseClassID', $gibbonCourseClassID); + + $form->addRow()->addHeading(__('Basic Information')); + + $data = array('gibbonSchoolYearID' => $session->get('gibbonSchoolYearID')); + $sql = "SELECT gibbonYearGroup.name as groupBy, gibbonCourseClassID as value, CONCAT(gibbonCourse.nameShort, '.', gibbonCourseClass.nameShort) AS name FROM gibbonCourseClass JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) JOIN gibbonYearGroup ON (gibbonCourse.gibbonYearGroupIDList LIKE concat( '%', gibbonYearGroup.gibbonYearGroupID, '%' )) WHERE gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourseClass.reportable='Y' ORDER BY name"; + + $row = $form->addRow(); + $col = $row->addColumn(); + $col->addLabel('gibbonCourseClassIDMulti', __('Class')); + $multiSelect = $col->addMultiSelect('gibbonCourseClassIDMulti') + ->isRequired(); + + $multiSelect + ->source() + ->fromQuery($pdo, $sql, $data, 'nogroupBy') + ->selected($gibbonCourseClassID); + + //TODO: This should probably be core functionality + $multiSelect->destination()->fromArray(array_fill_keys(array_keys($multiSelect->source()->getOptions()), [])); + + $row = $form->addRow(); + $row->addLabel('name', __('Name')); + $row->addTextField('name')->isRequired()->maxLength(20); + + $row = $form->addRow(); + $row->addLabel('description', __('Description')); + $row->addTextField('description')->isRequired()->maxLength(1000); + + $form->addRow()->addHeading(__('Assessment')); + + $row = $form->addRow(); + $row->addLabel('gibbonRubricID', __('Rubric')); + $rubrics = $row->addSelectRubric('gibbonRubricID', $class['gibbonYearGroupIDList'], $class['gibbonDepartmentID']); + + // Look for and select an Approach to Learning rubric + $rubrics->selected(array_reduce($rubrics->getOptions(), function ($result, $items) { + foreach ($items as $key => $value) { + $result = (stripos($value, 'Approach to Learning') === false) ? $result : $key; + } + return $result; + }, false)); + + $form->addRow()->addHeading(__('Access')); + + $row = $form->addRow(); + $row->addLabel('completeDate', __('Go Live Date'))->prepend('1. ')->append('
'.__('2. Column is hidden until date is reached.'))->append('
'.__('3. This will act as a due date if for students.')); + $row->addDate('completeDate'); + + $row = $form->addRow(); + $row->addLabel('forStudents', __('For Students?'))->description(__('Is this column meant to be filled out by students?')); + $row->addYesNo('forStudents') + ->selected('N') + ->required(); + + $row = $form->addRow(); + $row->addFooter(); + $row->addSubmit(); + + echo $form->getOutput(); + } + } + //Print sidebar + $session->set('sidebarExtra', sidebarExtra($gibbonCourseClassID, 'manage')); +} diff --git a/ATL/atl_manage_addProcess.php b/ATL/atl_manage_addProcess.php index 18bc895..427db6c 100644 --- a/ATL/atl_manage_addProcess.php +++ b/ATL/atl_manage_addProcess.php @@ -1,123 +1,95 @@ -. -*/ - -include '../../gibbon.php'; - - -$gibbonCourseClassID = $_GET['gibbonCourseClassID']; -$URL = $session->get('absoluteURL').'/index.php?q=/modules/'.getModuleName($_GET['address'])."/atl_manage_add.php&gibbonCourseClassID=$gibbonCourseClassID"; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_add.php') == false) { - //Fail 0 - $URL .= '&return=error0'; - header("Location: {$URL}"); -} else { - if (empty($_POST)) { - $URL .= '&return=error5'; - header("Location: {$URL}"); - } else { - //Proceed! - //Validate Inputs - $gibbonCourseClassIDMulti = null; - if (isset($_POST['gibbonCourseClassIDMulti'])) { - $gibbonCourseClassIDMulti = $_POST['gibbonCourseClassIDMulti']; - $gibbonCourseClassIDMulti = array_unique($gibbonCourseClassIDMulti); - } - $name = $_POST['name']; - $description = $_POST['description']; - $gibbonRubricID = $_POST['gibbonRubricID']; - $completeDate = $_POST['completeDate']; - if ($completeDate == '') { - $completeDate = null; - $complete = 'N'; - } else { - $completeDate = dateConvert($guid, $completeDate); - $complete = 'Y'; - } - $gibbonPersonIDCreator = $session->get('gibbonPersonID'); - $gibbonPersonIDLastEdit = $session->get('gibbonPersonID'); - - //Lock markbook column table - try { - $sqlLock = 'LOCK TABLES atlColumn WRITE'; - $resultLock = $connection2->query($sqlLock); - } catch (PDOException $e) { - //Fail 2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - exit(); - } - - //Get next groupingID - try { - $sqlGrouping = 'SELECT DISTINCT groupingID FROM atlColumn WHERE NOT groupingID IS NULL ORDER BY groupingID DESC'; - $resultGrouping = $connection2->query($sqlGrouping); - } catch (PDOException $e) { - //Fail 2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - exit(); - } - - $rowGrouping = $resultGrouping->fetch(); - if (is_null($rowGrouping['groupingID'])) { - $groupingID = 1; - } else { - $groupingID = ($rowGrouping['groupingID'] + 1); - } - - if (is_array($gibbonCourseClassIDMulti) == false or is_numeric($groupingID) == false or $groupingID < 1 or $name == '' or $description == '') { - //Fail 3 - $URL .= '&return=error3'; - header("Location: {$URL}"); - } else { - $partialFail = false; - - foreach ($gibbonCourseClassIDMulti as $gibbonCourseClassIDSingle) { - //Write to database - try { - $data = array('groupingID' => $groupingID, 'gibbonCourseClassID' => $gibbonCourseClassIDSingle, 'name' => $name, 'description' => $description, 'gibbonRubricID' => $gibbonRubricID, 'completeDate' => $completeDate, 'complete' => $complete, 'gibbonPersonIDCreator' => $gibbonPersonIDCreator, 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit); - $sql = 'INSERT INTO atlColumn SET groupingID=:groupingID, gibbonCourseClassID=:gibbonCourseClassID, name=:name, description=:description, gibbonRubricID=:gibbonRubricID, completeDate=:completeDate, complete=:complete, gibbonPersonIDCreator=:gibbonPersonIDCreator, gibbonPersonIDLastEdit=:gibbonPersonIDLastEdit'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - //Fail 2 - $partialFail = true; - } - } - - //Unlock module table - try { - $sql = 'UNLOCK TABLES'; - $result = $connection2->query($sql); - } catch (PDOException $e) { - } - - if ($partialFail != false) { - //Success 0 - $URL .= '&return=error6'; - header("Location: {$URL}"); - } else { - //Success 0 - $URL .= '&return=success0'; - header("Location: {$URL}"); - } - } - } -} +. +*/ + +use Gibbon\Module\ATL\Domain\ATLColumnGateway; +use Gibbon\Module\ATL\Domain\ATLEntryGateway; +use Gibbon\Services\Format; + +include '../../gibbon.php'; + +$gibbonCourseClassID = $_POST['gibbonCourseClassID']; +$URL = $session->get('absoluteURL').'/index.php?q=/modules/ATL/'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_add.php') == false) { + //Fail 0 + $URL .= 'atl_manage.php&return=error0'; + header("Location: {$URL}"); +} else { + //Proceed! + $URL .= "atl_manage_add.php&gibbonCourseClassID=$gibbonCourseClassID"; + + //Validate Inputs + $gibbonCourseClassIDMulti = array_unique($_POST['gibbonCourseClassIDMulti']) ?? ''; + $name = $_POST['name'] ?? ''; + $description = $_POST['description'] ?? ''; + $gibbonRubricID = $_POST['gibbonRubricID'] ?? ''; + $completeDate = $_POST['completeDate'] ?? ''; + if ($completeDate == '') { + $completeDate = null; + $complete = 'N'; + } else { + $completeDate = Format::dateConvert($completeDate); + $complete = 'Y'; + } + $forStudents = $_POST['forStudents'] ?? ''; + $gibbonPersonIDCreator = $session->get('gibbonPersonID'); + $gibbonPersonIDLastEdit = $session->get('gibbonPersonID'); + + if (!is_array($gibbonCourseClassIDMulti) || empty($gibbonCourseClassIDMulti) || empty($name) || empty($description) || empty($forStudents)) { + //Fail 3 + $URL .= '&return=error1'; + header("Location: {$URL}"); + exit(); + } else { + $partialFail = false; + + $atlColumnGateway = $container->get(ATLColumnGateway::class); + $atlEntryGateway = $container->get(ATLEntryGateway::class); + + $data = [ + 'name' => $name, + 'description' => $description, + 'gibbonRubricID' => $gibbonRubricID, + 'completeDate' => $completeDate, + 'forStudents' => $forStudents, + 'complete' => $complete, + 'gibbonPersonIDCreator' => $gibbonPersonIDCreator, + 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit + ]; + + foreach ($gibbonCourseClassIDMulti as $gibbonCourseClassIDSingle) { + //Write to database + $data['gibbonCourseClassID'] = $gibbonCourseClassIDSingle; + $atlColumnID = $atlColumnGateway->insert($data); + if (!$atlColumnID) { + $partialFail = true; + } else { + $atlEntryGateway->createATLEntries($atlColumnID, $gibbonCourseClassIDSingle, $gibbonPersonIDCreator); + } + } + + if ($partialFail) { + $URL .= '&return=warning1'; + } else { + $URL .= '&return=success0'; + } + header("Location: {$URL}"); + exit(); + } +} diff --git a/ATL/atl_manage_delete.php b/ATL/atl_manage_delete.php index 7d5ae57..bcf3047 100644 --- a/ATL/atl_manage_delete.php +++ b/ATL/atl_manage_delete.php @@ -1,80 +1,47 @@ -. -*/ - -use Gibbon\Forms\Prefab\DeleteForm; - -//Module includes -include './modules/'.$session->get('module').'/moduleFunctions.php'; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_delete.php') == false) { - //Acess denied - $page->addError(__('You do not have access to this action.')); -} else { - //Check if school year specified - $gibbonCourseClassID = $_GET['gibbonCourseClassID']; - $atlColumnID = $_GET['atlColumnID']; - if ($gibbonCourseClassID == '' or $atlColumnID == '') { - $page->addError(__('You have not specified one or more required parameters.'));; - } else { - try { - $data = array('gibbonCourseClassID' => $gibbonCourseClassID); - $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID, gibbonCourse.gibbonDepartmentID, gibbonYearGroupIDList FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' ORDER BY course, class"; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - echo "
".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- try {
- $data2 = array('atlColumnID' => $atlColumnID);
- $sql2 = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID';
- $result2 = $connection2->prepare($sql2);
- $result2->execute($data2);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result2->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- //Let's go!
- $row = $result->fetch();
- $row2 = $result2->fetch();
-
- $page->breadcrumbs
- ->add(__('Manage {courseClass} ATLs', ['courseClass' => $row['course'].'.'.$row['class']]), 'atl_manage.php', ['gibbonCourseClassID' => $gibbonCourseClassID])
- ->add(__('Delete Column'));
-
- if (isset($_GET['return'])) {
- returnProcess($guid, $_GET['return'], null, null);
- }
-
- $form = DeleteForm::createForm($session->get('absoluteURL').'/modules/'.$session->get('module').'/atl_manage_deleteProcess.php?atlColumnID='.$atlColumnID);
- $form->addHiddenValue('gibbonCourseClassID', $gibbonCourseClassID);
- echo $form->getOutput();
- }
- }
-
- //Print sidebar
- $session->set('sidebarExtra', sidebarExtra($guid, $connection2, $gibbonCourseClassID, 'manage', 'Manage ATLs_all'));
- }
-}
+.
+*/
+
+use Gibbon\Forms\Prefab\DeleteForm;
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+
+//Module includes
+require_once __DIR__ . '/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_delete.php') == false) {
+ //Acess denied
+ $page->addError(__('You do not have access to this action.'));
+} else {
+ //Check if school year specified
+ $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? '';
+ $atlColumnID = $_GET['atlColumnID'] ?? '';
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+
+ if (!$atlColumnGateway->exists($atlColumnID)) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ //Let's go!
+ $form = DeleteForm::createForm($session->get('absoluteURL').'/modules/'.$session->get('module').'/atl_manage_deleteProcess.php');
+ $form->addHiddenValue('atlColumnID', $atlColumnID);
+ $form->addHiddenValue('gibbonCourseClassID', $gibbonCourseClassID);
+ echo $form->getOutput();
+
+ //Print sidebar
+ $session->set('sidebarExtra', sidebarExtra($gibbonCourseClassID, 'manage'));
+ }
+}
diff --git a/ATL/atl_manage_deleteProcess.php b/ATL/atl_manage_deleteProcess.php
index e441ead..b0fd6ca 100644
--- a/ATL/atl_manage_deleteProcess.php
+++ b/ATL/atl_manage_deleteProcess.php
@@ -1,75 +1,62 @@
-.
-*/
-
-include '../../gibbon.php';
-
-
-$gibbonCourseClassID = $_POST['gibbonCourseClassID'];
-$atlColumnID = $_GET['atlColumnID'];
-$URL = $session->get('absoluteURL').'/index.php?q=/modules/'.getModuleName($_POST['address'])."/atl_manage_delete.php&atlColumnID=$atlColumnID&gibbonCourseClassID=$gibbonCourseClassID";
-$URLDelete = $session->get('absoluteURL').'/index.php?q=/modules/'.getModuleName($_POST['address'])."/atl_manage.php&gibbonCourseClassID=$gibbonCourseClassID";
-
-if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_delete.php') == false) {
- //Fail 0
- $URL .= '&return=error0';
- header("Location: {$URL}");
-} else {
- //Proceed!
- //Check if school year specified
- if ($atlColumnID == '' or $gibbonCourseClassID == '') {
- //Fail1
- $URL .= '&return=error1';
- header("Location: {$URL}");
- } else {
- try {
- $data = array('atlColumnID' => $atlColumnID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID AND gibbonCourseClassID=:gibbonCourseClassID';
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- //Fail2
- $URL .= '&return=error2';
- header("Location: {$URL}");
- exit();
- }
-
- if ($result->rowCount() != 1) {
- //Fail 2
- $URL .= '&return=error2';
- header("Location: {$URL}");
- } else {
- //Write to database
- try {
- $data = array('atlColumnID' => $atlColumnID);
- $sql = 'DELETE FROM atlColumn WHERE atlColumnID=:atlColumnID';
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- //Fail 2
- $URL .= '&return=error2';
- header("Location: {$URL}");
- exit();
- }
-
- //Success 0
- $URLDelete = $URLDelete.'&return=success0';
- header("Location: {$URLDelete}");
- }
- }
-}
+.
+*/
+
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Module\ATL\Domain\ATLEntryGateway;
+
+include '../../gibbon.php';
+
+$gibbonCourseClassID = $_POST['gibbonCourseClassID'] ?? '';
+$atlColumnID = $_POST['atlColumnID'] ?? '';
+$URL = $session->get('absoluteURL').'/index.php?q=/modules/ATL/atl_manage.php&gibbonCourseClassID=' . $gibbonCourseClassID;
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_delete.php') == false) {
+ //Fail 0
+ $URL .= '&return=error0';
+ header("Location: {$URL}");
+ exit();
+} else {
+ //Proceed!
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+
+ if (!$atlColumnGateway->exists($atlColumnID)) {
+ $URL .= '&return=error1';
+ header("Location: {$URL}");
+ exit();
+ } else {
+ //Write to database
+ if (!$atlColumnGateway->delete($atlColumnID)) {
+ $URL .= '&return=error2';
+ header("Location: {$URL}");
+ exit();
+ }
+
+ $atlEntryGateway = $container->get(ATLEntryGateway::class);
+ if (!$atlEntryGateway->deleteWhere(['atlColumnID' => $atlColumnID])) {
+ $URL .= '&return=warning1';
+ header("Location: {$URL}");
+ exit();
+ }
+
+ //Success 0
+ $URL .= '&return=success0';
+ header("Location: {$URL}");
+ exit();
+ }
+}
diff --git a/ATL/atl_manage_edit.php b/ATL/atl_manage_edit.php
index 96f47d6..6e2699a 100644
--- a/ATL/atl_manage_edit.php
+++ b/ATL/atl_manage_edit.php
@@ -1,130 +1,123 @@
-.
-*/
-
-use Gibbon\Forms\Form;
-
-//Module includes
-include './modules/'.$session->get('module').'/moduleFunctions.php';
-
-if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_edit.php') == false) {
- //Acess denied
- $page->addError(__('You do not have access to this action.'));
-} else {
- //Get action with highest precendence
- $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2);
- if ($highestAction == false) {
- $page->addError(__('The highest grouped action cannot be determined.'));
- } else {
- //Check if school year specified
- $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? '';
- $atlColumnID = $_GET['atlColumnID'] ?? '';
- if ($gibbonCourseClassID == '' or $atlColumnID == '') {
- $page->addError(__('You have not specified one or more required parameters.'));
- } else {
- try {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID, gibbonCourse.gibbonDepartmentID, gibbonYearGroupIDList FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' ORDER BY course, class";
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- try {
- $data2 = array('atlColumnID' => $atlColumnID);
- $sql2 = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID';
- $result2 = $connection2->prepare($sql2);
- $result2->execute($data2);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result2->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- //Let's go!
- $class = $result->fetch();
- $values = $result2->fetch();
-
- $page->breadcrumbs
- ->add(__('Manage {courseClass} ATLs', ['courseClass' => $class['course'].'.'.$class['class']]), 'atl_manage.php', ['gibbonCourseClassID' => $gibbonCourseClassID])
- ->add(__('Edit Column'));
-
- if (isset($_GET['return'])) {
- returnProcess($guid, $_GET['return'], null, null);
- }
-
- $form = Form::create('ATL', $session->get('absoluteURL').'/modules/ATL/atl_manage_editProcess.php?atlColumnID='.$atlColumnID.'&gibbonCourseClassID='.$gibbonCourseClassID.'&address='.$session->get('address'));
- $form->addHiddenValue('address', $session->get('address'));
-
- $form->addRow()->addHeading(__('Basic Information'));
-
- $row = $form->addRow();
- $row->addLabel('className', __('Class'));
- $row->addTextField('className')->readonly()->setValue(htmlPrep($class['course']).'.'.htmlPrep($class['class']));
-
- $row = $form->addRow();
- $row->addLabel('name', __('Name'));
- $row->addTextField('name')->isRequired()->maxLength(20);
-
- $row = $form->addRow();
- $row->addLabel('description', __('Description'));
- $row->addTextField('description')->isRequired()->maxLength(1000);
-
- $form->addRow()->addHeading(__('Assessment'));
-
- $data = array('gibbonYearGroupIDList' => $class['gibbonYearGroupIDList'], 'gibbonDepartmentID' => $class['gibbonDepartmentID'], 'rubrics' => __('Rubrics'));
- $sql = "SELECT CONCAT(scope, ' ', :rubrics) as groupBy, gibbonRubricID as value,
- (CASE WHEN category <> '' THEN CONCAT(category, ' - ', gibbonRubric.name) ELSE gibbonRubric.name END) as name
- FROM gibbonRubric
- JOIN gibbonYearGroup ON (FIND_IN_SET(gibbonYearGroup.gibbonYearGroupID, gibbonRubric.gibbonYearGroupIDList))
- WHERE gibbonRubric.active='Y'
- AND FIND_IN_SET(gibbonYearGroup.gibbonYearGroupID, :gibbonYearGroupIDList)
- AND (scope='School' OR (scope='Learning Area' AND gibbonDepartmentID=:gibbonDepartmentID))
- GROUP BY gibbonRubric.gibbonRubricID
- ORDER BY scope, category, name";
-
- $row = $form->addRow();
- $row->addLabel('gibbonRubricID', __('Rubric'));
- $row->addSelect('gibbonRubricID')->fromQuery($pdo, $sql, $data, 'groupBy')->placeholder();
-
- $form->addRow()->addHeading(__('Access'));
-
- $row = $form->addRow();
- $row->addLabel('completeDate', __('Go Live Date'))->prepend('1. ')->append(''.__('2. Column is hidden until date is reached.')); - $row->addDate('completeDate'); - - $row = $form->addRow(); - $row->addFooter(); - $row->addSubmit(); - - $form->loadAllValuesFrom($values); - - echo $form->getOutput(); - } - } - - //Print sidebar - $session->set('sidebarExtra', sidebarExtra($guid, $connection2, $gibbonCourseClassID, 'manage', $highestAction)); - } - } -} +. +*/ + +use Gibbon\Forms\Form; +use Gibbon\Module\ATL\Domain\ATLColumnGateway; +use Gibbon\Services\Format; + +//Module includes +require_once __DIR__ . '/moduleFunctions.php'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_edit.php') == false) { + //Acess denied + $page->addError(__('You do not have access to this action.')); +} else { + //Check if school year specified + $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? ''; + $atlColumnID = $_GET['atlColumnID'] ?? ''; + try { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID); + $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID, gibbonCourse.gibbonDepartmentID, gibbonYearGroupIDList FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' ORDER BY course, class"; + $result = $connection2->prepare($sql); + $result->execute($data); + } catch (PDOException $e) { + $page->addError(__('A database error has occured.')); + } + + if ($result->rowCount() != 1) { + $page->addError(__('The selected record does not exist, or you do not have access to it.')); + } else { + $atlColumnGateway = $container->get(ATLColumnGateway::class); + $atlColumn = $atlColumnGateway->getByID($atlColumnID); + if (empty($atlColumn)) { + $page->addError(__('The selected record does not exist, or you do not have access to it.')); + } else { + //Let's go! + $class = $result->fetch(); + + $page->breadcrumbs + ->add(__('Manage {courseClass} ATLs', ['courseClass' => Format::courseClassName($class['course'], $class['class'])]), 'atl_manage.php', ['gibbonCourseClassID' => $gibbonCourseClassID]) + ->add(__('Edit Column')); + + $form = Form::create('ATL', $session->get('absoluteURL').'/modules/ATL/atl_manage_editProcess.php'); + $form->addHiddenValue('address', $session->get('address')); + $form->addHiddenValue('atlColumnID', $atlColumnID); + $form->addHiddenValue('gibbonCourseClassID', $gibbonCourseClassID); + + $form->addRow()->addHeading(__('Basic Information')); + + $row = $form->addRow(); + $row->addLabel('className', __('Class')); + $row->addTextField('className') + ->readonly() + ->setValue(htmlPrep(Format::courseClassName($class['course'], $class['class']))); + + $row = $form->addRow(); + $row->addLabel('name', __('Name')); + $row->addTextField('name') + ->isRequired() + ->maxLength(20); + + $row = $form->addRow(); + $row->addLabel('description', __('Description')); + $row->addTextField('description') + ->isRequired() + ->maxLength(1000); + + $form->addRow()->addHeading(__('Assessment')); + + $data = array('gibbonYearGroupIDList' => $class['gibbonYearGroupIDList'], 'gibbonDepartmentID' => $class['gibbonDepartmentID'], 'rubrics' => __('Rubrics')); + $sql = "SELECT CONCAT(scope, ' ', :rubrics) as groupBy, gibbonRubricID as value, + (CASE WHEN category <> '' THEN CONCAT(category, ' - ', gibbonRubric.name) ELSE gibbonRubric.name END) as name + FROM gibbonRubric + JOIN gibbonYearGroup ON (FIND_IN_SET(gibbonYearGroup.gibbonYearGroupID, gibbonRubric.gibbonYearGroupIDList)) + WHERE gibbonRubric.active='Y' + AND FIND_IN_SET(gibbonYearGroup.gibbonYearGroupID, :gibbonYearGroupIDList) + AND (scope='School' OR (scope='Learning Area' AND gibbonDepartmentID=:gibbonDepartmentID)) + GROUP BY gibbonRubric.gibbonRubricID + ORDER BY scope, category, name"; + + $row = $form->addRow(); + $row->addLabel('gibbonRubricID', __('Rubric')); + $row->addSelect('gibbonRubricID')->fromQuery($pdo, $sql, $data, 'groupBy')->placeholder(); + + $form->addRow()->addHeading(__('Access')); + + $row = $form->addRow(); + $row->addLabel('completeDate', __('Go Live Date'))->prepend('1. ')->append('
'.__('2. Column is hidden until date is reached.')); + $row->addDate('completeDate'); + + $row = $form->addRow(); + $row->addLabel('forStudents', __('For Students?'))->description(__('Is this column meant to be filled out by students?')); + $row->addYesNo('forStudents') + ->required(); + + $row = $form->addRow(); + $row->addFooter(); + $row->addSubmit(); + + $form->loadAllValuesFrom($atlColumn); + + echo $form->getOutput(); + } + } + + //Print sidebar + $session->set('sidebarExtra', sidebarExtra($gibbonCourseClassID, 'manage')); +} diff --git a/ATL/atl_manage_editProcess.php b/ATL/atl_manage_editProcess.php index 555e582..22a5199 100644 --- a/ATL/atl_manage_editProcess.php +++ b/ATL/atl_manage_editProcess.php @@ -1,136 +1,103 @@ -. -*/ - -include '../../gibbon.php'; - - -$gibbonCourseClassID = $_GET['gibbonCourseClassID']; -$atlColumnID = $_GET['atlColumnID']; -$URL = $session->get('absoluteURL').'/index.php?q=/modules/'.getModuleName($_GET['address'])."/atl_manage_edit.php&atlColumnID=$atlColumnID&gibbonCourseClassID=$gibbonCourseClassID"; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_edit.php') == false) { - //Fail 0 - $URL .= '&return=error0'; - header("Location: {$URL}"); -} else { - $highestAction = getHighestGroupedAction($guid, $_GET['address'], $connection2); - if ($highestAction == false) { - //Fail 0 - $URL .= '&return=error0'; - header("Location: {$URL}"); - } else { - if (empty($_POST)) { - $URL .= '&return=error5'; - header("Location: {$URL}"); - } else { - //Proceed! - //Check if school year specified - if ($atlColumnID == '' or $gibbonCourseClassID == '') { - //Fail1 - $URL .= '&return=error1'; - header("Location: {$URL}"); - } else { - try { - $data = array('atlColumnID' => $atlColumnID, 'gibbonCourseClassID' => $gibbonCourseClassID); - $sql = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID AND gibbonCourseClassID=:gibbonCourseClassID'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - //Fail2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - exit(); - } - - if ($result->rowCount() != 1) { - //Fail 2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - } else { - $row = $result->fetch(); - - //Validate Inputs - $name = $_POST['name']; - $description = $_POST['description']; - $gibbonRubricID = $_POST['gibbonRubricID']; - $completeDate = $_POST['completeDate']; - if ($completeDate == '') { - $completeDate = null; - $complete = 'N'; - } else { - $completeDate = dateConvert($guid, $completeDate); - $complete = 'Y'; - } - $gibbonPersonIDLastEdit = $session->get('gibbonPersonID'); - $groupingID = $row['groupingID']; - - if ($name == '' or $description == '') { - //Fail 3 - $URL .= '&return=error3'; - header("Location: {$URL}"); - } else { - //ATTEMPT TO UPDATE LINKED COLUMNS - $partialFail = false; - if (isset($_POST['gibbonCourseClassID'])) { - if (is_array($_POST['gibbonCourseClassID'])) { - $gibbonCourseClassIDs = $_POST['gibbonCourseClassID']; - foreach ($gibbonCourseClassIDs as $gibbonCourseClassID2) { - //Write to database - try { - $data = array('name' => $name, 'description' => $description, 'gibbonRubricID' => $gibbonRubricID, 'completeDate' => $completeDate, 'complete' => $complete, 'gibbonPersonIDLastEdit' => $session->get('gibbonPersonID'), 'groupingID' => $groupingID, 'gibbonCourseClassID' => $gibbonCourseClassID2); - $sql = 'UPDATE atlColumn SET name=:name, description=:description, gibbonRubricID=:gibbonRubricID, completeDate=:completeDate, complete=:complete, gibbonPersonIDLastEdit=:gibbonPersonIDLastEdit WHERE groupingID=:groupingID AND gibbonCourseClassID=:gibbonCourseClassID'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - $partialFail = true; - echo $e->getMessage(); - } - - } - } - } - - //Write to database - try { - $data = array('gibbonCourseClassID' => $gibbonCourseClassID, 'name' => $name, 'description' => $description, 'gibbonRubricID' => $gibbonRubricID, 'completeDate' => $completeDate, 'complete' => $complete, 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit, 'atlColumnID' => $atlColumnID); - $sql = 'UPDATE atlColumn SET gibbonCourseClassID=:gibbonCourseClassID, name=:name, description=:description, gibbonRubricID=:gibbonRubricID, completeDate=:completeDate, complete=:complete, gibbonPersonIDLastEdit=:gibbonPersonIDLastEdit WHERE atlColumnID=:atlColumnID'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - //Fail 2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - exit(); - } - - if ($partialFail == true) { - //Fail 6 - $URL .= '&return=warning1'; - header("Location: {$URL}"); - } else { - //Success 0 - $URL .= '&return=success0'; - header("Location: {$URL}"); - } - } - } - } - } - } -} +. +*/ + +use Gibbon\Module\ATL\Domain\ATLColumnGateway; +use Gibbon\Module\ATL\Domain\ATLEntryGateway; +use Gibbon\Services\Format; + +include '../../gibbon.php'; + +$URL = $session->get('absoluteURL').'/index.php?q=/modules/ATL/'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_manage_edit.php') == false) { + //Fail 0 + $URL .= 'atl_manage.php&return=error0'; + header("Location: {$URL}"); + exit(); +} else { + $gibbonCourseClassID = $_POST['gibbonCourseClassID'] ?? ''; + $atlColumnID = $_POST['atlColumnID'] ?? ''; + + $atlColumnGateway = $container->get(ATLColumnGateway::class); + $atlColumn = $atlColumnGateway->getByID($atlColumnID); + //Proceed! + //Check if school year specified + if (empty($atlColumn) || $atlColumn['gibbonCourseClassID'] != $gibbonCourseClassID) { + //Fail1 + $URL .= 'atl_manage.php&return=error1'; + header("Location: {$URL}"); + exit(); + } else { + $URL .= "atl_manage_edit.php&atlColumnID=$atlColumnID&gibbonCourseClassID=$gibbonCourseClassID"; + + //Validate Inputs + $name = $_POST['name'] ?? ''; + $description = $_POST['description'] ?? ''; + $gibbonRubricID = $_POST['gibbonRubricID'] ?? $atlColumn['gibbonRubricID']; + $completeDate = $_POST['completeDate'] ?? ''; + if ($completeDate == '') { + $completeDate = null; + $complete = 'N'; + } else { + $completeDate = Format::dateConvert($completeDate); + $complete = 'Y'; + } + $forStudents = $_POST['forStudents'] ?? $atlColumn['forStudents']; + $gibbonPersonIDLastEdit = $session->get('gibbonPersonID'); + + if (empty($name) || empty($description) || empty($forStudents)) { + //Fail 3 + $URL .= '&return=error1'; + header("Location: {$URL}"); + exit(); + } else { + $data = [ + 'name' => $name, + 'description' => $description, + 'gibbonRubricID' => $gibbonRubricID, + 'completeDate' => $completeDate, + 'forStudents' => $forStudents, + 'complete' => $complete, + 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit + ]; + + if (!$atlColumnGateway->update($atlColumnID, $data)) { + //Fail 6 + $URL .= '&return=error2'; + header("Location: {$URL}"); + exit(); + } + + + if ($gibbonRubricID != $atlColumn['gibbonRubricID']) { + $atlEntryGateway = $container->get(ATLEntryGateway::class); + if (!$atlEntryGateway->updateWhere(['atlColumnID' => $atlColumnID], ['complete' => 'N'])) { + $URL .= '&return=warning1'; + header("Location: {$URL}"); + exit(); + } + } + + //Success 0 + $URL .= '&return=success0'; + header("Location: {$URL}"); + exit(); + } + } +} diff --git a/ATL/atl_view.php b/ATL/atl_view.php index 25c7432..96e8054 100644 --- a/ATL/atl_view.php +++ b/ATL/atl_view.php @@ -1,185 +1,179 @@ -. -*/ - -use Gibbon\Forms\DatabaseFormFactory; -use Gibbon\Forms\Form; -use Gibbon\Services\Format; - -//Module includes -include './modules/'.$session->get('module').'/moduleFunctions.php'; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) { - //Acess denied - $page->addError(__('You do not have access to this action.')); -} else { - // Register scripts available to the core, but not included by default - $page->scripts->add('chart'); - - //Get action with highest precendence - $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2); - if ($highestAction == false) { - $page->addError(__('The highest grouped action cannot be determined.')); - } else { - if ($highestAction == 'View ATLs_all') { //ALL STUDENTS - $page->breadcrumbs->add(__('View All ATLs')); - - $gibbonPersonID = null; - if (isset($_GET['gibbonPersonID'])) { - $gibbonPersonID = $_GET['gibbonPersonID']; - } - - echo '
'; - echo __('Choose A Student'); - echo '
'; - - $form = Form::create("filter", $session->get('absoluteURL')."/index.php", "get", "noIntBorder fullWidth standardForm"); - $form->setFactory(DatabaseFormFactory::create($pdo)); - - $form->addHiddenValue('q', '/modules/ATL/atl_view.php'); - $form->addHiddenValue('address', $session->get('address')); - - $row = $form->addRow(); - $row->addLabel('gibbonPersonID', __('Student')); - $row->addSelectStudent('gibbonPersonID', $session->get("gibbonSchoolYearID"), array())->selected($gibbonPersonID)->placeholder(); - - $row = $form->addRow(); - $row->addSearchSubmit($gibbon->session); - - echo $form->getOutput(); - - if (!empty($gibbonPersonID)) { - echo ''; - echo __('ATLs'); - echo '
'; - - //Check for access - try { - $dataCheck = array('gibbonPersonID' => $gibbonPersonID); - $sqlCheck = "SELECT DISTINCT gibbonPerson.* FROM gibbonPerson LEFT JOIN gibbonStudentEnrolment ON (gibbonPerson.gibbonPersonID=gibbonStudentEnrolment.gibbonPersonID) WHERE gibbonPerson.gibbonPersonID=:gibbonPersonID AND status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."')"; - $resultCheck = $connection2->prepare($sqlCheck); - $resultCheck->execute($dataCheck); - } catch (PDOException $e) { - echo "".$e->getMessage().'
';
- }
-
- if ($resultCheck->rowCount() != 1) {
- echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- echo getATLRecord($guid, $connection2, $gibbonPersonID);
- }
- }
- } elseif ($highestAction == 'View ATLs_myChildrens') { //MY CHILDREN
- $page->breadcrumbs->add(__('View My Childrens\'s ATLs'));
-
- //Test data access field for permission
- try {
- $data = array('gibbonPersonID' => $session->get('gibbonPersonID'));
- $sql = "SELECT * FROM gibbonFamilyAdult WHERE gibbonPersonID=:gibbonPersonID AND childDataAccess='Y'";
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() < 1) {
- echo "";
- echo __('Access denied.');
- echo '
';
- } else {
- //Get child list
- $gibbonPersonID = null;
- $options = array();
- while ($row = $result->fetch()) {
- try {
- $dataChild = array('gibbonFamilyID' => $row['gibbonFamilyID'], 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'today' => date('Y-m-d'));
- $sqlChild = "SELECT * FROM gibbonFamilyChild JOIN gibbonPerson ON (gibbonFamilyChild.gibbonPersonID=gibbonPerson.gibbonPersonID) JOIN gibbonStudentEnrolment ON (gibbonPerson.gibbonPersonID=gibbonStudentEnrolment.gibbonPersonID) JOIN gibbonFormGroup ON (gibbonStudentEnrolment.gibbonFormGroupID=gibbonFormGroup.gibbonFormGroupID) WHERE gibbonFamilyID=:gibbonFamilyID AND gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<=:today) AND (dateEnd IS NULL OR dateEnd>=:today) AND gibbonStudentEnrolment.gibbonSchoolYearID=:gibbonSchoolYearID ORDER BY surname, preferredName ";
- $resultChild = $connection2->prepare($sqlChild);
- $resultChild->execute($dataChild);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
- while ($rowChild = $resultChild->fetch()) {
- $options[$rowChild['gibbonPersonID']]=Format::name('', $rowChild['preferredName'], $rowChild['surname'], 'Student', true);
- }
- }
-
- if (count($options) == 0) {
- echo "";
- echo __('Access denied.');
- echo '
';
- } elseif (count($options) == 1) {
- $gibbonPersonID = key($options);
- } else {
- echo ''; - echo __('Choose Student'); - echo '
'; - - $gibbonPersonID = (isset($_GET['gibbonPersonID']))? $_GET['gibbonPersonID'] : null; - - $form = Form::create("filter", $session->get('absoluteURL')."/index.php", "get", "noIntBorder fullWidth standardForm"); - $form->setFactory(DatabaseFormFactory::create($pdo)); - - $form->addHiddenValue('q', '/modules/ATL/atl_view.php'); - - $row = $form->addRow(); - $row->addLabel('gibbonPersonID', __('Child'))->description('Choose the child you are registering for.'); - $row->addSelect('gibbonPersonID')->fromArray($options)->selected($gibbonPersonID); - - $row = $form->addRow(); - $row->addSearchSubmit($gibbon->session); - - echo $form->getOutput(); - } - - $showParentAttainmentWarning = getSettingByScope($connection2, 'Markbook', 'showParentAttainmentWarning'); - $showParentEffortWarning = getSettingByScope($connection2, 'Markbook', 'showParentEffortWarning'); - - if (!empty($gibbonPersonID) and count($options) > 0) { - //Confirm access to this student - try { - $dataChild = array(); - $sqlChild = "SELECT * FROM gibbonFamilyChild JOIN gibbonFamily ON (gibbonFamilyChild.gibbonFamilyID=gibbonFamily.gibbonFamilyID) JOIN gibbonFamilyAdult ON (gibbonFamilyAdult.gibbonFamilyID=gibbonFamily.gibbonFamilyID) JOIN gibbonPerson ON (gibbonFamilyChild.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND gibbonFamilyChild.gibbonPersonID=$gibbonPersonID AND gibbonFamilyAdult.gibbonPersonID=".$session->get('gibbonPersonID')." AND childDataAccess='Y'"; - $resultChild = $connection2->prepare($sqlChild); - $resultChild->execute($dataChild); - } catch (PDOException $e) { - echo "".$e->getMessage().'
';
- }
- if ($resultChild->rowCount() < 1) {
- echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- $rowChild = $resultChild->fetch();
- echo getATLRecord($guid, $connection2, $gibbonPersonID);
- }
- }
- }
- } else { //My ATLS
- $page->breadcrumbs->add(__('View My ATLs'));
-
- echo ''; - echo __('ATLs'); - echo '
'; - - echo getATLRecord($guid, $connection2, $session->get('gibbonPersonID')); - } - } -} +. +*/ + +use Gibbon\Domain\System\SettingGateway; +use Gibbon\Domain\User\FamilyAdultGateway; +use Gibbon\Forms\DatabaseFormFactory; +use Gibbon\Forms\Form; +use Gibbon\Services\Format; + +//Module includes +require_once __DIR__ . '/moduleFunctions.php'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) { + //Acess denied + $page->addError(__('You do not have access to this action.')); +} else { + // Register scripts available to the core, but not included by default + $page->scripts->add('chart'); + + //Get action with highest precendence + $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2); + if ($highestAction == false) { + $page->addError(__('The highest grouped action cannot be determined.')); + } else { + if ($highestAction == 'View ATLs_all') { //ALL STUDENTS + $page->breadcrumbs->add(__('View All ATLs')); + + $gibbonPersonID = $_GET['gibbonPersonID'] ?? ''; + + $form = Form::create("filter", $session->get('absoluteURL').'/index.php', 'get', 'noIntBorder fullWidth standardForm'); + $form->setFactory(DatabaseFormFactory::create($pdo)); + + $form->setTitle(__('Choose A Student')); + + $form->addHiddenValue('q', '/modules/ATL/atl_view.php'); + $form->addHiddenValue('address', $session->get('address')); + + $row = $form->addRow(); + $row->addLabel('gibbonPersonID', __('Student')); + $row->addSelectStudent('gibbonPersonID', $session->get('gibbonSchoolYearID'), []) + ->selected($gibbonPersonID) + ->placeholder(); + + $row = $form->addRow(); + $row->addSearchSubmit($session); + + echo $form->getOutput(); + + if (!empty($gibbonPersonID)) { + echo ''; + echo __('ATLs'); + echo '
'; + + //Check for access + try { + $dataCheck = array('gibbonPersonID' => $gibbonPersonID, 'today' => date('Y-m-d')); + $sqlCheck = "SELECT DISTINCT gibbonPerson.* FROM gibbonPerson LEFT JOIN gibbonStudentEnrolment ON (gibbonPerson.gibbonPersonID=gibbonStudentEnrolment.gibbonPersonID) WHERE gibbonPerson.gibbonPersonID=:gibbonPersonID AND status='Full' AND (dateStart IS NULL OR dateStart<= :today) AND (dateEnd IS NULL OR dateEnd>= :today)"; + $resultCheck = $connection2->prepare($sqlCheck); + $resultCheck->execute($dataCheck); + } catch (PDOException $e) { + } + + if ($resultCheck->rowCount() != 1) { + echo Format::alert(__('The selected record does not exist, or you do not have access to it.')); + } else { + echo ''; + echo visualiseATL($container, $gibbonPersonID); + + echo getATLRecord($gibbonPersonID); + } + } + } elseif ($highestAction == 'View ATLs_myChildrens') { //MY CHILDREN + $page->breadcrumbs->add(__('View My Childrens\'s ATLs')); + + //Test data access field for permission + $familyAdultGateway = $container->get(FamilyAdultGateway::class); + $adult = $familyAdultGateway->selectBy(['gibbonPersonID' => $session->get('gibbonPersonID'), 'childDataAccess' => 'Y']); + + if ($adult->isEmpty()) { + echo Format::alert(__('Access denied.')); + } else { + //Get child list + $adult = $adult->fetch(); + $gibbonPersonID = ''; + $options = []; + + try { + $dataChild = array('gibbonFamilyID' => $adult['gibbonFamilyID'], 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'today' => date('Y-m-d')); + $sqlChild = "SELECT * FROM gibbonFamilyChild JOIN gibbonPerson ON (gibbonFamilyChild.gibbonPersonID=gibbonPerson.gibbonPersonID) JOIN gibbonStudentEnrolment ON (gibbonPerson.gibbonPersonID=gibbonStudentEnrolment.gibbonPersonID) JOIN gibbonFormGroup ON (gibbonStudentEnrolment.gibbonFormGroupID=gibbonFormGroup.gibbonFormGroupID) WHERE gibbonFamilyID=:gibbonFamilyID AND gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<=:today) AND (dateEnd IS NULL OR dateEnd>=:today) AND gibbonStudentEnrolment.gibbonSchoolYearID=:gibbonSchoolYearID ORDER BY surname, preferredName "; + $resultChild = $connection2->prepare($sqlChild); + $resultChild->execute($dataChild); + } catch (PDOException $e) { + echo "
".$e->getMessage().'
';
+ }
+ while ($rowChild = $resultChild->fetch()) {
+ $options[$rowChild['gibbonPersonID']]=Format::name('', $rowChild['preferredName'], $rowChild['surname'], 'Student', true);
+ }
+
+ if (empty($options)) {
+ echo Format::alert(__('Access denied.'));
+ } elseif (count($options) == 1) {
+ $gibbonPersonID = key($options);
+ } else {
+ echo ''; + echo __('Choose Student'); + echo '
'; + + $gibbonPersonID = $_GET['gibbonPersonID'] ?? ''; + + $form = Form::create("filter", $session->get('absoluteURL').'/index.php', 'get', 'noIntBorder fullWidth standardForm'); + $form->setFactory(DatabaseFormFactory::create($pdo)); + + $form->addHiddenValue('q', '/modules/ATL/atl_view.php'); + + $row = $form->addRow(); + $row->addLabel('gibbonPersonID', __('Child'))->description('Choose the child you are registering for.'); + $row->addSelect('gibbonPersonID') + ->fromArray($options) + ->selected($gibbonPersonID); + + $row = $form->addRow(); + $row->addSearchSubmit($session); + + echo $form->getOutput(); + } + + $settingGateway = $container->get(SettingGateway::class); + $showParentAttainmentWarning = $settingGateway->getSettingByScope('Markbook', 'showParentAttainmentWarning'); + $showParentEffortWarning = $settingGateway->getSettingByScope('Markbook', 'showParentEffortWarning'); + + if (!empty($gibbonPersonID) && !empty($options)) { + //Confirm access to this student + try { + $dataChild = array(); + $sqlChild = "SELECT * FROM gibbonFamilyChild JOIN gibbonFamily ON (gibbonFamilyChild.gibbonFamilyID=gibbonFamily.gibbonFamilyID) JOIN gibbonFamilyAdult ON (gibbonFamilyAdult.gibbonFamilyID=gibbonFamily.gibbonFamilyID) JOIN gibbonPerson ON (gibbonFamilyChild.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND gibbonFamilyChild.gibbonPersonID=$gibbonPersonID AND gibbonFamilyAdult.gibbonPersonID=".$session->get('gibbonPersonID')." AND childDataAccess='Y'"; + $resultChild = $connection2->prepare($sqlChild); + $resultChild->execute($dataChild); + } catch (PDOException $e) { + } + if ($resultChild->rowCount() < 1) { + echo Format::alert(__('The selected record does not exist, or you do not have access to it.')); + } else { + $rowChild = $resultChild->fetch(); + echo ''; + echo visualiseATL($container, $gibbonPersonID); + + echo getATLRecord($gibbonPersonID); + } + } + } + } else { //My ATLS + $page->breadcrumbs->add(__('View My ATLs')); + + echo '
'; + echo __('ATLs'); + echo '
'; + + echo visualiseATL($container, $session->get('gibbonPersonID')); + + echo getATLRecord($session->get('gibbonPersonID')); + } + } +} diff --git a/ATL/atl_view_rubric.php b/ATL/atl_view_rubric.php index 1842b70..755f4e4 100644 --- a/ATL/atl_view_rubric.php +++ b/ATL/atl_view_rubric.php @@ -1,120 +1,106 @@ -. -*/ - -use Gibbon\Services\Format; - -//Rubric includes -include './modules/Rubrics/moduleFunctions.php'; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) { - //Acess denied - $page->addError(__('You do not have access to this action.')); -} else { - //Proceed! - //Check if school year specified - $gibbonCourseClassID = $_GET['gibbonCourseClassID']; - $atlColumnID = $_GET['atlColumnID']; - $gibbonPersonID = $_GET['gibbonPersonID']; - $gibbonRubricID = $_GET['gibbonRubricID']; - if ($gibbonCourseClassID == '' or $atlColumnID == '' or $gibbonPersonID == '' or $gibbonRubricID == '') { echo "";
- echo __('You have not specified one or more required parameters.');
- echo '
';
- } else {
- $roleCategory = getRoleCategory($session->get('gibbonRoleIDPrimary'), $connection2);
- $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
- if ($_GET['type'] == 'attainment') {
- $contextDBTableGibbonRubricIDField = 'gibbonRubricIDAttainment';
- } elseif ($_GET['type'] == 'effort') {
- $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
- }
-
- try {
- if ($roleCategory == 'Staff') {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = 'SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class';
- } elseif ($roleCategory == 'Student') {
- $data = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID AND role='Student' AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class";
- } elseif ($roleCategory == 'Parent') {
- $data = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID AND role='Student' AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class";
- }
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- try {
- $data2 = array('atlColumnID' => $atlColumnID);
- $sql2 = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID';
- $result2 = $connection2->prepare($sql2);
- $result2->execute($data2);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result2->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- try {
- $data3 = array('gibbonRubricID' => $gibbonRubricID);
- $sql3 = 'SELECT * FROM gibbonRubric WHERE gibbonRubricID=:gibbonRubricID';
- $result3 = $connection2->prepare($sql3);
- $result3->execute($data3);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result3->rowCount() != 1) {
- $page->addError(__('The selected record does not exist.'));
- } else {
- try {
- $data4 = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql4 = "SELECT DISTINCT surname, preferredName, gibbonPerson.gibbonPersonID FROM gibbonPerson JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE gibbonPerson.gibbonPersonID=:gibbonPersonID AND gibbonCourseClassID=:gibbonCourseClassID AND status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND (role='Student' OR role='Student - Left')";
- $result4 = $connection2->prepare($sql4);
- $result4->execute($data4);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result4->rowCount() != 1) {
- $page->addError(__('The selected record does not exist, or you do not have access to it.'));
- } else {
- //Let's go!
- $row = $result->fetch();
- $row2 = $result2->fetch();
- $row3 = $result3->fetch();
- $row4 = $result4->fetch();
-
- echo "";
- echo $row3['name'].'
';
- echo "".Format::name('', $row4['preferredName'], $row4['surname'], 'Student', true).'';
- echo '
';
-
- echo rubricView($guid, $connection2, $gibbonRubricID, false, $row4['gibbonPersonID'], 'atlColumn', 'atlColumnID', $atlColumnID, $contextDBTableGibbonRubricIDField, 'name', 'completeDate');
- }
- }
- }
- }
- }
-}
+.
+*/
+
+use Gibbon\Domain\Rubrics\RubricGateway;
+use Gibbon\Domain\Timetable\CourseEnrolmentGateway;
+use Gibbon\Domain\Timetable\CourseGateway;
+use Gibbon\Domain\User\RoleGateway;
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Module\ATL\Domain\ATLEntryGateway;
+use Gibbon\Services\Format;
+
+//Rubric includes
+include './modules/Rubrics/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
+ $page->addError(__('You do not have access to this action.'));
+} else {
+ //Proceed!
+ //Check if school year specified
+ $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? '';
+ $atlColumnID = $_GET['atlColumnID'] ?? '';
+ $gibbonPersonID = $_GET['gibbonPersonID'] ?? '';
+ $gibbonRubricID = $_GET['gibbonRubricID'] ?? '';
+ if (empty($gibbonCourseClassID) || empty($atlColumnID) || empty($gibbonPersonID) || empty($gibbonRubricID)) {
+ $page->addError(__('You have not specified one or more required parameters.'));
+ } else {
+ $type = $_GET['type'] ?? '';
+ $contextDBTableGibbonRubricIDField = '';
+ if ($type == 'attainment') {
+ $contextDBTableGibbonRubricIDField = 'gibbonRubricIDAttainment';
+ } else {
+ $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
+ }
+
+ $allowed = false;
+ $roleGateway = $container->get(RoleGateway::class);
+ $roleCategory = $roleGateway->getByID($session->get('gibbonRoleIDPrimary'))['category'] ?? '';
+
+ if ($roleCategory == 'Staff') {
+ $courseGateway = $container->get(CourseGateway::class);
+ $result = $courseGateway->getCourseClassByID($gibbonCourseClassID);
+ $allowed = !empty($result);
+ } elseif ($roleCategory == 'Student' || $roleCategory == 'Parent') {
+ $courseEnrolmentGateway = $container->get(CourseEnrolmentGateway::class);
+ $result = $courseEnrolmentGateway->selectBy(['gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID, 'role' => 'Student']);
+ $allowed = $result->isNotEmpty();
+ }
+
+ if (!$allowed) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+ if (!$atlColumnGateway->exists($atlColumnID)) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ $rubricGateway = $container->get(RubricGateway::class);
+ $rubric = $rubricGateway->getByID($gibbonRubricID);
+
+ if (empty($rubric)) {
+ $page->addError(__('The specified record does not exist.'));
+ } else {
+ try {
+ $data4 = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
+ $sql4 = "SELECT DISTINCT surname, preferredName, gibbonPerson.gibbonPersonID, image_240 FROM gibbonPerson JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE gibbonPerson.gibbonPersonID=:gibbonPersonID AND gibbonCourseClassID=:gibbonCourseClassID AND status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND (role='Student' OR role='Student - Left')";
+ $result4 = $connection2->prepare($sql4);
+ $result4->execute($data4);
+ } catch (PDOException $e) {
+ echo "".$e->getMessage().'
';
+ }
+
+ if ($result4->rowCount() != 1) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ //Let's go!
+ $row4 = $result4->fetch();
+
+ echo "";
+ echo $rubric['name'].'
';
+ echo "".Format::name('', $row4['preferredName'], $row4['surname'], 'Student', true).'';
+ echo '
';
+
+ echo Format::photo($row4['image_240'], 75, 'inline-block align-top mt-1');
+
+ echo rubricView($guid, $connection2, $gibbonRubricID, false, $row4['gibbonPersonID'], 'atlColumn', 'atlColumnID', $atlColumnID, $contextDBTableGibbonRubricIDField, 'name', 'completeDate');
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/ATL/atl_write.php b/ATL/atl_write.php
index 97d41a0..5ab6843 100644
--- a/ATL/atl_write.php
+++ b/ATL/atl_write.php
@@ -1,541 +1,446 @@
-.
-*/
-
-use Gibbon\Services\Format;
-
-//Module includes
-include './modules/'.$session->get('module').'/moduleFunctions.php';
-
-//Get gibbonHookID
-$gibbonHookID = null;
-try {
- $data = array();
- $sql = "SELECT gibbonHookID FROM gibbonHook WHERE type='Student Profile' AND name='ATL'";
- $result = $connection2->prepare($sql);
- $result->execute($data);
-} catch (PDOException $e) {
-}
-if ($result->rowCount() == 1) {
- $row = $result->fetch();
- $gibbonHookID = $row['gibbonHookID'];
-}
-
-if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write.php') == false) {
- //Acess denied
- echo "";
- echo __('Your request failed because you do not have access to this action.');
- echo '
';
-} else {
- // Register scripts available to the core, but not included by default
- $page->scripts->add('chart');
-
- //Get action with highest precendence
- $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2);
- if ($highestAction == false) {
- echo "";
- echo __('The highest grouped action cannot be determined.');
- echo '
';
- } else {
- $alert = getAlert($guid, $connection2, 002);
-
- //Proceed!
- //Get class variable
- $gibbonCourseClassID = null;
- if (isset($_GET['gibbonCourseClassID'])) {
- $gibbonCourseClassID = $_GET['gibbonCourseClassID'];
- }
- if ($gibbonCourseClassID == '') {
- try {
- $data = array('gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'gibbonPersonID' => $session->get('gibbonPersonID'));
- $sql = 'SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID ORDER BY course, class';
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
- if ($result->rowCount() > 0) {
- $row = $result->fetch();
- $gibbonCourseClassID = $row['gibbonCourseClassID'];
- }
- }
- if ($gibbonCourseClassID == '') {
- $page->breadcrumbs->add(__('Write ATLs'));
- echo "";
- echo 'Use the class listing on the right to choose an ATL to write.';
- echo '
';
- } else {
- //Check existence of and access to this class.
- try {
- if ($highestAction == 'Write ATLs_all') {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID) WHERE gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' ";
- } else {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID, 'gibbonPersonID' => $session->get('gibbonPersonID'), 'gibbonCourseClassID2' => $gibbonCourseClassID, 'gibbonPersonID2' => $session->get('gibbonPersonID'), 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'));
- $sql = "(SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID) JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) WHERE gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonPersonID=:gibbonPersonID AND (role='Teacher' OR role='Assistant') AND gibbonCourseClass.reportable='Y')
- UNION
- (SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourseClass JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) JOIN gibbonDepartment ON (gibbonCourse.gibbonDepartmentID=gibbonDepartment.gibbonDepartmentID) JOIN gibbonDepartmentStaff ON (gibbonDepartmentStaff.gibbonDepartmentID=gibbonDepartment.gibbonDepartmentID) WHERE gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID2 AND gibbonDepartmentStaff.gibbonPersonID=:gibbonPersonID2 AND gibbonDepartmentStaff.role='Coordinator' AND gibbonCourse.gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourseClass.reportable='Y')";
- }
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
- if ($result->rowCount() != 1) {
- $page->breadcrumbs->add(__('Write ATLs'));
- echo "";
- echo __('The specified record does not exist or you do not have access to it.');
- echo '
';
- } else {
- $row = $result->fetch();
- $courseName = $row['courseName'];
- $gibbonYearGroupIDList = $row['gibbonYearGroupIDList'];
-
- $page->breadcrumbs->add(__('Write {courseClass} ATLs', ['courseClass' => $row['course'].'.'.$row['class']]));
-
- if (isset($_GET['deleteReturn'])) {
- $deleteReturn = $_GET['deleteReturn'];
- } else {
- $deleteReturn = '';
- }
- $deleteReturnMessage = '';
- $class = 'error';
- if (!($deleteReturn == '')) {
- if ($deleteReturn == 'success0') {
- $deleteReturnMessage = __('Your request was completed successfully.');
- $class = 'success';
- }
- echo "";
- echo $deleteReturnMessage;
- echo '
';
- }
-
- //Get teacher list
- $teaching = false;
- try {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonPerson.gibbonPersonID, title, surname, preferredName, gibbonCourseClassPerson.reportable FROM gibbonCourseClassPerson JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE (role='Teacher' OR role='Assistant') AND gibbonCourseClassID=:gibbonCourseClassID ORDER BY surname, preferredName";
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() > 0) {
- echo ""; - echo __('Teachers'); - echo '
'; - echo '- ';
- while ($row = $result->fetch()) {
- if ($row['reportable'] != 'Y') continue;
-
- echo '
- '.Format::name($row['title'], $row['preferredName'], $row['surname'], 'Staff').' '; - if ($row['gibbonPersonID'] == $session->get('gibbonPersonID')) { - $teaching = true; - } - } - echo '
'; - echo __('Marks'); - echo '
'; - - //Count number of columns - try { - $data = array('gibbonCourseClassID' => $gibbonCourseClassID); - $sql = 'SELECT * FROM atlColumn WHERE gibbonCourseClassID=:gibbonCourseClassID ORDER BY complete, completeDate DESC'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - echo "".$e->getMessage().'
';
- }
- $columns = $result->rowCount();
- if ($columns < 1) {
- echo "";
- echo __('There are no records to display.');
- echo '
';
- } else {
- $x = null;
- if (isset($_GET['page'])) {
- $x = $_GET['page'];
- }
- if ($x == '') {
- $x = 0;
- }
- $columnsPerPage = 3;
- $columnsThisPage = 3;
-
- if ($columns < 1) {
- echo "";
- echo __('There are no records to display.');
- echo '
';
- } else {
- if ($columns < 3) {
- $columnsThisPage = $columns;
- }
- if ($columns - ($x * $columnsPerPage) < 3) {
- $columnsThisPage = $columns - ($x * $columnsPerPage);
- }
- try {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = 'SELECT * FROM atlColumn WHERE gibbonCourseClassID=:gibbonCourseClassID ORDER BY complete, completeDate DESC LIMIT '.($x * $columnsPerPage).', '.$columnsPerPage;
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- //Work out details for external assessment display
- $externalAssessment = false;
- if (isActionAccessible($guid, $connection2, '/modules/External Assessment/externalAssessment_details.php')) {
- $gibbonYearGroupIDListArray = (explode(',', $gibbonYearGroupIDList));
- if (count($gibbonYearGroupIDListArray) == 1) {
- $primaryExternalAssessmentByYearGroup = unserialize(getSettingByScope($connection2, 'School Admin', 'primaryExternalAssessmentByYearGroup'));
- if ($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]] != '' and $primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]] != '-') {
- $gibbonExternalAssessmentID = substr($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], 0, strpos($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], '-'));
- $gibbonExternalAssessmentIDCategory = substr($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], (strpos($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], '-') + 1));
-
- try {
- $dataExternalAssessment = array('gibbonExternalAssessmentID' => $gibbonExternalAssessmentID, 'category' => $gibbonExternalAssessmentIDCategory);
- $courseNameTokens = explode(' ', $courseName);
- $courseWhere = ' AND (';
- $whereCount = 1;
- foreach ($courseNameTokens as $courseNameToken) {
- if (strlen($courseNameToken) > 3) {
- $dataExternalAssessment['token'.$whereCount] = '%'.$courseNameToken.'%';
- $courseWhere .= "gibbonExternalAssessmentField.name LIKE :token$whereCount OR ";
- ++$whereCount;
- }
- }
- if ($whereCount < 1) {
- $courseWhere = '';
- } else {
- $courseWhere = substr($courseWhere, 0, -4).')';
- }
- $sqlExternalAssessment = "SELECT gibbonExternalAssessment.name AS assessment, gibbonExternalAssessmentField.name, gibbonExternalAssessmentFieldID, category FROM gibbonExternalAssessmentField JOIN gibbonExternalAssessment ON (gibbonExternalAssessmentField.gibbonExternalAssessmentID=gibbonExternalAssessment.gibbonExternalAssessmentID) WHERE gibbonExternalAssessmentField.gibbonExternalAssessmentID=:gibbonExternalAssessmentID AND category=:category $courseWhere ORDER BY name";
- $resultExternalAssessment = $connection2->prepare($sqlExternalAssessment);
- $resultExternalAssessment->execute($dataExternalAssessment);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
- if ($resultExternalAssessment->rowCount() >= 1) {
- $rowExternalAssessment = $resultExternalAssessment->fetch();
- $externalAssessment = true;
- $externalAssessmentFields = array();
- $externalAssessmentFields[0] = $rowExternalAssessment['gibbonExternalAssessmentFieldID'];
- $externalAssessmentFields[1] = $rowExternalAssessment['name'];
- $externalAssessmentFields[2] = $rowExternalAssessment['assessment'];
- $externalAssessmentFields[3] = $rowExternalAssessment['category'];
- }
- }
- }
- }
-
- //Print table header
- echo "";
- echo "
';
-
- echo "";
- if ($x <= 0) {
- echo __('Newer');
- } else {
- echo "".__('Newer').'';
- }
- echo ' | ';
- if ((($x + 1) * $columnsPerPage) >= $columns) {
- echo __('Older');
- } else {
- echo "".__('Older').'';
- }
- echo '
';
- echo '| "; - echo __('Student'); - echo ' | '; - - //Show Baseline data header - if ($externalAssessment == true) { - echo "";
- $title = __($externalAssessmentFields[2]).' | ';
- $title .= __(substr($externalAssessmentFields[3], (strpos($externalAssessmentFields[3], '_') + 1))).' | ';
- $title .= __($externalAssessmentFields[1]);
-
- //Get PAS
- $PAS = getSettingByScope($connection2, 'System', 'primaryAssessmentScale');
- try {
- $dataPAS = array('gibbonScaleID' => $PAS);
- $sqlPAS = 'SELECT * FROM gibbonScale WHERE gibbonScaleID=:gibbonScaleID';
- $resultPAS = $connection2->prepare($sqlPAS);
- $resultPAS->execute($dataPAS);
- } catch (PDOException $e) {
- }
- if ($resultPAS->rowCount() == 1) {
- $rowPAS = $resultPAS->fetch();
- $title .= ' | '.$rowPAS['name'].' '.__('Scale').' ';
- }
-
- echo " ";
- echo __('Baseline').' ';
- echo ''; - echo ' | ';
- }
-
- $columnID = array();
- for ($i = 0; $i < $columnsThisPage; ++$i) {
- $row = $result->fetch();
- if ($row === false) {
- $columnID[$i] = false;
- } else {
- $columnID[$i] = $row['atlColumnID'];
- $gibbonRubricID[$i] = $row['gibbonRubricID'];
- }
-
- //Column count
- $span = 1;
- $contents = true;
- if ($gibbonRubricID[$i] != '') {
- ++$span;
- }
- if ($span == 1) {
- $contents = false;
- }
-
- echo "";
- echo "".$row['name'].' '; - echo ""; - if ($row['completeDate'] != '') { - echo __('Marked on').' '.dateConvertBack($guid, $row['completeDate']).' '; - } else { - echo __('Unmarked').' '; - } - echo ' '; - if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_data.php')) { - echo " | ';
- }
- echo '|||
|---|---|---|---|---|---|
| "; - - echo ' | '; - } else { - $leftBorder = false; - //Set up complete checkbox - $leftBorderStyle = ''; - if ($leftBorder == false) { - $leftBorder = true; - $leftBorderStyle = 'border-left: 2px solid #666;'; - } - echo ""; - echo "".__('Complete').''; - echo ' | '; - //Set up rubric box - if ($gibbonRubricID[$i] != '') { - $leftBorderStyle = ''; - if ($leftBorder == false) { - $leftBorder = true; - $leftBorderStyle = 'border-left: 2px solid #666;'; - } - echo ""; - echo "".__('Rubric').''; - echo ' | '; - } - } - } - echo '|||
| '; - echo ''.__('There are no records to display.').''; - echo ' | '; - echo '|||||
| '; - echo "'; - echo ' | '; - - if ($externalAssessment == true) { - echo "";
- try {
- $dataEntry = array('gibbonPersonID' => $rowStudents['gibbonPersonID'], 'gibbonExternalAssessmentFieldID' => $externalAssessmentFields[0]);
- $sqlEntry = "SELECT gibbonScaleGrade.value, gibbonScaleGrade.descriptor, gibbonExternalAssessmentStudent.date FROM gibbonExternalAssessmentStudentEntry JOIN gibbonExternalAssessmentStudent ON (gibbonExternalAssessmentStudentEntry.gibbonExternalAssessmentStudentID=gibbonExternalAssessmentStudent.gibbonExternalAssessmentStudentID) JOIN gibbonScaleGrade ON (gibbonExternalAssessmentStudentEntry.gibbonScaleGradeIDPrimaryAssessmentScale=gibbonScaleGrade.gibbonScaleGradeID) WHERE gibbonPersonID=:gibbonPersonID AND gibbonExternalAssessmentFieldID=:gibbonExternalAssessmentFieldID AND NOT gibbonScaleGradeIDPrimaryAssessmentScale='' ORDER BY date DESC";
- $resultEntry = $connection2->prepare($sqlEntry);
- $resultEntry->execute($dataEntry);
- } catch (PDOException $e) {
- echo " ".$e->getMessage().' ';
- }
- if ($resultEntry->rowCount() >= 1) {
- $rowEntry = $resultEntry->fetch();
- echo "".__($rowEntry['value']).'';
- }
- echo ' | ';
- }
-
- for ($i = 0; $i < $columnsThisPage; ++$i) {
- $row = $result->fetch();
- try {
- $dataEntry = array('atlColumnID' => $columnID[($i)], 'gibbonPersonIDStudent' => $rowStudents['gibbonPersonID']);
- $sqlEntry = 'SELECT atlEntry.* FROM atlEntry JOIN atlColumn ON (atlEntry.atlColumnID=atlColumn.atlColumnID) WHERE atlEntry.atlColumnID=:atlColumnID AND gibbonPersonIDStudent=:gibbonPersonIDStudent';
- $resultEntry = $connection2->prepare($sqlEntry);
- $resultEntry->execute($dataEntry);
- } catch (PDOException $e) {
- echo ""; - $checked = ''; - if ($rowEntry['complete'] == 'Y') { - $checked = 'checked'; - } - echo ''; - echo ' | '; - //Rubric - if ($gibbonRubricID[$i] != '') { - $leftBorderStyle = ''; - if ($leftBorder == false) { - $leftBorder = true; - $leftBorderStyle = 'border-left: 2px solid #666;'; - } - echo "";
- if ($gibbonRubricID[$i] != '') {
- echo " | ';
- }
- } else {
- $emptySpan = 1;
- if ($gibbonRubricID[$i] != '') {
- ++$emptySpan;
- }
- if ($emptySpan > 0) {
- echo ""; - } - } - if (isset($submission[$i])) { - if ($submission[$i] == true) { - $leftBorderStyle = ''; - if ($leftBorder == false) { - $leftBorder = true; - $leftBorderStyle = 'border-left: 2px solid #666;'; - } - echo " | ";
- try {
- $dataWork = array('gibbonPlannerEntryID' => $rowEntry['gibbonPlannerEntryID'], 'gibbonPersonID' => $rowStudents['gibbonPersonID']);
- $sqlWork = 'SELECT * FROM gibbonPlannerEntryHomework WHERE gibbonPlannerEntryID=:gibbonPlannerEntryID AND gibbonPersonID=:gibbonPersonID ORDER BY count DESC';
- $resultWork = $connection2->prepare($sqlWork);
- $resultWork->execute($dataWork);
- } catch (PDOException $e) {
- echo " ".$e->getMessage().' ';
- }
- if ($resultWork->rowCount() > 0) {
- $rowWork = $resultWork->fetch();
-
- if ($rowWork['status'] == 'Exemption') {
- $linkText = __('Exe');
- } elseif ($rowWork['version'] == 'Final') {
- $linkText = __('Fin');
- } else {
- $linkText = __('Dra').$rowWork['count'];
- }
-
- $style = '';
- $status = 'On Time';
- if ($rowWork['status'] == 'Exemption') {
- $status = __('Exemption');
- } elseif ($rowWork['status'] == 'Late') {
- $style = "style='color: #ff0000; font-weight: bold; border: 2px solid #ff0000; padding: 2px 4px'";
- $status = __('Late');
- }
-
- if ($rowWork['type'] == 'File') {
- echo "$linkText";
- } elseif ($rowWork['type'] == 'Link') {
- echo "$linkText";
- } else {
- echo "$linkText";
- }
- } else {
- if (date('Y-m-d H:i:s') < $homeworkDueDateTime[$i]) {
- echo "Pen";
- } else {
- if ($rowStudents['dateStart'] > $lessonDate[$i]) {
- echo "".__('NA').'';
- } else {
- if ($rowSub['homeworkSubmissionRequired'] == 'Compulsory') {
- echo "".__('Inc').'';
- } else {
- echo "".__('NA').'';
- }
- }
- }
- }
- echo ' | ';
- }
- }
- }
- echo '
"; + echo __('Teachers'); + echo '
'; + echo '- ';
+ while ($row = $result->fetch()) {
+ if ($row['reportable'] != 'Y') continue;
+
+ echo '
- '.Format::name($row['title'], $row['preferredName'], $row['surname'], 'Staff').' '; + if ($row['gibbonPersonID'] == $session->get('gibbonPersonID')) { + $teaching = true; + } + } + echo '
'; + echo __('Marks'); + echo '
'; + + //Count number of columns + try { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID); + $sql = 'SELECT * FROM atlColumn WHERE gibbonCourseClassID=:gibbonCourseClassID ORDER BY complete, completeDate DESC'; + $result = $connection2->prepare($sql); + $result->execute($data); + } catch (PDOException $e) { + echo "".$e->getMessage().'
';
+ }
+ $columns = $result->rowCount();
+ if ($columns < 1) {
+ echo "";
+ echo __('There are no records to display.');
+ echo '
';
+ } else {
+ $x = null;
+ if (isset($_GET['page'])) {
+ $x = $_GET['page'];
+ }
+ if ($x == '') {
+ $x = 0;
+ }
+ $columnsPerPage = 3;
+ $columnsThisPage = 3;
+
+ if ($columns < 1) {
+ echo "";
+ echo __('There are no records to display.');
+ echo '
';
+ } else {
+ if ($columns < 3) {
+ $columnsThisPage = $columns;
+ }
+ if ($columns - ($x * $columnsPerPage) < 3) {
+ $columnsThisPage = $columns - ($x * $columnsPerPage);
+ }
+ try {
+ $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
+ $sql = 'SELECT * FROM atlColumn WHERE gibbonCourseClassID=:gibbonCourseClassID ORDER BY complete, completeDate DESC LIMIT '.($x * $columnsPerPage).', '.$columnsPerPage;
+ $result = $connection2->prepare($sql);
+ $result->execute($data);
+ } catch (PDOException $e) {
+ echo "".$e->getMessage().'
';
+ }
+
+ //Work out details for external assessment display
+ $externalAssessment = false;
+ if (isActionAccessible($guid, $connection2, '/modules/External Assessment/externalAssessment_details.php')) {
+ $gibbonYearGroupIDListArray = (explode(',', $gibbonYearGroupIDList));
+ if (count($gibbonYearGroupIDListArray) == 1) {
+ $primaryExternalAssessmentByYearGroup = unserialize($settingGateway->getSettingByScope('School Admin', 'primaryExternalAssessmentByYearGroup'));
+ if ($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]] != '' and $primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]] != '-') {
+ $gibbonExternalAssessmentID = substr($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], 0, strpos($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], '-'));
+ $gibbonExternalAssessmentIDCategory = substr($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], (strpos($primaryExternalAssessmentByYearGroup[$gibbonYearGroupIDListArray[0]], '-') + 1));
+
+ try {
+ $dataExternalAssessment = array('gibbonExternalAssessmentID' => $gibbonExternalAssessmentID, 'category' => $gibbonExternalAssessmentIDCategory);
+ $courseNameTokens = explode(' ', $courseName);
+ $courseWhere = ' AND (';
+ $whereCount = 1;
+ foreach ($courseNameTokens as $courseNameToken) {
+ if (strlen($courseNameToken) > 3) {
+ $dataExternalAssessment['token'.$whereCount] = '%'.$courseNameToken.'%';
+ $courseWhere .= "gibbonExternalAssessmentField.name LIKE :token$whereCount OR ";
+ ++$whereCount;
+ }
+ }
+ if ($whereCount < 1) {
+ $courseWhere = '';
+ } else {
+ $courseWhere = substr($courseWhere, 0, -4).')';
+ }
+ $sqlExternalAssessment = "SELECT gibbonExternalAssessment.name AS assessment, gibbonExternalAssessmentField.name, gibbonExternalAssessmentFieldID, category FROM gibbonExternalAssessmentField JOIN gibbonExternalAssessment ON (gibbonExternalAssessmentField.gibbonExternalAssessmentID=gibbonExternalAssessment.gibbonExternalAssessmentID) WHERE gibbonExternalAssessmentField.gibbonExternalAssessmentID=:gibbonExternalAssessmentID AND category=:category $courseWhere ORDER BY name";
+ $resultExternalAssessment = $connection2->prepare($sqlExternalAssessment);
+ $resultExternalAssessment->execute($dataExternalAssessment);
+ } catch (PDOException $e) {
+ echo "".$e->getMessage().'
';
+ }
+ if ($resultExternalAssessment->rowCount() >= 1) {
+ $rowExternalAssessment = $resultExternalAssessment->fetch();
+ $externalAssessment = true;
+ $externalAssessmentFields = array();
+ $externalAssessmentFields[0] = $rowExternalAssessment['gibbonExternalAssessmentFieldID'];
+ $externalAssessmentFields[1] = $rowExternalAssessment['name'];
+ $externalAssessmentFields[2] = $rowExternalAssessment['assessment'];
+ $externalAssessmentFields[3] = $rowExternalAssessment['category'];
+ }
+ }
+ }
+ }
+
+ //Print table header
+ echo "";
+ echo "
';
+
+ echo "";
+ if ($x <= 0) {
+ echo __('Newer');
+ } else {
+ echo "".__('Newer').'';
+ }
+ echo ' | ';
+ if ((($x + 1) * $columnsPerPage) >= $columns) {
+ echo __('Older');
+ } else {
+ echo "".__('Older').'';
+ }
+ echo '
';
+ echo '| "; + echo __('Student'); + echo ' | '; + + //Show Baseline data header + if ($externalAssessment == true) { + echo "";
+ $title = __($externalAssessmentFields[2]).' | ';
+ $title .= __(substr($externalAssessmentFields[3], (strpos($externalAssessmentFields[3], '_') + 1))).' | ';
+ $title .= __($externalAssessmentFields[1]);
+
+ //Get PAS
+ $PAS = $settingGateway->getSettingByScope('System', 'primaryAssessmentScale');
+ $gradeScaleGateway = $container->get(GradeScaleGateway::class);
+ $gradeScale = $gradeScaleGateway->getByID($PAS);
+
+ if (!isempty($gradeScale)) {
+ $title .= ' | '.$gradeScale['name'].' '.__('Scale').' ';
+ }
+
+ echo " ";
+ echo __('Baseline').' ';
+ echo ''; + echo ' | ';
+ }
+
+ $columnID = [];
+ for ($i = 0; $i < $columnsThisPage; ++$i) {
+ $row = $result->fetch();
+ if ($row === false) {
+ $columnID[$i] = false;
+ } else {
+ $columnID[$i] = $row['atlColumnID'];
+ $gibbonRubricID[$i] = $row['gibbonRubricID'];
+ }
+
+ //Column count
+ $span = 1;
+ $contents = true;
+ if ($gibbonRubricID[$i] != '') {
+ ++$span;
+ }
+ if ($span == 1) {
+ $contents = false;
+ }
+
+ echo "";
+ echo "".$row['name'].' '; + echo ""; + if ($row['forStudents'] == 'Y') { + if ($row['completeDate'] != '') { + echo __('Due on').' '.Format::date($row['completeDate']).' '; + } else { + echo __('No Due Date').' '; + } + } else { + if ($row['completeDate'] != '') { + echo __('Marked on').' '.Format::date($row['completeDate']).' '; + } else { + echo __('Unmarked').' '; + } + } + echo ' '; + if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_data.php') && $row['forStudents'] == 'N') { //TODO: Change for students check to be more sensible + echo " | ';
+ }
+ echo '||
|---|---|---|---|---|
| "; + + echo ' | '; + } else { + $leftBorder = false; + //Set up complete checkbox + $leftBorderStyle = ''; + if ($leftBorder == false) { + $leftBorder = true; + $leftBorderStyle = 'border-left: 2px solid #666;'; + } + echo ""; + echo "".__('Complete').''; + echo ' | '; + //Set up rubric box + if ($gibbonRubricID[$i] != '') { + $leftBorderStyle = ''; + if ($leftBorder == false) { + $leftBorder = true; + $leftBorderStyle = 'border-left: 2px solid #666;'; + } + echo ""; + echo "".__('Rubric').''; + echo ' | '; + } + } + } + echo '||
| '; + echo ''.__('There are no records to display.').''; + echo ' | '; + echo '||||
| '; + echo "'; + echo ' | '; + + if ($externalAssessment == true) { + echo "";
+ try {
+ $dataEntry = array('gibbonPersonID' => $rowStudents['gibbonPersonID'], 'gibbonExternalAssessmentFieldID' => $externalAssessmentFields[0]);
+ $sqlEntry = "SELECT gibbonScaleGrade.value, gibbonScaleGrade.descriptor, gibbonExternalAssessmentStudent.date FROM gibbonExternalAssessmentStudentEntry JOIN gibbonExternalAssessmentStudent ON (gibbonExternalAssessmentStudentEntry.gibbonExternalAssessmentStudentID=gibbonExternalAssessmentStudent.gibbonExternalAssessmentStudentID) JOIN gibbonScaleGrade ON (gibbonExternalAssessmentStudentEntry.gibbonScaleGradeIDPrimaryAssessmentScale=gibbonScaleGrade.gibbonScaleGradeID) WHERE gibbonPersonID=:gibbonPersonID AND gibbonExternalAssessmentFieldID=:gibbonExternalAssessmentFieldID AND NOT gibbonScaleGradeIDPrimaryAssessmentScale='' ORDER BY date DESC";
+ $resultEntry = $connection2->prepare($sqlEntry);
+ $resultEntry->execute($dataEntry);
+ } catch (PDOException $e) {
+ echo " ".$e->getMessage().' ';
+ }
+ if ($resultEntry->rowCount() >= 1) {
+ $rowEntry = $resultEntry->fetch();
+ echo "".__($rowEntry['value']).'';
+ }
+ echo ' | ';
+ }
+
+ for ($i = 0; $i < $columnsThisPage; ++$i) {
+ $row = $result->fetch();
+ try {
+ $dataEntry = array('atlColumnID' => $columnID[($i)], 'gibbonPersonIDStudent' => $rowStudents['gibbonPersonID']);
+ $sqlEntry = 'SELECT atlEntry.* FROM atlEntry JOIN atlColumn ON (atlEntry.atlColumnID=atlColumn.atlColumnID) WHERE atlEntry.atlColumnID=:atlColumnID AND gibbonPersonIDStudent=:gibbonPersonIDStudent';
+ $resultEntry = $connection2->prepare($sqlEntry);
+ $resultEntry->execute($dataEntry);
+ } catch (PDOException $e) {
+ echo ""; + $checked = ($rowEntry['complete'] == 'Y') ? 'checked' : ''; + echo ''; + echo ' | '; + //Rubric + if ($gibbonRubricID[$i] != '') { + $leftBorderStyle = ''; + if ($leftBorder == false) { + $leftBorder = true; + $leftBorderStyle = 'border-left: 2px solid #666;'; + } + echo "";
+ if ($gibbonRubricID[$i] != '') {
+ echo " | ';
+ }
+ } else {
+ $emptySpan = 1;
+ if ($gibbonRubricID[$i] != '') {
+ ++$emptySpan;
+ }
+ if ($emptySpan > 0) {
+ echo ""; + } + } + } + echo ' |
";
- echo __('You do not have access to this action.');
- echo '
';
-} else {
- // Register scripts available to the core, but not included by default
- $page->scripts->add('chart');
-
- $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2);
- if ($highestAction == false) {
- echo "";
- echo __('The highest grouped action cannot be determined.');
- echo '
';
- } else {
- //Check if school year specified
- $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? '';
- $atlColumnID = $_GET['atlColumnID'];
- if ($gibbonCourseClassID == '' or $atlColumnID == '') {
- echo "";
- echo __('You have not specified one or more required parameters.');
- echo '
';
- } else {
- try {
- if ($highestAction == 'Write ATLs_all') {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID) WHERE gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' ";
- } else {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID, 'gibbonPersonID' => $session->get('gibbonPersonID'), 'gibbonCourseClassID2' => $gibbonCourseClassID, 'gibbonPersonID2' => $session->get('gibbonPersonID'), 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'));
- $sql = "(SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID) JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) WHERE gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonPersonID=:gibbonPersonID AND (role='Teacher' OR role='Assistant') AND gibbonCourseClass.reportable='Y')
- UNION
- (SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourseClass JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) JOIN gibbonDepartment ON (gibbonCourse.gibbonDepartmentID=gibbonDepartment.gibbonDepartmentID) JOIN gibbonDepartmentStaff ON (gibbonDepartmentStaff.gibbonDepartmentID=gibbonDepartment.gibbonDepartmentID) WHERE gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID2 AND gibbonDepartmentStaff.gibbonPersonID=:gibbonPersonID2 AND gibbonDepartmentStaff.role='Coordinator' AND gibbonCourse.gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourseClass.reportable='Y')";
- }
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- try {
- $data2 = array('atlColumnID' => $atlColumnID);
- $sql2 = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID';
- $result2 = $connection2->prepare($sql2);
- $result2->execute($data2);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result2->rowCount() != 1) {
- echo "";
- echo 'The selected column does not exist, or you do not have access to it.';
- echo '
';
- } else {
- //Let's go!
- $class = $result->fetch();
- $values = $result2->fetch();
-
- $page->breadcrumbs
- ->add(__('Write {courseClass} ATLs', ['courseClass' => $class['course'].'.'.$class['class']]), 'atl_write.php', ['gibbonCourseClassID' => $gibbonCourseClassID])
- ->add(__('Enter ATL Results'));
-
- if (isset($_GET['return'])) {
- returnProcess($guid, $_GET['return'], null, null);
- }
-
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID, 'atlColumnID' => $atlColumnID, 'today' => date('Y-m-d'));
- $sql = "SELECT gibbonPerson.gibbonPersonID, gibbonPerson.title, gibbonPerson.surname, gibbonPerson.preferredName, gibbonPerson.dateStart, atlEntry.*
- FROM gibbonCourseClassPerson
- JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID)
- LEFT JOIN atlEntry ON (atlEntry.gibbonPersonIDStudent=gibbonPerson.gibbonPersonID AND atlEntry.atlColumnID=:atlColumnID)
- WHERE gibbonCourseClassPerson.gibbonCourseClassID=:gibbonCourseClassID
- AND gibbonCourseClassPerson.reportable='Y' AND gibbonCourseClassPerson.role='Student'
- AND gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<=:today) AND (dateEnd IS NULL OR dateEnd>=:today)
- ORDER BY gibbonPerson.surname, gibbonPerson.preferredName";
- $result = $pdo->executeQuery($data, $sql);
- $students = ($result->rowCount() > 0)? $result->fetchAll() : array();
-
- $form = Form::create('internalAssessment', $session->get('absoluteURL').'/modules/'.$session->get('module').'/atl_write_dataProcess.php?gibbonCourseClassID='.$gibbonCourseClassID.'&atlColumnID='.$atlColumnID.'&address='.$session->get('address'));
- $form->setFactory(DatabaseFormFactory::create($pdo));
- $form->addHiddenValue('address', $session->get('address'));
-
- $form->addRow()->addHeading(__('Assessment Details'));
-
- if (count($students) == 0) {
- $form->addRow()->addHeading(__('Students'));
- $form->addRow()->addAlert(__('There are no records to display.'), 'error');
- } else {
- $table = $form->addRow()->addTable()->setClass('smallIntBorder fullWidth colorOddEven noMargin noPadding noBorder');
-
- $completeText = !empty($values['completeDate'])? __('Marked on').' '.dateConvertBack($guid, $values['completeDate']) : __('Unmarked');
-
- $header = $table->addHeaderRow();
- $header->addTableCell(__('Student'))->rowSpan(2);
- $header->addTableCell($values['name'])
- ->setTitle($values['description'])
- ->append(''.$completeText.'') - ->setClass('textCenter') - ->colSpan(3); - - $header = $table->addHeaderRow(); - $header->addContent(__('Complete'))->setClass('textCenter'); - $header->addContent(__('Rubric'))->setClass('textCenter'); - } - - foreach ($students as $index => $student) { - $count = $index+1; - $row = $table->addRow(); - - $row->addWebLink(Format::name('', $student['preferredName'], $student['surname'], 'Student', true)) - ->setURL($session->get('absoluteURL').'/index.php?q=/modules/Students/student_view_details.php') - ->addParam('gibbonPersonID', $student['gibbonPersonID']) - ->addParam('subpage', 'Markbook') - ->wrap('', '') - ->prepend($count.') '); - - $row->addCheckbox('complete'.$count)->setValue('Y')->checked($student['complete'])->setClass('textCenter'); - - $row->addWebLink('
.'/img/rubric.png "'.__('Mark Rubric').'")
')
- ->setURL($session->get('absoluteURL').'/fullscreen.php?q=/modules/'.$session->get('module').'/atl_write_rubric.php')
- ->setClass('thickbox textCenter')
- ->addParam('gibbonRubricID', $values['gibbonRubricID'])
- ->addParam('gibbonCourseClassID', $gibbonCourseClassID)
- ->addParam('gibbonPersonID', $student['gibbonPersonID'])
- ->addParam('atlColumnID', $atlColumnID)
- ->addParam('type', 'effort')
- ->addParam('width', '1100')
- ->addParam('height', '550');
-
- $form->addHiddenValue($count.'-gibbonPersonID', $student['gibbonPersonID']);
- }
-
- $form->addHiddenValue('count', $count);
-
- $form->addRow()->addHeading(__('Assessment Complete?'));
-
- $row = $form->addRow();
- $row->addLabel('completeDate', __('Go Live Date'))->prepend('1. ')->append(''.__('2. Column is hidden until date is reached.')); - $row->addDate('completeDate'); - - $row = $form->addRow(); - $row->addSubmit(); - - $form->loadAllValuesFrom($values); - - echo $form->getOutput(); - } - } - } - - //Print sidebar - $session->set('sidebarExtra', sidebarExtra($guid, $connection2, $gibbonCourseClassID, 'write', $highestAction)); - } -} +. +*/ + +use Gibbon\Forms\DatabaseFormFactory; +use Gibbon\Forms\Form; +use Gibbon\Module\ATL\Domain\ATLColumnGateway; +use Gibbon\Services\Format; + +//Module includes +require_once __DIR__ . '/moduleFunctions.php'; + +echo "'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_data.php') == false) { + //Acess denied + $page->addError(__('You do not have access to this action.')); +} else { + // Register scripts available to the core, but not included by default + $page->scripts->add('chart'); + + $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2); + if ($highestAction == false) { + $page->addError(__('The highest grouped action cannot be determined.')); + } else { + //Check if school year specified + $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? ''; + $atlColumnID = $_GET['atlColumnID'] ?? ''; + if ($gibbonCourseClassID == '' || $atlColumnID == '') { + $page->addError(__('You have not specified one or more required parameters.')); + } else { + try { + if ($highestAction == 'Write ATLs_all') { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID); + $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID) WHERE gibbonCourseClassID=:gibbonCourseClassID AND gibbonCourseClass.reportable='Y' "; + } else { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID, 'gibbonPersonID' => $session->get('gibbonPersonID'), 'gibbonCourseClassID2' => $gibbonCourseClassID, 'gibbonPersonID2' => $session->get('gibbonPersonID'), 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID')); + $sql = "(SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID) JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) WHERE gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID AND gibbonPersonID=:gibbonPersonID AND (role='Teacher' OR role='Assistant') AND gibbonCourseClass.reportable='Y') + UNION + (SELECT gibbonCourse.nameShort AS course, gibbonCourse.name AS courseName, gibbonCourseClass.nameShort AS class, gibbonYearGroupIDList FROM gibbonCourseClass JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) JOIN gibbonDepartment ON (gibbonCourse.gibbonDepartmentID=gibbonDepartment.gibbonDepartmentID) JOIN gibbonDepartmentStaff ON (gibbonDepartmentStaff.gibbonDepartmentID=gibbonDepartment.gibbonDepartmentID) WHERE gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID2 AND gibbonDepartmentStaff.gibbonPersonID=:gibbonPersonID2 AND gibbonDepartmentStaff.role='Coordinator' AND gibbonCourse.gibbonSchoolYearID=:gibbonSchoolYearID AND gibbonCourseClass.reportable='Y')"; + } + $result = $connection2->prepare($sql); + $result->execute($data); + } catch (PDOException $e) { + } + + if ($result->rowCount() != 1) { + $page->addError(__('The selected record does not exist, or you do not have access to it.')); + } else { + $atlColumnGateway = $container->get(ATLColumnGateway::class); + $atlColumn = $atlColumnGateway->getByID($atlColumnID); + + if (empty($atlColumn)) { + $page->addError(__('The selected column does not exist, or you do not have access to it.')); + } else { + //Let's go! + $class = $result->fetch(); + + $page->breadcrumbs + ->add(__('Write {courseClass} ATLs', ['courseClass' => $class['course'].'.'.$class['class']]), 'atl_write.php', ['gibbonCourseClassID' => $gibbonCourseClassID]) + ->add(__('Enter ATL Results')); + + if ($atlColumn['forStudents'] == 'Y') { + $page->addError(__('You cannot mark this ATL')); + } else { + $data = array('gibbonCourseClassID' => $gibbonCourseClassID, 'atlColumnID' => $atlColumnID, 'today' => date('Y-m-d')); + $sql = "SELECT gibbonPerson.gibbonPersonID, gibbonPerson.title, gibbonPerson.surname, gibbonPerson.preferredName, gibbonPerson.dateStart, atlEntry.* + FROM gibbonCourseClassPerson + JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) + LEFT JOIN atlEntry ON (atlEntry.gibbonPersonIDStudent=gibbonPerson.gibbonPersonID AND atlEntry.atlColumnID=:atlColumnID) + WHERE gibbonCourseClassPerson.gibbonCourseClassID=:gibbonCourseClassID + AND gibbonCourseClassPerson.reportable='Y' AND gibbonCourseClassPerson.role='Student' + AND gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<=:today) AND (dateEnd IS NULL OR dateEnd>=:today) + ORDER BY gibbonPerson.surname, gibbonPerson.preferredName"; + $result = $connection2->prepare($sql); + $result->execute($data); + $students = ($result->rowCount() > 0) ? $result->fetchAll() : []; + + $form = Form::create('internalAssessment', $session->get('absoluteURL').'/modules/'.$session->get('module').'/atl_write_dataProcess.php?gibbonCourseClassID='.$gibbonCourseClassID.'&atlColumnID='.$atlColumnID); + $form->setFactory(DatabaseFormFactory::create($pdo)); + $form->addHiddenValue('address', $session->get('address')); + + $form->addRow()->addHeading(__('Assessment Details')); + if (empty($students)) { + $form->addRow()->addHeading(__('Students')); + $form->addRow()->addAlert(__('There are no records to display.'), 'error'); + } else { + $table = $form->addRow()->addTable()->setClass('smallIntBorder fullWidth colorOddEven noMargin noPadding noBorder'); + + $completeText = !empty($atlColumn['completeDate']) ? __('Marked on') . ' ' . Format::date($atlColumn['completeDate']) : __('Unmarked'); + + $header = $table->addHeaderRow(); + $header->addTableCell(__('Student'))->rowSpan(2); + $header->addTableCell($atlColumn['name']) + ->setTitle($atlColumn['description']) + ->append('
'.$completeText.'') + ->setClass('textCenter') + ->colSpan(3); + + $header = $table->addHeaderRow(); + $header->addContent(__('Complete'))->setClass('textCenter'); + $header->addContent(__('Rubric'))->setClass('textCenter'); + } + + foreach ($students as $index => $student) { + $count = $index+1; + $row = $table->addRow(); + + $row->addWebLink(Format::name('', $student['preferredName'], $student['surname'], 'Student', true)) + ->setURL($session->get('absoluteURL').'/index.php?q=/modules/Students/student_view_details.php') + ->addParam('gibbonPersonID', $student['gibbonPersonID']) + ->addParam('subpage', 'Markbook') + ->wrap('', '') + ->prepend($count.') '); + + $row->addCheckbox('complete'.$count)->setValue('Y')->checked($student['complete'])->setClass('textCenter'); + + $row->addWebLink('
')
+ ->setURL($session->get('absoluteURL').'/fullscreen.php?q=/modules/'.$session->get('module').'/atl_write_rubric.php')
+ ->setClass('thickbox textCenter')
+ ->addParam('gibbonRubricID', $atlColumn['gibbonRubricID'])
+ ->addParam('gibbonCourseClassID', $gibbonCourseClassID)
+ ->addParam('gibbonPersonID', $student['gibbonPersonID'])
+ ->addParam('atlColumnID', $atlColumnID)
+ ->addParam('type', 'effort')
+ ->addParam('width', '1100')
+ ->addParam('height', '550');
+
+ $form->addHiddenValue($count.'-gibbonPersonID', $student['gibbonPersonID']);
+ }
+
+ $form->addHiddenValue('count', $count);
+
+ $form->addRow()->addHeading(__('Assessment Complete?'));
+
+ $row = $form->addRow();
+ $row->addLabel('completeDate', __('Go Live Date'))->prepend('1. ')->append(''.__('2. Column is hidden until date is reached.')); + $row->addDate('completeDate'); + + $row = $form->addRow(); + $row->addSubmit(); + + $form->loadAllValuesFrom($atlColumn); + + echo $form->getOutput(); + } + } + } + } + + //Print sidebar + $session->set('sidebarExtra', sidebarExtra($gibbonCourseClassID, 'write')); + } +} \ No newline at end of file diff --git a/ATL/atl_write_dataProcess.php b/ATL/atl_write_dataProcess.php index 3da26e3..855ef25 100644 --- a/ATL/atl_write_dataProcess.php +++ b/ATL/atl_write_dataProcess.php @@ -1,137 +1,108 @@ -. -*/ - -include '../../gibbon.php'; - - -$gibbonCourseClassID = $_GET['gibbonCourseClassID']; -$atlColumnID = $_GET['atlColumnID']; -$URL = $session->get('absoluteURL').'/index.php?q=/modules/'.getModuleName($_GET['address'])."/atl_write_data.php&atlColumnID=$atlColumnID&gibbonCourseClassID=$gibbonCourseClassID"; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_data.php') == false) { - //Fail 0 - $URL .= '&return=error0'; - header("Location: {$URL}"); -} else { - if (empty($_POST)) { - $URL .= '&return=error5'; - header("Location: {$URL}"); - } else { - //Proceed! - //Check if school year specified - if ($atlColumnID == '' or $gibbonCourseClassID == '') { - //Fail1 - $URL .= '&return=error1'; - header("Location: {$URL}"); - } else { - try { - $data = array('atlColumnID' => $atlColumnID, 'gibbonCourseClassID' => $gibbonCourseClassID); - $sql = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID AND gibbonCourseClassID=:gibbonCourseClassID'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - //Fail2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - exit(); - } - - if ($result->rowCount() != 1) { - //Fail 2 - $URL .= '&return=error2'; - header("Location: {$URL}"); - } else { - $row = $result->fetch(); - $name = $row['name' ]; - $count = $_POST['count']; - $partialFail = false; - - for ($i = 1;$i <= $count;++$i) { - $gibbonPersonIDStudent = $_POST["$i-gibbonPersonID"]; - //Complete - $completeValue = isset($_POST["complete$i"])? $_POST["complete$i"] : 'N'; - $gibbonPersonIDLastEdit = $session->get('gibbonPersonID'); - - $selectFail = false; - try { - $data = array('atlColumnID' => $atlColumnID, 'gibbonPersonIDStudent' => $gibbonPersonIDStudent); - $sql = 'SELECT * FROM atlEntry WHERE atlColumnID=:atlColumnID AND gibbonPersonIDStudent=:gibbonPersonIDStudent'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - $partialFail = true; - $selectFail = true; - } - if (!($selectFail)) { - if ($result->rowCount() < 1) { - try { - $data = array('atlColumnID' => $atlColumnID, 'gibbonPersonIDStudent' => $gibbonPersonIDStudent, 'complete' => $completeValue, 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit); - $sql = 'INSERT INTO atlEntry SET atlColumnID=:atlColumnID, gibbonPersonIDStudent=:gibbonPersonIDStudent, complete=:complete, gibbonPersonIDLastEdit=:gibbonPersonIDLastEdit'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - $partialFail = true; - } - } else { - $row = $result->fetch(); - //Update - try { - $data = array('atlColumnID' => $atlColumnID, 'gibbonPersonIDStudent' => $gibbonPersonIDStudent, 'complete' => $completeValue, 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit, 'atlEntryID' => $row['atlEntryID']); - $sql = 'UPDATE atlEntry SET atlColumnID=:atlColumnID, gibbonPersonIDStudent=:gibbonPersonIDStudent, complete=:complete, gibbonPersonIDLastEdit=:gibbonPersonIDLastEdit WHERE atlEntryID=:atlEntryID'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - $partialFail = true; - } - } - } - } - - //Update column - $completeDate = $_POST['completeDate']; - if ($completeDate == '') { - $completeDate = null; - $complete = 'N'; - } else { - $completeDate = dateConvert($guid, $completeDate); - $complete = 'Y'; - } - try { - $data = array('completeDate' => $completeDate, 'complete' => $complete, 'atlColumnID' => $atlColumnID); - $sql = 'UPDATE atlColumn SET completeDate=:completeDate, complete=:complete WHERE atlColumnID=:atlColumnID'; - $result = $connection2->prepare($sql); - $result->execute($data); - } catch (PDOException $e) { - $partialFail = true; - } - - //Return! - if ($partialFail == true) { - //Fail 3 - $URL .= '&return=error3'; - header("Location: {$URL}"); - } else { - //Success 0 - $URL .= '&return=success0'; - header("Location: {$URL}"); - } - } - } - } -} +. +*/ + +use Gibbon\Module\ATL\Domain\ATLColumnGateway; +use Gibbon\Module\ATL\Domain\ATLEntryGateway; +use Gibbon\Services\Format; + +include '../../gibbon.php'; + +$URL = $session->get('absoluteURL').'/index.php?q=/modules/ATL/'; + +if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_data.php') == false) { + //Fail 0 + $URL .= 'atl_manage.php&return=error0'; + header("Location: {$URL}"); +} else { + $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? ''; + $atlColumnID = $_GET['atlColumnID'] ?? ''; + + $atlColumnGateway = $container->get(ATLColumnGateway::class); + $atlColumn = $atlColumnGateway->getByID($atlColumnID); + + if (empty($atlColumn)) { + //Fail 2 + $URL .= 'atl_manage.php&return=error2'; + header("Location: {$URL}"); + exit(); + } else { + $URL .= "atl_write_data.php&atlColumnID=$atlColumnID&gibbonCourseClassID=$gibbonCourseClassID"; + $name = $atlColumn['name']; + $count = $_POST['count']; + $partialFail = false; + + if ($atlColumn['forStudents'] == 'Y') { + $URL .= '&return=error1'; + header("Location: {$URL}"); + exit(); + } + + $atlEntryGateway = $container->get(ATLEntryGateway::class); + + for ($i = 1; $i <= $count; ++$i) { + $gibbonPersonIDStudent = $_POST["$i-gibbonPersonID"]; + //Complete + $completeValue = $_POST["complete$i"] ?? 'N'; + $gibbonPersonIDLastEdit = $session->get('gibbonPersonID'); + + $data = [ + 'atlColumnID' => $atlColumnID, + 'gibbonPersonIDStudent' => $gibbonPersonIDStudent, + 'complete' => $completeValue, + 'gibbonPersonIDLastEdit' => $gibbonPersonIDLastEdit, + ]; + + $atlEntry = $atlEntryGateway->selectBy(['atlColumnID' => $atlColumnID, 'gibbonPersonIDStudent' => $gibbonPersonIDStudent]); + + if ($atlEntry->isNotEmpty()) { + $atlEntry = $atlEntry->fetch(); + $partialFail |= !$atlEntryGateway->update($atlEntry['atlEntryID'], $data); + } else { + $partialFail |= !$atlEntryGateway->insert($data); + } + } + + //Update column + $completeDate = $_POST['completeDate']; + if (empty($completeDate)) { + $data = [ + 'completeDate' => null, + 'complete' => 'N' + ]; + } else { + $data = [ + 'completeDate' => Format::dateConvert($completeDate), + 'complete' => 'Y' + ]; + } + + $partialFail |= !$atlColumnGateway->update($atlColumnID, $data); + + //Return! + if ($partialFail) { + //Fail 3 + $URL .= '&return=error3'; + } else { + //Success 0 + $URL .= '&return=success0'; + } + header("Location: {$URL}"); + exit(); + } +} diff --git a/ATL/atl_write_rubric.php b/ATL/atl_write_rubric.php index f0326fb..864f740 100644 --- a/ATL/atl_write_rubric.php +++ b/ATL/atl_write_rubric.php @@ -1,136 +1,144 @@ -. -*/ - -use Gibbon\Services\Format; - -//Rubric includes -include './modules/Rubrics/moduleFunctions.php'; - -if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write.php') == false) { - //Acess denied - echo "
";
- echo __('Your request failed because you do not have access to this action.');
- echo '
';
-} else {
- //Proceed!
- //Check if school year specified
- $gibbonCourseClassID = $_GET['gibbonCourseClassID'];
- $atlColumnID = $_GET['atlColumnID'];
- $gibbonPersonID = $_GET['gibbonPersonID'];
- $gibbonRubricID = $_GET['gibbonRubricID'];
- if ($gibbonCourseClassID == '' or $atlColumnID == '' or $gibbonPersonID == '' or $gibbonRubricID == '') { echo "";
- echo __('You have not specified one or more required parameters.');
- echo '
';
- } else {
- $roleCategory = getRoleCategory($session->get('gibbonRoleIDPrimary'), $connection2);
- $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
- if ($_GET['type'] == 'attainment') {
- $contextDBTableGibbonRubricIDField = 'gibbonRubricIDAttainment';
- } elseif ($_GET['type'] == 'effort') {
- $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
- }
-
- try {
- if ($roleCategory == 'Staff') {
- $data = array('gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = 'SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class';
- } elseif ($roleCategory == 'Student') {
- $data = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID AND role='Student' AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class";
- } elseif ($roleCategory == 'Parent') {
- $data = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql = "SELECT gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class, gibbonCourseClass.gibbonCourseClassID FROM gibbonCourse, gibbonCourseClass, gibbonCourseClassPerson WHERE gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourseClass.gibbonCourseClassID=gibbonCourseClassPerson.gibbonCourseClassID AND gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID AND role='Student' AND gibbonCourseClass.gibbonCourseClassID=:gibbonCourseClassID ORDER BY course, class";
- }
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result->rowCount() != 1) {
- echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- try {
- $data2 = array('atlColumnID' => $atlColumnID);
- $sql2 = 'SELECT * FROM atlColumn WHERE atlColumnID=:atlColumnID';
- $result2 = $connection2->prepare($sql2);
- $result2->execute($data2);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result2->rowCount() != 1) {
- echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- try {
- $data3 = array('gibbonRubricID' => $gibbonRubricID);
- $sql3 = 'SELECT * FROM gibbonRubric WHERE gibbonRubricID=:gibbonRubricID';
- $result3 = $connection2->prepare($sql3);
- $result3->execute($data3);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result3->rowCount() != 1) {
- echo "";
- echo __('The specified record does not exist.');
- echo '
';
- } else {
- try {
- $data4 = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
- $sql4 = "SELECT DISTINCT surname, preferredName, gibbonPerson.gibbonPersonID FROM gibbonPerson JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE gibbonPerson.gibbonPersonID=:gibbonPersonID AND gibbonCourseClassID=:gibbonCourseClassID AND status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND (role='Student' OR role='Student - Left')";
- $result4 = $connection2->prepare($sql4);
- $result4->execute($data4);
- } catch (PDOException $e) {
- echo "".$e->getMessage().'
';
- }
-
- if ($result4->rowCount() != 1) {
- echo "";
- echo __('The selected record does not exist, or you do not have access to it.');
- echo '
';
- } else {
- //Let's go!
- $row = $result->fetch();
- $row2 = $result2->fetch();
- $row3 = $result3->fetch();
- $row4 = $result4->fetch();
-
- echo "";
- echo $row3['name'].'
';
- echo "".Format::name('', $row4['preferredName'], $row4['surname'], 'Student', true).'';
- echo '
';
-
- $mark = true;
- if (isset($_GET['mark'])) {
- if ($_GET['mark'] == 'FALSE') {
- $mark = false;
- }
- }
- echo rubricView($guid, $connection2, $gibbonRubricID, $mark, $row4['gibbonPersonID'], 'atlColumn', 'atlColumnID', $atlColumnID, $contextDBTableGibbonRubricIDField, 'name', 'completeDate');
- }
- }
- }
- }
- }
-}
+.
+*/
+
+use Gibbon\Domain\Rubrics\RubricGateway;
+use Gibbon\Domain\Timetable\CourseEnrolmentGateway;
+use Gibbon\Domain\Timetable\CourseGateway;
+use Gibbon\Domain\User\RoleGateway;
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Module\ATL\Domain\ATLEntryGateway;
+use Gibbon\Services\Format;
+
+//Rubric includes
+include './modules/Rubrics/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write.php') == false
+ && isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_student.php') == false) {
+ //Acess denied
+ $page->addError(__('Your request failed because you do not have access to this action.'));
+} else {
+ //Proceed!
+ //Check if school year specified
+ $gibbonCourseClassID = $_GET['gibbonCourseClassID'] ?? '';
+ $atlColumnID = $_GET['atlColumnID'] ?? '';
+ $gibbonPersonID = $_GET['gibbonPersonID'] ?? '';
+ $gibbonRubricID = $_GET['gibbonRubricID'] ?? '';
+ if (empty($gibbonCourseClassID) || empty($atlColumnID) || empty($gibbonPersonID) || empty($gibbonRubricID)) {
+ $page->addError(__('You have not specified one or more required parameters.'));
+ } else {
+ $type = $_GET['type'] ?? '';
+ $contextDBTableGibbonRubricIDField = '';
+ if ($type == 'attainment') {
+ $contextDBTableGibbonRubricIDField = 'gibbonRubricIDAttainment';
+ } else {
+ $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
+ }
+
+ $allowed = false;
+ $roleGateway = $container->get(RoleGateway::class);
+ $roleCategory = $roleGateway->getByID($session->get('gibbonRoleIDPrimary'))['category'] ?? '';
+
+ if ($roleCategory == 'Staff') {
+ $courseGateway = $container->get(CourseGateway::class);
+ $result = $courseGateway->getCourseClassByID($gibbonCourseClassID);
+ $allowed = !empty($result);
+ } elseif ($roleCategory == 'Student' || $roleCategory == 'Parent') {
+ $courseEnrolmentGateway = $container->get(CourseEnrolmentGateway::class);
+ $result = $courseEnrolmentGateway->selectBy(['gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID, 'role' => 'Student']);
+ $allowed = $result->isNotEmpty();
+
+ }
+
+ if (!$allowed) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+ if (!$atlColumnGateway->exists($atlColumnID)) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ $rubricGateway = $container->get(RubricGateway::class);
+ $rubric = $rubricGateway->getByID($gibbonRubricID);
+
+ if (empty($rubric)) {
+ $page->addError(__('The specified record does not exist.'));
+ } else {
+ try {
+ $data4 = array('gibbonPersonID' => $gibbonPersonID, 'gibbonCourseClassID' => $gibbonCourseClassID);
+ $sql4 = "SELECT DISTINCT surname, preferredName, gibbonPerson.gibbonPersonID, image_240 FROM gibbonPerson JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE gibbonPerson.gibbonPersonID=:gibbonPersonID AND gibbonCourseClassID=:gibbonCourseClassID AND status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND (role='Student' OR role='Student - Left')";
+ $result4 = $connection2->prepare($sql4);
+ $result4->execute($data4);
+ } catch (PDOException $e) {
+ echo "".$e->getMessage().'
';
+ }
+
+ if ($result4->rowCount() != 1) {
+ $page->addError(__('The selected record does not exist, or you do not have access to it.'));
+ } else {
+ //Let's go!
+ $row4 = $result4->fetch();
+
+ echo "";
+ echo $rubric['name'].'
';
+ echo "".Format::name('', $row4['preferredName'], $row4['surname'], 'Student', true).'';
+ echo '
';
+
+ echo Format::photo($row4['image_240'], 75, 'inline-block align-top mt-1');
+
+ $mark = ($_GET['mark'] ?? '') !== 'FALSE';
+ echo rubricView($guid, $connection2, $gibbonRubricID, $mark, $row4['gibbonPersonID'], 'atlColumn', 'atlColumnID', $atlColumnID, $contextDBTableGibbonRubricIDField, 'name', $gibbonPersonID == $session->get('gibbonPersonID') ? '' : 'completeDate');
+
+ if ($mark && $gibbonPersonID !== $session->get('gibbonPersonID')) {
+ try {
+ $dataStudents = array('gibbonCourseClassID' => $gibbonCourseClassID);
+ $sqlStudents = "SELECT gibbonPerson.gibbonPersonID, dateStart FROM gibbonCourseClassPerson JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID) WHERE role='Student' AND gibbonCourseClassID=:gibbonCourseClassID AND status='Full' AND (dateStart IS NULL OR dateStart<='".date('Y-m-d')."') AND (dateEnd IS NULL OR dateEnd>='".date('Y-m-d')."') AND gibbonCourseClassPerson.reportable='Y' ORDER BY surname, preferredName";
+ $resultStudents = $connection2->prepare($sqlStudents);
+ $resultStudents->execute($dataStudents);
+ } catch (PDOException $e) {
+ }
+
+ $prev = '';
+ $next = '';
+ while (($rowStudent = $resultStudents->fetch()) != null) {
+ if ($rowStudent['gibbonPersonID'] == $gibbonPersonID) {
+ $nextRowStudent = $resultStudents->fetch();
+ if ($nextRowStudent != null) {
+ $next = $nextRowStudent['gibbonPersonID'];
+ }
+ break;
+ } else {
+ $prev = $rowStudent['gibbonPersonID'];
+ }
+ }
+
+ echo '';
+ if (!empty($prev)) {
+ echo "get('absoluteURL').'/fullscreen.php?q=/modules/ATL/atl_write_rubric.php&gibbonRubricID='.$gibbonRubricID."&gibbonCourseClassID=$gibbonCourseClassID&atlColumnID=".$atlColumnID.'&gibbonPersonID='.$prev."&mark=TRUE&type=" . $_GET['type'] . "&width=" . $_GET['width'] . "&height=" . $_GET['height'] . "')\">";
+ }
+
+ if (!empty($next)) {
+ echo "get('absoluteURL').'/fullscreen.php?q=/modules/ATL/atl_write_rubric.php&gibbonRubricID='.$gibbonRubricID."&gibbonCourseClassID=$gibbonCourseClassID&atlColumnID=".$atlColumnID.'&gibbonPersonID='.$next."&mark=TRUE&type=" . $_GET['type'] . "&width=" . $_GET['width'] . "&height=" . $_GET['height'] . "')\">";
+ }
+ echo '
';
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/ATL/atl_write_student.php b/ATL/atl_write_student.php
new file mode 100644
index 0000000..22b28c4
--- /dev/null
+++ b/ATL/atl_write_student.php
@@ -0,0 +1,69 @@
+.
+*/
+
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Services\Format;
+use Gibbon\Tables\DataTable;
+
+//Module includes
+require_once __DIR__ . '/moduleFunctions.php';
+
+$page->breadcrumbs->add('Fill ATLs');
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_student.php') == false) {
+ //Acess denied
+ $page->addError(__('Your request failed because you do not have access to this action.'));
+} else {
+ $page->scripts->add('chart');
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+ $criteria = $atlColumnGateway->newQueryCriteria()
+ ->sortBy('completeDate');
+
+ $gibbonPersonID = $session->get('gibbonPersonID');
+ $atlColumns = $atlColumnGateway->queryATLColumnsByStudent($criteria, $session->get('gibbonSchoolYearID'), $gibbonPersonID, 'N');
+
+ $table = DataTable::createPaginated('studentATLs', $criteria);
+
+ $table->addColumn('course', __('Class'))
+ ->format(Format::using('courseClassName', ['course', 'class']));
+
+ $table->addColumn('name', __('ATL'));
+
+ $table->addColumn('completeDate', __('Due Date'))
+ ->format(Format::using('date', ['completeDate']));
+
+ $table->addActionColumn()
+ ->addParam('gibbonRubricID')
+ ->addParam('gibbonCourseClassID')
+ ->addParam('gibbonPersonID', $gibbonPersonID)
+ ->addParam('atlColumnID')
+ ->addParam('type', 'effort')
+ ->format(function ($column, $actions) {
+ $actions->addAction('data', __('Enter Data'))
+ ->setURL('/modules/ATL/atl_write_rubric.php')
+ ->setIcon('markbook')
+ ->modalWindow(1100, 550);
+
+ $actions->addAction('complete', __('Complete'))
+ ->setURL('/modules/ATL/atl_write_student_complete.php')
+ ->setIcon('iconTick')
+ ->modalWindow();
+ });
+
+ echo $table->render($atlColumns);
+}
\ No newline at end of file
diff --git a/ATL/atl_write_student_complete.php b/ATL/atl_write_student_complete.php
new file mode 100644
index 0000000..c3bede2
--- /dev/null
+++ b/ATL/atl_write_student_complete.php
@@ -0,0 +1,62 @@
+.
+*/
+
+use Gibbon\Forms\Form;
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Module\ATL\Domain\ATLEntryGateway;
+
+//Module includes
+require_once __DIR__ . '/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_student.php') == false) {
+ //Acess denied
+ $page->addError(__('Your request failed because you do not have access to this action.'));
+} else {
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+ $atlEntryGateway = $container->get(ATLEntryGateway::class);
+
+ $atlColumnID = $_GET['atlColumnID'] ?? '';
+ $gibbonPersonID = $session->get('gibbonPersonID');
+ $gibbonSchoolYearID = $session->get('gibbonSchoolYearID');
+
+ //Check if atl column is for student
+ if ($atlColumnGateway->isForStudent($atlColumnID, $gibbonPersonID, $gibbonSchoolYearID)) {
+ //Check if student has already completed atl
+ $atlEntry = $atlEntryGateway->selectBy(['gibbonPersonIDStudent' => $gibbonPersonID, 'atlColumnID' => $atlColumnID, 'complete' => 'Y']);
+ if ($atlEntry->isNotEmpty()) {
+ $page->addError(__('You have already completed this ATL.'));
+ } else {
+ $form = Form::create('ATL', $session->get('absoluteURL').'/modules/ATL/atl_write_student_completeProcess.php');
+ $form->addHiddenValue('address', $session->get('address'));
+ $form->addHiddenValue('atlColumnID', $atlColumnID);
+
+ $row = $form->addRow();
+ $col = $row->addColumn();
+ $col->addContent(__('Are you sure you want to mark this ATL as complete?'))->wrap('', '');
+ $col->addContent(__('Once marked as complete, you will not be able to edit your ATL.'))
+ ->wrap('', '');
+
+ $form->addRow()->addConfirmSubmit();
+
+ echo $form->getOutput();
+ }
+ } else {
+ $page->addError(__('Your request failed because you do not have access to this action.'));
+ }
+}
\ No newline at end of file
diff --git a/ATL/atl_write_student_completeProcess.php b/ATL/atl_write_student_completeProcess.php
new file mode 100644
index 0000000..e021803
--- /dev/null
+++ b/ATL/atl_write_student_completeProcess.php
@@ -0,0 +1,74 @@
+.
+*/
+
+include '../../gibbon.php';
+
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Module\ATL\Domain\ATLEntryGateway;
+
+$URL = $session->get('absoluteURL').'/index.php?q=/modules/ATL/atl_write_student.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_write_student.php') == false) {
+ //Fail 0
+ $URL .= '&return=error0';
+ header("Location: {$URL}");
+ exit();
+} else {
+ $atlColumnGateway = $container->get(ATLColumnGateway::class);
+ $atlEntryGateway = $container->get(ATLEntryGateway::class);
+
+ $atlColumnID = $_POST['atlColumnID'] ?? '';
+ $gibbonPersonID = $session->get('gibbonPersonID');
+ $gibbonSchoolYearID = $session->get('gibbonSchoolYearID');
+
+ //Check if atl column is for student
+ if ($atlColumnGateway->isForStudent($atlColumnID, $gibbonPersonID, $gibbonSchoolYearID)) {
+ $data = [
+ 'atlColumnID' => $atlColumnID,
+ 'gibbonPersonIDStudent' => $gibbonPersonID,
+ 'complete' => 'Y',
+ 'gibbonPersonIDLastEdit' => $gibbonPersonID
+ ];
+
+ $atlEntry = $atlEntryGateway->selectBy(['gibbonPersonIDStudent' => $gibbonPersonID, 'atlColumnID' => $atlColumnID]);
+ $atlEntry = $atlEntry->isNotEmpty() ? $atlEntry->fetch() : [];
+
+ if (empty($atlEntry)) {
+ if (!$atlEntryGateway->insert($data)) {
+ $URL .= '&return=error2';
+ header("Location: {$URL}");
+ exit();
+ }
+ } else {
+ if (!$atlEntryGateway->update($atlEntry['atlEntryID'], $data)) {
+ $URL .= '&return=error2';
+ header("Location: {$URL}");
+ exit();
+ }
+ }
+
+ $URL .= '&return=success0';
+ header("Location: {$URL}");
+ exit();
+ } else {
+ $URL .= '&return=error0';
+ header("Location: {$URL}");
+ exit();
+ }
+}
diff --git a/ATL/cli/goLiveNotifications.php b/ATL/cli/goLiveNotifications.php
index 91ff255..aaf911c 100644
--- a/ATL/cli/goLiveNotifications.php
+++ b/ATL/cli/goLiveNotifications.php
@@ -1,79 +1,78 @@
-.
-*/
-
-//USAGE
-//Ideally this script should be run shortly after midnight, to alert users to columns that have just gone live
-
-require getcwd().'/../../../gibbon.php';
-
-getSystemSettings($guid, $connection2);
-
-setCurrentSchoolYear($guid, $connection2);
-
-//Set up for i18n via gettext
-if (isset($_SESSION[$guid]['i18n']['code'])) { if ($_SESSION[$guid]['i18n']['code'] != null) {
- putenv('LC_ALL='.$_SESSION[$guid]['i18n']['code']);
- setlocale(LC_ALL, $_SESSION[$guid]['i18n']['code']);
- bindtextdomain('gibbon', getcwd().'/../i18n');
- textdomain('gibbon');
- }
-}
-
-
-//Check for CLI, so this cannot be run through browser
-if (php_sapi_name() != 'cli') {
- echo __('This script cannot be run from a browser, only via CLI.')."\n\n";
-} else {
- //SCAN THROUGH ALL ATLS GOING LIVE TODAY
- try {
- $data = array('completeDate' => date('Y-m-d'));
- $sql = 'SELECT atlColumn.*, gibbonCourseClass.nameShort AS class, gibbonCourse.nameShort AS course FROM atlColumn JOIN gibbonCourseClass ON (atlColumn.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) WHERE completeDate=:completeDate';
- $result = $connection2->prepare($sql);
- $result->execute($data);
- } catch (PDOException $e) {
- }
-
- while ($row = $result->fetch()) {
- try {
- $dataPerson = array('gibbonCourseClassID' => $row['gibbonCourseClassID'], 'today' => date('Y-m-d'));
- $sqlPerson = "SELECT gibbonCourseClassPerson.*
- FROM gibbonCourseClassPerson
- JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID)
- JOIN gibbonCourseClass ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID)
- WHERE (role='Teacher' OR role='Assistant' OR role='Student')
- AND gibbonCourseClassPerson.gibbonCourseClassID=:gibbonCourseClassID
- AND gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<=:today) AND (dateEnd IS NULL OR dateEnd>=:today)
- AND gibbonCourseClass.reportable='Y'
- AND gibbonCourseClassPerson.reportable='Y'";
- $resultPerson = $connection2->prepare($sqlPerson);
- $resultPerson->execute($dataPerson);
- } catch (PDOException $e) {
- }
-
- while ($rowPerson = $resultPerson->fetch()) {
- if ($rowPerson['role'] == 'Teacher' || $rowPerson['role'] == 'Assistant') {
- $notificationText = sprintf(__('Your ATL column for class %1$s has gone live today.'), $row['course'].'.'.$row['class']);
- setNotification($connection2, $guid, $rowPerson['gibbonPersonID'], $notificationText, 'ATL', '/index.php?q=/modules/ATL/atl_write.php&gibbonCourseClassID='.$row['gibbonCourseClassID']);
- } else {
- $notificationText = sprintf(__('You have new ATL assessment feedback for class %1$s.'), $row['course'].'.'.$row['class']);
- setNotification($connection2, $guid, $rowPerson['gibbonPersonID'], $notificationText, 'ATL', '/index.php?q=/modules/ATL/atl_view.php');
- }
- }
- }
-}
+.
+*/
+
+//USAGE
+//Ideally this script should be run shortly after midnight, to alert users to columns that have just gone live
+
+require getcwd().'/../../../gibbon.php';
+
+getSystemSettings($guid, $connection2);
+
+setCurrentSchoolYear($guid, $connection2);
+
+//Set up for i18n via gettext
+if (!empty($session->get('i18n')['code'])) {
+ putenv('LC_ALL='.$session->get('i18n')['code']);
+ setlocale(LC_ALL, $session->get('i18n')['code']);
+ bindtextdomain('gibbon', getcwd().'/../i18n');
+ textdomain('gibbon');
+}
+
+
+//Check for CLI, so this cannot be run through browser
+if (php_sapi_name() != 'cli') {
+ echo __('This script cannot be run from a browser, only via CLI.')."\n\n";
+} else {
+ //SCAN THROUGH ALL ATLS GOING LIVE TODAY
+ $data = array('completeDate' => date('Y-m-d'));
+ $sql = 'SELECT atlColumn.*, gibbonCourseClass.nameShort AS class, gibbonCourse.nameShort AS course FROM atlColumn JOIN gibbonCourseClass ON (atlColumn.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) WHERE completeDate=:completeDate';
+ $result = $connection2->prepare($sql);
+ $result->execute($data);
+
+ while ($row = $result->fetch()) {
+ $dataPerson = array('gibbonCourseClassID' => $row['gibbonCourseClassID'], 'today' => date('Y-m-d'));
+ $sqlPerson = "SELECT gibbonCourseClassPerson.*
+ FROM gibbonCourseClassPerson
+ JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID)
+ JOIN gibbonCourseClass ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID)
+ WHERE (role='Teacher' OR role='Assistant' OR role='Student')
+ AND gibbonCourseClassPerson.gibbonCourseClassID=:gibbonCourseClassID
+ AND gibbonPerson.status='Full' AND (dateStart IS NULL OR dateStart<=:today) AND (dateEnd IS NULL OR dateEnd>=:today)
+ AND gibbonCourseClass.reportable='Y'
+ AND gibbonCourseClassPerson.reportable='Y'";
+ $resultPerson = $connection2->prepare($sqlPerson);
+ $resultPerson->execute($dataPerson);
+
+ $notificationGateway = new \Gibbon\Domain\System\NotificationGateway($pdo);
+
+ while ($rowPerson = $resultPerson->fetch()) {
+ if ($rowPerson['role'] == 'Teacher' || $rowPerson['role'] == 'Assistant') {
+ $notificationSender = new \Gibbon\Comms\NotificationSender($notificationGateway, $session);
+ $notificationText = sprintf(__('Your ATL column for class %1$s has gone live today.'), $row['course'].'.'.$row['class']);
+ $notificationSender->addNotification($rowPerson['gibbonPersonID'], $notificationText, 'ATL', '/index.php?q=/modules/ATL/atl_write.php&gibbonCourseClassID='.$row['gibbonCourseClassID']);
+ $notificationSender->sendNotifications();
+ } else {
+ $notificationSender = new \Gibbon\Comms\NotificationSender($notificationGateway, $session);
+ $notificationText = sprintf(__('You have new ATL assessment feedback for class %1$s.'), $row['course'].'.'.$row['class']);
+ $notificationSender->addNotification($rowPerson['gibbonPersonID'], $notificationText, 'ATL', '/index.php?q=/modules/ATL/atl_view.php');
+ $notificationSender->sendNotifications();
+ }
+ }
+ }
+}
diff --git a/ATL/hook_parentalDashboard_atlView.php b/ATL/hook_parentalDashboard_atlView.php
index 2beed15..c36d86b 100644
--- a/ATL/hook_parentalDashboard_atlView.php
+++ b/ATL/hook_parentalDashboard_atlView.php
@@ -1,38 +1,42 @@
-.
-*/
-
-global $page;
-
-$returnInt = null;
-
-require_once './modules/ATL/moduleFunctions.php';
-
-if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
- //Acess denied
- $returnInt .= "";
- $returnInt .= 'You do not have access to this action.';
- $returnInt .= '
';
-} else {
- // Register scripts available to the core, but not included by default
- $page->scripts->add('chart');
-
- $returnInt .= getATLRecord($guid, $connection2, $gibbonPersonID);
-}
-
-return $returnInt;
+.
+*/
+
+use Gibbon\Services\Format;
+
+global $page, $container;
+
+$returnInt = null;
+
+require_once __DIR__ . '/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
+ //Acess denied
+ $returnInt .= Format::alert(__('You do not have access to this action.'));
+} else {
+ // Register scripts available to the core, but not included by default
+ $page->scripts->add('chart');
+ //TODO: This is a hack to make sure that the ATLEntryGateway is loaded and should be fixed properly somehow.
+ $container->get('autoloader')->addPsr4('Gibbon\\Module\\ATL\\', $session->get('absolutePath') . '/modules/ATL/src');
+
+ $returnInt .= visualiseATL($container, $gibbonPersonID);
+
+ $returnInt .= getATLRecord($gibbonPersonID);
+}
+
+return $returnInt;
diff --git a/ATL/hook_studentDashboard_atlView.php b/ATL/hook_studentDashboard_atlView.php
index ea1926b..e30f0e4 100644
--- a/ATL/hook_studentDashboard_atlView.php
+++ b/ATL/hook_studentDashboard_atlView.php
@@ -1,38 +1,42 @@
-.
-*/
-
-global $page;
-
-$returnInt = null;
-
-require_once './modules/ATL/moduleFunctions.php';
-
-if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
- //Acess denied
- $returnInt .= "";
- $returnInt .= 'You do not have access to this action.';
- $returnInt .= '
';
-} else {
- // Register scripts available to the core, but not included by default
- $page->scripts->add('chart');
-
- $returnInt .= getATLRecord($guid, $connection2, $session->get('gibbonPersonID'));
-}
-
-return $returnInt;
+.
+*/
+
+use Gibbon\Services\Format;
+
+global $page, $container;
+
+$returnInt = null;
+
+require_once __DIR__ . '/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
+ //Acess denied
+ $returnInt .= Format::alert(__('You do not have access to this action.'));
+} else {
+ // Register scripts available to the core, but not included by default
+ $page->scripts->add('chart');
+ //TODO: This is a hack to make sure that the ATLEntryGateway is loaded and should be fixed properly somehow.
+ $container->get('autoloader')->addPsr4('Gibbon\\Module\\ATL\\', $session->get('absolutePath') . '/modules/ATL/src');
+
+ $returnInt .= visualiseATL($container, $session->get('gibbonPersonID'));
+
+ $returnInt .= getATLRecord($session->get('gibbonPersonID'));
+}
+
+return $returnInt;
diff --git a/ATL/hook_studentProfile_atlView.php b/ATL/hook_studentProfile_atlView.php
index ba3ab5e..c165b85 100644
--- a/ATL/hook_studentProfile_atlView.php
+++ b/ATL/hook_studentProfile_atlView.php
@@ -1,33 +1,43 @@
-.
-*/
-
-//Module includes
-require_once './modules/ATL/moduleFunctions.php';
-
-if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
- //Acess denied
- echo "";
- echo 'You do not have access to this action.';
- echo '
';
-} else {
- // Register scripts available to the core, but not included by default
- $page->scripts->add('chart');
-
- echo getATLRecord($guid, $connection2, $gibbonPersonID);
-}
+.
+*/
+
+use Gibbon\Services\Format;
+
+global $page, $container;
+
+use Gibbon\Module\Rubrics\Visualise;
+use Gibbon\Domain\Rubrics\RubricGateway;
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+
+//Module includes
+require_once __DIR__ . '/moduleFunctions.php';
+
+if (isActionAccessible($guid, $connection2, '/modules/ATL/atl_view.php') == false) {
+ //Acess denied
+ echo Format::alert(__('You do not have access to this action.'));
+} else {
+ // Register scripts available to the core, but not included by default
+ $page->scripts->add('chart');
+ //TODO: This is a hack to make sure that the ATLEntryGateway is loaded and should be fixed properly somehow.
+ $container->get('autoloader')->addPsr4('Gibbon\\Module\\ATL\\', $session->get('absolutePath') . '/modules/ATL/src');
+
+ echo visualiseATL($container, $gibbonPersonID);
+
+ echo getATLRecord($gibbonPersonID);
+}
diff --git a/ATL/manifest.php b/ATL/manifest.php
index 7357ebf..95f9656 100644
--- a/ATL/manifest.php
+++ b/ATL/manifest.php
@@ -1,173 +1,208 @@
-.
-*/
-
-//This file describes the module, including database tables
-
-//Basica variables
-$name = 'ATL';
-$description = 'The ATL module allows schools to run a program of Approaches To Learning assessments, based on a rubric.';
-$entryURL = 'atl_write.php';
-$type = 'Additional';
-$category = 'Assess';
-$version = '1.5.02';
-$author = 'Ross Parker';
-$url = 'http://rossparker.org';
-
-//Module tables
-$moduleTables[0] = "CREATE TABLE `atlColumn` (
- `atlColumnID` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
- `gibbonCourseClassID` int(8) unsigned zerofill NOT NULL,
- `groupingID` int(8) unsigned zerofill DEFAULT NULL COMMENT 'A value used to group multiple ATL columns.',
- `name` varchar(20) NOT NULL,
- `description` text NOT NULL,
- `gibbonRubricID` int(8) unsigned zerofill DEFAULT NULL,
- `complete` enum('N','Y') NOT NULL,
- `completeDate` date DEFAULT NULL,
- `gibbonPersonIDCreator` int(10) unsigned zerofill NOT NULL,
- `gibbonPersonIDLastEdit` int(10) unsigned zerofill NOT NULL,
- PRIMARY KEY (`atlColumnID`),
- KEY `gibbonCourseClassID` (`gibbonCourseClassID`),
- KEY `gibbonRubricID` (`gibbonRubricID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
-
-$moduleTables[1] = "CREATE TABLE `atlEntry` (
- `atlEntryID` int(12) unsigned zerofill NOT NULL AUTO_INCREMENT,
- `atlColumnID` int(10) unsigned zerofill NOT NULL,
- `gibbonPersonIDStudent` int(10) unsigned zerofill NOT NULL,
- `complete` enum('Y','N') NOT NULL DEFAULT 'N',
- `gibbonPersonIDLastEdit` int(10) unsigned zerofill NOT NULL,
- PRIMARY KEY (`atlEntryID`),
- KEY (`atlColumnID`),
- KEY (`gibbonPersonIDStudent`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
-
-//Action rows
-$actionRows[0]['name'] = 'Manage ATLs_all';
-$actionRows[0]['precedence'] = '0';
-$actionRows[0]['category'] = 'Manage & Assess';
-$actionRows[0]['description'] = 'Allows privileged users to create and manage ATL columns.';
-$actionRows[0]['URLList'] = 'atl_manage.php, atl_manage_add.php, atl_manage_edit.php, atl_manage_delete.php';
-$actionRows[0]['entryURL'] = 'atl_manage.php';
-$actionRows[0]['defaultPermissionAdmin'] = 'Y';
-$actionRows[0]['defaultPermissionTeacher'] = 'N';
-$actionRows[0]['defaultPermissionStudent'] = 'N';
-$actionRows[0]['defaultPermissionParent'] = 'N';
-$actionRows[0]['defaultPermissionSupport'] = 'N';
-$actionRows[0]['categoryPermissionStaff'] = 'Y';
-$actionRows[0]['categoryPermissionStudent'] = 'N';
-$actionRows[0]['categoryPermissionParent'] = 'N';
-$actionRows[0]['categoryPermissionOther'] = 'N';
-
-$actionRows[1]['name'] = 'Write ATLs_myClasses';
-$actionRows[1]['precedence'] = '0';
-$actionRows[1]['category'] = 'Manage & Assess';
-$actionRows[1]['description'] = 'Allows teachers to enter ATL assessment data to columns in their classes.';
-$actionRows[1]['URLList'] = 'atl_write.php, atl_write_data.php';
-$actionRows[1]['entryURL'] = 'atl_write.php';
-$actionRows[1]['defaultPermissionAdmin'] = 'N';
-$actionRows[1]['defaultPermissionTeacher'] = 'Y';
-$actionRows[1]['defaultPermissionStudent'] = 'N';
-$actionRows[1]['defaultPermissionParent'] = 'N';
-$actionRows[1]['defaultPermissionSupport'] = 'N';
-$actionRows[1]['categoryPermissionStaff'] = 'Y';
-$actionRows[1]['categoryPermissionStudent'] = 'N';
-$actionRows[1]['categoryPermissionParent'] = 'N';
-$actionRows[1]['categoryPermissionOther'] = 'N';
-
-$actionRows[2]['name'] = 'Write ATLs_all';
-$actionRows[2]['precedence'] = '1';
-$actionRows[2]['category'] = 'Manage & Assess';
-$actionRows[2]['description'] = 'Allows privileged users to enter ATL assessment data to columns in all classes.';
-$actionRows[2]['URLList'] = 'atl_write.php, atl_write_data.php';
-$actionRows[2]['entryURL'] = 'atl_write.php';
-$actionRows[2]['defaultPermissionAdmin'] = 'Y';
-$actionRows[2]['defaultPermissionTeacher'] = 'N';
-$actionRows[2]['defaultPermissionStudent'] = 'N';
-$actionRows[2]['defaultPermissionParent'] = 'N';
-$actionRows[2]['defaultPermissionSupport'] = 'N';
-$actionRows[2]['categoryPermissionStaff'] = 'Y';
-$actionRows[2]['categoryPermissionStudent'] = 'N';
-$actionRows[2]['categoryPermissionParent'] = 'N';
-$actionRows[2]['categoryPermissionOther'] = 'N';
-
-$actionRows[3]['name'] = 'View ATLs_mine';
-$actionRows[3]['precedence'] = '0';
-$actionRows[3]['category'] = 'View';
-$actionRows[3]['description'] = 'Allows students to view their own ATL results.';
-$actionRows[3]['URLList'] = 'atl_view.php';
-$actionRows[3]['entryURL'] = 'atl_view.php';
-$actionRows[3]['defaultPermissionAdmin'] = 'N';
-$actionRows[3]['defaultPermissionTeacher'] = 'N';
-$actionRows[3]['defaultPermissionStudent'] = 'Y';
-$actionRows[3]['defaultPermissionParent'] = 'N';
-$actionRows[3]['defaultPermissionSupport'] = 'N';
-$actionRows[3]['categoryPermissionStaff'] = 'N';
-$actionRows[3]['categoryPermissionStudent'] = 'Y';
-$actionRows[3]['categoryPermissionParent'] = 'N';
-$actionRows[3]['categoryPermissionOther'] = 'N';
-
-$actionRows[4]['name'] = 'View ATLs_myChildrens';
-$actionRows[4]['precedence'] = '1';
-$actionRows[4]['category'] = 'View';
-$actionRows[4]['description'] = "Allows parents to view their childrens' ATL results.";
-$actionRows[4]['URLList'] = 'atl_view.php';
-$actionRows[4]['entryURL'] = 'atl_view.php';
-$actionRows[4]['defaultPermissionAdmin'] = 'N';
-$actionRows[4]['defaultPermissionTeacher'] = 'N';
-$actionRows[4]['defaultPermissionStudent'] = 'N';
-$actionRows[4]['defaultPermissionParent'] = 'Y';
-$actionRows[4]['defaultPermissionSupport'] = 'N';
-$actionRows[4]['categoryPermissionStaff'] = 'N';
-$actionRows[4]['categoryPermissionStudent'] = 'N';
-$actionRows[4]['categoryPermissionParent'] = 'Y';
-$actionRows[4]['categoryPermissionOther'] = 'N';
-
-$actionRows[5]['name'] = 'View ATLs_all';
-$actionRows[5]['precedence'] = '2';
-$actionRows[5]['category'] = 'View';
-$actionRows[5]['description'] = 'Allows staff to see ATL results for all children.';
-$actionRows[5]['URLList'] = 'atl_view.php';
-$actionRows[5]['entryURL'] = 'atl_view.php';
-$actionRows[5]['defaultPermissionAdmin'] = 'Y';
-$actionRows[5]['defaultPermissionTeacher'] = 'Y';
-$actionRows[5]['defaultPermissionStudent'] = 'N';
-$actionRows[5]['defaultPermissionParent'] = 'N';
-$actionRows[5]['defaultPermissionSupport'] = 'N';
-$actionRows[5]['categoryPermissionStaff'] = 'Y';
-$actionRows[5]['categoryPermissionStudent'] = 'N';
-$actionRows[5]['categoryPermissionParent'] = 'N';
-$actionRows[5]['categoryPermissionOther'] = 'N';
-
-$array = array();
-$array['sourceModuleName'] = 'ATL';
-$array['sourceModuleAction'] = 'View ATLs_all';
-$array['sourceModuleInclude'] = 'hook_studentProfile_atlView.php';
-$hooks[0] = "INSERT INTO `gibbonHook` (`gibbonHookID`, `name`, `type`, `options`, gibbonModuleID) VALUES (NULL, 'ATL', 'Student Profile', '".serialize($array)."', (SELECT gibbonModuleID FROM gibbonModule WHERE name='$name'));";
-
-$array = array();
-$array['sourceModuleName'] = 'ATL';
-$array['sourceModuleAction'] = 'View ATLs_myChildrens';
-$array['sourceModuleInclude'] = 'hook_parentalDashboard_atlView.php';
-$hooks[1] = "INSERT INTO `gibbonHook` (`gibbonHookID`, `name`, `type`, `options`, gibbonModuleID) VALUES (NULL, 'ATL', 'Parental Dashboard', '".serialize($array)."', (SELECT gibbonModuleID FROM gibbonModule WHERE name='$name'));";
-
-$array = array();
-$array['sourceModuleName'] = 'ATL';
-$array['sourceModuleAction'] = 'View ATLs_mine';
-$array['sourceModuleInclude'] = 'hook_studentDashboard_atlView.php';
-$hooks[2] = "INSERT INTO `gibbonHook` (`gibbonHookID`, `name`, `type`, `options`, gibbonModuleID) VALUES (NULL, 'ATL', 'Student Dashboard', '".serialize($array)."', (SELECT gibbonModuleID FROM gibbonModule WHERE name='$name'));";
+.
+*/
+
+//This file describes the module, including database tables
+
+//Basic variables
+$name = 'ATL';
+$description = 'The ATL module allows schools to run a program of Approaches To Learning assessments, based on a rubric.';
+$entryURL = 'atl_write.php';
+$type = 'Additional';
+$category = 'Assess';
+$version = '1.6.00';
+$author = 'Ross Parker';
+$url = 'http://rossparker.org';
+
+//Module tables
+$moduleTables[] = "CREATE TABLE `atlColumn` (
+ `atlColumnID` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
+ `gibbonCourseClassID` int(8) unsigned zerofill NOT NULL,
+ `name` varchar(20) NOT NULL,
+ `description` text NOT NULL,
+ `gibbonRubricID` int(8) unsigned zerofill DEFAULT NULL,
+ `complete` enum('N','Y') NOT NULL,
+ `completeDate` date DEFAULT NULL,
+ `forStudents` enum('Y','N') NOT NULL DEFAULT 'N',
+ `gibbonPersonIDCreator` int(10) unsigned zerofill NOT NULL,
+ `gibbonPersonIDLastEdit` int(10) unsigned zerofill NOT NULL,
+ PRIMARY KEY (`atlColumnID`),
+ KEY `gibbonCourseClassID` (`gibbonCourseClassID`),
+ KEY `gibbonRubricID` (`gibbonRubricID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+
+$moduleTables[] = "CREATE TABLE `atlEntry` (
+ `atlEntryID` int(12) unsigned zerofill NOT NULL AUTO_INCREMENT,
+ `atlColumnID` int(10) unsigned zerofill NOT NULL,
+ `gibbonPersonIDStudent` int(10) unsigned zerofill NOT NULL,
+ `complete` enum('Y','N') NOT NULL DEFAULT 'N',
+ `gibbonPersonIDLastEdit` int(10) unsigned zerofill NOT NULL,
+ PRIMARY KEY (`atlEntryID`),
+ KEY (`atlColumnID`),
+ KEY (`gibbonPersonIDStudent`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+
+//Action rows
+$actionRows[] = [
+ 'name' => 'Manage ATLs_all',
+ 'precedence' => '0',
+ 'category' => 'Manage & Assess',
+ 'description' => 'Allows privileged users to create and manage ATL columns.',
+ 'URLList' => 'atl_manage.php, atl_manage_add.php, atl_manage_edit.php, atl_manage_delete.php',
+ 'entryURL' => 'atl_manage.php',
+ 'defaultPermissionAdmin' => 'Y',
+ 'defaultPermissionTeacher' => 'N',
+ 'defaultPermissionStudent' => 'N',
+ 'defaultPermissionParent' => 'N',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'Y',
+ 'categoryPermissionStudent' => 'N',
+ 'categoryPermissionParent' => 'N',
+ 'categoryPermissionOther' => 'N'
+];
+
+$actionRows[] = [
+ 'name' => 'Write ATLs_myClasses',
+ 'precedence' => '0',
+ 'category' => 'Manage & Assess',
+ 'description' => 'Allows teachers to enter ATL assessment data to columns in their classes.',
+ 'URLList' => 'atl_write.php, atl_write_data.php',
+ 'entryURL' => 'atl_write.php',
+ 'defaultPermissionAdmin' => 'N',
+ 'defaultPermissionTeacher' => 'Y',
+ 'defaultPermissionStudent' => 'N',
+ 'defaultPermissionParent' => 'N',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'Y',
+ 'categoryPermissionStudent' => 'N',
+ 'categoryPermissionParent' => 'N',
+ 'categoryPermissionOther' => 'N'
+];
+
+$actionRows[] = [
+ 'name' => 'Write ATLs_all',
+ 'precedence' => '1',
+ 'category' => 'Manage & Assess',
+ 'description' => 'Allows privileged users to enter ATL assessment data to columns in all classes.',
+ 'URLList' => 'atl_write.php, atl_write_data.php',
+ 'entryURL' => 'atl_write.php',
+ 'defaultPermissionAdmin' => 'Y',
+ 'defaultPermissionTeacher' => 'N',
+ 'defaultPermissionStudent' => 'N',
+ 'defaultPermissionParent' => 'N',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'Y',
+ 'categoryPermissionStudent' => 'N',
+ 'categoryPermissionParent' => 'N',
+ 'categoryPermissionOther' => 'N'
+];
+
+$actionRows[] = [
+ 'name' => 'View ATLs_mine',
+ 'precedence' => '0',
+ 'category' => 'View',
+ 'description' => 'Allows students to view their own ATL results.',
+ 'URLList' => 'atl_view.php',
+ 'entryURL' => 'atl_view.php',
+ 'defaultPermissionAdmin' => 'N',
+ 'defaultPermissionTeacher' => 'N',
+ 'defaultPermissionStudent' => 'Y',
+ 'defaultPermissionParent' => 'N',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'N',
+ 'categoryPermissionStudent' => 'Y',
+ 'categoryPermissionParent' => 'N',
+ 'categoryPermissionOther' => 'N'
+];
+
+$actionRows[] = [
+ 'name' => 'View ATLs_myChildrens',
+ 'precedence' => '1',
+ 'category' => 'View',
+ 'description' => "Allows parents to view their childrens' ATL results.",
+ 'URLList' => 'atl_view.php',
+ 'entryURL' => 'atl_view.php',
+ 'defaultPermissionAdmin' => 'N',
+ 'defaultPermissionTeacher' => 'N',
+ 'defaultPermissionStudent' => 'N',
+ 'defaultPermissionParent' => 'Y',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'N',
+ 'categoryPermissionStudent' => 'N',
+ 'categoryPermissionParent' => 'Y',
+ 'categoryPermissionOther' => 'N'
+];
+
+$actionRows[] = [
+ 'name' => 'View ATLs_all',
+ 'precedence' => '2',
+ 'category' => 'View',
+ 'description' => 'Allows staff to see ATL results for all children.',
+ 'URLList' => 'atl_view.php',
+ 'entryURL' => 'atl_view.php',
+ 'defaultPermissionAdmin' => 'Y',
+ 'defaultPermissionTeacher' => 'Y',
+ 'defaultPermissionStudent' => 'N',
+ 'defaultPermissionParent' => 'N',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'Y',
+ 'categoryPermissionStudent' => 'N',
+ 'categoryPermissionParent' => 'N',
+ 'categoryPermissionOther' => 'N'
+];
+
+$actionRows[] = [
+ 'name' => 'Fill ATLs',
+ 'precedence' => '0',
+ 'category' => 'View',
+ 'description' => 'Allows students to enter ATL assessment data to columns in their classes.',
+ 'URLList' => 'atl_write_student.php',
+ 'entryURL' => 'atl_write_student.php',
+ 'defaultPermissionAdmin' => 'N',
+ 'defaultPermissionTeacher' => 'N',
+ 'defaultPermissionStudent' => 'Y',
+ 'defaultPermissionParent' => 'N',
+ 'defaultPermissionSupport' => 'N',
+ 'categoryPermissionStaff' => 'N',
+ 'categoryPermissionStudent' => 'Y',
+ 'categoryPermissionParent' => 'N',
+ 'categoryPermissionOther' => 'N'
+];
+
+//Hooks
+$array = [
+ 'sourceModuleName' => 'ATL',
+ 'sourceModuleAction' => 'View ATLs_all',
+ 'sourceModuleInclude' => 'hook_studentProfile_atlView.php'
+];
+$hooks[] = "INSERT INTO `gibbonHook` (`gibbonHookID`, `name`, `type`, `options`, gibbonModuleID) VALUES (NULL, 'ATL', 'Student Profile', '".serialize($array)."', (SELECT gibbonModuleID FROM gibbonModule WHERE name='$name'));";
+
+$array = [
+ 'sourceModuleName' => 'ATL',
+ 'sourceModuleAction' => 'View ATLs_myChildrens',
+ 'sourceModuleInclude' => 'hook_parentalDashboard_atlView.php'
+];
+$hooks[] = "INSERT INTO `gibbonHook` (`gibbonHookID`, `name`, `type`, `options`, gibbonModuleID) VALUES (NULL, 'ATL', 'Parental Dashboard', '".serialize($array)."', (SELECT gibbonModuleID FROM gibbonModule WHERE name='$name'));";
+
+$array = [
+ 'sourceModuleName' => 'ATL'
+ 'sourceModuleAction' => 'View ATLs_mine',
+ 'sourceModuleInclude' => 'hook_studentDashboard_atlView.php'
+];
+$hooks[] = "INSERT INTO `gibbonHook` (`gibbonHookID`, `name`, `type`, `options`, gibbonModuleID) VALUES (NULL, 'ATL', 'Student Dashboard', '".serialize($array)."', (SELECT gibbonModuleID FROM gibbonModule WHERE name='$name'));";
+
diff --git a/ATL/moduleFunctions.php b/ATL/moduleFunctions.php
index cfeb394..cc448ac 100644
--- a/ATL/moduleFunctions.php
+++ b/ATL/moduleFunctions.php
@@ -1,145 +1,205 @@
-.
-*/
-
-use Gibbon\Forms\Form;
-use Gibbon\Forms\DatabaseFormFactory;
-
-function getATLRecord($guid, $connection2, $gibbonPersonID)
-{
- $output = '';
-
- //Get school years in reverse order
- try {
- $dataYears = array('gibbonPersonID' => $gibbonPersonID);
- $sqlYears = "SELECT * FROM gibbonSchoolYear JOIN gibbonStudentEnrolment ON (gibbonStudentEnrolment.gibbonSchoolYearID=gibbonSchoolYear.gibbonSchoolYearID) WHERE (status='Current' OR status='Past') AND gibbonPersonID=:gibbonPersonID ORDER BY sequenceNumber DESC";
- $resultYears = $connection2->prepare($sqlYears);
- $resultYears->execute($dataYears);
- } catch (PDOException $e) {
- $output .= "".$e->getMessage().'
';
- }
-
- if ($resultYears->rowCount() < 1) {
- $output .= "";
- $output .= __('There are no records to display.');
- $output .= '
';
- } else {
- $results = false;
- while ($rowYears = $resultYears->fetch()) {
- //Get and output ATLs
- try {
- $dataATL = array('gibbonPersonID1' => $gibbonPersonID, 'gibbonPersonID2' => $gibbonPersonID, 'gibbonSchoolYearID' => $rowYears['gibbonSchoolYearID']);
- $sqlATL = "SELECT DISTINCT atlColumn.*, atlEntry.*, gibbonCourse.name AS course, gibbonCourseClass.nameShort AS class, gibbonPerson.dateStart FROM gibbonCourse JOIN gibbonCourseClass ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID) JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) JOIN atlColumn ON (atlColumn.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID) JOIN atlEntry ON (atlEntry.atlColumnID=atlColumn.atlColumnID) JOIN gibbonPerson ON (atlEntry.gibbonPersonIDStudent=gibbonPerson.gibbonPersonID) WHERE gibbonCourseClassPerson.gibbonPersonID=:gibbonPersonID1 AND atlEntry.gibbonPersonIDStudent=:gibbonPersonID2 AND gibbonSchoolYearID=:gibbonSchoolYearID AND completeDate<='".date('Y-m-d')."' AND gibbonCourseClass.reportable='Y' AND gibbonCourseClassPerson.reportable='Y' ORDER BY completeDate DESC, gibbonCourse.nameShort, gibbonCourseClass.nameShort";
- $resultATL = $connection2->prepare($sqlATL);
- $resultATL->execute($dataATL);
- } catch (PDOException $e) {
- $output .= "".$e->getMessage().'
';
- }
-
- if ($resultATL->rowCount() > 0) {
- $results = true;
- $output .= ''; - $output .= $rowYears['name']; - $output .= '
'; - $output .= "| "; - $output .= 'Assessment'; - $output .= ' | '; - $output .= ''; - $output .= ""; - $output .= __('Rubric'); - $output .= ' | '; - $output .= '|
|---|---|---|
| ';
- $output .= "".$rowATL['course'].' '.$rowATL['name'].' '; - $output .= ""; - if ($rowATL['completeDate'] != '') { - $output .= 'Marked on '.dateConvertBack($guid, $rowATL['completeDate']).' '; - } else { - $output .= 'Unmarked '; - } - $output .= ' '; - $output .= ' | ';
- if ($rowATL['gibbonRubricID'] == '') {
- $output .= ""; - $output .= __('N/A'); - $output .= ' | '; - } else { - $output .= "";
- $output .= " | ';
- }
-
- $output .= '
";
- $output .= __('There are no records to display.');
- $output .= '
';
- }
- }
-
- return $output;
-}
-
-function sidebarExtra($guid, $connection2, $gibbonCourseClassID, $mode = 'manage', $highestAction = '')
-{
- $output = '';
-
- $output .= '';
- $output .= '
';
-
- return $output;
-}
+.
+*/
+
+use Gibbon\Contracts\Database\Connection;
+use Gibbon\Contracts\Services\Session;
+use Gibbon\Domain\Rubrics\RubricGateway;
+use Gibbon\Forms\DatabaseFormFactory;
+use Gibbon\Forms\Form;
+use Gibbon\Module\ATL\Domain\ATLColumnGateway;
+use Gibbon\Module\ATL\Domain\ATLEntryGateway;
+use Gibbon\Module\Rubrics\Visualise;
+use Gibbon\Services\Format;
+use Gibbon\Tables\DataTable;
+
+
+function getATLRecord($gibbonPersonID)
+{
+ global $container, $session;
+
+ $output = '';
+
+ $atlEntryGateway = $container->get(ATLEntryGateway::class);
+ $criteria = $atlEntryGateway->newQueryCriteria(true)
+ ->sortBy('gibbonSchoolYear.sequenceNumber', 'DESC')
+ ->sortBy('completeDate', 'DESC')
+ ->sortBy(['courseName'])
+ ->fromPOST();
+
+ $atls = $atlEntryGateway->queryATLsByStudent($criteria, $gibbonPersonID);
+
+ $gibbonSchoolYearFilter = array_reduce($atls->toArray(), function ($group, $atl) {
+ $group['gibbonSchoolYearID' . $atl['gibbonSchoolYearID']] = __('School Year') . ': ' . $atl['yearName'];
+ return $group;
+ }, []);
+
+ $table = DataTable::createPaginated('atlView', $criteria);
+
+ $table->addMetaData('filterOptions', $gibbonSchoolYearFilter);
+
+ $table->addColumn('yearName', __('School Year'))
+ ->sortable('gibbonSchoolYear.sequenceNumber');
+
+ $table->addColumn('courseName', __('Course'));
+
+ $table->addColumn('assessment', __('Assessment'))
+ ->sortable('completeDate')
+ ->description(__('Marked on'))
+ ->format(function($atl) {
+ $output = '';
+
+ $output .= Format::tag($atl['ATLName'], '', $atl['ATLDescription']);
+ $output .= '';
+ if (empty($atl['completeDate'])) {
+ $output .= __('N/A');
+ } else {
+ $output .= Format::small(Format::dateReadable($atl['completeDate']));
+ }
+ return $output;
+ });
+
+ $table->addActionColumn()
+ ->addParam('gibbonCourseClassID')
+ ->addParam('atlColumnID')
+ ->addParam('gibbonRubricID')
+ ->addParam('gibbonPersonID', $gibbonPersonID)
+ ->format(function($atl, $actions) use ($session) {
+ $actions->addAction('enterData', __('View Rubric'))
+ ->addParam('type', 'effort')
+ ->modalWindow(1100, 500)
+ ->setURL('/modules/ATL/atl_view_rubric.php')
+ ->setIcon('markbook');
+ });
+
+
+ $output .= $table->render($atls);
+
+ return $output;
+}
+
+function sidebarExtra($gibbonCourseClassID, $mode = 'manage')
+{
+ global $pdo, $session;
+
+ $output = '';
+
+ $output .= ''; - $output .= __('View Classes'); - $output .= '
'; - - $selectCount = 0; - - global $pdo; - - $form = Form::create('classSelect', $_SESSION[$guid]['absoluteURL'].'/index.php', 'get'); - $form->setFactory(DatabaseFormFactory::create($pdo)); - $form->addHiddenValue('q', '/modules/'.$_SESSION[$guid]['module'].'/'.($mode == 'write'? 'atl_write.php' : 'atl_manage.php')); - $form->setClass('smallIntBorder w-full'); - - $row = $form->addRow(); - $row->addSelectClass('gibbonCourseClassID', $_SESSION[$guid]['gibbonSchoolYearID'], $_SESSION[$guid]['gibbonPersonID']) - ->selected($gibbonCourseClassID) - ->placeholder() - ->setClass('fullWidth'); - $row->addSubmit(__('Go')); - - $output .= $form->getOutput(); - $output .= '';
+ $output .= '
';
+
+ return $output;
+}
+
+function visualiseATL($container, $gibbonPersonID) {
+ $session = $container->get(Session::class);
+ $pdo = $container->get(Connection::class);
+
+ require_once $session->get('absolutePath').'/modules/ATL/src/Domain/ATLColumnGateway.php';
+
+ // Display the visualization of all ATLs
+ $contextDBTable = 'atlColumn';
+ $contextDBTableID = $gibbonPersonID;
+ $contextDBTableIDField = 'atlColumnID';
+ $contextDBTableGibbonRubricIDField = 'gibbonRubricID';
+ $contextDBTableNameField = 'name';
+ $contextDBTableDateField = 'completeDate';
+
+ $rubricGateway = $container->get(RubricGateway::class);
+ $studentRubricInfo = $container->get(ATLColumnGateway::class)->getATLRubricByStudent($session->get('gibbonSchoolYearID'), $gibbonPersonID);
+ $gibbonRubricID = $studentRubricInfo['gibbonRubricID'] ?? '';
+ $rubric = $rubricGateway->getByID($gibbonRubricID);
+
+ if ($gibbonRubricID && $rubric) {
+ // Get rows, columns and cells
+ $rows = $rubricGateway->selectRowsByRubric($gibbonRubricID)->fetchAll();
+ $columns = $rubricGateway->selectColumnsByRubric($gibbonRubricID)->fetchAll();
+ $gradeScales = $rubricGateway->selectGradeScalesByRubric($gibbonRubricID)->fetchGroupedUnique();
+
+ if (empty($rows) or empty($columns)) {
+ $col->addAlert(__('The rubric is missing data and cannot be drawn.'));
+ } else {
+ $cells = [];
+ $resultCells = $rubricGateway->selectCellsByRubric($gibbonRubricID);
+ while ($rowCells = $resultCells->fetch()) {
+ $cells[$rowCells['gibbonRubricRowID']][$rowCells['gibbonRubricColumnID']] = $rowCells;
+ }
+
+ // Get other uses of this rubric in this context, and store for use in visualisation
+ $contexts = [];
+
+ $dataContext = array('gibbonPersonID' => $gibbonPersonID, 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'));
+ $sqlContext = "SELECT gibbonRubricEntry.*, $contextDBTable.*, gibbonRubricEntry.*, gibbonRubricCell.*, gibbonCourse.nameShort AS course, gibbonCourseClass.nameShort AS class
+ FROM gibbonRubricEntry
+ JOIN $contextDBTable ON (gibbonRubricEntry.contextDBTableID=$contextDBTable.$contextDBTableIDField
+ AND gibbonRubricEntry.gibbonRubricID=$contextDBTable.$contextDBTableGibbonRubricIDField)
+ JOIN gibbonRubricCell ON (gibbonRubricEntry.gibbonRubricCellID=gibbonRubricCell.gibbonRubricCellID)
+ JOIN gibbonCourseClass ON ($contextDBTable.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID)
+ JOIN gibbonCourse ON (gibbonCourseClass.gibbonCourseID=gibbonCourse.gibbonCourseID)
+ WHERE contextDBTable='$contextDBTable'
+ AND gibbonRubricEntry.gibbonPersonID=:gibbonPersonID
+ AND gibbonSchoolYearID=:gibbonSchoolYearID
+ AND NOT $contextDBTableDateField IS NULL
+ ORDER BY $contextDBTableDateField DESC";
+ $resultContext = $pdo->select($sqlContext, $dataContext);
+
+ if ($resultContext->rowCount() > 0) {
+ while ($rowContext = $resultContext->fetch()) {
+ $context = $rowContext['course'].'.'.$rowContext['class'].' - '.$rowContext[$contextDBTableNameField].' ('.Format::date($rowContext[$contextDBTableDateField]).')';
+ $cells[$rowContext['gibbonRubricRowID']][$rowContext['gibbonRubricColumnID']]['context'][] = $context;
+
+ $contexts[] = [
+ 'gibbonRubricEntry' => $rowContext['gibbonRubricEntry'],
+ 'gibbonRubricID' => $rowContext['gibbonRubricID'],
+ 'gibbonPersonID' => $rowContext['gibbonPersonID'],
+ 'gibbonRubricCellID' => $rowContext['gibbonRubricCellID'],
+ 'contextDBTable' => $rowContext['contextDBTable'],
+ 'contextDBTableID' => $rowContext['contextDBTableID']
+ ];
+ }
+ }
+
+ }
+
+ if (!empty($contexts) && !empty($columns) && !empty($rows) && !empty($cells)) {
+ require_once $session->get('absolutePath').'/modules/Rubrics/src/Visualise.php';
+ $visualise = new Visualise($session->get('absoluteURL'), $container->get('page'), $gibbonPersonID.'All', $columns, $rows, $cells, $contexts);
+ return $visualise->renderVisualise();
+ }
+
+ return '';
+ }
+}
diff --git a/ATL/src/Domain/ATLColumnGateway.php b/ATL/src/Domain/ATLColumnGateway.php
index 566be22..e830758 100644
--- a/ATL/src/Domain/ATLColumnGateway.php
+++ b/ATL/src/Domain/ATLColumnGateway.php
@@ -1,24 +1,122 @@
-newQuery()
+ ->from($this->getTableName())
+ ->cols([
+ 'atlColumnID', 'gibbonCourseClassID', 'name', 'description', 'gibbonRubricID', 'complete', 'completeDate', 'gibbonPersonIDCreator', 'gibbonPersonIDLastEdit'
+ ])
+ ->where('atlColumn.gibbonCourseClassID = :gibbonCourseClassID')
+ ->bindValue('gibbonCourseClassID', $gibbonCourseClassID);
+
+ return $this->runQuery($query, $criteria);
+ }
+
+ /**
+ * @param QueryCriteria $criteria
+ * @return DataSet
+ */
+ public function queryATLColumnsByStudent(QueryCriteria $criteria, $gibbonSchoolYearID, $gibbonPersonID, $notComplete = false)
+ {
+ $query = $this
+ ->newQuery()
+ ->from($this->getTableName())
+ ->cols([
+ 'atlColumn.atlColumnID', 'atlColumn.gibbonRubricID', 'atlColumn.gibbonCourseClassID', 'atlEntry.atlEntryID', 'atlColumn.name', 'atlColumn.description', 'atlColumn.complete', 'atlColumn.completeDate', 'gibbonCourse.nameShort AS course', 'gibbonCourseClass.nameShort AS class', 'atlEntry.complete as entryComplete'
+ ])
+ ->leftJoin('atlEntry', 'atlColumn.atlColumnID=atlEntry.atlColumnID AND atlEntry.gibbonPersonIDStudent = :gibbonPersonID')
+ ->leftJoin('gibbonCourseClass', 'atlColumn.gibbonCourseClassID = gibbonCourseClass.gibbonCourseClassID')
+ ->leftJoin('gibbonCourseClassPerson', 'gibbonCourseClass.gibbonCourseClassID = gibbonCourseClassPerson.gibbonCourseClassID')
+ ->leftJoin('gibbonCourse', 'gibbonCourseClass.gibbonCourseID = gibbonCourse.gibbonCourseID')
+ ->where("atlColumn.forStudents = 'Y'")
+ ->where('atlColumn.completeDate >= :today')
+ ->where('gibbonCourseClassPerson.gibbonPersonID = :gibbonPersonID')
+ ->where("gibbonCourseClassPerson.role = 'Student'")
+ ->where('gibbonCourse.gibbonSchoolYearID = :gibbonSchoolYearID')
+ ->bindValue('today', date('Y-m-d'))
+ ->bindValue('gibbonPersonID', $gibbonPersonID)
+ ->bindValue('gibbonSchoolYearID', $gibbonSchoolYearID);
+
+ if ($notComplete) {
+ $query->where("(atlEntry.complete = 'N' OR atlEntry.complete IS NULL)");
+ }
+
+ return $this->runQuery($query, $criteria);
+ }
+
+ public function getATLRubricByStudent($gibbonSchoolYearID, $gibbonPersonID)
+ {
+ $data = array('gibbonSchoolYearID' => $gibbonSchoolYearID, 'gibbonPersonID' => $gibbonPersonID);
+ $sql = "SELECT
+ gibbonPerson.gibbonPersonID,
+ surname,
+ preferredName,
+ gibbonCourseClass.gibbonCourseClassID,
+ gibbonRubricID
+ FROM gibbonPerson
+ JOIN gibbonStudentEnrolment ON (gibbonPerson.gibbonPersonID=gibbonStudentEnrolment.gibbonPersonID)
+ JOIN gibbonFormGroup ON (gibbonStudentEnrolment.gibbonFormGroupID=gibbonFormGroup.gibbonFormGroupID)
+ JOIN gibbonCourseClassPerson ON (gibbonCourseClassPerson.gibbonPersonID=gibbonPerson.gibbonPersonID)
+ JOIN gibbonCourseClass ON (gibbonCourseClassPerson.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID)
+ JOIN gibbonCourse ON (gibbonCourse.gibbonCourseID=gibbonCourseClass.gibbonCourseID AND gibbonCourse.gibbonSchoolYearID=gibbonStudentEnrolment.gibbonSchoolYearID)
+ JOIN atlColumn ON (atlColumn.gibbonCourseClassID=gibbonCourseClass.gibbonCourseClassID)
+ WHERE status='Full'
+ AND gibbonStudentEnrolment.gibbonSchoolYearID=:gibbonSchoolYearID
+ AND gibbonPerson.gibbonPersonID=:gibbonPersonID
+ AND gibbonCourseClassPerson.role='Student'
+ ORDER BY surname, preferredName
+ LIMIT 0, 1";
+
+ return $this->db()->selectOne($sql, $data);
+ }
+
+ public function isForStudent($atlColumnID, $gibbonPersonID, $gibbonSchoolYearID) {
+ $select = $this
+ ->newSelect()
+ ->from($this->getTableName())
+ ->cols([
+ 'atlColumn.atlColumnID'
+ ])
+ ->leftJoin('gibbonCourseClass', 'atlColumn.gibbonCourseClassID = gibbonCourseClass.gibbonCourseClassID')
+ ->leftJoin('gibbonCourseClassPerson', 'gibbonCourseClass.gibbonCourseClassID = gibbonCourseClassPerson.gibbonCourseClassID')
+ ->leftJoin('gibbonCourse', 'gibbonCourseClass.gibbonCourseID = gibbonCourse.gibbonCourseID')
+ ->where('atlColumn.atlColumnID = :atlColumnID')
+ ->where("atlColumn.forStudents = 'Y'")
+ ->where('gibbonCourseClassPerson.gibbonPersonID = :gibbonPersonID')
+ ->where("gibbonCourseClassPerson.role = 'Student'")
+ ->where('gibbonCourse.gibbonSchoolYearID = :gibbonSchoolYearID')
+ ->bindValue('atlColumnID', $atlColumnID)
+ ->bindValue('gibbonPersonID', $gibbonPersonID)
+ ->bindValue('gibbonSchoolYearID', $gibbonSchoolYearID);
+
+ $result = $this->runSelect($select);
+ return $result->isNotEmpty();
+ }
+
+}
diff --git a/ATL/src/Domain/ATLEntryGateway.php b/ATL/src/Domain/ATLEntryGateway.php
new file mode 100644
index 0000000..533440c
--- /dev/null
+++ b/ATL/src/Domain/ATLEntryGateway.php
@@ -0,0 +1,73 @@
+newQuery()
+ ->from($this->getTableName())
+ ->cols([
+ 'gibbonSchoolYear.name as yearName', 'gibbonCourse.gibbonSchoolYearID', 'gibbonCourse.name as courseName', 'atlColumn.name as ATLName', 'atlColumn.description as ATLDescription', 'atlColumn.completeDate', 'atlColumn.gibbonRubricID', 'atlColumn.gibbonCourseClassID', 'atlColumn.atlColumnID'
+ ])
+ ->leftJoin('atlColumn', 'atlEntry.atlColumnID=atlColumn.atlColumnID')
+ ->leftJoin('gibbonCourseClass', 'atlColumn.gibbonCourseClassID = gibbonCourseClass.gibbonCourseClassID')
+ ->leftJoin('gibbonCourseClassPerson', 'gibbonCourseClass.gibbonCourseClassID = gibbonCourseClassPerson.gibbonCourseClassID AND atlEntry.gibbonPersonIDStudent = gibbonCourseClassPerson.gibbonPersonID')
+ ->leftJoin('gibbonCourse', 'gibbonCourseClass.gibbonCourseID = gibbonCourse.gibbonCourseID')
+ ->leftJoin('gibbonSchoolYear', 'gibbonCourse.gibbonSchoolYearID = gibbonSchoolYear.gibbonSchoolYearID')
+ ->where('atlEntry.gibbonPersonIDStudent = :gibbonPersonID')
+ ->where('completeDate <= :today')
+ ->where("gibbonCourseClass.reportable = 'Y'")
+ ->where("gibbonCourseClassPerson.reportable = 'Y'")
+ ->bindValue('gibbonPersonID', $gibbonPersonID)
+ ->bindValue('today', date('Y-m-d'));
+
+ $criteria->addFilterRules([
+ 'gibbonSchoolYearID' => function($query, $gibbonSchoolYearID) {
+ return $query->where('gibbonCourse.gibbonSchoolYearID = :gibbonSchoolYearID')
+ ->bindValue('gibbonSchoolYearID', $gibbonSchoolYearID);
+ }
+ ]);
+
+ return $this->runQuery($query, $criteria);
+ }
+
+ public function createATLEntries($atlColumnID, $gibbonCourseClassID, $gibbonPersonID) {
+ $data = ['atlColumnID' => $atlColumnID, 'gibbonCourseClassID' => $gibbonCourseClassID, 'gibbonPersonID' => $gibbonPersonID, 'today' => date('Y-m-d')];
+ $sql = "INSERT INTO atlEntry (atlColumnID, gibbonPersonIDStudent, complete, gibbonPersonIDLastEdit)
+ SELECT :atlColumnID as atlColumnID, gibbonPerson.gibbonPersonID, 'N' as complete, :gibbonPersonID as gibbonPersonIDLastEdit
+ FROM gibbonCourseClassPerson
+ INNER JOIN gibbonPerson ON (gibbonCourseClassPerson.gibbonPersonID = gibbonPerson.gibbonPersonID)
+ WHERE gibbonCourseClassPerson.gibbonCourseClassID=:gibbonCourseClassID
+ AND gibbonPerson.status='Full'
+ AND (dateStart IS NULL OR dateStart<=:today)
+ AND (dateEnd IS NULL OR dateEnd>=:today)
+ AND role = 'Student'
+ ";
+
+ return $this->db()->insert($sql, $data);
+ }
+
+}
diff --git a/ATL/version.php b/ATL/version.php
index db5a184..051b09b 100644
--- a/ATL/version.php
+++ b/ATL/version.php
@@ -1,24 +1,24 @@
-.
-*/
-
-/**
- * Sets version information.
- */
-$moduleVersion = '1.5.02';
-$coreVersion = '22.0.00';
+.
+*/
+
+/**
+ * Sets version information.
+ */
+$moduleVersion = '1.6.00';
+$coreVersion = '22.0.00';