From 20a2e369c59d624aa6b93ac4dcc70dee54709fb6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Apr 2024 15:53:56 +0200
Subject: [PATCH] adds new button to show all new and changed lehrauftraege in
 the orderLehrauftrag view, so that the user can set the initial filter
 himself

---
 .../lehre/lehrauftrag/orderLehrauftrag.php    | 11 +++++-----
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  | 17 ++++++++++++++++
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index 12f5c25d0..04f7391ce 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -187,13 +187,14 @@ $this->load->view(
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
                         <button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
-                        <button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
-                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button><!-- png img set in javascript -->
-                        <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'); ?>"><i class='fa fa-user-check'></i></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-regular fa-handshake'></i></button>
+                        <button id="show-newAndChanged" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'neuUndGeaenderteAnzeigen'); ?>"><i style="margin-right:10px" class='fa fa-user-plus'></i><i style="margin-right:10px" class="fa fa-ellipsis-vertical"></i>&nbsp;<i class='fa fa-user-pen'></i></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
-                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-edit'></i></button></button><!-- png img set in javascript -->
+                        <button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
+                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></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'); ?>"><i class='fa fa-user-check'></i></button>
+                        <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-regular fa-handshake'></i></button>
+                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-pen'></i></button></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
                         <button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 3356972f0..847a863f8 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -565,6 +565,23 @@ $(function () {
     $("#tableWidgetTabulator").tabulator("clearFilter");
   });
 
+  // Show all rows
+  $("#show-newAndChanged").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      [
+        { field: "personalnummer", type: ">", value: 0 }, // not dummy
+        { field: "personalnummer", type: "=", value: null }, // include projektbetreuer
+      ],
+      { field: "mitarbeiter_uid", type: "!=", value: null }, // AND is Mitarbeiter
+      { field: "stunden", type: "!=", value: null }, // AND has Semesterstunden (not null and not 0)
+      { field: "stunden", type: "!=", value: 0 },
+      [
+        { field: "status", type: "=", value: "Neu" }, // AND neu
+        { field: "status", type: "=", value: "Geändert" }, // OR geaendert
+      ],
+    ]);
+  });
+
   // Show only rows with new lehrauftraege (not dummy lectors or external projektbetreuer; stunden not 0 or null)
   $("#show-new").click(function () {
     $("#tableWidgetTabulator").tabulator("setFilter", [
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5e2145676..9615a06c0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -5900,6 +5900,26 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'neuUndGeaenderteAnzeigen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue und geänderte anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show new and changed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',