From 5ecac3cb998be5284686098d55a949ebc1aca7de Mon Sep 17 00:00:00 2001 From: SimonGschnell Date: Fri, 15 Mar 2024 15:01:55 +0100 Subject: [PATCH] migrates createAnrechnung to bootstrap 5 and tabulator 5 --- .../lehre/anrechnung/createAnrechnung.php | 78 +++++++++---------- .../lehre/anrechnung/createAnrechnungData.php | 12 +-- .../js/lehre/anrechnung/createAnrechnung.js | 36 ++++++++- 3 files changed, 76 insertions(+), 50 deletions(-) diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php index e3cc9cad1..0ed7a8027 100644 --- a/application/views/lehre/anrechnung/createAnrechnung.php +++ b/application/views/lehre/anrechnung/createAnrechnung.php @@ -5,11 +5,13 @@ $this->load->view( 'title' => $this->p->t('anrechnung', 'neueAnrechnung'), 'jquery3' => true, 'jqueryui1' => true, - 'bootstrap3' => true, + 'bootstrap5' => true, 'fontawesome4' => true, 'ajaxlib' => true, 'dialoglib' => true, - 'tabulator4' => true, + 'tabulator5' => true, + 'tabulator5JQuery' => true, + 'cis'=>true, 'tablewidget' => true, 'phrases' => array( 'global' => array( @@ -42,20 +44,20 @@ $this->load->view(
-
-
-

+
+
+

p->t('anrechnung', 'neueAnrechnung'); ?> - | p->t('global', 'antragAnlegen'); ?> + | p->t('global', 'antragAnlegen'); ?>

-
-
-
-
+
+
+ +
widgetlib->widget( 'Studiensemester_widget', @@ -64,13 +66,14 @@ $this->load->view( ), array( 'name' => 'studiensemester', - 'id' => 'studiensemester' + 'id' => 'studiensemester', + 'class'=>'form-select w-auto ', ) ); ?>
@@ -78,29 +81,28 @@ $this->load->view(
-
-
+
+
load->view('lehre/anrechnung/createAnrechnungData.php'); ?>
-

-
-
- +
+
+
- - + + - + - + - + - - +
p->t('lehre', 'lehrveranstaltung'); ?> *p->t('lehre', 'lehrveranstaltung'); ?> * - @@ -109,9 +111,9 @@ $this->load->view(
p->t('global', 'begruendung'); ?> *p->t('global', 'begruendung'); ?> * - @@ -126,7 +128,7 @@ $this->load->view(
p->t('anrechnung', 'herkunftDerKenntnisse'); ?>p->t('anrechnung', 'herkunftDerKenntnisse'); ?> 'herkunftKenntnisse', @@ -136,31 +138,27 @@ $this->load->view(
p->t('anrechnung', 'nachweisdokumente'); ?> * -
'uploadfile', - 'accept' => '.pdf', - 'size' => '50', - 'required' => 'required', - 'enctype' => "multipart/form-data" - )); ?> -
- + 		p->t('anrechnung', 'nachweisdokumente'); ?> * + + +
-
-
+
+
- - +
diff --git a/application/views/lehre/anrechnung/createAnrechnungData.php b/application/views/lehre/anrechnung/createAnrechnungData.php index c09d8926c..a0994189a 100644 --- a/application/views/lehre/anrechnung/createAnrechnungData.php +++ b/application/views/lehre/anrechnung/createAnrechnungData.php @@ -56,17 +56,13 @@ $filterWidgetArray = array( layout: "fitColumns", // fit columns to width of table persistentLayout:true, autoResize: false, // prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated - headerFilterPlaceholder: " ", index: "prestudent_id", // assign specific column as unique id (important for row indexing) selectable: 1, // allow row selection selectablePersistence:false, // deselect previously selected rows when table is filtered, sorted or paginated - rowSelected: function(row) { - func_rowSelected(row); - }, - rowSelectionChanged:function(data, rows){ - func_rowSelectionChanged(data, rows); - }, - tableWidgetHeader: false + tableWidgetHeader: false, + columnDefaults:{ + headerFilterPlaceholder: " ", + } }', 'datasetRepFieldsDefs' => '{ prestudent_id: {visible: false, headerFilter:"input"}, diff --git a/public/js/lehre/anrechnung/createAnrechnung.js b/public/js/lehre/anrechnung/createAnrechnung.js index 176821f2c..fd4e02a2b 100644 --- a/public/js/lehre/anrechnung/createAnrechnung.js +++ b/public/js/lehre/anrechnung/createAnrechnung.js @@ -1,5 +1,16 @@ $(function () { + // tableInit is called in the jquery_wrapper when the tableBuilt event was finished + $(document).on("tableInit", function(event,tabulatorInstance) { + + // event rowSelected needs to be attached as a callback to the tableBuilt event in tabulator5 + $("#tableWidgetTabulator").tabulator("on","rowSelected",(row)=>{func_rowSelected(row)}); + // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5 + $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",(data,rows)=>{func_rowSelectionChanged(data,rows)}); + + }); + + // Disable all form fields by default createAnrechnung.disableFormFields(); @@ -8,6 +19,13 @@ $(function () { e.preventDefault(); + var fileInput = $('#requestAnrechnung-uploadfile'); + const uploadMaxFilesize = $('#requestAnrechnung-uploadfile').data('maxsize') ; // in byte + if (!createAnrechnung.fileSizeOk(fileInput, uploadMaxFilesize)) // in byte + { + return FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "errorDokumentZuGross")); + } + FHC_AjaxClient.ajaxCallPost( FHC_JS_DATA_STORAGE_OBJECT.called_path + "/create", { @@ -93,6 +111,20 @@ function func_rowSelectionChanged(data, rows){ // --------------------------------------------------------------------------------------------------------------------- var createAnrechnung = { + fileSizeOk: function(fileInput, maxSize){ + + if (fileInput.get(0).files.length){ + + var fileSize = fileInput.get(0).files[0].size; // in bytes + + if (fileSize > maxSize) + { + return false; + } + + return true; + } + }, emptyFormFields: function(){ // Empty field StudentIn @@ -102,7 +134,7 @@ var createAnrechnung = { $('#createAnrechnung-form :input:not([type=hidden])').val(''); // Hide eventually displayed button to open Anrechnung - $('#createAnrechnung-openAnrechnung').addClass('hidden'); + $('#createAnrechnung-openAnrechnung').addClass('visually-hidden'); }, disableFormFields: function(){ let prestudent_id = $('#prestudent_id').data('prestudent_id'); @@ -152,7 +184,7 @@ var createAnrechnung = { displayButtonToOpenAnrechnung: function(anrechnung_id){ // Display button to open Anrechnung in new tab $('#createAnrechnung-openAnrechnung') - .removeClass('hidden') + .removeClass('visually-hidden') .attr('href', 'ApproveAnrechnungDetail/?anrechnung_id=' + anrechnung_id) .html(' ' + FHC_PhrasesLib.t("global", "antragBearbeiten")); }