Skip to content

Admin: Fix resource sequencing, course tab + selection/save behavior - refs BT#22586 #6271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

Admin: Fix resource sequencing, course tab + selection/save behavior - refs BT#22586 #6271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 29 additions & 15 deletions public/main/admin/resource_sequence.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
$httpRequest = HttpRequest::createFromGlobals();

// setting breadcrumbs
$interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')];
$interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('Platform Admin')];

$type = $httpRequest->query->has('type')
? $httpRequest->query->getInt('type', SequenceResource::SESSION_TYPE)
: $httpRequest->request->getInt('type', SequenceResource::SESSION_TYPE);

$tpl = new Template(get_lang('ResourcesSequencing'));
$tpl = new Template(get_lang('Resources Sequencing'));
$em = Database::getManager();
$sequenceRepository = $em->getRepository(Sequence::class);

Expand All @@ -33,7 +33,7 @@
$formSequence = new FormValidator('sequence_form', 'post', $currentUrl, null, null, FormValidator::LAYOUT_INLINE);
$formSequence->addText('name', get_lang('Sequence'), true, ['cols-size' => [3, 8, 1]]);
$formSequence->applyFilter('name', 'html_filter');
$formSequence->addButtonCreate(get_lang('AddSequence'), 'submit_sequence', false, ['cols-size' => [3, 8, 1]]);
$formSequence->addButtonCreate(get_lang('Add sequence'), 'submit_sequence', false, ['cols-size' => [3, 8, 1]]);

$em = Database::getManager();

Expand All @@ -51,12 +51,18 @@

$selectSequence = new FormValidator('frm_select_delete', 'post', $currentUrl);
$sequenceList = $sequenceRepository->findAllToSelect($type);
$currentSequenceName = '';
$selectedSequenceId = $selectSequence->getSubmitValue('sequence');

if (!empty($selectedSequenceId) && isset($sequenceList[$selectedSequenceId])) {
$currentSequenceName = $sequenceList[$selectedSequenceId];
}

$sequenceElement = $selectSequence->addSelect(
'sequence',
get_lang('Sequence'),
$sequenceList,
['id' => 'sequence_id', 'cols-size' => [3, 7, 2], 'disabled' => 'disabled']
['id' => 'sequence_id', 'cols-size' => [3, 7, 2]]
);

if (!empty($sequenceList)) {
Expand Down Expand Up @@ -88,45 +94,51 @@
}

$form = new FormValidator('');
$form->addHtml("<div class='col-md-6'>");

$form->addHidden('sequence_type', $type);
$form->addHtml('<div class="flex flex-col lg:flex-row gap-4 items-end">');

$form->addHtml('<div class="w-full lg:w-1/2">');
$form->addSelect(
'sessions',
$label,
$list,
['id' => 'item', 'cols-size' => [4, 7, 1], 'disabled' => 'disabled']
['id' => 'item', 'class' => 'w-full']
);
$form->addButtonNext(
get_lang('UseAsReference'),
get_lang('Use as reference'),
'use_as_reference',
['cols-size' => [4, 7, 1], 'disabled' => 'disabled']
['class' => 'mt-2']
);
$form->addHtml("</div>");
$form->addHtml("<div class='col-md-6'>");
$form->addHtml('</div>');

$form->addHtml('<div class="w-full lg:w-1/2">');
$form->addSelect(
'requirements',
get_lang('Requirements'),
$list,
['id' => 'requirements', 'cols-size' => [3, 7, 2], 'disabled' => 'disabled']
['id' => 'requirements', 'class' => 'w-full']
);

$form->addButtonCreate(
get_lang('SetAsRequirement'),
get_lang('Set as requirement'),
'set_requirement',
false,
['cols-size' => [3, 7, 2], 'disabled' => 'disabled']
['class' => 'mt-2']
);
$form->addHtml('</div>');

$form->addHtml('</div>');

$formSave = new FormValidator('');
$formSave->addButton(
'save_resource',
get_lang('SaveSettings'),
get_lang('Save settings'),
'floppy-o',
'success',
null,
null,
['cols-size' => [1, 10, 1], 'disabled' => 'disabled']
['cols-size' => [1, 10, 1]]
);

