From e41e24be04d1f7b19c6e71a41abb35e8be7ad875 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 5 Mar 2024 15:38:51 +0100
Subject: [PATCH] adding the option to add css classes to the HTMLWidget

---
 .../approveAnrechnungUebersicht.php           | 43 +++++++++++--------
 .../approveAnrechnungUebersichtData.php       |  2 +-
 .../lehre/anrechnung/requestAnrechnung.php    |  4 +-
 application/views/widgets/dropdown.php        |  1 +
 application/widgets/html/HTMLWidget.php       |  1 +
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 988d6c227..cf5f4b363 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -5,11 +5,12 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'tabulator4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
+        'cis'=>true,
 		'tablewidget' => true,
 		'phrases' => array(
 			'global' => array(
@@ -80,7 +81,7 @@ $this->load->view(
 			)
 		),
 		'customJSs' => array(
-			'public/js/bootstrapper.js',
+			//'public/js/bootstrapper5.js',
 			'public/js/lehre/anrechnung/approveAnrechnungUebersicht.js'
 		)
 	)
@@ -89,20 +90,23 @@ $this->load->view(
 
 <div id="page-wrapper">
     <div class="container-fluid">
-        <!-- title -->
+        <!-- header -->
         <div class="row">
-            <div class="col-lg-12 page-header">
-                <h3>
+            <div class="col-12 mt-5 mb-3 pb-2 border-bottom">
+                <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
-                    <small>| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
+                    <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
                 </h3>
             </div>
         </div>
+    
+        <!-- end header -->
+
         <!-- dropdown studiensemester -->
         <div class="row">
-            <div class="col-lg-12">
-                <form id="formApproveAnrechnungUebersicht" class="form-inline" action="" method="get" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>" data-createaccess="<?php echo json_encode($hasCreateAnrechnungAccess)?>">
-                    <div class="form-group">
+            <div class="col-12">
+                <form id="formApproveAnrechnungUebersicht" class="row align-items-center" action="" method="get" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>" data-createaccess="<?php echo json_encode($hasCreateAnrechnungAccess)?>">
+                    <div class="col-auto">
 						<?php
 						echo $this->widgetlib->widget(
 							'Studiensemester_widget',
@@ -111,13 +115,15 @@ $this->load->view(
 							),
 							array(
 								'name' => 'studiensemester',
-								'id' => 'studiensemester'
+								'id'=>'studiensemester',
+                                'class'=>'form-select w-auto ',
 							)
 						);
 						?>
                     </div>
+                    
                     <button type="submit"
-                            class="btn btn-default form-group"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
+                            class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
                 </form>
             </div>
         </div>
@@ -132,6 +138,7 @@ $this->load->view(
             <div class="panel panel-default panel-body" style="display: none"
                  id="approveAnrechnungUebersicht-begruendung-panel">
                 <div>
+                
                     <h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'genehmigungenNegativQuestion'); ?></h4>
                     &nbsp;<b><?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?>
                     <span class="text-danger">
@@ -193,35 +200,35 @@ $this->load->view(
         <!-- Filter buttons / Submit buttons-->
         <div class="row">
             <!-- Filter buttons -->
-            <div class="col-xs-4 col-md-5">
+            <div class="col-4 col-md-5">
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
-                        <button id="show-inProgressDP" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-inProgressDP" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'alleInBearbeitungSTGL'); ?>">
                                     <i class='fa fa-eye'></i>
                         </button>
-                        <button id="show-inProgressLektor" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-inProgressLektor" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'alleInBearbeitungLektor'); ?>"><i
                                     class='fa fa-clock-o'></i>
                         </button>
-                        <button id="show-recommended" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-up'></i>
                         </button>
-                        <button id="show-not-recommended" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-down'></i>
                         </button>
-                        <button id="show-approved" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-approved" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
                                     class='fa fa-check'></i>
                         </button>
-                        <button id="show-rejected" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-rejected" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
                                     class='fa fa-times'></i>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index cbc824aa6..7551a59c8 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -218,7 +218,7 @@ $filterWidgetArray = array(
             func_tableBuilt(this);
         },
         tableWidgetFooter: {
-			selectButtons: true
+			selectButtons: false
 		},
 		selectableCheck: function(row){
             return func_selectableCheck(row);
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 83d7bcca5..9f6482e85 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -73,8 +73,8 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 mt-4 mb-3 pb-2 border-bottom">
-                <h3 class="fw-normal mt-2 mb-1">
+            <div class="col-12 mt-5 mb-3 pb-2 border-bottom">
+                <h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'anerkennungNachgewiesenerKenntnisse'); ?>
                     <small class="text-secondary fs-6">| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
                 </h3>
diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php
index 51db6d536..f61141a4b 100644
--- a/application/views/widgets/dropdown.php
+++ b/application/views/widgets/dropdown.php
@@ -34,6 +34,7 @@
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::REGEX); ?>
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::TITLE); ?>
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::DISABLED, false); ?>
+					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::STYLE); ?>
 				>
 					<?php
 						$elements = ${DropdownWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME};
diff --git a/application/widgets/html/HTMLWidget.php b/application/widgets/html/HTMLWidget.php
index 0034edfd9..366008beb 100644
--- a/application/widgets/html/HTMLWidget.php
+++ b/application/widgets/html/HTMLWidget.php
@@ -27,6 +27,7 @@ class HTMLWidget extends Widget
 	const MIN_LENGTH = 'min-length';
 	const PLACEHOLDER = 'placeholder';
 	const DISABLED = 'disabled';
+	const STYLE = 'class';
 
 	/**
 	 * It gets also the htmlArgs array as parameter, it will be used to set the HTML properties