Merge branch 'master' into feature-7264/Dauerampel_fuer_fehlende_Timesheets

2026-07-20 00:12:15 +00:00 · 2021-08-22 21:05:19 +02:00 · 2021-07-27 19:32:25 +02:00 · 2021-01-29 15:31:53 +01:00 · 2020-05-14 14:23:28 +02:00 · 2020-05-14 14:22:56 +02:00
2128 changed files with 177206 additions and 173411 deletions
@@ -24,7 +24,6 @@ application/logs/
 application/models/extensions/
 application/views/extensions/
 application/widgets/extensions/
-application/components/extensions/

 public/extensions/

@@ -1,19 +0,0 @@
-<?php
-	$filterCmptArray = array(
-		'app' => 'core',
-		'datasetName' => 'logs',
-		//'filterKurzbz' => 'jobs48hours', // REMOVE ME
-		'query' => '
-			SELECT wsl.webservicelog_id AS "LogId",
-					wsl.request_id AS "RequestId",
-					wsl.execute_time AS "ExecutionTime",
-					wsl.execute_user AS "ExecutedBy",
-					wsl.beschreibung AS "Description",
-					wsl.request_data AS "Data",
-					wsl.webservicetyp_kurzbz AS "WebserviceType"
-			 FROM system.tbl_webservicelog wsl
-		 ORDER BY wsl.execute_time DESC
-		',
-		'requiredPermissions' => 'admin'
-	);
-
@@ -1,14 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-/**
- * NOTE(chris): example:
-	Events::on('stv_conf_student', function (&$res) {
-		$res['test'] = [
-			'title' => 'TEST',
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
-		];
-	});
- */
@@ -1,23 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-// Deadline for Application given as Time-Interval after Semesterstart.
-$config['interval_blocking_application'] = 'P1M';
-
-// Lehrveranstaltungen with these grades will be blocked for application
-$config['grades_blocking_application'] = array(
-	5,  // nicht genügend
-	6,  // angerechnet
-	9,  // noch nicht eingetragen
-	13, // nicht erfolgreich absolviert
-	14, // nicht bestanden,
-	15, // nicht teilgenommen
-	18  // unentschuldigt
-);
-
-//Enables Fachbereichsleiter instead of LV Leiter
-$config['fbl'] = FALSE;
-//Enables Info Mails
-$config['send_mail'] = TRUE;
@@ -57,6 +57,14 @@ define('AUTH_SUCCESS',				0);
 define('AUTH_NOT_AUTHENTICATED',	1);
 define('AUTH_INVALID_CREDENTIALS',	2);