$headers[] = [
Expand All @@ -147,5 +159,7 @@
$tpl->assign('save_sequence', $formSave->returnForm());
$tpl->assign('sequence_type', $type);
$tpl->assign('tabs', $tabs);
$tpl->assign('_p', ['web_ajax' => api_get_path(WEB_AJAX_PATH)]);
$tpl->assign('current_sequence_name', $currentSequenceName);
$layout = $tpl->get_template('admin/resource_sequence.tpl');
$tpl->display($layout);
57 changes: 37 additions & 20 deletions public/main/inc/ajax/sequence.ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
$graphImage = $graphviz->createImageSrc($graph);
echo Display::img(
$graphImage,
get_lang('GraphDependencyTree'),
get_lang('Graph Dependency Tree'),
['class' => 'center-block'],
false
);
Expand All @@ -58,7 +58,7 @@
.' because GraphViz command "dot" could not be executed '
.'- Make sure graphviz is installed.'
);
echo '<p class="text-center"><small>'.get_lang('MissingChartLibraryPleaseCheckLog')
echo '<p class="text-center"><small>'.get_lang('Missing chart library please checkLog')
.'</small></p>';
}
}
Expand All @@ -69,14 +69,11 @@
api_protect_admin_script();

$showDelete = isset($_REQUEST['show_delete']) ? $_REQUEST['show_delete'] : false;
$image = Display::getMdiIcon('notebook', 'ch-tool-icon', null, ICON_SIZE_LARGE);

if (empty($id)) {
exit;
}

$link = '';
$linkDelete = $linkUndo = '';
$resourceName = '';
switch ($type) {
case SequenceResource::SESSION_TYPE:
Expand All @@ -97,42 +94,40 @@
exit;
}

$linkDelete = '';
$linkUndo = '';
if (!empty($resourceData) && $showDelete) {
$linkDelete = Display::toolbarButton(
$linkDelete = Display::tag(
'button',
get_lang('Delete'),
'#',
'delete',
'default',
[
'class' => 'delete_vertex btn btn-block btn-xs',
'class' => 'delete_vertex text-xs text-red-600 hover:underline',
'data-id' => $id,
]
);

$linkUndo = Display::toolbarButton(
$linkUndo = Display::tag(
'button',
get_lang('Undo'),
'#',
'undo',
'default',
[
'class' => 'undo_delete btn btn-block btn-xs',
'style' => 'display: none;',
'class' => 'undo_delete text-xs text-blue-600 hover:underline hidden',
'data-id' => $id,
]
);
}

$image = Display::getMdiIcon('notebook', 'text-blue-500', null, ICON_SIZE_LARGE);

$link = '<div class="parent" data-id="'.$id.'">';
$link .= '<div class="big-icon">';
$link .= '<div class="bg-yellow-100 border border-yellow-300 rounded-lg p-4 shadow-sm flex flex-col items-center justify-center space-y-2 text-center">';
$link .= $image;
$link .= '<div class="sequence-course">'.$resourceName.'</div>';
$link .= Display::tag(
'button',
$resourceName,
[
'class' => 'sequence-id',
'title' => get_lang('UseAsReference'),
'class' => 'sequence-id text-gray-800 font-semibold text-sm hover:underline',
'type' => 'button',
'title' => get_lang('UseAsReference'),
]
);
$link .= $linkDelete;
Expand Down Expand Up @@ -453,4 +448,26 @@
$view->display($template);

break;
case 'get_initial_resource':
api_block_anonymous_users();
api_protect_admin_script();

/** @var Sequence $sequence */
$sequence = $sequenceRepository->find($sequenceId);

if (null === $sequence || !$sequence->hasGraph()) {
exit;
}

$graph = $sequence->getUnSerializeGraph();

foreach ($graph->getVertices() as $vertex) {
$vertexId = $vertex->getId();
if (!empty($vertexId)) {
echo (int) $vertexId;
exit;
}
}

exit;
}
Loading
Loading