Skip to content

Internal: Enhance tables and charts: spacing, alignment, titles, Excel export - refs BT#21957 #5792

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
Sep 11, 2024
Merged

Internal: Enhance tables and charts: spacing, alignment, titles, Excel export - refs BT#21957 #5792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/css/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,10 @@ form .field {
@apply w-full md:w-1/2 px-4;
}

.section-header__title {
@apply mt-4;
}

//@import 'primevue-md-light-indigo/theme.css';
//@import '~primevue/resources/primevue.min.css';
//@import '~primeflex/primeflex.css';
Expand Down
59 changes: 29 additions & 30 deletions public/main/admin/statistics/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,10 @@

$content .= $table->toHtml();

$content .= '<div class="row">';
$content .= '<div class="col-md-4"><h4 class="page-header" id="canvas1_title"></h4><div id="canvas1_table"></div></div>';
$content .= '<div class="col-md-4"><h4 class="page-header" id="canvas2_title"></h4><div id="canvas2_table"></div></div>';
$content .= '<div class="col-md-4"><h4 class="page-header" id="canvas3_title"></h4><div id="canvas3_table"></div></div>';
$content .= '<div class="grid grid-cols-3 gap-4">';
$content .= '<div><h4 class="text-center" id="canvas1_title"></h4><div id="canvas1_table"></div></div>';
$content .= '<div><h4 class="text-center" id="canvas2_title"></h4><div id="canvas2_table"></div></div>';
$content .= '<div><h4 class="text-center" id="canvas3_title"></h4><div id="canvas3_table"></div></div>';
$content .= '</div>';

$tableCourse = new HTML_Table(['class' => 'table table-responsive']);
Expand Down Expand Up @@ -518,15 +518,14 @@

$content .= $tableCourse->toHtml();

$content .= '<div class="row">';
$content .= '<div class="col-md-4"><canvas id="canvas1" style="margin-bottom: 20px"></canvas></div>';
$content .= '<div class="col-md-4"><canvas id="canvas2" style="margin-bottom: 20px"></canvas></div>';
$content .= '<div class="col-md-4"><canvas id="canvas3" style="margin-bottom: 20px"></canvas></div>';

$content .= '<div class="grid grid-cols-3 gap-4">';
$content .= '<div><canvas id="canvas1" class="mb-5"></canvas></div>';
$content .= '<div><canvas id="canvas2" class="mb-5"></canvas></div>';
$content .= '<div><canvas id="canvas3" class="mb-5"></canvas></div>';
$content .= '</div>';

$content .= '<div class="row">';
$content .= '<div class="col-md-12"><canvas id="canvas4" style="margin-bottom: 20px"></canvas></div>';
$content .= '<div class="grid grid-cols-1">';
$content .= '<div><canvas id="canvas4" class="mb-5"></canvas></div>';
$content .= '</div>';
}

Expand Down Expand Up @@ -720,24 +719,24 @@
$startDate = $values['daterange_start'];
$endDate = $values['daterange_end'];

$graph = '<div class="row">';
$graph .= '<div class="col-md-4"><canvas id="canvas1" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="col-md-4"><canvas id="canvas2" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="col-md-4"><canvas id="canvas3" style="margin-bottom: 20px"></canvas></div>';
$graph = '<div class="grid grid-cols-3 gap-4">';
$graph .= '<div><canvas id="canvas1" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '<div><canvas id="canvas2" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '<div><canvas id="canvas3" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '</div>';

$graph .= '<div class="row">';
$graph .= '<div class="col-md-6"><canvas id="canvas4" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="col-md-6"><canvas id="canvas8" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="grid grid-cols-2 gap-4">';
$graph .= '<div><canvas id="canvas4" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '<div><canvas id="canvas8" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '</div>';

$graph .= '<div class="row">';
$graph .= '<div class="col-md-6"><canvas id="canvas5" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="col-md-6"><canvas id="canvas6" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="grid grid-cols-2 gap-4">';
$graph .= '<div><canvas id="canvas5" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '<div><canvas id="canvas6" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '</div>';

$graph .= '<div class="row">';
$graph .= '<div class="col-md-6"><canvas id="canvas7" style="margin-bottom: 20px"></canvas></div>';
$graph .= '<div class="grid grid-cols-2 gap-4">';
$graph .= '<div><canvas id="canvas7" class="mb-5 mt-5 mx-auto"></canvas></div>';
$graph .= '</div>';

$conditions = [];
Expand Down Expand Up @@ -769,7 +768,7 @@

$table->actionButtons = [
'export' => [
'label' => get_lang('ExportAsXLS'),
'label' => get_lang('Export As XLS'),
'icon' => Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET,'ch-tool-icon'),
],
];
Expand Down Expand Up @@ -842,7 +841,7 @@

$userLanguage = '';
if (!empty($user['locale'])) {
$userLanguage = $languages[$user['locale']];
$userLanguage = $languages[$user['locale']] ?? 'en';
}