+/*
+|--------------------------------------------------------------------------
+| LDAP constants
+|--------------------------------------------------------------------------
+*/
+define('LDAP_NO_USER_DN',			10);
+define('LDAP_TOO_MANY_USER_DN',		11);
+
 /*
 |--------------------------------------------------------------------------
 | Language constants
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2023 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-// NOTE: if database encryption is _not_ used then leave this array empty!
-$config['encryption_passwords'] = array(
-	// 'password name 1' => 'password 1'
-	// 'password name 2' => 'password 2'
-	// 'password name ...' => 'password ...'
-	// 'password name N' => 'password N'
-);
-
@@ -17,8 +17,7 @@ if (defined('LDAP_SERVER')) // 1st LDAP server
 		'basedn'	=> LDAP_BASE_DN,
 		'username'	=> LDAP_BIND_USER,
 		'password'	=> LDAP_BIND_PASSWORD,
-		'usf'		=> LDAP_USER_SEARCH_FILTER,
-		'timeout'	=> 1
+		'usf'		=> LDAP_USER_SEARCH_FILTER
 	);
 }

@@ -31,8 +30,7 @@ if (defined('LDAP2_SERVER')) // 2nd LDAP server
 		'basedn'	=> LDAP2_BASE_DN,
 		'username'	=> LDAP2_BIND_USER,
 		'password'	=> LDAP2_BIND_PASSWORD,
-		'usf'		=> LDAP2_USER_SEARCH_FILTER,
-		'timeout'	=> 1
+		'usf'		=> LDAP2_USER_SEARCH_FILTER
 	);
 }

@@ -47,8 +45,7 @@ if (defined('LDAP_SERVER')) // 1st LDAP server
 		'basedn'	=> LDAP_BASE_DN,
 		'username'	=> LDAP_BIND_USER,
 		'password'	=> LDAP_BIND_PASSWORD,
-		'usf'		=> LDAP_USER_SEARCH_FILTER,
-		'timeout'	=> 1
+		'usf'		=> LDAP_USER_SEARCH_FILTER
 	);
 }

@@ -61,8 +58,6 @@ if (defined('LDAP2_SERVER')) // 2nd LDAP server
 		'basedn'	=> LDAP2_BASE_DN,
 		'username'	=> LDAP2_BIND_USER,
 		'password'	=> LDAP2_BIND_PASSWORD,
-		'usf'		=> LDAP2_USER_SEARCH_FILTER,
-		'timeout'	=> 1
+		'usf'		=> LDAP2_USER_SEARCH_FILTER
 	);
 }
-
@@ -15,7 +15,7 @@ $config['navigation_header'] = array(
 			'description' => 'Organisation',
 			'sort' => 20,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children' => array(
+			'children'=> array(
 				'vilesci' => array(
 					'link' => base_url('vilesci'),
 					'icon' => '',
@@ -23,22 +23,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 10,
 					'requiredPermissions' => 'basis/vilesci:r'
-				),
-				'oehbeitragsverwaltung' => array(
-					'link' => site_url('codex/Oehbeitrag'),
-					'icon' => '',
-					'description' => 'ÖH-Beitragsverwaltung',
-					'expand' => true,
-					'sort' => 20,
-					'requiredPermissions' => 'admin:w'
-				),
-				'bismeldestichtagsverwaltung' => array(
-					'link' => site_url('codex/Bismeldestichtag'),
-					'icon' => '',
-					'description' => 'BIS-Meldestichtagsverwaltung',
-					'expand' => true,
-					'sort' => 30,
-					'requiredPermissions' => 'admin:w'
 				)
 			)
 		),
@@ -48,7 +32,7 @@ $config['navigation_header'] = array(
 			'description' => 'Lehre',
 			'sort' => 30,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children' => array(
+			'children'=> array(
 				'cis' => array(
 					'link' => CIS_ROOT,
 					'icon' => '',
@@ -79,16 +63,6 @@ $config['navigation_header'] = array(
 						'lehre/lehrauftrag_erteilen:r'
 					)
 				),
-				'zverfueg' => array(
-					'link' => site_url('lehre/lvplanung/AdminZeitverfuegbarkeit'),
-					'description' => 'Zeitverf&uuml;gbarkeit',
-					'expand' => true,
-					'sort' => 45,
-					'requiredPermissions' => array(
-						'lehre/zeitverfuegbarkeit:rw',
-						'lehre/zeitverfuegbarkeit:rw'
-					)
-				),
 				'zgvueberpruefung' => array(
 					'link' => site_url('system/infocenter/ZGVUeberpruefung'),
 					'description' => 'ZGV Überprüfung',
@@ -106,7 +80,7 @@ $config['navigation_header'] = array(
 			'description' => 'Personen',
 			'sort' => 40,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children' => array(
+			'children'=> array(
 				'messages' => array(
 					'link' => site_url('system/messages/MessageClient/read'),
 					'icon' => '',
@@ -120,27 +94,6 @@ $config['navigation_header'] = array(
 					'description' => 'BPK Wartung',
 					'sort' => 20,
 					'requiredPermissions' => 'admin:r'
-				),
-				'errormonitoring' => array(
-					'link' => site_url('system/issues/Issues'),
-					'description' => 'Fehler Monitoring',
-					'expand' => true,
-					'sort' => 30,
-					'requiredPermissions' => 'system/issues_verwalten:r'
-				),
-				'plausichecks' => array(
-					'link' => site_url('system/issues/Plausichecks'),
-					'description' => 'Plausichecks',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'system/issues_verwalten:r'
-				),
-				'gruppenmanagement' => array(
-					'link' => site_url('person/Gruppenmanagement'),
-					'description' => 'Gruppenmanagement',
-					'expand' => true,
-					'sort' => 50,
-					'requiredPermissions' => 'lehre/gruppenmanager:r'
 				)
 			)
 		),
@@ -151,7 +104,7 @@ $config['navigation_header'] = array(
 			'expand' => false,
 			'sort' => 50,
 			'requiredPermissions' => 'admin:r',
-			'children' => array(
+			'children'=> array(
 				'extensions' => array(
 					'link' => site_url('system/extensions/Manager'),
 					'description' => 'Extensions Manager',
@@ -172,14 +125,7 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'system/developer:r'
-				),
-                'anrechnungen' => array(
-                    'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
-                    'description' => 'Anrechnungen',
-                    'expand' => true,
-                    'sort' => 30,
-                    'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                )
+				)
 			)
 		)
 	)
@@ -199,15 +145,6 @@ $config['navigation_menu']['Vilesci/index'] = array(
 	)
 );

-$config['navigation_menu']['Vilesci/index'] = array(
-    'dashboard' => array(
-        'link' => '#',
-        'description' => 'Dashboard',
-        'icon' => 'dashboard',
-        'sort' => 1
-    )
-);
-
 $config['navigation_menu']['organisation/Reihungstest/index'] = array(
 	'reihungstestverwalung' => array(
 		'link' => base_url('vilesci/stammdaten/reihungstestverwaltung.php'),
@@ -232,8 +169,7 @@ $config['navigation_menu']['lehre/lehrauftrag/Lehrauftrag/*'] = array(
 		'icon' => 'dashboard',
 		'sort' => 1,
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r','lehre/lehrauftrag_erteilen:r')
-	),
-	'lehrauftragBestellen' => array(
+	),'lehrauftragBestellen' => array(
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag'),
 		'description' => 'Lehrauftrag bestellen',
 		'icon' => '',
@@ -255,7 +191,6 @@ $config['navigation_menu']['lehre/lehrauftrag/Lehrauftrag/*'] = array(
 		'requiredPermissions' => array('lehre/lehrauftrag_erteilen:r')
 	)
 );
-
 $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 	'lehrauftragDashboard' => array(
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
@@ -263,8 +198,7 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 		'icon' => 'dashboard',
 		'sort' => 1,
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r','lehre/lehrauftrag_erteilen:r')
-	),
-	'lehrauftragBestellen' => array(
+	),'lehrauftragBestellen' => array(
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag'),
 		'description' => 'Lehrauftrag bestellen',
 		'icon' => '',
@@ -286,23 +220,3 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 		'requiredPermissions' => array('lehre/lehrauftrag_erteilen:r')
 	)
 );
-
-$config['navigation_menu']['system/issues/Issues/*'] = array(
-	'fehlerzustaendigkeiten' => array(
-		'link' => site_url('system/issues/IssuesZustaendigkeiten'),
-		'description' => 'Fehler Zuständigkeiten',
-		'icon' => 'users',
-		'sort' => 100,
-		'target' => '_blank',
-		'requiredPermissions' => array('admin:rw')
-	),
-	'fehlerkonfiguration' => array(
-		'link' => site_url('system/issues/IssuesKonfiguration'),
-		'description' => 'Fehler Konfiguration',
-		'icon' => 'cogs',
-		'sort' => 200,
-		'target' => '_blank',
-		'requiredPermissions' => array('admin:rw')
-	),
-);
-
@@ -60,26 +60,3 @@ $route['api/v1/organisation/[G|g]eschaeftsjahr/(:any)'] = 'api/v1/organisation/g
 $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisation/organisationseinheit2/$1';
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
-
-// load routes from extensions
-$subdir = 'application/config/extensions';
-$dirlist = scandir($subdir);
-
-if ($dirlist)
-{
-	$files = array_diff($dirlist, array('.','..'));
-
-	foreach ($files as &$item)
-	{
-		if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
-		{
-			$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
-
-			if (file_exists($routes_file))
-			{
-				require($routes_file);
-			}
-		}
-	}
-}
-
@@ -1,170 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
-$config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
-
-// TODO(chris): review this!
-#$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => null];
-$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => 'Akte'];
-
-/**
- * UPLOAD
- */
-
-/**
- * Allowed filetypes for attachment upload in unterbrechung antrag
- *
- * @var array           An array of fileextensions
- */
-$config['unterbrechung_dms_filetypes'] = ['jpg', 'pdf'];
-
-
-/**
- * GRADES
- */
-
-/**
- * On wiederholung the student must repeat certain lvs.
- * This lvs will be graded with this id
- *
- * @var integer			tbl_note.note
- */
-$config['wiederholung_note_angerechnet'] = 19;
-
-/**
- * On wiederholung the student can not attend certain lvs.
- * Those lvs will be graded with this id
- *
- * @var integer			tbl_note.note
- */
-$config['wiederholung_note_nicht_zugelassen'] = 20;
-
-
-/**
- * JOBS
- */
-
-/**
- * The Job will remind for every Unterbrecher who has a
- * wiedereinstieg_datum between the date the Job is run
- * and the modified date
- * e.g.: If the Job is running on 2023-04-20 and the modifier
- * is '+3 days' it will remind of everyone that
- * has a wiedereinstiegs_datum between 2023-04-20 and 2023-04-23
- *
- * @var string	        A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
-
-/**
- * The Job will sent a request to everyone who faild the 3rd committee exam
- * and respecting the given conditions (not repeated yet, stg not in blacklist)
- * to decide if he/she will repeat or not
- *
- * First request
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['wiederholung_job_request_1_date_modifier'] = '+0 days';
-
-/**
- * Second request
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
-
-/**
- * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['wiederholung_job_deadline_date_modifier'] = '+1 month';
-
-/**
- * before this exam dates for Wiederholer will be ignored
- *
- * @var string           A string formated as Date
- *
- */
-$config['digitalization_start'] = '2022-07-01';
-
-
-
-
-/**
- * Objection period - the student will be abgemeldet if he hasn't objected in this period
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
-
-
-
-/**
- * System User - uid of a user that is allowed to set prestudentstatus
- *
- * @var string
- */
-$config['antrag_job_systemuser'] = '';
-
-
-/**
- * WHITELISTS
- */
-
-/**
- * List of stati who entitle a prestudent to create an Antrag
- *
- * @var array			Array of tbl_status.status_kurzbz's
- */
-$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
-$config['antrag_prestudentstatus_whitelist_abmeldung'] = ['Student', 'Diplomand', 'Unterbrecher'];
-
-
-/**
- * BLACKLISTS
- */
-
-/**
- * List of Statusgründe that prevent a prestudent from create an Wiederholungsantrag
- *
- * @var array			An array of tbl_status_grund.statusgrund_id's
- */
-$config['status_gruende_wiederholer'] = [16, 15];
-
-/**
- * Blacklisted for abmeldung anträge
- *
- * @var array           An array of tbl_studiengang.studiengang_kz's
- */
-$config['stgkz_blacklist_abmeldung'] = [];
-
-/**
- * Blacklisted for unterbrechung anträge
- *
- * @var array           An array of tbl_studiengang.studiengang_kz's
- */
-$config['stgkz_blacklist_unterbrechung'] = [];
-
-/**
- * Blacklisted for wiederholung anträge
- *
- * @var array           An array of tbl_studiengang.studiengang_kz's
- */
-$config['stgkz_blacklist_wiederholung'] = [];
-
-/**
- * Blacklisted noten for negative committee exams
- * noten with this ids won't be seen as negative
- *
- * @var array           An array of noten ids
- */
-$config['note_blacklist_wiederholung'] = [];
@@ -9,13 +9,6 @@
 		"name": {
 			"type": "string"
 		},
