Merge branch 'master' into feature-70376/Lohnguide

system/dbupdate_3.4.php

@@ -91,6 +91,7 @@ require_once('dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php');
 require_once('dbupdate_3.4/68744_StV_settings.php');
 require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php');
 require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
+require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/70376_lohnguide.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen

system/dbupdate_3.4/61164_abgabetool_quality_gates.php

@@ -363,6 +363,21 @@ if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzb
 	}
 }
 
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'PAANoSigAssSM'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('PAANoSigAssSM', 'PAANoSigAssSM', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage PAANoSigAssSM hinzugefuegt";
+	}
+}
+
 if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'QualGateNegativ'"))
 {
 	if($db->db_num_rows($result) === 0)

system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php

@@ -0,0 +1,28 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_message_person_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_msg_message_person_id ON public.tbl_msg_message USING btree (person_id)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_msg_message_person_id: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_msg_message_person_id angelegt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_recipient_person_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_msg_recipient_person_id ON public.tbl_msg_recipient USING btree (person_id)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_msg_recipient_person_id: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_msg_recipient_person_id angelegt<br>';
+	}
+}

system/filtersupdate.php

@@ -1418,14 +1418,14 @@ $filters = array(
 						{"name": "PersonId"},
 						{"name": "Vorname"},
 						{"name": "Nachname"},
-						{"name": "EMail"}, 
-						{"name": "Unternehmen"}, 
-						{"name": "Vertragsart"}, 
-						{"name": "DV_von"}, 
-						{"name": "DV_bis"}, 
-						{"name": "Wochenstunden"}, 
-						{"name": "WS_von"}, 
-						{"name": "WS_bis"}, 
+						{"name": "EMail"},
+						{"name": "Unternehmen"},
+						{"name": "Vertragsart"},
+						{"name": "DV_von"},
+						{"name": "DV_bis"},
+						{"name": "Wochenstunden"},
+						{"name": "WS_von"},
+						{"name": "WS_bis"},
 						{"name": "Standardkostenstelle"},
 						{"name": "DV_status"}
 					],
@@ -1456,14 +1456,14 @@ $filters = array(
 						{"name": "PersonId"},
 						{"name": "Vorname"},
 						{"name": "Nachname"},
-						{"name": "EMail"}, 
-						{"name": "Unternehmen"}, 
-						{"name": "Vertragsart"}, 
-						{"name": "DV_von"}, 
-						{"name": "DV_bis"}, 
-						{"name": "Wochenstunden"}, 
-						{"name": "WS_von"}, 
-						{"name": "WS_bis"}, 
+						{"name": "EMail"},
+						{"name": "Unternehmen"},
+						{"name": "Vertragsart"},
+						{"name": "DV_von"},
+						{"name": "DV_bis"},
+						{"name": "Wochenstunden"},
+						{"name": "WS_von"},
+						{"name": "WS_bis"},
 						{"name": "Standardkostenstelle"},
 						{"name": "DV_status"}
 					],
@@ -1494,14 +1494,14 @@ $filters = array(
 					{"name": "PersonId"},
 					{"name": "Vorname"},
 					{"name": "Nachname"},
-					{"name": "EMail"}, 
-					{"name": "Unternehmen"}, 
-					{"name": "Vertragsart"}, 
-					{"name": "DV_von"}, 
-					{"name": "DV_bis"}, 
-					{"name": "Wochenstunden"}, 
-					{"name": "WS_von"}, 
-					{"name": "WS_bis"}, 
+					{"name": "EMail"},
+					{"name": "Unternehmen"},
+					{"name": "Vertragsart"},
+					{"name": "DV_von"},
+					{"name": "DV_bis"},
+					{"name": "Wochenstunden"},
+					{"name": "WS_von"},
+					{"name": "WS_bis"},
 					{"name": "Standardkostenstelle"},
 					{"name": "DV_status"}
 				],
@@ -1532,14 +1532,14 @@ $filters = array(
 					{"name": "PersonId"},
 					{"name": "Vorname"},
 					{"name": "Nachname"},
-					{"name": "EMail"}, 
-					{"name": "Unternehmen"}, 
-					{"name": "Vertragsart"}, 
-					{"name": "DV_von"}, 
-					{"name": "DV_bis"}, 
-					{"name": "Wochenstunden"}, 
-					{"name": "WS_von"}, 
-					{"name": "WS_bis"}, 
+					{"name": "EMail"},
+					{"name": "Unternehmen"},
+					{"name": "Vertragsart"},
+					{"name": "DV_von"},
+					{"name": "DV_bis"},
+					{"name": "Wochenstunden"},
+					{"name": "WS_von"},
+					{"name": "WS_bis"},
 					{"name": "Standardkostenstelle"},
 					{"name": "DV_status"}
 				],
@@ -1570,10 +1570,10 @@ $filters = array(
 					{"name": "PersonId"},
 					{"name": "Vorname"},
 					{"name": "Nachname"},
-					{"name": "Unternehmen"}, 
-					{"name": "Vertragsart"}, 
-					{"name": "DV_von"}, 
-					{"name": "DV_bis"}, 
+					{"name": "Unternehmen"},
+					{"name": "Vertragsart"},
+					{"name": "DV_von"},
+					{"name": "DV_bis"},
 					{"name": "Disziplinaere_Zuordnung"},
 					{"name": "DV_status"}
 				],
@@ -1581,6 +1581,63 @@ $filters = array(
 			}',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'vertragsverwaltung',
+		'filter_kurzbz' => 'VertragsverwaltungAktiv',
+		'description' => '{Aktive Mitarbeiter}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Aktive Mitarbeiter",
+				"columns": [
+					{"name": "uid"},
+					{"name": "person_id"},
+					{"name": "nachname"},
+					{"name": "vorname"},
+					{"name": "aktiv"},
+					{"name": "gebdatum"},
+					{"name": "unternehmen"},
+					{"name": "vertragsarten"},
+					{"name": "ids"}
+				],
+				"filters": [
+					{
+						"name": "aktiv",
+						"option": "",
+						"operation": "equal",
+						"condition": "true"
+					}
+					]
+			}',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'vertragsverwaltung',
+		'filter_kurzbz' => 'VertragsverwaltungAlle',
+		'description' => '{Alle Mitarbeiter}',
+		'sort' => 1,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "Alle Mitarbeiter",
+				"columns": [
+					{"name": "uid"},
+					{"name": "person_id"},
+					{"name": "nachname"},
+					{"name": "vorname"},
+					{"name": "aktiv"},
+					{"name": "gebdatum"},
+					{"name": "unternehmen"},
+					{"name": "vertragsarten"},
+					{"name": "ids"}
+				],
+				"filters": []
+			}',
+		'oe_kurzbz' => null,
+	),
 );
 
 // Loop through the filters array