$languageTarget = '';
Expand Down Expand Up @@ -1447,12 +1446,12 @@
</div>';
break;
case 'users':
$content .= '<div class="row">';
$content .= '<div class="col-md-4"><canvas id="canvas1" style="margin-bottom: 20px"></canvas></div>';
$content .= '<div class="col-md-4"><canvas id="canvas2" style="margin-bottom: 20px"></canvas></div>';
$content .= '<div class="col-md-4"><canvas id="canvas3" style="margin-bottom: 20px"></canvas></div>';

$content .= '<div class="grid grid-cols-3 gap-4">';
$content .= '<div><canvas id="canvas1" class="mb-5"></canvas></div>';
$content .= '<div><canvas id="canvas2" class="mb-5"></canvas></div>';
$content .= '<div><canvas id="canvas3" class="mb-5"></canvas></div>';
$content .= '</div>';

// total amount of users
$teachers = $students = [];
$countInvisible = isset($_GET['count_invisible_courses']) ? intval($_GET['count_invisible_courses']) : null;
Expand Down
39 changes: 23 additions & 16 deletions public/main/inc/lib/sortable_table.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,21 +417,28 @@ class="form-search"
}
}
$html .= '<input type="hidden" name="action">';
$html .= '<div class="q-card p-2 mb-4 sortable-buttons-actions">';
$html .= '<div class="flex flex-row justify-between">';
$html .= '<div class="flex q-card p-2 mb-4 sortable-buttons-actions">';
$html .= '<div class="flex w-1/2 flex-wrap items-center justify-between">';

if (count($this->actionButtons) > 0) {
$html .= '<div class="btn-toolbar flex space-x-2">';
$html .= '<div class="btn-group">';

foreach ($this->actionButtons as $action => $data) {
$label = $data['label'];
$icon = $data['icon'];
$html .= '<a class="btn btn-default" href="?'.$params.'&action_table='.$action.'">'.$icon.'&nbsp;'.$label.'</a>';
}
$html .= '</div>';
$html .= '</div>';
}

if (count($this->form_actions) > 0) {
$html .= '<div class="flex flex-row justify-between" role="group">';
$html .= '<a
class="btn btn--action mr-2"
href="?'.$params.'&amp;'.$this->param_prefix.'selectall=1"
onclick="javascript: setCheckbox(true, \''.$table_id.'\'); return false;">'.
get_lang('Select all').'</a>';
$html .= '<a
class="btn btn--action mr-2"
href="?'.$params.'"
onclick="javascript: setCheckbox(false, \''.$table_id.'\'); return false;">'.
get_lang('Deselect all').'</a> ';
$html .= '<div class="flex space-x-2">';
$html .= '<a class="btn btn--action mr-2" href="?'.$params.'&amp;'.$this->param_prefix.'selectall=1" onclick="javascript: setCheckbox(true, \''.$table_id.'\'); return false;">'
.get_lang('Select all').'</a>';
$html .= '<a class="btn btn--action mr-2" href="?'.$params.'" onclick="javascript: setCheckbox(false, \''.$table_id.'\'); return false;">'
.get_lang('Deselect all').'</a>';

$items = [];
foreach ($this->form_actions as $action => $label) {
Expand All @@ -451,13 +458,13 @@ class="btn btn--action mr-2"

// Pagination
if ($this->get_total_number_of_items() > $this->default_items_per_page) {
$html .= '<div class="col-12 col-md-6">';
$html .= '<div class="flex justify-end mt-4 w-1/2">';
$html .= '<div class="page-nav pb-2 pt-2">'.$nav.'</div>';
$html .= '</div>';
}

$html .= '</div>'; //btn-group
$html .= '</div>';
$html .= '</div>'; // btn-group
$html .= '</div>'; // sortable-buttons-actions
if (count($this->form_actions) > 0) {
$html .= '</form>';
}
Expand Down
25 changes: 20 additions & 5 deletions public/main/inc/lib/statistics.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,12 +1223,19 @@ public static function getJSChartTemplate($url, $type = 'pie', $options = '', $e
url: "'.$url.'",
type: "POST",
success: function(data) {
Chart.defaults.responsive = true;
Chart.defaults.responsive = false;
var ctx = document.getElementById("'.$elementId.'").getContext("2d");
ctx.canvas.width = 420;
ctx.canvas.height = 420;
var chart = new Chart(ctx, {
type: "'.$type.'",
data: data,
options: {'.$options.'}
options: {
plugins: {
'.$options.'
},
cutout: "25%"
}
});
var title = chart.options.plugins.title.text;
$("#'.$elementId.'_title").html(title);
Expand All @@ -1251,13 +1258,21 @@ public static function getJSChartTemplateWithData($data, $type = 'pie', $options
$(function() {
Chart.defaults.responsive = '.$responsiveValue.';
var ctx = document.getElementById("'.$elementId.'").getContext("2d");
ctx.canvas.width = 400;
ctx.canvas.height = 400;
ctx.canvas.width = 420;
ctx.canvas.height = 420;
var chart = new Chart(ctx, {
type: "'.$type.'",
data: '.$data.',
options: {'.$options.'}
options: {
plugins: {
'.$options.'
},
cutout: "25%"
}
});
var title = chart.options.plugins.title.text;
$("#'.$elementId.'_title").html(title);
$("#'.$elementId.'_table").html(chart.data.datasets[0].data);
});
</script>';

Expand Down