-		"type": {
-			"type": "string",
-			"enum": ["checkbox", "textfield", "textarea", "date", "dropdown", "multipledropdown"]
-		},
-		"requiredPermissions": {
-			"type": "array"
-		},
 		"description": {
 			"type": "array",
 		},
@@ -25,6 +18,10 @@
 		"title": {
 			"type": "array",
 		},
+		"type": {
+			"type": "string",
+			"enum": ["checkbox", "textfield", "textarea", "date", "dropdown", "multipledropdown"]
+		},
 		"sort": {
 			"type": "integer"
 		},
@@ -70,6 +67,5 @@
 			}
 		}
 	},
-	"required": ["type", "name", "requiredPermissions"]
-}
-
+	"required": ["type", "name"]
+}
@@ -1,16 +0,0 @@
-<?php
- 
-if ( !defined("PHPUNIT_TEST") ) {
-    show_404();
-}
- 
-class Test extends CI_Controller
-{
-    public function index()
-    {
-        // Yep... This is all we need.
-        ini_set('error_reporting', E_ALL); // or error_reporting(E_ALL);
-        ini_set('display_errors', '1');
-        ini_set('display_startup_errors', '1');
-    }
-}
@@ -12,7 +12,7 @@ class CheckUserAuth extends RESTFul_Controller
 		parent::__construct();

 		// Loads helper message to manage returning messages
