Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,10 @@ var/*

# Ignore node_modules folder
node_modules

# Ignore testing modules
/modules/Courses and Classes
/modules/AccessAPI
/modules/BigBlueButton
/modules/Data Admin

9 changes: 3 additions & 6 deletions modules/Planner/planner_add.php
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,9 @@
$row->addLabel('timeEnd', __('End Time'))->description(__("Format: hh:mm (24hr)"));
$row->addTime('timeEnd')->setValue($nextTimeEnd)->required();

if (empty($gibbonTTDayRowClassID)) {
$row = $form->addRow();
$row->addLabel('gibbonSpaceID', __('Location'));
$row->addSelectSpace('gibbonSpaceID')
->placeholder();
}
$row = $form->addRow();
$row->addLabel('gibbonSpaceID', __('Location'))->description(__('Override for timetable location'));
$row->addSelectSpace('gibbonSpaceID')->placeholder();

$form->addRow()->addHeading('Lesson Content', __('Lesson Content'));

Expand Down
10 changes: 3 additions & 7 deletions modules/Planner/planner_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,9 @@
$row->addLabel('timeEnd', __('End Time'));
$row->addTime('timeEnd')->required();

if (empty($values['gibbonTTDayRowClassID'])) {
$row = $form->addRow();
$row->addLabel('gibbonSpaceID', __('Location'));
$row->addSelectSpace('gibbonSpaceID')
->placeholder();
}

$row = $form->addRow();
$row->addLabel('gibbonSpaceID', __('Location'))->description(__('Override for timetable location'));
$row->addSelectSpace('gibbonSpaceID')->placeholder();

//LESSON
$form->addRow()->addHeading('Lesson Content', __('Lesson Content'));
Expand Down
57 changes: 57 additions & 0 deletions modules/Planner/planner_import.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php
/**
* Planner Import UI
*/
require_once __DIR__ . '/moduleFunctions.php';

use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

// Use planner_edit permission as the guard so import follows edit access
if (isActionAccessible($guid, $connection2, '/modules/Planner/planner_edit.php') == false) {
$page->addError(__('You do not have access to this action.'));
return;
}

$page->breadcrumbs
->add(__('Planner'), 'planner.php')
->add(__('Bulk Import Lessons'));

// Display any import messages or errors stored in session BEFORE the form
$importErrors = $_SESSION['planner_import_errors'] ?? null;
if (!empty($importErrors) && is_array($importErrors)) {
foreach ($importErrors as $err) {
$page->addError($err);
}
unset($_SESSION['planner_import_errors']);
}

$importMsg = $_SESSION['planner_import_message'] ?? null;
if (!empty($importMsg)) {
$page->addSuccess($importMsg);
unset($_SESSION['planner_import_message']);
}

$form = Form::create('plannerImport', $session->get('absoluteURL').'/index.php?q=/modules/Planner/planner_importProcess.php');
$form->setClass('w-full max-w-3xl');
$form->setFactory(DatabaseFormFactory::create($pdo));

$form->addHeaderAction('download', __('Download Template'))
->setIcon('download')
->setURL('/modules/Planner/planner_import_export.php')
->addParam('action', 'downloadTemplate')
->directLink()
->displayLabel();

$form->addRow()->addHeading(__('Import Lessons from CSV'));

$row = $form->addRow();
$row->addLabel('file', __('Upload CSV'))->description(__('Select the CSV file containing lesson data to import.'));
$row->addFileUpload('file')->required();

$row = $form->addRow();
$row->addFooter();
$row->addSubmit(__('Import'));

echo $form->getOutput();

Loading
Loading