replaces the icons images with actual icons from the fontawesome6 library

This commit is contained in:
SimonGschnell
2024-04-29 11:34:18 +02:00
parent ffe4fcb0b3
commit 8cf63f3b76
11 changed files with 162 additions and 247 deletions
@@ -167,17 +167,17 @@ $this->load->view(
data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i>
</button>
<button id="show-approved" class="btn btn-outline-secondary btn-lehrauftrag" type="button"
data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>">
</button><!-- png img set in javascript -->
data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i>
</button>
<button id="show-accepted" class="btn btn-outline-secondary btn-lehrauftrag" type="button"
data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i>
data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i>
</button>
</div>
<button id="show-cancelled" class="btn btn-outline-secondary btn-lehrauftrag" type="button" style="margin-left: 20px;"
data-bs-toggle="collapse" data-placement="left" title="<?php echo $this->p->t('ui', 'nurStornierteAnzeigen'); ?>"
data-bs-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample">
</button><!-- png img set in javascript -->
data-bs-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample"><i class="fa fa-user-xmark"></i>
</button>
</div>
</div>
@@ -26,8 +26,8 @@
<table class="table table-bordered">
<tr class="text-center">
<td class="col-1"><i class='fa fa-users'></i></td>
<td class="col-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
<td class="col-1"><i class='fa fa-handshake-o'></i></td>
<td class="col-1"><i class='fa fa-user-check'></i></td>
<td class="col-1"><i class='fa-regular fa-handshake'></i></td>
</tr>
<tr class="text-center">
<td><?php echo $this->p->t('lehre', 'filterAlleBeiAnnahme'); ?></td>
@@ -7,7 +7,7 @@ $this->load->view(
'jqueryui1' => true,
'jquerycheckboxes1' => true,
'bootstrap3' => true,
'fontawesome4' => true,
'fontawesome6' => true,
'sbadmintemplate3' => true,
'tabulator5' => true,
'tabulator5JQuery' => true,
@@ -190,12 +190,12 @@ $this->load->view(
<div class="btn-group" role="group">
<button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
<button id="show-new" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
<button id="show-ordered" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"></button><!-- png img set in javascript -->
<button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"></button><!-- png img set in javascript -->
<button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i></button>
<button id="show-ordered" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button>
<button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button>
<button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
</div>
<div class="btn-group" role="group" style="margin-left: 20px;">
<button id="show-changed" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"></button><!-- png img set in javascript -->
<button id="show-changed" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-pen'></i></button>
</div>
<div class="btn-group" role="group" style="margin-left: 20px;">
<button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
@@ -2,11 +2,11 @@
<div class="panel panel-body">
<table>
<tr class="text-center">
<td><img src="../../../public/images/icons/fa-user-tag.png" style="height: 60px; width: 60px;"></td>
<td><i class='fa fa-2x fa-user-tag'></i></td>
<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
<td><img src="../../../public/images/icons/fa-user-check.png" style="height: 60px; width: 60px;"></td>
<td><i class='fa fa-2x fa-user-check'></i></td>
<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
<td><i class='fa fa-2x fa-handshake-o'></i></td>
<td><i class='fa-regular fa-2x fa-handshake'></i></td>
</tr>
<tr class="text-center">
<td class="text-muted"><?php echo $this->p->t('lehre', 'lehrauftragStandardBestellprozessBestellen'); ?></td>
@@ -48,10 +48,10 @@
<tr class="text-center">
<td class="col-xs-1"><i class='fa fa-users'></i></td>
<td class="col-xs-1"><i class='fa fa-user-plus'></i></td>
<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px;"></td>
<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
<td class="col-xs-1"><i class='fa fa-handshake-o'></i></td>
<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px;"></td>
<td class="col-xs-1"><i class='fa fa-user-tag'></i></td>
<td class="col-xs-1"><i class='fa fa-user-check'></i></td>
<td class="col-xs-1"><i class='fa-regular fa-handshake'></i></td>
<td class="col-xs-1"><i class='fa fa-user-pen'></i></td>
<td class="col-xs-1"><i class='fa fa-user-secret'></i></td>
</tr>
@@ -7,7 +7,7 @@ $this->load->view(
'jqueryui1' => true,
'jquerycheckboxes1' => true,
'bootstrap3' => true,
'fontawesome4' => true,
'fontawesome6' => true,
'sbadmintemplate3' => true,
'tabulator5' => true,
'tabulator5JQuery' => true,
@@ -188,12 +188,12 @@ $this->load->view(
<div class="btn-group" role="group">
<button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
<button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
<button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"></button><!-- png img set in javascript -->
<button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"></button><!-- png img set in javascript -->
<button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i></button>
<button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button><!-- png img set in javascript -->
<button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button><!-- png img set in javascript -->
<button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
</div>
<div class="btn-group" role="group" style="margin-left: 20px;">
<button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"></button><!-- png img set in javascript -->
<button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-edit'></i></button></button><!-- png img set in javascript -->
</div>
<div class="btn-group" role="group" style="margin-left: 20px;">
<button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
@@ -2,11 +2,11 @@
<div class="panel panel-body">
<table>
<tr class="text-center">
<td><img src="../../../public/images/icons/fa-user-tag.png" style="height: 60px; width: 60px;"></td>
<td><i class='fa fa-2x fa-user-tag'></i></td>
<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
<td><img src="../../../public/images/icons/fa-user-check.png" style="height: 60px; width: 60px;"></td>
<td><i class='fa fa-2x fa-user-check'></i></td>
<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
<td><i class='fa fa-2x fa-handshake-o'></i></td>
<td><i class='fa-regular fa-2x fa-handshake'></i></td>
</tr>
<tr class="text-center">
<td><b><?php echo $this->p->t('lehre', 'lehrauftragStandardBestellprozessBestellen'); ?></b></td>
@@ -50,10 +50,10 @@
<tr class="text-center">
<td class="col-xs-1"><i class='fa fa-users'></i></td>
<td class="col-xs-1"><i class='fa fa-user-plus'></i></td>
<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px;"></td>
<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
<td class="col-xs-1"><i class='fa fa-handshake-o'></i></td>
<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px;"></td>
<td class="col-xs-1"><i class='fa fa-user-tag'></i></td>
<td class="col-xs-1"><i class='fa fa-user-check'></i></td>
<td class="col-xs-1"><i class='fa-regular fa-handshake'></i></td>
<td class="col-xs-1"><i class='fa fa-user-pen'></i></td>
<td class="col-xs-1"><i class='fa fa-user-secret'></i></td>
</tr>
+108 -91
View File
@@ -1,128 +1,145 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
if (!defined('BASEPATH'))
exit('No direct script access allowed');
// Defines the includes variables
require('FHC-Common.php');
// Defines the includes variables
require ('FHC-Common.php');
// All the following variables are used only in this view
// By default set the parameters to null
$title = isset($title) ? $title : null;
$refresh = isset($refresh) ? $refresh : null;
$customCSSs = isset($customCSSs) ? $customCSSs : null;
// All the following variables are used only in this view
// By default set the parameters to null
$title = isset($title) ? $title : null;
$refresh = isset($refresh) ? $refresh : null;
$customCSSs = isset($customCSSs) ? $customCSSs : null;
?>
<!-- Header start -->
<!DOCTYPE HTML>
<html>
<head>
<title><?php printPageTitle($title); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<head>
<title><?php printPageTitle($title); ?></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php printRefreshMeta($refresh); ?>
<meta charset="UTF-8">
<?php
// --------------------------------------------------------------------------------------------------------
// CSS
<?php printRefreshMeta($refresh); ?>
// --------------------------------------------------------------------------------------------------------
// From vendor folder
<?php
// --------------------------------------------------------------------------------------------------------
// CSS
// --------------------------------------------------------------------------------------------------------
// From vendor folder
// Securimage CSS
if ($captcha3 === true)
generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
// Securimage CSS
if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
// Font Awesome 4 CSS free icons
if ($fontawesome4 === true)
generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css');
// Font Awesome 4 CSS free icons
if ($fontawesome4 === true) generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css');
// Font Awesome 6 CSS free icons
if ($fontawesome6 === true) {
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/regular.min.css');
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
}
// Font Awesome 6 CSS free icons
if ($fontawesome6 === true)
{
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
}
// jQuery UI CSS
if ($jqueryui1 === true)
generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
// jQuery UI CSS
if ($jqueryui1 === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
// jQuery treetable
if ($jquerytreetable3 === true)
generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
// jQuery treetable
if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
// Bootstrap 3 CSS
if ($bootstrap3 === true)
generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css');
// Bootstrap 3 CSS
if ($bootstrap3 === true) generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css');
// Bootstrap 5 CSS
if ($bootstrap5 === true)
generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css');
// Bootstrap 5 CSS
if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css');
// PivotUI CSS
if ($pivotui2 === true)
generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
// PivotUI CSS
if ($pivotui2 === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
// SB Admin 2 template CSS
if ($sbadmintemplate3 === true) {
generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
}
// SB Admin 2 template CSS
if ($sbadmintemplate3 === true)
{
generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
}
// Table sorter CSS
if ($tablesorter2 === true)
generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
// Table sorter CSS
if ($tablesorter2 === true) generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
// Tabulator 4 CSS
if ($tabulator4 === true) {
generateCSSsInclude('vendor/olifolkerd/tabulator4/dist/css/bootstrap/tabulator_bootstrap.min.css');
generateCSSsInclude('public/css/Tabulator.css');
}
// Tabulator 4 CSS
if ($tabulator4 === true)
{
generateCSSsInclude('vendor/olifolkerd/tabulator4/dist/css/bootstrap/tabulator_bootstrap.min.css');
generateCSSsInclude('public/css/Tabulator.css');
}
// Tabulator 5 CSS
if ($tabulator5 === true)
generateCSSsInclude('public/css/Tabulator5.css');
// Tabulator 5 CSS
if ($tabulator5 === true) generateCSSsInclude('public/css/Tabulator5.css');
// Tinymce 5 CSS
if ($tinymce5 === true)
generateCSSsInclude('public/css/TinyMCE5.css');
// Tinymce 5 CSS
if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
// PrimeVUE
if ($primevue3 === true) {
generateCSSsInclude('vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css');
generateCSSsInclude('vendor/npm-asset/primevue/resources/primevue.min.css');
// generateCSSsInclude('vendor/npm-asset/primevue/resources/primeflex.min.css');
generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
}
// PrimeVUE
if ($primevue3 === true)
{
generateCSSsInclude('vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css');
generateCSSsInclude('vendor/npm-asset/primevue/resources/primevue.min.css');
// generateCSSsInclude('vendor/npm-asset/primevue/resources/primeflex.min.css');
generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
}
// --------------------------------------------------------------------------------------------------------
// From public folder
// AjaxLib CSS
if ($ajaxlib === true)
generateCSSsInclude('public/css/AjaxLib.css');
// --------------------------------------------------------------------------------------------------------
// From public folder
// DialogLib CSS
if ($dialoglib === true)
generateCSSsInclude('public/css/DialogLib.css');
// AjaxLib CSS
if ($ajaxlib === true) generateCSSsInclude('public/css/AjaxLib.css');
// VUE FilterWidget CSS
if ($filtercomponent === true)
generateCSSsInclude('public/css/components/FilterComponent.css');
// DialogLib CSS
if ($dialoglib === true) generateCSSsInclude('public/css/DialogLib.css');
// FilterWidget CSS
if ($filterwidget === true)
generateCSSsInclude('public/css/FilterWidget.css');
// VUE FilterWidget CSS
if ($filtercomponent === true) generateCSSsInclude('public/css/components/FilterComponent.css');
// VUE NavigationWidget CSS
if ($navigationcomponent === true)
generateCSSsInclude('public/css/components/NavigationComponent.css');
// FilterWidget CSS
if ($filterwidget === true) generateCSSsInclude('public/css/FilterWidget.css');
// NavigationWidget CSS
if ($navigationwidget === true)
generateCSSsInclude('public/css/NavigationWidget.css');
// VUE NavigationWidget CSS
if ($navigationcomponent === true) generateCSSsInclude('public/css/components/NavigationComponent.css');
// HTML Widget CSS
if ($widgets === true)
generateCSSsInclude('public/css/Widgets.css');
// NavigationWidget CSS
if ($navigationwidget === true) generateCSSsInclude('public/css/NavigationWidget.css');
// CIS
if ($cis === true)
generateCSSsInclude('public/css/cis_bs5.css');
// HTML Widget CSS
if ($widgets === true) generateCSSsInclude('public/css/Widgets.css');
// Eventually required CSS
generateCSSsInclude($customCSSs); // Eventually required CSS
?>
</head>
// CIS
if ($cis === true) generateCSSsInclude('public/css/cis_bs5.css');
// Eventually required CSS
generateCSSsInclude($customCSSs); // Eventually required CSS
?>
</head>
<body>
<!-- Header end -->
<body>
<!-- Header end -->
+3 -4
View File
@@ -39,10 +39,9 @@
z-index: 999999;
}
/* classes for rows that are not selectable in the tabulator */
.tabulator-row.tabulator-unselectable{
color:var(--bs-gray-500);
/* classes for rows that are not selectable in the tabulator, except for rows that are used for calculation */
.tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
color: #adb5bd !important;
}
/* using bootstrap background classes to style the background color of tabulator rows */
@@ -9,26 +9,11 @@
// -----------------------------------------------------------------------------------------------------------------
const APP_ROOT = FHC_JS_DATA_STORAGE_OBJECT.app_root;
const COLOR_LIGHTGREY = "#f5f5f5";
const TABLE_CANCELLED_LEHRAUFTRAG =
"[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator";
const TABLE_ACCEPT_LEHRAUFTRAG =
"[tableuniqueid = acceptLehrauftrag] #tableWidgetTabulator";
/**
* PNG icons used in status- and filter buttons
* Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
* */
const ICON_LEHRAUFTRAG_ORDERED =
'<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_APPROVED =
'<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_CHANGED =
'<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_CANCELLED =
'<img src="../../../public/images/icons/fa-user-times.png" style="height: 30px; width: 30px; margin: -6px;">';
// Fields that should not be provided in the column picker
var tableWidgetBlacklistArray_columnUnselectable = [
"status",
@@ -183,10 +168,10 @@ function func_tableBuilt(table) {
// Add status column to table
table.addColumn(
{
title: "<i class='fa fa-user-o'></i>",
title: "<i class='fa fa-user'></i>",
field: "status",
width: 40,
align: "center",
hozAlign: "center",
downloadTitle: "Status",
formatter: status_formatter,
tooltip: status_tooltip,
@@ -313,13 +298,12 @@ status_formatter = function (cell, formatterParams, onRendered) {
// commented icons would be so nice to have with fontawsome 5.11...
if (bestellt != null && isNaN(vertrag_betrag)) {
return "<i class='fas fa-user-minus'></i>"; // kein Vertrag
return "<i class='fa fa-user-minus'></i>"; // kein Vertrag
} else if (
(bestellt != null && betrag != vertrag_betrag) ||
(bestellt != null && stunden != vertrag_stunden)
) {
return ICON_LEHRAUFTRAG_CHANGED; // geaendert
// return "<i class='fas fa-user-edit'></i>";
return "<i class='fa fa-user-pen'></i>";
} else if (
bestellt == null &&
erteilt == null &&
@@ -328,16 +312,13 @@ status_formatter = function (cell, formatterParams, onRendered) {
) {
return "<i class='fa fa-user-plus'></i>"; // neu
} else if (bestellt != null && erteilt == null && akzeptiert == null) {
return ICON_LEHRAUFTRAG_ORDERED; // bestellt
// return "<i class='fa fa-user-tag'></i>";
return "<i class='fa fa-user-tag'></i>";
} else if (bestellt != null && erteilt != null && akzeptiert == null) {
return ICON_LEHRAUFTRAG_APPROVED; // erteilt
// return "<i class='fas fa-user-check'></i>";
return "<i class='fa fa-user-check'></i>";
} else if (bestellt != null && erteilt != null && akzeptiert != null) {
return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
// return "<i class='fas fa-user-graduate'></i>";
return "<i class='fa-regular fa-handshake'></i>"; // akzeptiert
} else if (is_storniert) {
return ICON_LEHRAUFTRAG_CANCELLED; // storniert
return "<i class='fa-solid fa-user-xmark'></i>"; // storniert
} else {
return "<i class='fa fa-user'></i>"; // default
}
@@ -548,21 +529,6 @@ $(function () {
]);
});
// Set png-icons into filter-buttons
$(".btn-lehrauftrag").each(function () {
switch (this.id) {
case "show-ordered":
this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
break;
case "show-approved":
this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
break;
case "show-cancelled":
this.innerHTML = ICON_LEHRAUFTRAG_CANCELLED;
break;
}
});
// De/activate and un/focus on clicked button
$(".btn-lehrauftrag").click(function () {
// De/activate and un/focus on clicked button
@@ -8,19 +8,6 @@
// Global vars
// -----------------------------------------------------------------------------------------------------------------
const COLOR_LIGHTGREY = "#f5f5f5";
/**
* PNG icons used in status- and filter buttons
* Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
* */
const ICON_LEHRAUFTRAG_ORDERED =
'<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_APPROVED =
'<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_CHANGED =
'<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
// Fields that should not be provided in the column picker
var tableWidgetBlacklistArray_columnUnselectable = [
"status",
@@ -179,8 +166,6 @@ function func_rowFormatter(row) {
cell.getElement().classList.add("bg-success"); // akzeptiert
}
// default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
// row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
});
}
@@ -227,10 +212,10 @@ function func_tableBuilt(table) {
table.tabulator(
"addColumn",
{
title: "<i class='fa fa-user-o'></i>",
title: "<i class='fa fa-user'></i>",
field: "status",
width: 40,
align: "center",
hozAlign: "center",
downloadTitle: "Status",
formatter: status_formatter,
tooltip: status_tooltip,
@@ -368,19 +353,15 @@ status_formatter = function (cell, formatterParams, onRendered) {
(bestellt != null && stunden != vertrag_stunden)
) {
// geaendert ((if betrag is 0 or null)
return ICON_LEHRAUFTRAG_CHANGED; // geaendert
// return "<i class='fas fa-user-edit'></i>";
return "<i class='fas fa-user-pen'></i>";
} else if (bestellt == null && erteilt == null && akzeptiert == null) {
return "<i class='fa fa-user-plus'></i>"; // neu
} else if (bestellt != null && erteilt == null && akzeptiert == null) {
return ICON_LEHRAUFTRAG_ORDERED; // bestellt
// return "<i class='fa fa-user-tag'></i>";
return "<i class='fa fa-user-tag'></i>";
} else if (bestellt != null && erteilt != null && akzeptiert == null) {
return ICON_LEHRAUFTRAG_APPROVED; // erteilt
// return "<i class='fas fa-user-check'></i>";
return "<i class='fa fa-user-check'></i>";
} else if (bestellt != null && erteilt != null && akzeptiert != null) {
return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
// return "<i class='fas fa-user-graduate'></i>";
return "<i class='fa-regular fa-handshake'></i>"; // akzeptiert
} else {
return "<i class='fa fa-user'></i>"; // default
}
@@ -576,21 +557,6 @@ $(function () {
]);
});
// Set png-icons into filter-buttons
$(".btn-lehrauftrag").each(function () {
switch (this.id) {
case "show-ordered":
this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
break;
case "show-approved":
this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
break;
case "show-changed":
this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
break;
}
});
// De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag erteilen'
$(".btn-lehrauftrag").click(function () {
// De/activate and un/focus on clicked button
@@ -8,19 +8,6 @@
// Global vars
// -----------------------------------------------------------------------------------------------------------------
const COLOR_LIGHTGREY = "#f5f5f5";
/**
* PNG icons used in status- and filter buttons
* Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
* */
const ICON_LEHRAUFTRAG_ORDERED =
'<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_APPROVED =
'<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
const ICON_LEHRAUFTRAG_CHANGED =
'<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
// Fields that should not be provided in the column picker
var tableWidgetBlacklistArray_columnUnselectable = [
"status",
@@ -192,8 +179,6 @@ function func_rowFormatter(row) {
row.getCells().forEach(function (cell) {
if (is_dummy) {
cell.getElement().classList.add("bg-info"); // dummy lectors
} else if ((!is_mitarbeiter || !has_stunden) && akzeptiert == null) {
row.getElement().style["background-color"] = COLOR_LIGHTGREY;
} else if (
(bestellt != null && betrag != vertrag_betrag) ||
(bestellt != null &&
@@ -256,10 +241,10 @@ function func_tableBuilt(table) {
table.tabulator(
"addColumn",
{
title: "<i class='fa fa-user-o'></i>",
title: "<i class='fa fa-user'></i>",
field: "status",
width: 40,
align: "center",
hozAlign: "center",
downloadTitle: "Status",
formatter: status_formatter,
tooltip: status_tooltip,
@@ -406,18 +391,15 @@ status_formatter = function (cell, formatterParams, onRendered) {
(bestellt != null && stunden != vertrag_stunden)
) {
// geaendert ((if betrag is 0 or null)
return ICON_LEHRAUFTRAG_CHANGED; // geaendert
// return "<i class='fas fa-user-edit'></i>";
return "<i class='fa fa-user-pen'></i>";
} else if (bestellt == null && erteilt == null && akzeptiert == null) {
return "<i class='fa fa-user-plus'></i>"; // neu
} else if (bestellt != null && erteilt == null && akzeptiert == null) {
return ICON_LEHRAUFTRAG_ORDERED; // bestellt
// return "<i class='fa fa-user-tag'></i>";
return "<i class='fa fa-user-tag'></i>";
} else if (bestellt != null && erteilt != null && akzeptiert == null) {
return ICON_LEHRAUFTRAG_APPROVED; // erteilt
// return "<i class='fas fa-user-check'></i>";
return "<i class='fa fa-user-check'></i>";
} else if (bestellt != null && erteilt != null && akzeptiert != null) {
return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
return "<i class='fa-regular fa-handshake'></i>"; // akzeptiert
} else {
return "<i class='fa fa-user'></i>"; // default
}
@@ -654,21 +636,6 @@ $(function () {
]);
});
// Set png-icons into filter-buttons
$(".btn-lehrauftrag").each(function () {
switch (this.id) {
case "show-ordered":
this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
break;
case "show-approved":
this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
break;
case "show-changed":
this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
break;
}
});
// De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag bestellen'
$(".btn-lehrauftrag").click(function () {
// De/activate and un/focus on clicked button