-		// NOTE: loaded here because it does not extend the API_Controller
+		// NOTE: loaded here because it does not extend the APIv1_Controller
 		$this->load->helper('hlp_return_object');
 	}

@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Aufteilung extends API_Controller
+class Aufteilung extends APIv1_Controller
 {
 	/**
 	 * Aufteilung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bestelldetail extends API_Controller
+class Bestelldetail extends APIv1_Controller
 {
 	/**
 	 * Bestelldetail API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bestelldetailtag extends API_Controller
+class Bestelldetailtag extends APIv1_Controller
 {
 	/**
 	 * Bestelldetailtag API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bestellstatus extends API_Controller
+class Bestellstatus extends APIv1_Controller
 {
 	/**
 	 * Bestellstatus API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bestellung extends API_Controller
+class Bestellung extends APIv1_Controller
 {
 	/**
 	 * Bestellung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bestellungtag extends API_Controller
+class Bestellungtag extends APIv1_Controller
 {
 	/**
 	 * Bestellungtag API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Buchung extends API_Controller
+class Buchung extends APIv1_Controller
 {
 	/**
 	 * Buchung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Buchungstyp extends API_Controller
+class Buchungstyp extends APIv1_Controller
 {
 	/**
 	 * Buchungstyp API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Budget extends API_Controller
+class Budget extends APIv1_Controller
 {
 	/**
 	 * Budget API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Konto extends API_Controller
+class Konto extends APIv1_Controller
 {
 	/**
 	 * Konto API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Kostenstelle extends API_Controller
+class Kostenstelle extends APIv1_Controller
 {
 	/**
 	 * Kostenstelle API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Rechnung extends API_Controller
+class Rechnung extends APIv1_Controller
 {
 	/**
 	 * Rechnung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Rechnungsbetrag extends API_Controller
+class Rechnungsbetrag extends APIv1_Controller
 {
 	/**
 	 * Rechnungsbetrag API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Rechnungstyp extends API_Controller
+class Rechnungstyp extends APIv1_Controller
 {
 	/**
 	 * Rechnungstyp API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Vertrag extends API_Controller
+class Vertrag extends APIv1_Controller
 {
 	/**
 	 * Vertrag API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Vertragsstatus extends API_Controller
+class Vertragsstatus extends APIv1_Controller
 {
 	/**
 	 * Vertragsstatus API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Vertragstyp extends API_Controller
+class Vertragstyp extends APIv1_Controller
 {
 	/**
 	 * Vertragstyp API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Zahlungstyp extends API_Controller
+class Zahlungstyp extends APIv1_Controller
 {
 	/**
 	 * Zahlungstyp API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Akadgrad extends API_Controller
+class Akadgrad extends APIv1_Controller
 {
 	/**
 	 * Akadgrad API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Archiv extends API_Controller
+class Archiv extends APIv1_Controller
 {
 	/**
 	 * Archiv API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Aufmerksamdurch extends API_Controller
+class Aufmerksamdurch extends APIv1_Controller
 {
 	/**
 	 * Aufmerksamdurch API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Ausbildung extends API_Controller
+class Ausbildung extends APIv1_Controller
 {
 	/**
 	 * Ausbildung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Berufstaetigkeit extends API_Controller
+class Berufstaetigkeit extends APIv1_Controller
 {
 	/**
 	 * Berufstaetigkeit API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Beschaeftigungsausmass extends API_Controller
+class Beschaeftigungsausmass extends APIv1_Controller
 {
 	/**
 	 * Beschaeftigungsausmass API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Besqual extends API_Controller
+class Besqual extends APIv1_Controller
 {
 	/**
 	 * Besqual API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bisfunktion extends API_Controller
+class Bisfunktion extends APIv1_Controller
 {
 	/**
 	 * Bisfunktion API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bisio extends API_Controller
+class Bisio extends APIv1_Controller
 {
 	/**
 	 * Bisio API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bisorgform extends API_Controller
+class Bisorgform extends APIv1_Controller
 {
 	/**
 	 * Bisorgform API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bisverwendung extends API_Controller
+class Bisverwendung extends APIv1_Controller
 {
 	/**
 	 * Bisverwendung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bundesland extends API_Controller
+class Bundesland extends APIv1_Controller
 {
 	/**
 	 * Course API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Entwicklungsteam extends API_Controller
+class Entwicklungsteam extends APIv1_Controller
 {
 	/**
 	 * Entwicklungsteam API constructor.
@@ -14,7 +14,7 @@

 if (!defined("BASEPATH")) exit("No direct script access allowed");

-class Gemeinde extends API_Controller
+class Gemeinde extends APIv1_Controller
 {
 	/**
 	 * Gemeinde API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Hauptberuf extends API_Controller
+class Hauptberuf extends APIv1_Controller
 {
 	/**
 	 * Hauptberuf API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Lehrform extends API_Controller
+class Lehrform extends APIv1_Controller
 {
 	/**
 	 * Lehrform API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Lgartcode extends API_Controller
+class Lgartcode extends APIv1_Controller
 {
 	/**
 	 * Lgartcode API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Mobilitaetsprogramm extends API_Controller
+class Mobilitaetsprogramm extends APIv1_Controller
 {
 	/**
 	 * Mobilitaetsprogramm API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Nation extends API_Controller
+class Nation extends APIv1_Controller
 {
 	/**
 	 * Course API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Note extends API_Controller
+class Note extends APIv1_Controller
 {
 	/**
 	 * Note API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Orgform extends API_Controller
+class Orgform extends APIv1_Controller
 {
 	/**
 	 * Orgform API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Verwendung extends API_Controller
+class Verwendung extends APIv1_Controller
 {
 	/**
 	 * Verwendung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Zgv extends API_Controller
+class Zgv extends APIv1_Controller
 {
 	/**
 	 * Zgv API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Zgvdoktor extends API_Controller
+class Zgvdoktor extends APIv1_Controller
 {
 	/**
 	 * Zgvdoktor API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Zgvgruppe extends API_Controller
+class Zgvgruppe extends APIv1_Controller
 {
 	/**
 	 * Zgvgruppe API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Zgvmaster extends API_Controller
+class Zgvmaster extends APIv1_Controller
 {
 	/**
 	 * Zgvmaster API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Zweck extends API_Controller
+class Zweck extends APIv1_Controller
 {
 	/**
 	 * Zweck API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Ampel extends API_Controller
+class Ampel extends APIv1_Controller
 {
 	/**
 	 * Ampel API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Content extends API_Controller
+class Content extends APIv1_Controller
 {
 	/**
 	 * Content API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Contentchild extends API_Controller
+class Contentchild extends APIv1_Controller
 {
 	/**
 	 * Contentchild API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Contentgruppe extends API_Controller
+class Contentgruppe extends APIv1_Controller
 {
 	/**
 	 * Contentgruppe API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Contentlog extends API_Controller
+class Contentlog extends APIv1_Controller
 {
 	/**
 	 * Contentlog API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Contentsprache extends API_Controller
+class Contentsprache extends APIv1_Controller
 {
 	/**
 	 * Contentsprache API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Dms extends API_Controller
+class Dms extends APIv1_Controller
 {
 	/**
 	 *
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Infoscreen extends API_Controller
+class Infoscreen extends APIv1_Controller
 {
 	/**
 	 * Infoscreen API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class News extends API_Controller
+class News extends APIv1_Controller
 {
 	/**
 	 * News API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Template extends API_Controller
+class Template extends APIv1_Controller
 {
 	/**
 	 * Template API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Veranstaltung extends API_Controller
+class Veranstaltung extends APIv1_Controller
 {
 	/**
 	 * Veranstaltung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Veranstaltungskategorie extends API_Controller
+class Veranstaltungskategorie extends APIv1_Controller
 {
 	/**
 	 * Veranstaltungskategorie API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Akte extends API_Controller
+class Akte extends APIv1_Controller
 {
 	/**
 	 * Akte API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Aufnahmeschluessel extends API_Controller
+class Aufnahmeschluessel extends APIv1_Controller
 {
 	/**
 	 * Aufnahmeschluessel API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Aufnahmetermin extends API_Controller
+class Aufnahmetermin extends APIv1_Controller
 {
 	/**
 	 * Aufnahmetermin API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Aufnahmetermintyp extends API_Controller
+class Aufnahmetermintyp extends APIv1_Controller
 {
 	/**
 	 * Aufnahmetermintyp API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Bewerbungstermine extends API_Controller
+class Bewerbungstermine extends APIv1_Controller
 {
 	/**
 	 * Bewerbungstermine API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Buchungstyp extends API_Controller
+class Buchungstyp extends APIv1_Controller
 {
 	/**
 	 * Buchungstyp API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Dokument extends API_Controller
+class Dokument extends APIv1_Controller
 {
 	/**
 	 * Dokument API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Dokumentprestudent extends API_Controller
+class Dokumentprestudent extends APIv1_Controller
 {
 	/**
 	 * Dokumentprestudent API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Dokumentstudiengang extends API_Controller
+class Dokumentstudiengang extends APIv1_Controller
 {
 	/**
 	 * Dokumentstudiengang API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Konto extends API_Controller
+class Konto extends APIv1_Controller
 {
 	/**
 	 * Konto API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Preincoming extends API_Controller
+class Preincoming extends APIv1_Controller
 {
 	/**
 	 * Preincoming API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Preinteressent extends API_Controller
+class Preinteressent extends APIv1_Controller
 {
 	/**
 	 * Person API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Preinteressentstudiengang extends API_Controller
+class Preinteressentstudiengang extends APIv1_Controller
 {
 	/**
 	 * Preinteressentstudiengang API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Preoutgoing extends API_Controller
+class Preoutgoing extends APIv1_Controller
 {
 	/**
 	 * Preoutgoing API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Prestudent extends API_Controller
+class Prestudent extends APIv1_Controller
 {
 	/**
 	 * Prestudent API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Prestudentstatus extends API_Controller
+class Prestudentstatus extends APIv1_Controller
 {
 	/**
 	 * Prestudentstatus API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Reihungstest extends API_Controller
+class Reihungstest extends APIv1_Controller
 {
 	/**
 	 * Reihungstest API constructor.
@@ -14,7 +14,7 @@

 if (!defined("BASEPATH")) exit("No direct script access allowed");

-class RtPerson extends API_Controller
+class RtPerson extends APIv1_Controller
 {
 	/**
 	 * Status API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Status extends API_Controller
+class Status extends APIv1_Controller
 {
 	/**
 	 * Status API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Statusgrund extends API_Controller
+class Statusgrund extends APIv1_Controller
 {
 	/**
 	 * Status API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Student extends API_Controller
+class Student extends APIv1_Controller
 {
 	/**
 	 * Student API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Abgabe extends API_Controller
+class Abgabe extends APIv1_Controller
 {
 	/**
 	 * Abgabe API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Abschlussbeurteilung extends API_Controller
+class Abschlussbeurteilung extends APIv1_Controller
 {
 	/**
 	 * Abschlussbeurteilung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Abschlusspruefung extends API_Controller
+class Abschlusspruefung extends APIv1_Controller
 {
 	/**
 	 * Abschlusspruefung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Anrechnung extends API_Controller
+class Anrechnung extends APIv1_Controller
 {
 	/**
 	 * Anrechnung API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Anwesenheit extends API_Controller
+class Anwesenheit extends APIv1_Controller
 {
 	/**
 	 * Anwesenheit API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Beispiel extends API_Controller
+class Beispiel extends APIv1_Controller
 {
 	/**
 	 * Beispiel API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Betreuerart extends API_Controller
+class Betreuerart extends APIv1_Controller
 {
 	/**
 	 * Betreuerart API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Feedback extends API_Controller
+class Feedback extends APIv1_Controller
 {
 	/**
 	 * Feedback API constructor.
@@ -14,7 +14,7 @@

 if (!defined('BASEPATH')) exit('No direct script access allowed');

-class Legesamtnote extends API_Controller
+class Legesamtnote extends APIv1_Controller
 {
 	/**
 	 * Legesamtnote API constructor.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paolo	e022f75943	Merge branch 'master' into feature-7264/Dauerampel_fuer_fehlende_Timesheets	2021-08-22 21:05:19 +02:00
Andreas Österreicher	2c8c3b2141	Merge branch 'master' into feature-7264/Dauerampel_fuer_fehlende_Timesheets	2021-07-27 19:32:25 +02:00
Andreas Österreicher	e6ce33a302	Merge branch 'master' into feature-7264/Dauerampel_fuer_fehlende_Timesheets	2021-01-29 15:31:53 +01:00
Cris	28b5761116	Added info-tooltip to Dauerampel	2020-05-14 14:23:28 +02:00
Cris	d1d219cc2c	Added parse_bool to dauerampel in ampel.class	2020-05-14 14:22:56 +02:00
Cris	4bcb2cc059	Fixed: Active Ampeln now matching correctly time conditions Before missing braces between AND/OR operands delivered wrong results. This is fixed now.	2020-04-29 13:16:32 +02:00
Cris	5267bc5d7a	Added parameter ampel_id to method active() in Ampel_model	2020-04-29 13:11:39 +02:00
Cris	ef69a1a2f3	Changed: Now single ampel_id is checked, if it is active + better code . If parameter ampel_id is passed to the job, it will now get the ampel data only if it is active. . Clearer way of treating dauerampel in code.	2020-04-29 13:10:20 +02:00
Cris	37aa23ee1e	Adapted job generateAmpelMail in AmpelMail Now an ampel_id can be given to generateAmpelMail. If an ampel_id is set, only this ampel is loaded. Otherwise all active Ampeln are loaded. Dauerampeln are always set as 'new': the status is then set to yellow and the message template for new ampeln fits well too.	2020-04-28 16:41:39 +02:00
Cris	ebe5cbe797	Added Dauerampel to CIS GUI Dauerampeln do not have Faelligkeitsdatum and do not have Bestaetigen-button. They are dismissed automatically when the benutzer_select-condition is not valid anymore.	2020-04-28 16:35:17 +02:00
Cris	fc2845ad72	Adapted method active() in Ampel_model . Added parameter dauerampel . Set both params to default null to have real usage of boolean param in the query.	2020-04-28 16:31:35 +02:00
Cris	9f42beaeb3	Fixed: Query getAll in Ampel Class Query was not retrieving correctly active Ampeln. Adapted time conditions.	2020-04-28 16:24:30 +02:00
Cris	a37b81c57a	Added property 'dauerampel' to all Ampel Class methods	2020-04-28 16:20:01 +02:00
Cris	7060fd81c9	Added column 'dauerampel' to tbl_ampel	2020-04-28 16:17:09 +02:00
Cris	f1565fea85	Added checkbox 'dauerampel' to Ampel Details If checkbox 'dauerampel' is checked, the checkbox 'verpflichtend' is disabled. Dauerampeln should not pop up each time.	2020-04-28 16:16:05 +02:00
Cris	2f2a5ea6f7	Optimized VILESCI GUI for Ampeln . Added links to display active or all ampeln (default: active) . Added column 'dauerampel' in ampel overview	2020-04-28 16:13:01 +02:00