From e4f1da751ddb2b3a67cae46369157fc1ce1cad87 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 15:19:24 +0200
Subject: [PATCH] migrating the acceptLehrauftrags view to bootstrap 5

---
 .../lehre/lehrauftrag/acceptLehrauftrag.php   | 63 ++++++++++---------
 .../lehrauftrag/acceptLehrauftragData.php     |  1 +
 .../lehrauftrag/acceptLehrauftragHelp.php     | 20 +++---
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index bdc839155..8c3312932 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -6,7 +6,7 @@ $this->load->view(
 		'jquery3' => true,
 		'jqueryui1' => true,
 		'jquerycheckboxes1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'sbadmintemplate' => false,
 		'tabulator5' => true,
@@ -92,8 +92,8 @@ $this->load->view(
 
 		<!-- title & helper link -->
 		<div class="row">
-			<div class="col-lg-12 page-header">
-				<a class="pull-right" data-toggle="collapse" href="#collapseHelp" aria-expanded="false" aria-controls="collapseExample">
+			<div class="col-12 page-header">
+				<a class="float-end" data-bs-toggle="collapse" href="#collapseHelp" aria-expanded="false" aria-controls="collapseExample">
 					<?php echo $this->p->t('ui', 'hilfeZuDieserSeite'); ?>
 				</a>
 				<h3>
@@ -104,19 +104,20 @@ $this->load->view(
 
 		<!-- helper collapse module -->
 		<div class="row">
-			<div class="col-lg-12 collapse" id="collapseHelp">
-				<div class="well">
+			<div class="col-12 collapse my-4" id="collapseHelp">
+				<div class="card p-3">
+					
 					<?php $this->load->view('lehre/lehrauftrag/acceptLehrauftragHelp') ?>
-				</div> <!--./well-->
+				</div> 
 			</div>
 		</div>
 
 		<!-- dropdown widgets -->
 		<div class="row">
-			<div class="col-lg-12">
-				<form id="formLehrauftrag" class="form-inline" action="" method="get">
+			<div class="col-12">
+				<form id="formLehrauftrag" class="row align-items-center" action="" method="get">
 					<input type="hidden" id="uid" name="uid" value="<?php echo getAuthUID(); ?>">
-					<div class="form-group">
+					<div class="col-auto">
 						<?php
 						echo $this->widgetlib->widget(
 							'Studiensemester_widget',
@@ -130,14 +131,14 @@ $this->load->view(
 						);
 						?>
 					</div>
-					<button type="submit" name="submit" value="anzeigen" class="btn btn-default form-group"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
+					<button type="submit" name="submit" value="anzeigen" class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
 				</form>
 			</div>
 		</div>
 
 		<!-- tabulator data table 'Lehrauftraege annehmen'-->
 		<div class="row">
-			<div class="col-lg-12">
+			<div class="col-12">
 				<?php $this->load->view('lehre/lehrauftrag/acceptLehrauftragData.php'); ?>
 			</div>
 		</div>
@@ -146,10 +147,10 @@ $this->load->view(
 		<!-- link for external lectors 'Informationsblatt fuer externe Lehrende'. Show only for external lecturers -->
 
 		<div class="row">
-			<div class="col-xs-12">
-				<span class="pull-left"><?php echo $this->p->t('ui' , 'hinweistextLehrauftrag'); ?></span>
+			<div class="col-12">
+				<span class="float-start"><?php echo $this->p->t('ui' , 'hinweistextLehrauftrag'); ?></span>
 				<?php if ($is_external_lector): ?>
-					<span class="pull-right"><?php echo $this->p->t('dms' , 'informationsblattExterneLehrende'); ?></span>
+					<span class="float-start"><?php echo $this->p->t('dms' , 'informationsblattExterneLehrende'); ?></span>
 				<?php endif; ?>
 			</div>
 		</div>
@@ -158,31 +159,31 @@ $this->load->view(
 
 		<!-- filter buttons & PDF downloads & password field & akzeptieren-button -->
 		<div class="row">
-			<div class="col-xs-5 col-md-4">
+			<div class="col-5 col-md-4">
 				<div class="btn-toolbar" role="toolbar">
 					<div class="btn-group" role="group">
-						<button id="show-all" class="btn btn-default btn-lehrauftrag active focus" type="button"
-								data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i>
+						<button id="show-all" class="btn btn-outline-secondary btn-lehrauftrag active focus" type="button"
+								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-default btn-lehrauftrag" type="button"
-								data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>">
+						<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 -->
-						<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 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>
 						</button>
 					</div>
 
-					<button id="show-cancelled" class="btn btn-default btn-lehrauftrag" type="button" style="margin-left: 20px;"
-							data-toggle="collapse" data-placement="left" title="<?php echo $this->p->t('ui', 'nurStornierteAnzeigen'); ?>"
-							data-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample">
+					<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 -->
 				</div>
 			</div>
 
 
-			<div class="col-xs-3 col-md-offset-2 col-md-2">
-					<div class="btn-group dropup pull-right">
-					<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			<div class="col-3 col-md-offset-2 col-md-2">
+					<div class="btn-group dropup float-end">
+					<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						<?php echo $this->p->t('global', 'dokumentePDF'); ?>&nbsp;&nbsp;<i class="fa fa-arrow-down"></i>&nbsp;&nbsp;&nbsp;&nbsp;<span class="caret"></span>
 					</button>
 					<ul id="ul-download-pdf" class="dropdown-menu">
@@ -192,12 +193,12 @@ $this->load->view(
 				</div>
 			</div>
 
-			<div class="col-xs-4 col-md-offset-0 col-md-4">
+			<div class="col-4 col-md-offset-0 col-md-4">
 				<div class="input-group">
 					<input id="username" autocomplete="username" style="position: absolute; opacity: 0;"><!-- this is to prevent Chrome autofilling a random input field with the username-->
 					<input id="password" type="password" autocomplete="new-password" class="form-control" placeholder="CIS-<?php echo ucfirst($this->p->t('password', 'password')); ?>">
 						<span class="input-group-btn">
-							<button id="accept-lehrauftraege" class="btn btn-primary pull-right"><?php echo ucfirst($this->p->t('global', 'lehrauftraegeAnnehmen')); ?></button>
+							<button id="accept-lehrauftraege" class="btn btn-primary float-end"><?php echo ucfirst($this->p->t('global', 'lehrauftraegeAnnehmen')); ?></button>
 						</span>
 				</div>
 			</div>
@@ -207,7 +208,7 @@ $this->load->view(
 
 		<!-- collapse module with data table 'Stornierte Lehrauftraege' (collapsed by default until opened on buttonclick)-->
 		<div class="row">
-			<div class="col-lg-12 collapse" id="collapseCancelledLehrauftraege">
+			<div class="col-12 collapse" id="collapseCancelledLehrauftraege">
 				<h4>
 					<?php echo ucfirst($this->p->t('global', 'stornierteLehrauftraege')); ?>:
 					<small>
@@ -217,7 +218,7 @@ $this->load->view(
 					</small>
 				</h4>
 				<div class="row">
-					<div class="col-lg-12">
+					<div class="col-12">
 						<?php $this->load->view('lehre/lehrauftrag/cancelledLehrauftragData.php'); ?>
 					</div>
 				</div>
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index fcc4759db..a36605d13 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -294,6 +294,7 @@ ORDER BY "akzeptiert" NULLS FIRST, "erteilt" NULLS LAST, "bestellt"
 
 $filterWidgetArray = array(
     'query' => $query,
+    'bootstrapVersion' => 5,
     'tableUniqueId' => 'acceptLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
     'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
index 9c8f0a680..2e7ede0a8 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
@@ -1,5 +1,6 @@
 <h4><?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmen'); ?></h4>
-<div class="panel panel-body">
+
+<div class="card-body">
 	<?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmenText'); ?>
 	<ol>
 		<li><?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmenKlickStatusicon'); ?></li>
@@ -7,22 +8,26 @@
 		<li><?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmenMitKlickAnnehmen'); ?></li>
 	</ol>
 </div>
+
 <br>
 
 <h4><?php echo $this->p->t('lehre', 'lehrauftraegeNichtAuswaehlbar'); ?></h4>
-<div class="panel panel-body">
+
+<div class="card-body">
 	<?php echo $this->p->t('lehre', 'lehrauftraegeNichtAuswaehlbarTextBeiAnnahme'); ?>
+
 </div>
 <br>
 
 <h4>Filter</h4>
-<div class="panel panel-body">
-	<div class="col-xs-12 col-md-8 col-lg-6">
+
+<div class="card-body">
+	<div class="col-12 col-md-8 col-lg-6">
 		<table class="table table-bordered">
 			<tr class="text-center">
-				<td class="col-xs-1"><i class='fa fa-users'></i></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-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>
 			</tr>
 			<tr class="text-center">
 				<td><?php echo $this->p->t('lehre', 'filterAlleBeiAnnahme'); ?></td>
@@ -31,5 +36,6 @@
 			</tr>
 		</table>
 	</div>
+
 </div>
 <br>
\ No newline at end of file