Corrected tableUniqueId for ReviewAnrechnungUebersicht

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>

application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php

@@ -72,10 +72,8 @@ $filterWidgetArray = array(
 	'datasetRepOptions' => '{
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
-		persistentLayout:true,
 		persistentSort:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
@@ -83,6 +81,9 @@ $filterWidgetArray = array(
         tableBuilt: function(){
             func_tableBuilt(this);
         },
+        tableWidgetHeader: {
+			headerButtons: true
+		},
         tableWidgetFooter: {
 			selectButtons: true
 		},

application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php

@@ -58,7 +58,7 @@ $query = '
 
 $filterWidgetArray = array(
 	'query' => $query,
-	'tableUniqueId' => 'approveAnrechnungUebersicht',
+	'tableUniqueId' => 'reviewAnrechnungUebersicht',
 	'requiredPermissions' => 'lehre/anrechnung_empfehlen',
 	'datasetRepresentation' => 'tabulator',
 	'columnsAliases' => array(
@@ -82,10 +82,8 @@ $filterWidgetArray = array(
 	'datasetRepOptions' => '{
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
-		persistentLayout:true,
 		persistentSort:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
@@ -93,6 +91,9 @@ $filterWidgetArray = array(
         tableBuilt: function(){
             func_tableBuilt(this);
         },
+        tableWidgetHeader: {
+			headerButtons: true
+		},
         tableWidgetFooter: {
 			selectButtons: true
 		},

application/views/lehre/lehrauftrag/acceptLehrauftragData.php

@@ -330,7 +330,6 @@ $filterWidgetArray = array(
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "row_index",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
@@ -353,6 +352,9 @@ $filterWidgetArray = array(
          renderStarted:function(){
             func_renderStarted(this);
         },
+        tableWidgetHeader: {
+			headerButtons: true
+		},
 		tableWidgetFooter: {
 			selectButtons: true
 		}

application/views/lehre/lehrauftrag/approveLehrauftragData.php

@@ -342,7 +342,6 @@ $filterWidgetArray = array(
 		layout: "fitColumns",			// fit columns to width of table
 		layoutColumnsOnNewData: true,	// ajust column widths to the data each time TableWidget is loaded
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
 	    groupBy:"lehrveranstaltung_id",
 	    groupToggleElement:"header",	//toggle group on click anywhere in the group header
 	    groupHeader: function(value, count, data, group){
@@ -370,6 +369,9 @@ $filterWidgetArray = array(
         tableBuilt: function(){
             func_tableBuilt(this);
         },
+        tableWidgetHeader: {
+			headerButtons: true
+		},
 		tableWidgetFooter: {
 			selectButtons: true
 		}

application/views/lehre/lehrauftrag/cancelledLehrauftragData.php

@@ -76,6 +76,9 @@ $tableWidgetArray = array(
         tableBuilt: function(){
             func_tableBuilt(this);
         },
+        tableWidgetHeader: {
+			headerButtons: true
+		}
     }', // tabulator properties
 	'datasetRepFieldsDefs' => '{
         vertrag_id: {visible: false},

application/views/lehre/lehrauftrag/orderLehrauftragData.php

@@ -376,7 +376,6 @@ $filterWidgetArray = array(
 		layout:"fitColumns",            // fit columns to width of table
 		layoutColumnsOnNewData: true,	// ajust column widths to the data each time TableWidget is loaded
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-		headerFilterPlaceholder: " ",
 		groupBy:"lehrveranstaltung_id",
 		groupToggleElement:"header",    //toggle group on click anywhere in the group header
 		groupHeader: function(value, count, data, group){
@@ -405,6 +404,9 @@ $filterWidgetArray = array(
         dataLoaded: function(data){
             func_dataLoaded(data, this);
         },
+        tableWidgetHeader: {
+			headerButtons: true
+		},
 		tableWidgetFooter: {
 			selectButtons: true
 		}

public/js/TableWidget.js

@@ -544,17 +544,34 @@ var FHC_TableWidget = {
 
 				options.columns = arrayTabulatorColumns;
 				options.data = data.dataset;
-				if (options.tableWidgetHeader == 'undefined')
-				{
-					options.persistentLayout = true;			// enables persistence (default store in localStorage if available, else in cookie)
-					options.persistenceID = data.tableUniqueId;	// TableWidget unique id to store persistence data seperately for multiple tables
-				}
-				options.movableColumns = true;				// allows changing column order
 				options.tooltipsHeader = true;				// set header tooltip with column title
 				options.placeholder = _func_placeholder();	// display text when table is empty
+				options.persistenceID = data.tableUniqueId;	// unique id to store persistence data separately for multiple tables
+
+				// Headerfilter should be empty by default
+				if (typeof(options.headerFilterPlaceholder) === 'undefined')
+				{
+					options.headerFilterPlaceholder = '';
+				}
+
+				// Columns can be moved by default
+				if (typeof(options.movableColumns) === 'undefined')
+				{
+					options.movableColumns = true;			// allows changing column order
+				}
+
+				// Column layout is stored by default
+				if (typeof(options.persistentLayout) === 'undefined')
+				{
+					options.persistentLayout = true;		// enables column layout persistence
+				}
+
+				// Sum up rows selected
 				options.rowSelectionChanged = function(data, rows){
 					_func_rowSelectionChanged(data, rows);
 				};
+				
+				// Redraw table when hiding / showing columns
 				options.columnVisibilityChanged = function(column, visible) {
 					_func_columnVisibilityChanged(column, visible);
 				};
@@ -569,15 +586,19 @@ var FHC_TableWidget = {
 		// -------------------------------------------------------------------------------------------------------------
 
 		// Render tableWidgetHeader
-		if (options.tableWidgetHeader == 'undefined' ||
-			(options.tableWidgetHeader != 'undefined' && options.tableWidgetHeader != false))
+		if (typeof(options.tableWidgetHeader) !== 'undefined' && options.tableWidgetHeader != null)
 		{
-			var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
-			tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
+			// If property headerButtons is true, render them! (CSV-, Help-, Settingbuttons)
+			if (typeof(options.tableWidgetHeader.headerButtons) !== 'undefined' && options.tableWidgetHeader.headerButtons === true)
+			{
+				// Render the buttons
+				var tabulatorHeaderButtonsHTML = _renderTabulatorHeaderButtonsHTML(tableWidgetDiv);
+				tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderButtonsHTML);
 
-			// Render the collapsable div triggered by button in tableWidgetHeader
-			var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
-			tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);
+				// Render the collapsable div triggered by clicking the headerButtons
+				var tabulatorHeaderButtonsCollapseHTML = _renderTabulatorHeaderButtonsCollapseHTML(tableWidgetDiv);
+				tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderButtonsCollapseHTML);
+			}
 		}
 
 		/**
@@ -588,7 +609,7 @@ var FHC_TableWidget = {
 		 *  	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
 		 *  }
  		 */
-		if (options.tableWidgetFooter != 'undefined' && options.tableWidgetFooter != null)
+		if (typeof(options.tableWidgetFooter) !== 'undefined' && options.tableWidgetFooter != null)
 		{
 			var tabulatorFooterHTML = _renderTabulatorFooterHTML(options.tableWidgetFooter);
 			tableWidgetDiv.find('#tableWidgetFooter').append(tabulatorFooterHTML);
@@ -759,7 +780,7 @@ function _func_placeholder(){
 }
 
 // Returns TableWidget Header HTML (download-, setting button...)
-function _renderTabulatorHeaderHTML(tableWidgetDiv){
+function _renderTabulatorHeaderButtonsHTML(tableWidgetDiv){
 
 	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
 
@@ -785,13 +806,13 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
 		'</button>';
 	tabulatorHeaderHTML += '</div>';
 	tabulatorHeaderHTML += '</div>';
-	tabulatorHeaderHTML += '<br><br><br>';
+	tabulatorHeaderHTML += '<br><br>';
 
 	return tabulatorHeaderHTML;
 }
 
 // Returns collapsable HTML element for TableWidget header buttons
-function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){
+function _renderTabulatorHeaderButtonsCollapseHTML(tableWidgetDiv){
 
 	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');