+
+
+
-
-
-
+
+
+
+
Keine Daten vorhanden.
"; +} + +// Returns TableWidget Header HTML (download-, setting button...) +function _renderTabulatorHeaderHTML(tableWidgetDiv){ + + var tableUniqueId = tableWidgetDiv.attr('tableUniqueId'); + + var tabulatorHeaderHTML = ''; + tabulatorHeaderHTML += ''; + tabulatorHeaderHTML += ''; + + return tabulatorHeaderHTML; +} + +// Returns collapsable HTML element for TableWidget header buttons +function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){ + + var tableUniqueId = tableWidgetDiv.attr('tableUniqueId'); + + var tabulatorHeaderCollapseHTML = ''; + + // CollapseHTML 'Settings' + tabulatorHeaderCollapseHTML += '
';
+ tabulatorHeaderCollapseHTML += '
'; // end row
+
+ // CollapseHTML 'Help'
+ tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += '
'; // end col
+ tabulatorHeaderCollapseHTML += ' ';
+
+ tabulatorHeaderCollapseHTML += '
'; // end panel-group
+ tabulatorHeaderCollapseHTML += ' ';
+ tabulatorHeaderCollapseHTML += '
'; // end panel
+
+ tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += '
'; // end panel-heading
+ tabulatorHeaderCollapseHTML += ''; + tabulatorHeaderCollapseHTML += 'Spalten einstellen'; + tabulatorHeaderCollapseHTML += '
'; + tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += '
'; // end panel-collapse
+ tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += '
'; // end panel-body
+ tabulatorHeaderCollapseHTML += '';
+
+ // Create column picker (Spalten einstellen)
+ tableWidgetDiv.find('#tableWidgetTabulator').tabulator('getColumns').forEach(function(column)
+ {
+ var field = column.getField();
+ var title = column.getDefinition().title;
+ var active_status = column.getVisibility() ? 'active' : '';
+
+ // If certain columns should be excluded from the column picker (define them in a blacklist array)
+ if (typeof tableWidgetBlacklistArray_columnUnselectable != 'undefined' &&
+ Array.isArray(tableWidgetBlacklistArray_columnUnselectable) &&
+ tableWidgetBlacklistArray_columnUnselectable.length)
+ {
+ if ($.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0)
+ {
+ tabulatorHeaderCollapseHTML += '';
+ }
+ }
+ // Else provide all tabulator fields as pickable columns
+ else
+ {
+ tabulatorHeaderCollapseHTML += '';
+ }
+ });
+
+ tabulatorHeaderCollapseHTML += '
'; // end btn-group
+ tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += '
'; // end row
+
+ return tabulatorHeaderCollapseHTML;
+}
+
+// Returns TableWidget Footer HTML (de-/select buttons,...)
+function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
+
+ var tabulatorFooterHTML = '';
+
+ // If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
+ if (tableWidgetFooterOptions.selectButtons != 'undefined' && tableWidgetFooterOptions.selectButtons == true)
+ {
+ tabulatorFooterHTML += '';
+ tabulatorFooterHTML += '';
+ }
+
+ return tabulatorFooterHTML;
+}
+
/**
* When JQuery is up
*/
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index da041c232..e35c3f79c 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -19,6 +19,18 @@ const ICON_LEHRAUFTRAG_APPROVED = '';
+ tabulatorHeaderCollapseHTML += '
'; // end col collapse
+ tabulatorHeaderCollapseHTML += ' ';
+
+ tabulatorHeaderCollapseHTML += '
'; // end panel-body + + tabulatorHeaderCollapseHTML += '
'; // end panel-body + + tabulatorHeaderCollapseHTML += '
'; // end well
+ tabulatorHeaderCollapseHTML += ' Tabelleneinstellungen
'; + tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += 'Spalten ein- und ausblenden';
+ tabulatorHeaderCollapseHTML += '
'; + tabulatorHeaderCollapseHTML += '
- ';
+ tabulatorHeaderCollapseHTML += '
- Mit einem Klick auf ' + + 'werden die Einstellungen geöffnet. '; + tabulatorHeaderCollapseHTML += '
- Auf Spalteneinstellungen klicken '; + tabulatorHeaderCollapseHTML += '
- Durch (wiederholtes) Klicken auf die einzelnen Spaltennamen können ' + + 'diese in der Tabelle beliebig oft aktiviert / deaktiviert werden. '; + tabulatorHeaderCollapseHTML += '
- Mit einem Klick auf ' + + 'werden die Einstellungen wieder geschlossen. '; + tabulatorHeaderCollapseHTML += '
Um die Spaltenbreite zu verändern, fährt man im Spaltenkopf langsam ' +
+ 'mit dem Mauszeiger auf den rechten Rand der entprechenden Spalte.
' +
+ 'Sobald sich der Mauszeiger in einen Doppelpfeil verwandelt, wird die Maustaste geklickt und ' +
+ 'mit gedrückter Maustaste die Spalte nach rechts erweitert oder nach links verkleinert.';
+ tabulatorHeaderCollapseHTML += '
INFO: Alle individuellen Tabelleneinstellungen werden in ' +
+ 'Ihrem Browser Cache gespeichert. Wenn Sie Ihren Browser Cache löschen, werden Ihre Einstellungen zurückgesetzt und ' +
+ 'müssen gegebenenfalls neu eingestellt werden.';
+ tabulatorHeaderCollapseHTML += '
';
+ tabulatorHeaderCollapseHTML += ''; // end panel-body + + tabulatorHeaderCollapseHTML += '
Zeilen auswählen
'; + tabulatorHeaderCollapseHTML += '';
+ tabulatorHeaderCollapseHTML += '
- ';
+ tabulatorHeaderCollapseHTML += '
- Einzeln auswählen: Strg + Klick auf einzelne Zeile(n) '; + tabulatorHeaderCollapseHTML += '
- Bereich auswählen: Shift + Klick auf Anfangs- und Endzeile '; + tabulatorHeaderCollapseHTML += '
- Alle auswählen: Button \'Alle auswählen\' '; + tabulatorHeaderCollapseHTML += '
'; // end panel-body + + tabulatorHeaderCollapseHTML += '
';
const ICON_LEHRAUFTRAG_CANCELLED = '
';
+// Fields that should not be provided in the column picker
+var tableWidgetBlacklistArray_columnUnselectable = [
+ 'status',
+ 'row_index',
+ 'betrag',
+ 'vertrag_id',
+ 'vertrag_stunden',
+ 'vertrag_betrag',
+ 'storniert_von', // fields from cancelledLehrauftragData
+ 'letzterStatus_vorStorniert' // fields from cancelledLehrauftragData
+];
+
// -----------------------------------------------------------------------------------------------------------------
// Mutators - setter methods to manipulate table data when entering the tabulator
// -----------------------------------------------------------------------------------------------------------------
@@ -81,10 +93,9 @@ function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData){
// Tabulator table format functions
// -----------------------------------------------------------------------------------------------------------------
-// Displays text when table is empty
-function func_placeholder()
-{
- return "Keine Daten vorhanden.
"; +// Returns relative height (depending on screen size) +function func_height(table){ + return $(window).height() * 0.50; } // Formats the rows @@ -254,65 +265,20 @@ function func_renderComplete(table){ ); } -// Tabulator footer element +// TableWidget Footer element // ----------------------------------------------------------------------------------------------------------------- -// Adds a footer with buttons select all / deselect all / download -function func_footerElement(){ - - var footer_html = '';
- footer_html += '
';
-
- return footer_html;
-}
-
-// Performs download CSV
-function footer_downloadCSV(){
- $('#tableWidgetTabulator').tabulator("download", "csv", "data.csv", {bom:true}); // BOM for correct UTF-8 char output
-}
-
/*
- * Performs select all
+ * Hook to overwrite TableWigdgets select-all-button behaviour
* Select all (filtered) rows and ignore rows that are bestellt and erteilt
*/
-function footer_selectAll(){
- $('#tableWidgetTabulator').tabulator('getRows', true)
- .filter(function(row){ return row.getData().bestellt != null && // bestellt
- row.getData().erteilt != null && // AND erteilt
- row.getData().akzeptiert == null && // AND NOT akzeptiert
- row.getData().status != 'Geändert'
- ;}) // AND NOT geändert
- .forEach((function(row){ return row.select();}));
-}
-
-/*
- * Performs deselect all
- * Deselect all (filtered) rows
- */
-function footer_deselectAll(){
- $('#tableWidgetTabulator').tabulator('deselectRow');
-}
-
-// Displays number of selected rows on row selection change
-function func_rowSelectionChanged(data, rows){
- $('#number-selected').html("Für Annehmen ausgewählt: " + rows.length + "");
+function tableWidgetHook_selectAllButton(tableWidgetDiv){
+ tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
+ .filter(row => row.getData().bestellt != null && // bestellt
+ row.getData().erteilt != null && // AND erteilt
+ row.getData().akzeptiert == null && // AND NOT akzeptiert
+ row.getData().status != 'Geändert') // AND NOT geändert
+ .forEach((row => row.select()));
}
// -----------------------------------------------------------------------------------------------------------------
@@ -476,6 +442,12 @@ $(function() {
return;
}
+ // Redraw table on resize to fit tabulators height to windows height
+ window.addEventListener('resize', function(){
+ $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
+ $('#tableWidgetTabulator').tabulator('redraw', true);
+ });
+
// Show all rows
$("#show-all").click(function(){
$('#tableWidgetTabulator').tabulator('clearFilter');
@@ -594,7 +566,7 @@ $(function() {
// Print error message
FHC_DialogLib.alertWarning(data.retval);
}
-
+
if (!data.error && data.retval != null)
{
// Update status 'Erteilt'
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index 5ce99ab2e..3131bcfb3 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -19,6 +19,17 @@ const ICON_LEHRAUFTRAG_ORDERED = '';
-
- footer_html += '';
-
- footer_html += '';
-
- footer_html += '
';
- footer_html += '
';
const ICON_LEHRAUFTRAG_CHANGED = '
';
+// Fields that should not be provided in the column picker
+var tableWidgetBlacklistArray_columnUnselectable = [
+ 'status',
+ 'row_index',
+ 'personalnummer',
+ 'betrag',
+ 'vertrag_id',
+ 'vertrag_stunden',
+ 'vertrag_betrag'
+];
+
// -----------------------------------------------------------------------------------------------------------------
// Mutators - setter methods to manipulate table data when entering the tabulator
// -----------------------------------------------------------------------------------------------------------------
@@ -95,10 +106,9 @@ function func_initialFilter(){
// Tabulator table format functions
// -----------------------------------------------------------------------------------------------------------------
-// Displays text when table is empty
-function func_placeholder()
-{
- return "Keine Daten vorhanden.
"; +// Returns relative height (depending on screen size) +function func_height(table){ + return $(window).height() * 0.50; } // Formats the group header @@ -301,65 +311,20 @@ function func_rowUpdated(row){ row.getElement().style["pointerEvents"] = "none"; } - -// Tabulator footer element +// TableWidget Footer element // ----------------------------------------------------------------------------------------------------------------- -// Adds a footer with buttons select all / deselect all / download -function func_footerElement(){ - - var footer_html = '';
- footer_html += '
';
-
- return footer_html;
-}
-
-// Performs download CSV
-function footer_downloadCSV(){
- $('#tableWidgetTabulator').tabulator("download", "csv", "data.csv", {bom:true}); // BOM for correct UTF-8 char output
-}
-
/*
- * Performs select all
+ * Hook to overwrite TableWigdgets select-all-button behaviour
* Select all (filtered) rows that are bestellt
*/
-function footer_selectAll(){
- $('#tableWidgetTabulator').tabulator('getRows', true)
- .filter(row => row.getData().personalnummer >= 0 && // NOT dummies
- row.getData().bestellt != null && // AND bestellt
- row.getData().erteilt == null && // AND NOT erteilt
- row.getData().status != 'Geändert') // AND NOT geaendert
- .forEach((row => row.select()));
-}
-
-/*
- * Performs deselect all
- * Deselect all (filtered) rows
- */
-function footer_deselectAll(){
- $('#tableWidgetTabulator').tabulator('deselectRow');
-}
-
-// Displays number of selected rows on row selection change
-function func_rowSelectionChanged(data, rows){
- $('#number-selected').html("Für Erteilung ausgewählt: " + rows.length + "");
+function tableWidgetHook_selectAllButton(tableWidgetDiv){
+ tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
+ .filter(row => row.getData().personalnummer >= 0 && // NOT dummies
+ row.getData().bestellt != null && // AND bestellt
+ row.getData().erteilt == null && // AND NOT erteilt
+ row.getData().status != 'Geändert') // AND NOT geaendert
+ .forEach((row => row.select()));
}
// -----------------------------------------------------------------------------------------------------------------
@@ -526,6 +491,12 @@ akzeptiert_tooltip = function(cell){
}
$(function() {
+ // Redraw table on resize to fit tabulators height to windows height
+ window.addEventListener('resize', function(){
+ $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
+ $('#tableWidgetTabulator').tabulator('redraw', true);
+ });
+
// Show all rows
$("#show-all").click(function(){
$('#tableWidgetTabulator').tabulator('clearFilter');
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 8f3953e0b..e52a7599e 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -18,6 +18,17 @@ const ICON_LEHRAUFTRAG_ORDERED = '';
-
- footer_html += '';
-
- footer_html += '';
-
- footer_html += '
';
- footer_html += '';
const ICON_LEHRAUFTRAG_CHANGED = '';
+// Fields that should not be provided in the column picker
+var tableWidgetBlacklistArray_columnUnselectable = [
+ 'status',
+ 'row_index',
+ 'personalnummer',
+ 'betrag',
+ 'vertrag_id',
+ 'vertrag_stunden',
+ 'vertrag_betrag'
+];
+
// -----------------------------------------------------------------------------------------------------------------
// Mutators - setter methods to manipulate table data when entering the tabulator
// -----------------------------------------------------------------------------------------------------------------
@@ -106,10 +117,9 @@ function func_dataLoaded(data, table){
// Tabulator table format functions
// -----------------------------------------------------------------------------------------------------------------
-// Displays text when table is empty
-function func_placeholder()
-{
- return "Keine Daten vorhanden.
"; +// Returns relative height (depending on screen size) +function func_height(table){ + return $(window).height() * 0.50; } // Formats the group header @@ -325,47 +335,16 @@ function func_rowUpdated(row){ row.getElement().style["pointerEvents"] = "none"; } -// Tabulator footer element +// TableWidget Footer element // ----------------------------------------------------------------------------------------------------------------- -// Adds a footer with buttons select all / deselect all / download -function func_footerElement(){ - - var footer_html = '';
- footer_html += '
';
-
- return footer_html;
-}
-
-// Performs download CSV
-function footer_downloadCSV(){
- $('#tableWidgetTabulator').tabulator("download", "csv", "data.csv", {bom:true}); // BOM for correct UTF-8 char output
-}
-
/*
- * Performs select all
+ * Hook to overwrite TableWigdgets select-all-button behaviour
* Select all (filtered) rows and ignore rows which have status bestellt
*/
-function footer_selectAll(){
- $('#tableWidgetTabulator').tabulator('getRows', true)
- .filter(row => (
+function tableWidgetHook_selectAllButton(tableWidgetDiv){
+ tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
+ .filter(row => (
row.getData().personalnummer > 0 || // not dummies
row.getData().personalnummer == null) && // include Projektbetreuer
row.getData().mitarbeiter_uid != null && // AND is Mitarbeiter
@@ -377,20 +356,7 @@ function footer_selectAll(){
row.getData().status == 'Geändert' // AND geaendert)
)
)
- .forEach((row => row.select()));
-}
-
-/*
- * Performs deselect all
- * Deselect all (filtered) rows
- */
-function footer_deselectAll(){
- $('#tableWidgetTabulator').tabulator('deselectRow');
-}
-
-// Displays number of selected rows on row selection change
-function func_rowSelectionChanged(data, rows){
- $('#number-selected').html("Für Bestellung ausgewählt: " + rows.length + "");
+ .forEach((row => row.select()));
}
// -----------------------------------------------------------------------------------------------------------------
@@ -576,6 +542,12 @@ akzeptiert_tooltip = function(cell){
$(function() {
+ // Redraw table on resize to fit tabulators height to windows height
+ window.addEventListener('resize', function(){
+ $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
+ $('#tableWidgetTabulator').tabulator('redraw', true);
+ });
+
// Show all rows
$("#show-all").click(function(){
$('#tableWidgetTabulator').tabulator('clearFilter');
';
-
- footer_html += '';
-
- footer_html += '';
-
- footer_html += '
';
- footer_html += '