Merge branch 'feature-68598/Rollup_lets_try_it_again' into demo-pv21

application/config/navigation.php

@@ -208,14 +208,7 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
-				'dashboardadmin' => array(
-					'link' => site_url('dashboard/Admin'),
-					'description' => 'Dashboard Admin',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'dashboard/admin:r'
-				)
+                )
 			)
 		)
 	)

application/config/search.php

@@ -45,7 +45,7 @@ $config['person'] = [
 			'field' => 'kontakt',
 			'join' => [
 				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy') AND tbl_kontakt.person_id = tbl_person.person_id"
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
 			],
 			"1-n" => true
 		],
@@ -360,10 +360,6 @@ $config['employee'] = [
 			'comparison' => 'equals',
 			'field' => "mitarbeiter_uid"
 		],
-		'personalnummer' => [
-			'comparison' => 'equal-int',
-			'field' => "personalnummer"
-		],
 		'vorname' => [
 			'alias' => ['firstname'],
 			'comparison' => 'similar',
@@ -419,27 +415,12 @@ $config['employee'] = [
 		'tel' => [
 			'alias' => ['phone', 'telefon'],
 			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'prepare' => "employee_tel (mitarbeiter_uid, kontakt) AS (
-				SELECT m.mitarbeiter_uid,
-					   TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, ''))
-				FROM public.tbl_mitarbeiter m
-				LEFT JOIN public.tbl_kontakt k
-					ON k.standort_id = m.standort_id
-					AND k.kontakttyp = 'telefon'
-				UNION
-				SELECT m.mitarbeiter_uid, k.kontakt
-				FROM public.tbl_mitarbeiter m
-				JOIN public.tbl_benutzer b ON b.uid = m.mitarbeiter_uid
-				JOIN public.tbl_kontakt k
-					ON k.person_id = b.person_id
-					AND k.kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy')
-			)",
+			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
 			'join' => [
-				'table' => "employee_tel",
-				'using' => "mitarbeiter_uid"
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
 			],
-			'1-n' => true
+			"1-n" => true
 		],
 		'pid' => [
 			'alias' => ['person_id'],
@@ -490,7 +471,6 @@ $config['employee'] = [
 	],
 	'resultfields' => [
 		"b.uid",
-		"m.personalnummer",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY(
@@ -532,6 +512,7 @@ $config['employee'] = [
 		) k ON (k.standort_id = m.standort_id)"
 ];
 
+// TODO(chris): move to searchpv21.php
 $config['unassigned_employee'] = $config['employee'];
 $config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
 $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
@@ -543,7 +524,7 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.uid IS NULL
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
 	UNION
 	SELECT tbl_mitarbeiter.*
 	FROM public.tbl_mitarbeiter
@@ -553,10 +534,10 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.uid IS NULL
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel'] = "
+$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";

application/config/searchPV.php

@@ -1,34 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-$CI =& get_instance();
-
-$config['person'] = $CI->config->item('person', 'search');
-
-$config['employee'] = $CI->config->item('employee', 'search');
-$config['employee']['resultjoin'] = "
-		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
-		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
-		JOIN public.tbl_person p USING(person_id)
-		LEFT JOIN (
-			SELECT kontakt, standort_id
-			FROM public.tbl_kontakt
-			WHERE kontakttyp = 'telefon'
-		) k ON (k.standort_id = m.standort_id)";
-
-$config['unassigned_employee'] = $CI->config->item('unassigned_employee', 'search');
-$config['unassigned_employee']['resultjoin'] = "
-    JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
-    JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
-    JOIN public.tbl_person p USING(person_id)
-    LEFT JOIN (
-        SELECT kontakt, standort_id
-        FROM public.tbl_kontakt
-        WHERE kontakttyp = 'telefon'
-    ) k ON (k.standort_id = m.standort_id)";
-
-$config['room'] = $CI->config->item('room', 'search');
-
-$config['organisationunit'] = $CI->config->item('organisationunit', 'search');

application/config/searchcis.php

@@ -7,7 +7,6 @@ $CI =& get_instance();
 
 
 $config['employee'] = $CI->config->item('employee', 'search');
-unset($config['employee']['searchfields']['tel']);
 $config['employee']['resultjoin'] = "
 		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
 		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)

application/controllers/api/frontend/v1/Abgabe.php

@@ -511,11 +511,10 @@ class Abgabe extends FHCAPI_Controller
 			return $projektarbeit->projektarbeit_id;
 		};
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
+
+		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
-		if(count($projektarbeiten_ids) > 0) {
-			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
-		}
 		
 		forEach($projektarbeiten->retval as $pa) {
 			
@@ -847,10 +846,9 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		if(count($result->retval) > 0) {
-			$email = getData($result);
-			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
-		} else return '';
+		$email = $this->getDataOrTerminateWithError($result, 'general');
+		
+		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
 
 	}
 

application/controllers/api/frontend/v1/Documents.php

@@ -208,6 +208,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -220,7 +221,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -250,9 +251,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -334,7 +332,6 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 

application/controllers/api/frontend/v1/Searchbar.php

@@ -37,8 +37,7 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
 			'searchCis' => self::PERM_LOGGED,
-			'searchStv' => self::PERM_LOGGED,
-			'searchPV' => self::PERM_LOGGED
+			'searchStv' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
@@ -88,15 +87,6 @@ class Searchbar extends FHCAPI_Controller
 		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
 	}
 
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	public function searchPV()
-	{
-		return $this->searchAdvanced([ 'config' => 'searchPV' ]);
-	}
-
-
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */

application/controllers/api/frontend/v1/dashboard/Board.php

@@ -1,121 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Board extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'create'				=> 'dashboard/admin:rw',
-			'update'				=> 'dashboard/admin:rw',
-			'delete'				=> 'dashboard/admin:rw'
-		]);
-
-		// Models
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-
-	public function list()
-	{
-		$result = $this->DashboardModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function create()
-	{
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		
-		$result = $this->DashboardModel->insert([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$beschreibung = $this->input->post('beschreibung');
-
-		$result = $this->DashboardModel->update([
-			'dashboard_id' => $dashboard_id
-		], [
-			'dashboard_kurzbz' => $dashboard_kurzbz,
-			'beschreibung' => $beschreibung
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-
-		//delete all presets
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-
-		$result = $this->DashboardPresetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		//delete all widgets
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-
-		$result = $this->DashboardWidgetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->DashboardModel->delete($dashboard_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-}

application/controllers/api/frontend/v1/dashboard/Preset.php

@@ -1,200 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Preset extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'getBatch'				=> 'dashboard/admin:r',
-			'addWidget'				=> 'dashboard/admin:rw',
-			'removeWidget'			=> 'dashboard/admin:rw'
-		]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function list($dashboard_kurzbz)
-	{
-		$sql = "
-			WITH
-			dashboard_presets AS (
-				SELECT
-					*
-				FROM
-					dashboard.tbl_dashboard_preset dp
-				JOIN
-					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
-				WHERE
-					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
-			),
-			general AS 	(
-				SELECT
-					'general' AS funktion_kurzbz,
-					'Allgemein' AS beschreibung
-			)
-
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					general f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz IS NULL
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-			)
-			UNION ALL
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					public.tbl_funktion f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-				ORDER BY
-					f.beschreibung ASC
-			)
-		";
-
-		$result = $this->FunktionModel->execReadOnlyQuery($sql);
-
-		$funktionen = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($funktionen);
-	}
-
-	public function getBatch()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$db = $this->input->post('db');
-		$funktionen = $this->input->post('funktionen') ?: [];
-
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->dashboardlib->getPreset($db, $funktion);
-			if ($conf) {
-				$preset = json_decode($conf->preset, true);
-				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-					$result[$funktion] = [];
-				else
-					$result[$funktion] = $preset[$funktion]['widgets'];
-			} else {
-				$result[$funktion] = [];
-			}
-		}
-
-		return $this->terminateWithSuccess($result);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widget = $this->input->post('widget');
-
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('db');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widgetid = $this->input->post('widgetid');
-
-		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if (!$preset)
-			show_404();
-
-		$preset_decoded = json_decode($preset->preset, true);
-
-		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
-			show_404();
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
-	}
-}

application/controllers/api/frontend/v1/dashboard/User.php

@@ -1,159 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class User extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> 'dashboard/benutzer:r',
-			'addWidget'						=> 'dashboard/benutzer:rw',
-			'removeWidget'					=> 'dashboard/benutzer:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function get($dashboard_kurzbz)
-	{
-		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
-		if (!$dashboard)
-			show_404();
-		
-		$uid = $this->authlib->getAuthObj()->username;
-
-		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
-
-		$this->terminateWithSuccess([
-			'general' => call_user_func_array(
-				'array_merge_recursive',
-				$mergedconfig
-			)
-		]);*/
-		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
-		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
-
-		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
-		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
-
-		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
-
-		$this->terminateWithSuccess([
-			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
-		]);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-		
-		$override_decoded = json_decode($override->override, true);
-
-		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
-			$override_decoded['general'] = [];
-
-		 if (!isset($override_decoded['general']['widgets']))
-				$override_decoded['general']['widgets'] = [];
-
-		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
-
-		// NOTE(chris): remove doubles in other funktionen
-		foreach ($override_decoded as $funktion => $array) {
-			if ($funktion == 'general')
-				continue;
-			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
-				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
-		}
-		
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget_id = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
-		if (!$override)
-			show_404();
-		
-		$override_decoded = json_decode($override->override, true);
-
-		foreach (array_keys($override_decoded) as $k) {
-			if (!isset($override_decoded[$k]["widgets"])) {
-				unset($override_decoded[$k]);
-				continue;
-			}
-			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
-				unset($override_decoded[$k]["widgets"][$widget_id]);
-			}
-			if (!$override_decoded[$k]["widgets"]) {
-				unset($override_decoded[$k]);
-			}
-		}
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess();
-	}
-}

application/controllers/api/frontend/v1/dashboard/Widget.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Widget extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-			'list'							=> 'dashboard/admin:r',
-			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-			'setAllowed'					=> 'dashboard/admin:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-	}
-
-	public function get($id)
-	{
-		$result = $this->WidgetModel->load($id);
-
-		$widget = $this->getDataOrTerminateWithError($result);
-
-		if (!$widget)
-			return $this->terminateWithSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$widget = current($widget);
-		$widget->arguments = json_decode($widget->arguments);
-		$tmpsetup = json_decode($widget->setup);
-		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-		$widget->setup = $tmpsetup;
-
-		$this->terminateWithSuccess($widget);
-	}
-
-	public function list($dashboard)
-	{
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function listAllowed($dashboard)
-	{
-		$result = $this->WidgetModel->getForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function setAllowed()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
-		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$data = [
-			'dashboard_id' => $this->input->post('dashboard_id'),
-			'widget_id' => $this->input->post('widget_id')
-		];
-
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-		
-		if ($this->input->post('allowed'))
-			$result = $this->DashboardWidgetModel->insert($data);
-		else
-			$result = $this->DashboardWidgetModel->delete($data);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/api/frontend/v1/stv/Students.php

@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -851,44 +851,40 @@ class Students extends FHCAPI_Controller
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$this->load->config('stv');
+		$tags = $this->config->item('stv_prestudent_tags');
 
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$tags = $this->config->item('stv_prestudent_tags');
+		$whereTags = '';
+		if (is_array($tags) && !isEmptyArray($tags)) {
+			$tags = array_keys($tags);
 
-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->db->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			foreach ($tags as $key => $tag) {
+				$tags[$key] = $this->db->escape($tag);
 			}
-			$subQueryTag = "
-			  (
-				SELECT
-				  tag.prestudent_id,
-				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-				  SELECT DISTINCT ON (n.notiz_id)
-					n.notiz_id AS id,
-					nt.typ_kurzbz,
-					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-					n.text AS notiz,
-					nt.style,
-					n.erledigt AS done,
-					nz.prestudent_id
-				  FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-				. $whereTags .
-				"
-				) AS tag
-				GROUP BY tag.prestudent_id
-			  ) AS tag_data_agg
-			";
+			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
 		}
+		$subQueryTag = "
+		  (
+			SELECT
+			  tag.prestudent_id,
+			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+			FROM (
+			  SELECT DISTINCT ON (n.notiz_id)
+				n.notiz_id AS id,
+				nt.typ_kurzbz,
+				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+				n.text AS notiz,
+				nt.style,
+				n.erledigt AS done,
+				nz.prestudent_id
+			  FROM public.tbl_notizzuordnung AS nz
+				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+			. $whereTags .
+			"
+			) AS tag
+			GROUP BY tag.prestudent_id
+		  ) AS tag_data_agg
+		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -911,17 +907,11 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
+		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
 
 
 		$this->PrestudentModel->addSelect("b.uid");
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addSelect('tag_data_agg.tags');
-		}
+		$this->PrestudentModel->addSelect('tag_data_agg.tags');
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');

application/controllers/dashboard/Admin.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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');
-
-/**
- */
-class Admin extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		// Set required permissions
-		parent::__construct(
-			array(
-				'index' => 'dashboard/admin:rw',
-				'preview' => 'dashboard/admin:r',
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function index()
-	{
-		$this->load->view('dashboard/admin.php', []);
-	}
-
-	public function preview($dashboard_kurzbz = 'CIS')
-	{
-		$this->load->view('dashboard/preview.php', [
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-	}
-}

application/controllers/dashboard/Api.php

@@ -0,0 +1,76 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class Api extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'		=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/benutzer:r',
+                'getAmpeln'	=> 'dashboard/benutzer:r',
+			)
+		);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		echo 'Dashboard API Controller';
+	}
+
+	/**
+	 * Get News.
+	 */
+	public function getNews()
+	{
+		$limit =  $this->input->get('limit');
+
+		$this->load->model('content/News_model', 'NewsModel');
+
+		$result = $this->NewsModel->getAll($limit);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+
+	/**
+	 * Get Ampeln.
+	 */
+	public function getAmpeln()
+	{
+
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+		$result = $this->AmpelModel->getByUser($this->_uid);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/dashboard/Config.php

@@ -0,0 +1,216 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Config
+ *
+ * @author bambi
+ */
+class Config extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/benutzer:r',
+				'dummy'							=> 'dashboard/benutzer:r',
+				'genWidgetId'					=> 'dashboard/benutzer:rw',
+				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
+				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
+				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
+				'funktionen'					=> 'dashboard/admin:r',
+				'preset'						=> 'dashboard/admin:r',
+				'presetBatch'					=> 'dashboard/admin:r'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+	
+	public function index()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$uid = $this->AuthLib->getAuthObj()->username;
+
+		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
+		if(!$dashboard) {
+			http_response_code(404);
+			$this->terminateWithJsonError(array(
+				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
+			));
+		}
+		
+		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$this->outputJsonSuccess($mergedconfig);
+	}
+	
+	public function genWidgetId()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		$this->outputJsonSuccess(array(
+			'widgetid' => $widgetid
+		));
+	}
+	
+	public function addWidgetsToPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$preset->preset = json_encode($preset_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('preset could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
+	}
+	
+	public function removeWidgetFromPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$widgetid = $input->widgetid;
+				
+		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if ($preset === null) {
+			http_response_code(404);
+			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
+		}
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
+	}
+
+	public function addWidgetsToUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+		
+		$override_decoded = json_decode($override->override, true);
+
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
+	}
+	
+	public function removeWidgetFromUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		$widgetid = $input->widgetid;
+		
+		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if (empty($override)) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
+		}
+		
+		$override_decoded = json_decode($override->override, true);
+		
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$override->override = json_encode($override_decoded);
+		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+	}
+	
+	public function funktionen()
+	{
+		$funktionen = $this->FunktionModel->load();
+
+		if (isError($funktionen)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($funktionen)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($funktionen) ?: []);
+	}
+	
+	public function preset()
+	{
+		$db = $this->input->get('db');
+		$funktion = $this->input->get('funktion');
+
+		$conf = $this->DashboardLib->getPreset($db, $funktion);
+
+		if (!$conf)
+			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
+
+		return $this->outputJsonSuccess(json_decode($conf->preset, true));
+	}
+	
+	public function presetBatch()
+	{
+		$db = $this->input->get('db');
+		$funktionen = $this->input->get('funktionen');
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->DashboardLib->getPreset($db, $funktion);
+			if ($conf)
+			{
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
+			}
+			else
+				$result[$funktion] = [];
+		}
+
+		return $this->outputJsonSuccess($result);
+	}
+}

application/controllers/dashboard/Dashboard.php

@@ -0,0 +1,86 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Dashboard extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/admin:r',
+				'create'						=> 'dashboard/admin:rw',
+				'update'						=> 'dashboard/admin:rw',
+				'delete'						=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+	
+	public function index()
+	{
+		$result = $this->DashboardModel->load();
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function create()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->insert($input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function update()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->update($input->dashboard_id, $input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function delete()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->delete($input->dashboard_id);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+}

application/controllers/dashboard/DashboardDemo.php

@@ -0,0 +1,58 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class DashboardDemo extends Auth_Controller
+{
+    private $_uid;  // uid of the logged user
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        // Set required permissions
+        parent::__construct(
+            array(
+                'index' => 'dashboard/benutzer:r',
+                'admin' => 'dashboard/admin:rw'
+            )
+        );
+
+        $this->load->library('AuthLib');
+        $this->load->library('WidgetLib');
+
+        $this->_setAuthUID(); // sets property uid
+
+        $this->setControllerId(); // sets the controller id
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/dashboard_demo.php', []);
+	}
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+    public function admin()
+    {
+        $this->load->view('dashboard/dashboard_demo_admin.php', []);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+}

application/controllers/dashboard/Widget.php

@@ -0,0 +1,134 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Widget extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+				'getAll'						=> 'dashboard/admin:r',
+				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+				'setAllowed'					=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+	}
+	
+	public function index()
+	{
+		$widget_id = $this->input->get('id');
+
+		$widget = $this->WidgetModel->load($widget_id);
+
+		if (isError($widget) || !getData($widget))
+			return $this->outputJsonSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => [
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+				],
+				"setup" => [
+					"name" => 'Widget Not Found',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
+					"width" => 1,
+					"height" => 1
+				]
+			]);
+
+		$widget = current(getData($widget));
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		return $this->outputJsonSuccess($widget);
+	}
+	
+	public function getAll()
+	{
+		$dashboard_id = $this->input->get('dashboard_id');
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
+	}
+	
+	public function getWidgetsForDashboard()
+	{
+		$db = $this->input->get('db');
+		$result = $this->WidgetModel->getForDashboard($db);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
+	}
+	
+	public function setAllowed()
+	{
+		$input = $this->getPostJSON();
+
+		$dashboard_id = $input->dashboard_id;
+		$widget_id = $input->widget_id;
+		$action = $input->action;
+
+		if ($action == 'add') {
+			$result = $this->DashboardWidgetModel->insert([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} elseif ($action == 'delete') {
+			$result = $this->DashboardWidgetModel->delete([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} else {
+			http_response_code(404); // TODO(chris): 400?
+			$this->terminateWithJsonError([
+				'error' => 'action value invalid'
+			]);
+		}
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		return $this->outputJsonSuccess(getData($result));
+	}
+}

application/controllers/jobs/AbgabetoolJob.php

@@ -495,10 +495,6 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
-		if(!$retval) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -561,8 +557,6 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
-			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
-			// abgaben at all to avoid sending empty emails since we filter on certain conditions
 			forEach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$betreuerRow = $tupel[1];
@@ -581,8 +575,6 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
-				$relevantCounter++;
-
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -641,11 +633,6 @@ class AbgabetoolJob extends JOB_Controller
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
-			if($relevantCounter == 0) {
-				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
-				continue;
-			}
-			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
 

application/helpers/hlp_header_helper.php

@@ -111,7 +111,9 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'theme' => [
 			'name'=>$ci->config->item('theme_name'),
 			'modes'=>$ci->config->item('theme_modes'),
-		]
+		],
+		'fhcomplete_build_version' => $ci->config->item('fhcomplete_build_version'),
+		'use_fhcomplete_build_version_in_path' => $ci->config->item('use_fhcomplete_build_version_in_path'),
 	);
 
 	$toPrint = "\n";
@@ -178,6 +180,8 @@ function generateJSModulesInclude($JSModules)
 
 	$ci =& get_instance();
 	$cachetoken = '?'.$ci->config->item('fhcomplete_build_version');
+	$ci->load->config('javascript');
+	$use_bundled_javascript = $ci->config->item('use_bundled_javascript');
 
 	if (isset($JSModules))
 	{
@@ -185,14 +189,20 @@ function generateJSModulesInclude($JSModules)
 
 		for ($tmpJSsCounter = 0; $tmpJSsCounter < count($tmpJSs); $tmpJSsCounter++)
 		{
+			$item = $tmpJSs[$tmpJSsCounter];
+			if($use_bundled_javascript && preg_match('#/js/apps/#', $item))
+			{
+				$item = preg_replace('#^public/#', 'public/dist/', $item);
+			}
+			echo "<!--{$item}-->".PHP_EOL;
 			if($ci->config->item('use_fhcomplete_build_version_in_path'))
 			{
-				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $tmpJSs[$tmpJSsCounter]);
+				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $item);
 				$toPrint = sprintf($jsInclude, base_url($relurl)).PHP_EOL;
 			}
 			else
 			{
-				$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
+				$toPrint = sprintf($jsInclude, base_url($item.$cachetoken)).PHP_EOL;
 			}
 
 			if ($tmpJSsCounter > 0) $toPrint = "\t\t".$toPrint;

application/libraries/ExtensionsLib.php

@@ -42,7 +42,7 @@ class ExtensionsLib
 	// Directories that are part of the extension archive
 	private $SOFTLINK_TARGET_DIRECTORIES = array(
 		APPPATH => array('config', 'components', 'controllers', 'helpers', 'hooks', 'libraries', 'models', 'views', 'widgets'),
-		DOC_ROOT => array('public')
+		DOC_ROOT => array('public', 'public/dist')
 	);
 
 	private $_errorOccurred; // boolean, true if an error occurred while installing an extension

application/libraries/PermissionLib.php

@@ -50,7 +50,6 @@ class PermissionLib
 	const LOGINAS_PERSONIDS_BLACKLIST = 'permission_loginas_personids_blacklist';
 
 	private $_ci; // CI instance
-	private $access_rights; // current users access rights
 	private static $bb; // benutzerberechtigung
 
 	/**
@@ -62,8 +61,6 @@ class PermissionLib
 		// Loads CI instance
 		$this->_ci =& get_instance();
 
-		$this->access_rights = null;
-
 		$this->_ci->config->load('permission'); // Loads permission configuration
 
 		// If it's NOT called from command line
@@ -72,10 +69,8 @@ class PermissionLib
 			// API Caller rights initialization
 			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj) {
+			if ($authObj)
 				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
-				$this->access_rights = self::$bb->berechtigungen;
-			}
 		}
 	}
 
@@ -345,16 +340,6 @@ class PermissionLib
         }
     }
 
-	/**
-	 * Returns the access rights for the current user
-	 *
-	 * @return array|null
-	 */
-	public function getAccessRights()
-	{
-		return $this->access_rights;
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

application/libraries/dashboard/DashboardLib.php

@@ -49,7 +49,7 @@ class DashboardLib
 	
 	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
@@ -57,31 +57,14 @@ class DashboardLib
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id, $uid)
 	{
-		$funktion_kurzbzs = [];
-		$rights = $this->_ci->permissionlib->getAccessRights();
-		if ($rights)
-			$funktion_kurzbzs = array_unique(array_map(function ($right) {
-				return $right->funktion_kurzbz;
-			}, $rights));
-		
-		$this->_ci->DashboardPresetModel->db
-			->group_start()
-				->where_in('funktion_kurzbz', $funktion_kurzbzs)
-				->or_where('funktion_kurzbz IS NULL')
-			->group_end();
-
-		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
-		
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard_id
-		]);
+		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
 		$defaultconfig = array();
 		
-		if (hasData($result))
+		if (hasData($res_presets))
 		{
-			$presets = getData($result);
+			$presets = getData($res_presets);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
@@ -154,10 +137,8 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard->dashboard_id,
-			'funktion_kurzbz' => $funktion_kurzbz
-		]);
+		$result = $this->_ci->DashboardPresetModel
+			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
 		if (hasData($result))
 		{
@@ -214,11 +195,11 @@ class DashboardLib
 	{
 		foreach ($addwigets as $widget)
 		{
-			if(!isset($widget['widgetid']))
+			if(!isset($widget->widgetid))
 			{
-				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
+				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
 			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
 		}
 	}
 	

application/models/dashboard/Dashboard_Preset_model.php

@@ -11,4 +11,57 @@ class Dashboard_Preset_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard_preset';
 		$this->pk = 'preset_id';
 	}
+
+	/**
+	 * Get Presets of given uid.
+	 * @param integer dashboard_id
+	 * @param string $uid
+	 * @return array
+	 */
+	public function getPresets($dashboard_id, $uid)
+	{
+		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
+		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+		$sql = <<<EOSQL
+			SELECT 
+				* 
+			FROM 
+				dashboard.tbl_dashboard_preset 
+			WHERE 
+				dashboard_id = ? 
+			AND (
+					funktion_kurzbz IN (
+						SELECT 
+							DISTINCT funktion_kurzbz 
+						FROM 
+							public.tbl_benutzerfunktion 
+						WHERE 
+							uid = ? 
+						AND 
+							NOW()::date 
+						BETWEEN 
+							COALESCE(datum_von, '1970-01-01') 
+						AND 
+							COALESCE(datum_bis, '2170-12-31')
+					) 
+					OR 
+						funktion_kurzbz IS NULL
+				) 
+			ORDER BY 
+				funktion_kurzbz DESC
+EOSQL;
+		
+		return $this->execQuery($sql, array($dashboard_id, $uid));
+	}
+	
+	/**
+	 * Get Preset by Dashboard and Funktion
+	 * @param integer dashboard_id
+	 * @param string funktion_kurzbz
+	 * @return array
+	 */
+	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
+	{
+		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
+	}
 }

application/views/dashboard/dashboard_demo.php

@@ -8,15 +8,9 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'primevue3' => true,
-		'vuedatepicker11' => true,
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
+		'customJSModules' => ['public/js/apps/Dashboard.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css',
-			'public/css/components/primevue.css',
+			'public/css/components/dashboard.css'
 		],
 		'navigationcomponent' => true
 	)
@@ -31,7 +25,7 @@ $this->load->view(
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
 				<h1 class="h2">Dashboard</h1>
 			</div>
-			<dashboard-admin></dashboard-admin>
+			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
 		</div>
 	</div>
 

application/views/dashboard/dashboard_demo_admin.php

@@ -8,12 +8,7 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'vuedatepicker11' => true,
-		'primevue3' => true,
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
+		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -28,9 +23,9 @@ $this->load->view(
 
 		<div id="content">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
+				<h1 class="h2">Dashboard</h1>
 			</div>
-			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
+			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
 		</div>
 	</div>
 

content/student/studentdetailoverlay.xul.php

@@ -802,10 +802,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
 								<splitter class="tree-splitter"/>
-								<treecol id="student-prestudent-tree-rolle-faktiv" label="F-Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
-									class="sortDirectionIndicator"
-									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv" />
-								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -832,7 +828,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
-												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv"/>
 											</treerow>
 										</treeitem>
 									</treechildren>

content/student/studentoverlay.js.php

@@ -3550,11 +3550,9 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
-		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
-		case 'microcredential_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/lehreinheitmitarbeiter.class.php

@@ -552,40 +552,9 @@ class lehreinheitmitarbeiter extends basis_db
 		$beginn = new DateTime($beginn);
 		$ende = new DateTime($ende);
 
-		// get relevant Studiensemester
-		$studiensemester_kurzbz_arr = [];
-
-		$qry = '
-			SELECT
-				studiensemester_kurzbz
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				start BETWEEN
-				'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
-				'. $this->db_add_param($ende->format('Y-m-d'));
-
-		if ($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$studiensemester_kurzbz_arr[] = $row->studiensemester_kurzbz;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Datenbankabfrage';
-			return false;
-		}
-
-		$lehrgaengeDistr = $this->_getLehrgaengeForDistribution($studiensemester_kurzbz_arr);
-
-		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return true;
-
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden, stg.studiengang_kz
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -595,103 +564,38 @@ class lehreinheitmitarbeiter extends basis_db
 					JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
 					JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
 				WHERE mitarbeiter_uid =  '. $this->db_add_param($uid). '
-					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
+					 AND (
+					 	ss.start BETWEEN
+					 	'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
+					 	'. $this->db_add_param($ende->format('Y-m-d')). ')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
 				-- keine lehreinheiten ohne semesterstunden
-					AND lema.semesterstunden != 0
+				AND lema.semesterstunden != 0
 			)
 
 			SELECT
 				studiengang_kz,
 				studiensemester_kurzbz,
-				melde_studiengang_kz,
-				lgartcode,
 				sum(semesterstunden)				AS summe,
 				round(sum(semesterstunden) / 15, 2)	AS sws
 			FROM
 				semester_sws_tbl
 			GROUP BY
 				studiengang_kz,
-				studiensemester_kurzbz,
-				melde_studiengang_kz,
-				lgartcode
+				studiensemester_kurzbz
 			ORDER BY
 				studiengang_kz;
 		';
 
 		if ($this->db_query($qry))
 		{
-			$additionalLehrgaenge = [];
-
 			while($row = $this->db_fetch_object())
 			{
 				$obj = new StdClass();
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
-				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
-				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
-
-				if (isset($lehrgaengeDistr[$uid][$row->studiensemester_kurzbz]))
-				{
-					$lehrgaenge = $lehrgaengeDistr[$uid][$row->studiensemester_kurzbz];
-
-					foreach ($lehrgaenge as $lehreinheit_id => $lehrgangKzArr)
-					{
-						// wenn lehrgang gefunden, zusammenhängende Lehrgaenge holen und sws aufteilen
-						if (array_key_exists($row->studiengang_kz, $lehrgangKzArr))
-						{
-							foreach ($lehrgangKzArr as $studiengang_kz => $lehrgang)
-							{
-								// check: nur eine Studiengangsverknüpfung pro Mitarbeiter, Semester, und Referenzstudiengang
-								if (
-									$studiengang_kz == $row->studiengang_kz
-									|| isset(
-										$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz]
-									)
-								) continue;
-
-								// Lehrgang erstellen
-								$lg = new StdClass();
-								$lg->mitarbeiter_uid = $uid;
-								$lg->melde_studiengang_kz = $lehrgang->melde_studiengang_kz;
-								$lg->lgartcode = $lehrgang->lgartcode;
-								$lg->studiengang_kz = $lehrgang->studiengang_kz;
-								$lg->studiensemester_kurzbz = $lehrgang->studiensemester_kurzbz;
-								$lg->summe = $row->summe;
-								$lg->sws = $row->sws;
-								// Lehrgang, der mit Ursprungsstudiengang aufgrund lehreinheit "verknüpft" ist, hinzufügen
-								$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz] = $lg;
-							}
-						}
-					}
-
-					// ignorieren, wenn für den Studiengang keine verknüpften Lehrgaenge hat
-					if (isset($additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz]))
-					{
-						$addLehrgaenge = $additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz];
-
-						// sws Durchschnitt über alle verknuepften Lehrgaenge berechnet
-						$summeSws = $row->summe/(count($addLehrgaenge) + 1);
-						$sws = $row->sws/(count($addLehrgaenge) + 1);
-
-						// neue sws zuweisen
-						$obj->summe = $summeSws;
-						$obj->sws = $sws;
-
-						foreach ($addLehrgaenge as $conn_ws_studiengang_kz => $lehrgang)
-						{
-							// sws fuer jeden verknuepften Lehrgang zuweisen
-							$lehrgang->summe = $summeSws;
-							$lehrgang->sws = $sws;
-
-							// neue lehrgang sws hinzufuegen
-							$this->result [] = $lehrgang;
-						}
-					}
-				}
-
 				$this->result []= $obj;
 			}
 			return true;
@@ -751,63 +655,4 @@ class lehreinheitmitarbeiter extends basis_db
 		return false;
 	}
 
-	/**
-	 * Get "connected" Lehrgaenge for equal sws distribution.
-	 * @param $studiensemester_kurzbz_arr all semester for which Lehrgaenge should be retrieved
-	 * @return object success or error
-	 */
-	private function _getLehrgaengeForDistribution($studiensemester_kurzbz_arr)
-	{
-		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return [];
-
-		$qry = "
-			WITH gruppen AS (
-				SELECT
-					mitarbeiter_uid, lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, sem.start, sem.ende,
-					lehreinheitgruppe_id, studiengang_kz, melde_studiengang_kz, lgartcode
-				FROM
-					lehre.tbl_lehreinheitmitarbeiter lema
-					JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
-					JOIN lehre.tbl_lehreinheitgruppe legr USING (lehreinheit_id)
-					JOIN public.tbl_studiengang stg USING (studiengang_kz)
-					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
-				WHERE
-					bismelden
-					AND stg.melderelevant
-					AND stg.typ = 'l'
-					AND le.studiensemester_kurzbz IN (".$this->implode4SQL($studiensemester_kurzbz_arr).")
-			)
-			SELECT
-				DISTINCT mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
-			FROM
-				gruppen gr
-			GROUP BY
-				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
-			ORDER BY
-				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode";
-
-		$lehrgaengeDistributions = [];
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				// group by properties
-				$lehrgaengeDistributions
-					[$row->mitarbeiter_uid]
-					[$row->studiensemester_kurzbz]
-					[$row->lehreinheit_id]
-					[$row->studiengang_kz]
-					= $row;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Datenbankabfrage';
-			return false;
-		}
-
-		return $lehrgaengeDistributions;
-	}
-
 }

include/lehrelisthelper.class.php

@@ -270,8 +270,6 @@ class LehreListHelper
 					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von > $stsemdatumvon || $row->von == '')) {
 						// if bis datum is not yet known but von is available already
 						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
-					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von <= $stsemdatumvon || $row->von == '') && ($row->bis == '' || $row->bis > date('Y-m-d'))){
-						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 					}
 						
 

include/prestudent.class.php

@@ -706,7 +706,6 @@ class prestudent extends person
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
 				$rolle->fgm = $row->fgm;
-				$rolle->faktiv = $this->db_parse_bool($row->faktiv);
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;

package.json

@@ -0,0 +1,27 @@
+{
+  "name": "fhc-core",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "build": "rollup -c",
+    "watch": "rollup --watch -c"
+  },
+  "dependencies": {
+  },
+  "devDependencies": {
+    "@rollup/plugin-alias": "^5.1.0",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-terser": "^0.4.4",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "glob": "^13.0.6",
+    "node-sass": "^9.0.0",
+    "rollup": "^4.52.4",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-vue": "^6.0.0"
+  }
+}

public/css/components/dashboard/news.css

@@ -193,6 +193,3 @@
 	word-break: break-word;
 }
 
-.news-list-item p {
-	word-break: break-word;
-}

public/dist/js/apps/Bismeldestichtag/API.js

@@ -0,0 +1,2 @@
+const e="error",t="retval",r={get:function(e,t,n=null){return r._axiosCall(e,t,"get",n)},post:function(e,t,n=null){return r._axiosCall(e,t,"post",n)},isSuccess:function(r){return!("object"!=typeof r||!r.hasOwnProperty(e)||!r.hasOwnProperty(t)||0!=r.error)},isError:function(e){return!r.isSuccess(e)},hasData:function(e){return!(!r.isSuccess(e)||!("object"==typeof e[t]&&Object.keys(e[t]).length>0||"array"==typeof e[t]&&e[t].length>0||"string"==typeof e[t]&&""!=e[t].trim()||"number"==typeof e[t]))},getData:function(e){return r.hasData(e)?e[t]:null},getError:function(e){return"object"==typeof e&&Object.keys(e).length>0&&e.hasOwnProperty(t)?e[t]:"Generic error"},getErrorCode:function(t){return"object"==typeof t&&t.hasOwnProperty(e)?t[e]:1},_generateRouterURI:function(e){var t=null;return"undefined"!=typeof FHC_JS_DATA_STORAGE_OBJECT&&(t=FHC_JS_DATA_STORAGE_OBJECT.app_root+FHC_JS_DATA_STORAGE_OBJECT.ci_router+"/"+e),t},_printDebug:function(e,t,r){},_axiosCall:function(e,t,n,i){let o={method:n,url:r._generateRouterURI(e),timeout:5e3};if("get"==n?o.params=t:o.data=t,"object"==typeof i)for(var s in i)o[s]=i[s];return axios(o)}},n=2e3,i={getStudiensemester:function(){return r.get("codex/Bismeldestichtag/getStudiensemester",null,{timeout:n})},getBismeldestichtage:function(){return r.get("codex/Bismeldestichtag/getBismeldestichtage",null,{timeout:n})},addBismeldestichtag:function(e){return r.post("codex/Bismeldestichtag/addBismeldestichtag",{meldestichtag:e.meldestichtag,studiensemester_kurzbz:e.studiensemester_kurzbz},{timeout:n})},deleteBismeldestichtag:function(e){return r.post("codex/Bismeldestichtag/deleteBismeldestichtag",{meldestichtag_id:e.meldestichtag_id},{timeout:n})}};export{i as BismeldestichtagAPIs};
+//# sourceMappingURL=API.js.map

public/dist/js/apps/Bismeldestichtag/BismeldestichtagHelper.js

@@ -0,0 +1,2 @@
+const t={formatDate:function(t){return t.replace(/(.*)-(.*)-(.*)/,"$3.$2.$1")}};export{t as BismeldestichtagHelper};
+//# sourceMappingURL=BismeldestichtagHelper.js.map

public/dist/js/apps/Bismeldestichtag/BismeldestichtagHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BismeldestichtagHelper.js","sources":["../../../../js/apps/Bismeldestichtag/BismeldestichtagHelper.js"],"sourcesContent":["/**\n * Copyright (C) 2022 fhcomplete.org\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program.  If not, see <https://www.gnu.org/licenses/>.\n */\n\nexport const BismeldestichtagHelper = {\n\tformatDate: function(date) {\n\t\treturn date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');\n\t}\n}\n"],"names":["BismeldestichtagHelper","formatDate","date","replace"],"mappings":"AAiBO,MAAMA,EAAyB,CACrCC,WAAY,SAASC,GACpB,OAAOA,EAAKC,QAAQ,iBAAkB,WACvC"}

public/dist/js/apps/LogsViewer/TabulatorSetup.js

@@ -0,0 +1,2 @@
+const e={height:700,layout:"fitColumns",columns:[{title:"Log ID",field:"LogId",headerFilter:!0},{title:"Request ID",field:"RequestId",headerFilter:!0},{title:"Execution time",field:"ExecutionTime",headerFilter:!0},{title:"Executed by",field:"ExecutedBy",headerFilter:!0},{title:"Description",field:"Description",headerFilter:!0},{title:"Data",field:"Data",headerFilter:!0},{title:"Web service type",field:"WebserviceType",headerFilter:!0}],rowFormatter:function(e){let t=e.getData();if(null!=t&&t.hasOwnProperty("RequestId")&&null!=t.RequestId){let l=t.RequestId;l.includes("error")?e.getElement().style.color="red":l.includes("warning")&&(e.getElement().style.color="orange")}}},t=[{event:"rowClick",handler:function(e,t){alert(t.getData().Data)}}];export{t as LogsViewerTabulatorEventHandlers,e as LogsViewerTabulatorOptions};
+//# sourceMappingURL=TabulatorSetup.js.map

public/dist/js/apps/LogsViewer/TabulatorSetup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TabulatorSetup.js","sources":["../../../../js/apps/LogsViewer/TabulatorSetup.js"],"sourcesContent":["/**\n * Copyright (C) 2022 fhcomplete.org\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program.  If not, see <https://www.gnu.org/licenses/>.\n */\n\n/**\n *\n */\nexport const LogsViewerTabulatorOptions = {\n\theight: 700,\n\tlayout: 'fitColumns',\n\tcolumns: [\n\t\t{title: 'Log ID', field: 'LogId', headerFilter: true},\n\t\t{title: 'Request ID', field: 'RequestId', headerFilter: true},\n\t\t{title: 'Execution time', field: 'ExecutionTime', headerFilter: true},\n\t\t{title: 'Executed by', field: 'ExecutedBy', headerFilter: true},\n\t\t{title: 'Description', field: 'Description', headerFilter: true},\n\t\t{title: 'Data', field: 'Data', headerFilter: true},\n\t\t{title: 'Web service type', field: 'WebserviceType', headerFilter: true}\n\t],\n\trowFormatter: function(row) {\n\n\t\tlet data = row.getData(); // get data for this row\n\n\t\t// If data is not null and provides the property RequestId and it is not null\n\t\tif (data != null && data.hasOwnProperty('RequestId') && data.RequestId != null)\n\t\t{\n\t\t\tlet requestId = data.RequestId;\n\n\t\t\tif (requestId.includes(\"error\"))\n\t\t\t{\n\t\t\t\trow.getElement().style.color = \"red\";\n\t\t\t}\n\t\t\telse if (requestId.includes(\"warning\"))\n\t\t\t{\n\t\t\t\trow.getElement().style.color = \"orange\";\n\t\t\t\n\t\t\t}\n\t\t}\n\t}\n};\n\n/**\n *\n */\nexport const LogsViewerTabulatorEventHandlers = [\n\t{\n\t\tevent: \"rowClick\",\n\t\thandler: function(e, row) {\n\t\t\talert(row.getData().Data);\n\t\t}\n\t}\n];\n\n"],"names":["LogsViewerTabulatorOptions","height","layout","columns","title","field","headerFilter","rowFormatter","row","data","getData","hasOwnProperty","RequestId","requestId","includes","getElement","style","color","LogsViewerTabulatorEventHandlers","event","handler","e","alert","Data"],"mappings":"AAoBO,MAAMA,EAA6B,CACzCC,OAAQ,IACRC,OAAQ,aACRC,QAAS,CACR,CAACC,MAAO,SAAUC,MAAO,QAASC,cAAc,GAChD,CAACF,MAAO,aAAcC,MAAO,YAAaC,cAAc,GACxD,CAACF,MAAO,iBAAkBC,MAAO,gBAAiBC,cAAc,GAChE,CAACF,MAAO,cAAeC,MAAO,aAAcC,cAAc,GAC1D,CAACF,MAAO,cAAeC,MAAO,cAAeC,cAAc,GAC3D,CAACF,MAAO,OAAQC,MAAO,OAAQC,cAAc,GAC7C,CAACF,MAAO,mBAAoBC,MAAO,iBAAkBC,cAAc,IAEpEC,aAAc,SAASC,GAEtB,IAAIC,EAAOD,EAAIE,UAGf,GAAY,MAARD,GAAgBA,EAAKE,eAAe,cAAkC,MAAlBF,EAAKG,UAC7D,CACC,IAAIC,EAAYJ,EAAKG,UAEjBC,EAAUC,SAAS,SAEtBN,EAAIO,aAAaC,MAAMC,MAAQ,MAEvBJ,EAAUC,SAAS,aAE3BN,EAAIO,aAAaC,MAAMC,MAAQ,SAGjC,CACD,GAMYC,EAAmC,CAC/C,CACCC,MAAO,WACPC,QAAS,SAASC,EAAGb,GACpBc,MAAMd,EAAIE,UAAUa,KACrB"}

public/dist/js/apps/api/fhcapifactory.js

@@ -0,0 +1,13 @@
+var Search = {
+  search: function (searchsettings) {
+    const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/SearchBar/search';
+    return axios.post(url, searchsettings);
+  }
+};
+
+var fhcapifactory = {
+  "search": Search
+};
+
+export { fhcapifactory as default };
+//# sourceMappingURL=fhcapifactory.js.map

public/dist/js/apps/api/fhcapifactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fhcapifactory.js","sources":["../../../../js/apps/api/search.js","../../../../js/apps/api/fhcapifactory.js"],"sourcesContent":["export default {\n  search: function(searchsettings) {\n      const url = FHC_JS_DATA_STORAGE_OBJECT.app_root \n                + FHC_JS_DATA_STORAGE_OBJECT.ci_router\n                + '/components/SearchBar/search';\n      return axios.post(url, searchsettings);\n  }\n};\n","import Search from \"./search.js\";\n\nexport default {\n    \"search\": Search,\n};\n"],"names":["search","searchsettings","url","FHC_JS_DATA_STORAGE_OBJECT","app_root","ci_router","axios","post","Search"],"mappings":"AAAA,aAAe;AACbA,EAAAA,MAAM,EAAE,UAASC,cAAc,EAAE;IAC7B,MAAMC,GAAG,GAAGC,0BAA0B,CAACC,QAAQ,GACnCD,0BAA0B,CAACE,SAAS,GACpC,8BAA8B;AAC1C,IAAA,OAAOC,KAAK,CAACC,IAAI,CAACL,GAAG,EAAED,cAAc,CAAC;AAC1C,EAAA;AACF,CAAC;;ACLD,oBAAe;AACX,EAAA,QAAQ,EAAEO;AACd,CAAC;;;;"}

public/dist/js/apps/api/search.js

@@ -0,0 +1,9 @@
+var search = {
+  search: function (searchsettings) {
+    const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/SearchBar/search';
+    return axios.post(url, searchsettings);
+  }
+};
+
+export { search as default };
+//# sourceMappingURL=search.js.map

public/dist/js/apps/api/search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.js","sources":["../../../../js/apps/api/search.js"],"sourcesContent":["export default {\n  search: function(searchsettings) {\n      const url = FHC_JS_DATA_STORAGE_OBJECT.app_root \n                + FHC_JS_DATA_STORAGE_OBJECT.ci_router\n                + '/components/SearchBar/search';\n      return axios.post(url, searchsettings);\n  }\n};\n"],"names":["search","searchsettings","url","FHC_JS_DATA_STORAGE_OBJECT","app_root","ci_router","axios","post"],"mappings":"AAAA,aAAe;AACbA,EAAAA,MAAM,EAAE,UAASC,cAAc,EAAE;IAC7B,MAAMC,GAAG,GAAGC,0BAA0B,CAACC,QAAQ,GACnCD,0BAA0B,CAACE,SAAS,GACpC,8BAA8B;AAC1C,IAAA,OAAOC,KAAK,CAACC,IAAI,CAACL,GAAG,EAAED,cAAc,CAAC;AAC1C,EAAA;AACF,CAAC;;;;"}

public/js/api/factory/dashboard/board.js

@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2026 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/>.
- */
-
-export default {
-	list() {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/board/list'
-		};
-	},
-	add(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/board/create',
-			params
-		};
-	},
-	update(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/board/update',
-			params
-		};
-	},
-	delete(dashboard_id) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/board/delete',
-			params: { dashboard_id }
-		};
-	}
-}

public/js/api/factory/dashboard/preset.js

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2026 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/>.
- */
-
-export default {
-	list(dashboard_kurzbz) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/preset/list/'
-				+ encodeURIComponent(dashboard_kurzbz)
-		};
-	},
-	getBatch(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/preset/getBatch',
-			params
-		};
-	},
-	addWidget(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/preset/addWidget',
-			params
-		};
-	},
-	removeWidget(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/preset/removeWidget',
-			params
-		};
-	}
-};

public/js/api/factory/dashboard/user.js

@@ -1,45 +0,0 @@
-/**
- * Copyright (C) 2026 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/>.
- */
-
-export default {
-	get(dashboard) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/dashboard/user/get/' + dashboard
-		};
-	},
-	addWidget(dashboard, widget) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/dashboard/user/addWidget',
-			params: {
-				dashboard,
-				widget
-			}
-		};
-	},
-	removeWidget(dashboard, widget) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/dashboard/user/removeWidget',
-			params: {
-				dashboard,
-				widget
-			}
-		};
-	}
-};

public/js/api/factory/dashboard/widget.js

@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2026 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/>.
- */
-
-export default {
-	get(widget) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/dashboard/widget/get/' + widget
-		};
-	},
-	list(dashboard) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/dashboard/widget/list/' + dashboard
-		};
-	},
-	listAllowed(dashboard) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/dashboard/widget/listAllowed/' + dashboard
-		};
-	},
-	setAllowed(dashboard_id, widget_id, allowed) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/dashboard/widget/setAllowed',
-			params: {
-				dashboard_id, widget_id, allowed
-			}
-		};
-	}
-};

public/js/api/factory/searchbar.js

@@ -36,12 +36,5 @@ export default {
 			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
-	},
-	searchPV(params) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/searchbar/searchPV',
-			params
-		};
 	}
 };

public/js/apps/Dashboard/Admin.js

@@ -1,67 +1,16 @@
-import { CoreNavigationCmpt } from '../../components/navigation/Navigation.js';
+import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
-
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
-import ApiRenderers from '../../api/factory/renderers.js';
-
 const app = Vue.createApp({
-	name: 'DashboardAdminApp',
-	data: () => ({
-		appSideMenuEntries: {},
-		renderers: null
-	}),
-	components: {
-		CoreNavigationCmpt,
-		DashboardAdmin
-	},
-	provide() {
-		return {
-			// TODO(chris): move those two into the components that need it
-			renderers: Vue.computed(() => this.renderers),
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
-		};
-	},
-	created() {
-		this.$api
-			.call(ApiRenderers.loadRenderers())
-			.then(res => {
-				for (let rendertype of Object.keys(res.data)) {
-					let modalTitle = null;
-					let modalContent = null;
-					let calendarEvent = null;
-					if (res.data[rendertype].modalTitle)
-						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
-					if (res.data[rendertype].modalContent) 	
-						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
-					if (res.data[rendertype].calendarEvent) 	
-						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
-
-					if (res.data[rendertype].calendarEventStyles) {
-						var head = document.head;
-						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
-							var link = document.createElement("link");
-							link.type = "text/css";
-							link.rel = "stylesheet";
-							link.href = res.data[rendertype].calendarEventStyles;
-							head.appendChild(link);
-						}
-					}
-
-					if (this.renderers === null) {
-						this.renderers = {};
-					}
-					if (!this.renderers[rendertype]) {
-						this.renderers[rendertype] = {}
-					}
-					this.renderers[rendertype].modalTitle = modalTitle;
-					this.renderers[rendertype].modalContent = modalContent;
-					this.renderers[rendertype].calendarEvent = calendarEvent;
-				}
-			})
-			.catch(this.$fhcAlert.handleSystemErrors);
-	}
+  name: 'AdminApp',
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    DashboardAdmin
+  }
 });
 app.use(PluginsPhrasen);
-app.directive('tooltip', primevue.tooltip);
 app.mount('#main');

public/js/apps/Dashboard/Preview.js

@@ -1,17 +0,0 @@
-import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
-import CoreDashboard from '../../components/Dashboard/Dashboard.js';
-import PluginsPhrasen from '../../plugins/Phrasen.js';
-
-const app = Vue.createApp({
-  name: 'DashboardPreviewApp',
-  data: () => ({
-      appSideMenuEntries: {}
-    }),
-  components: {
-    CoreNavigationCmpt,
-    CoreDashboard
-  }
-});
-app.use(PluginsPhrasen);
-app.directive('tooltip', primevue.tooltip);
-app.mount('#main');

public/js/components/Bootstrap/Confirm.js

@@ -17,7 +17,7 @@ export default {
 		</template>
 		<template v-slot:footer>
 			<button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
-			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'cancel')}}</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
 		</template>
 	</bs-modal>`
 }

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -180,7 +180,7 @@ export const AbgabetoolAssistenz = {
 					// 	frozen: true,
 					// 	width: 40
 					// },
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 100, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -226,7 +226,7 @@ export const AbgabetoolAssistenz = {
 						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetool_2026_03_16"
+				persistenceID: "abgabetool_2026_02_26"
 			},
 			abgabeTableEventHandlers: [
 			{
@@ -645,7 +645,7 @@ export const AbgabetoolAssistenz = {
 			actionButtons.className = "d-flex gap-3"; // you can keep Bootstrap gap if loaded
 			actionButtons.style.display = "flex";
 			actionButtons.style.alignItems = "stretch"; // buttons stretch to full height
-			actionButtons.style.justifyContent = "start";
+			actionButtons.style.justifyContent = "center";
 			actionButtons.style.height = "100%"; // full grid cell height
 
 			const val = cell.getValue();
@@ -675,20 +675,8 @@ export const AbgabetoolAssistenz = {
 				createButton('fa fa-timeline', 'abgabetool/c4termineTimeLine', () => this.openTimeline(val))
 			);
 
-			if(val.latestTerminWithUpload) {
-				actionButtons.append(
-					createButton('fa fa-download', 'abgabetool/c4downloadLatestAbgabe', () => this.downloadAbgabe(val.latestTerminWithUpload.paabgabe_id, val.student_uid, val.projektarbeit_id))
-				)
-			}
-
 			return actionButtons;
 		},
-		downloadAbgabe(paabgabe_id, student_uid, projektarbeit_id) {
-			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}&projektarbeit_id=${projektarbeit_id}`;
-
-			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
-			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
-		},
 
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
@@ -792,8 +780,6 @@ export const AbgabetoolAssistenz = {
 					// TODO: mehrsprachig englisch
 					projekt.note_bez = opt.bezeichnung
 				}
-
-				const latestTerminWithUpload = this.findLatestTerminWithUpload(projekt)
 				
 				return {
 					...projekt,
@@ -801,7 +787,6 @@ export const AbgabetoolAssistenz = {
 					details: {
 						student_uid: projekt.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
-						latestTerminWithUpload: latestTerminWithUpload ?? null
 					},
 					pkz: this.buildPKZ(projekt),
 					beurteilung: projekt.beurteilungLink ?? null,
@@ -815,15 +800,6 @@ export const AbgabetoolAssistenz = {
 				}
 			})
 		},
-		findLatestTerminWithUpload(projekt) {
-			const withAbgabedatumSorted = projekt?.abgabetermine?.filter(t => t.abgabedatum != null)?.sort((a,b) => a < b)
-
-			if(withAbgabedatumSorted.length) {
-				return withAbgabedatumSorted[0]
-			}
-
-			return null
-		},
 		createInfoString(data) {
 			let str = '';
 
@@ -1437,11 +1413,8 @@ export const AbgabetoolAssistenz = {
 		
 		<div id="abgabetable" style="max-height:40vw;">
 			<div class="row">
-				<div class="col-auto me-auto">
-					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-				</div>
 				<div class="col-auto">
-					<label class="col-form-label">{{$capitalize($p.t('lehre/studiengang'))}}:</label>
+					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 				</div>
 				<div class="col-3">
 					<Dropdown
@@ -1457,9 +1430,6 @@ export const AbgabetoolAssistenz = {
 						</template>
 					</Dropdown>
 				</div>
-				<div class="col-auto">
-					<label class="col-form-label">{{$capitalize($p.t('lehre/note'))}}:</label>
-				</div>
 				<div class="col-3">
 					<Dropdown
 						:placeholder="$p.t('lehre/note')" 

public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js

@@ -667,10 +667,8 @@ export const AbgabetoolMitarbeiter = {
 		setDetailComponent(details){
 			this.loading=true
 
-			const projektarbeiten = this.projektarbeiten?.retval ?? this.projektarbeiten
+			const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 
-			const pa = projektarbeiten.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-			
 			let paIsBenotet = false
 			if(pa.note !== undefined && pa.note !== null) {
 				// check if the note is not defined as a non final projektarbeit note

public/js/components/Dashboard/Admin.js

@@ -3,20 +3,15 @@ import DashboardAdminEdit from "./Admin/Edit.js";
 import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
-import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
-import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
-
 export default {
-	name: 'DashboardAdmin',
 	components: {
 		DashboardAdminEdit,
 		DashboardAdminWidgets,
-		DashboardAdminPresets,
+		DashboardAdminPresets
 	},
 	provide() {
 		return {
-			adminMode: true,
-			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
+			adminMode: true
 		};
 	},
 	data() {
@@ -27,6 +22,9 @@ export default {
 		};
 	},
 	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		},
 		dashboard() {
 			return this.dashboards.find(el => el.dashboard_id == this.current);
 		}
@@ -37,50 +35,33 @@ export default {
 			BsPrompt.popup('New Dashboard name').then(
 				name => {
 					_name = name;
-					const params = {
+					return axios.post(this.apiurl + '/Dashboard/create', {
 						dashboard_kurzbz: name
-					};
-					return this.$api
-						.call(ApiDashboardBoard.add(params))
-						.then(response =>{
-							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-
-							let newDashboard = {
-								dashboard_id: response.data,
-								dashboard_kurzbz: _name,
-								beschreibung: ''
-							};
-							this.dashboards.push(newDashboard);
-							this.current = newDashboard.dashboard_id;
-						})
-						.catch(this.$fhcAlert.handleSystemError);
-					});
+					})
+				}
+			).then(res => {
+				let newDashboard = {
+					dashboard_id: res.data.retval,
+					dashboard_kurzbz: _name,
+					beschreibung: ''
+				};
+				this.dashboards.push(newDashboard);
+				this.current = newDashboard.dashboard_id;
+			}).catch(err => err !== undefined ? console.error('ERROR:', err) : 0);
 		},
 		dashboardUpdate(dashboard) {
-			return this.$api
-				.call(ApiDashboardBoard.update(dashboard))
-				.then(response =>{
-
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-
-					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
-					old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
-					old.beschreibung = dashboard.beschreibung;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			// TODO(chris): Loading or message
+			axios.post(this.apiurl + '/Dashboard/update', dashboard).then(() => {
+				let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
+				old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
+				old.beschreibung = dashboard.beschreibung;
+			}).catch(err => console.error('ERROR:', err));
 		},
 		dashboardDelete(dashboard_id) {
-			return this.$api
-				.call(ApiDashboardBoard.delete(dashboard_id))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.current = -1;
-					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-				});
+			axios.post(this.apiurl + '/Dashboard/delete', {dashboard_id}).then(() => {
+				this.current = -1;
+				this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
+			}).catch(err => console.error('ERROR:', err));
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
@@ -91,35 +72,22 @@ export default {
 		}
 	},
 	created() {
-		this.$api
-			.call(ApiDashboardBoard.list())
-			.then(result => {
-				this.dashboards = result.data.retval;
-				for (const dashboard of this.dashboards) {
-					this.$api
-						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
-						.then(res => {
-							dashboard.widgetSetup = res.data;
-						})
-						.catch(this.$fhcAlert.handleSystemError);
-				}
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+		axios.get(this.apiurl + '/Dashboard').then(res => {
+			this.dashboards = res.data.retval;
+		}).catch(err => console.error('ERROR:', err));
 	},
 	template: `<div class="dashboard-admin">
-
 		<div class="input-group">
-			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
-			<select id="dashboard-select" class="form-select" v-model="current">
+			<label for="dashbaord-select" class="input-group-text">Dashboard:</label>
+			<select id="dashbaord-select" class="form-select" v-model="current">
 				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
 		</div>
-
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">{{this.$p.t('ui', 'bearbeiten')}}</button>
+					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">Edit</button>
 				</li>
 				<li class="nav-item" role="presentation">
 					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
@@ -133,7 +101,7 @@ export default {
 					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
 				</div>
 				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
-					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
+					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @change="test" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
 				</div>
 				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
 					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>

public/js/components/Dashboard/Admin/Edit.js

@@ -18,8 +18,7 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
-				.then(() => this.$emit('delete', this.dashboard_id)).catch();
+			BsConfirm.popup('Sure?').then(() => this.$emit('delete', this.dashboard_id)).catch();
 		}
 	},
 	template: `<div class="dashboard-admin-edit px-3">
@@ -32,8 +31,8 @@ export default {
 			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
 		</div>
 		<div>
-			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
-			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
+			<button class="btn btn-danger" @click="sendDelete">Delete</button>
+			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">Update</button>
 		</div>
 	</div>`
 }

public/js/components/Dashboard/Admin/Presets.js

@@ -1,7 +1,6 @@
 import DashboardSection from "../Section.js";
 import DashboardWidgetPicker from "../Widget/Picker.js";
 import ObjectUtils from "../../../helpers/ObjectUtils.js";
-import ApiDashboardPreset from "../../../api/factory/dashboard/preset.js";
 
 export default {
 	components: {
@@ -18,6 +17,9 @@ export default {
 		tmpLoading: ''
 	}),
 	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		},
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
 		}
@@ -26,7 +28,6 @@ export default {
 		widgetAdd(section_name, widget) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
-				widget.id = 'loading_' + String((new Date()).valueOf());
 				delete widget.custom;
 				widget.preset = 1;
 				let loading = {...widget};
@@ -35,153 +36,130 @@ export default {
 					if (section.name == section_name)
 						section.widgets.push(loading);
 				});
-
-				const params = {
-					dashboard: this.dashboard,
+				
+				axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
+					db: this.dashboard,
 					funktion_kurzbz: section_name,
-					widget
-				};
-
-				return this.$api
-					.call(ApiDashboardPreset.addWidget(params))
-					.then(result => {
-						let newId = result.data;
-						widget.id = newId;
-						widget.custom = 1;
-						this.sections.forEach(section => {
-							if (section.name == section_name) {
-								section.widgets.splice(section.widgets.indexOf(loading),1);
-								section.widgets.push(widget);
-							}
-						});
-						this.funktionen.forEach(funktion => {
-							if(funktion.funktion_kurzbz === section_name && funktion.has_preset < 1) {
-								funktion.has_preset = 1;
-							}
-						});
-					})
-					.catch(this.$fhcAlert.handleSystemError);
-			})
-			.catch(() => {});
+					widgets: [widget]
+				}).then(result => {
+					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
+					widget.id = newId;
+					widget.custom = 1;
+					this.sections.forEach(section => {
+						if (section.name == section_name) {
+							section.widgets.splice(section.widgets.indexOf(loading),1);
+							section.widgets.push(widget);
+						}
+					});
+				}).catch(error => {
+					console.error('ERROR: ', error);
+					alert('ERROR: ' + error.response.data.retval);
+				});
+			}).catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
 			for (var k in payload) {
-				const section = this.sections.find(section => section.name == section_name);
-				for (var wid in section.widgets) {
-					if (section.widgets[wid].id == k) {
-						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
-						// NOTE(chris): remove internal props
-						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
-							if (payload[k][prop])
-								delete payload[k][prop];
+				for (var i in this.sections) {
+					if (this.sections[i].name == section_name) {
+						for (var wid in this.sections[i].widgets) {
+							if (this.sections[i].widgets[wid].id == k) {
+								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
+								// NOTE(chris): remove internal props
+								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1})
+									if (payload[k][prop])
+										delete payload[k][prop];
+								break;
+							}
+						}
 						break;
 					}
 				}
 				payload[k].widgetid = k;
 				delete payload[k].custom;
 			}
-			this.$api
-				.call(Object.entries(payload).map(([key, widget]) => [
-					key,
-					ApiDashboardPreset.addWidget({
-						dashboard: this.dashboard,
-						funktion_kurzbz: section_name,
-						widget
-					})
-				]))
-				.then(result => {
-					this.sections.forEach(section => {
-						if (section.name == section_name) {
-							section.widgets.forEach((widget, i) => {
-								if (payload[widget.id]) {
-									payload[widget.id].id = widget.id;
-									payload[widget.id].index = widget.index;
-									section.widgets[i] = payload[widget.id];
-									section.widgets[i].custom = 1;
-								}
-							});
-						}
-					});
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
+				db: this.dashboard,
+				funktion_kurzbz: section_name,
+				widgets: payload
+			}).then(() => {
+				this.sections.forEach(section => {
+					if (section.name == section_name) {
+						section.widgets.forEach((widget, i) => {
+							if (payload[widget.id]) {
+								payload[widget.id].id = widget.id;
+								payload[widget.id].index = widget.index;
+								section.widgets[i] = payload[widget.id];
+								section.widgets[i].custom = 1;
+							}
+						});
+					}
+				});
+			}).catch(error => {
+				// TODO(chris): revert placement on failure
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
 		},
 		widgetRemove(section_name, id) {
-			const params = {
+			axios.post(this.apiurl + '/Config/removeWidgetFromPreset', {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
 				widgetid: id
-			};
-			return this.$api
-				.call(ApiDashboardPreset.removeWidget(params))
-				.then(result => {
-					this.sections.forEach(section => {
-						if (section.name == section_name)
-							section.widgets = section.widgets.filter(widget => widget.id != id);
-					});
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			}).then(() => {
+				this.sections.forEach(section => {
+					if (section.name == section_name)
+						section.widgets = section.widgets.filter(widget => widget.id != id);
+				});
+			}).catch(error => {
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
 		},
 		loadSections(evt) {
 			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
 			this.sections = [];
 			this.tmpLoading = funktionen.join('###');
-
-			const params = {
+			axios.get(this.apiurl + '/Config/presetBatch', {params: {
 				db: this.dashboard,
 				funktionen
-			};
-
-			return this.$api
-				.call(ApiDashboardPreset.getBatch(params))
-				.then(result => {
-					if (this.tmpLoading !== funktionen.join('###'))
-						return; // NOTE(chris): prevent race condition
-					for (var section in result.data) {
-						let widgets = [];
-						for (var wid in result.data[section]) {
-							result.data[section][wid].id = wid;
-							result.data[section][wid].custom = 1;
-							widgets.push(result.data[section][wid]);
-						}
-						this.sections.push({
-							name: section,
-							widgets
-						});
+			}}).then(res => {
+				if (this.tmpLoading !== funktionen.join('###'))
+					return; // NOTE(chris): prevent race condition
+				for (var section in res.data.retval) {
+					let widgets = [];
+					for (var wid in res.data.retval[section]) {
+						res.data.retval[section][wid].id = wid;
+						res.data.retval[section][wid].custom = 1;
+						widgets.push(res.data.retval[section][wid]);
 					}
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-
-		},
-		loadFunktionen() {
-			this.$api
-				.call(ApiDashboardPreset.list(this.dashboard))
-				.then(result => {
-					this.funktionen = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+					this.sections.push({
+						name: section,
+						widgets
+					});
+				}
+			}).catch(err => console.error('ERROR:', err));
 		}
 	},
 	created() {
-		this.loadFunktionen();
+		axios.get(this.apiurl + '/Config/funktionen').then(res => {
+			this.funktionen = {general: 'GENERAL'};
+			res.data.retval.forEach(funktion => {
+				this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
+			});
+		}).catch(err => console.error('ERROR:', err));
 	},
 	watch: {
 		dashboard() {
 			// TODO(chris): this should be done without a watcher
 			this.loadSections({target:this.$refs.funktionenList});
-			this.loadFunktionen();
 		}
 	},
 	template: `<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
 				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
-					<option
-						v-for="funktion in funktionen"
-						:key="funktion.funktion_kurzbz"
-						:value="funktion.funktion_kurzbz"
-						:class="(funktion.has_preset > 0) ? 'fw-bold' : ''"
-					>{{ funktion.beschreibung }}</option>
+					<option v-for="name,id in funktionen" :key="id" :value="id">{{ name }}</option>
 				</select>
 			</div>
 			<div class="col-9">

public/js/components/Dashboard/Admin/Widgets.js

@@ -1,5 +1,3 @@
-import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
-
 export default {
 	emits: [
 		"change",
@@ -9,25 +7,34 @@ export default {
 		dashboard_id: Number,
 		widgets: Array
 	},
+	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		}
+	},
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
-
-			this.$api
-				.call(ApiDashboardWidget.setAllowed(this.dashboard_id, widget_id, allow))
-				.catch(this.$fhcAlert.handleSystemError);
+			axios.post(this.apiurl + '/Widget/setAllowed', {
+				dashboard_id: this.dashboard_id,
+				widget_id,
+				action: allow ? 'add' : 'delete'
+			}).catch(err => console.error('ERROR: ' + err));
 		}
 	},
 	created() {
-		this.$api
-			.call(ApiDashboardWidget.list(this.dashboard_id))
-			.then(result => {
-				this.$emit('assignWidgets', result.data.map(el => ({
+		axios.get(this.apiurl + '/Widget/getAll', {
+			params:{
+				dashboard_id: this.dashboard_id
+			}
+		}).then(
+			result => {
+				this.$emit('assignWidgets', result.data.retval.map(el => ({
 					...el,
-					allowed: !!el.allowed
+					...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
 				})));
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+			}
+		).catch(err => console.error('ERROR:', err));
 	},
 	template: `
 	<div class="dashboard-admin-widgets">

public/js/components/Dashboard/Dashboard.js

@@ -2,8 +2,7 @@ import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
-import ApiDashboardWidget from '../../api/factory/dashboard/widget.js';
-import ApiDashboardUser from '../../api/factory/dashboard/user.js';
+import ApiDashboard from '../../api/factory/cis/dashboard.js';
 
 export default {
 	name: 'Dashboard',
@@ -21,147 +20,181 @@ export default {
 			type: Object,
 			required: true,
 			validator(value) {
-				return value && value.name && value.timezone
+				return value && value.name && value.uid && value.timezone
 			}
 		}
 	},
 	data() {
 		return {
-			widgets: [],
-			originalWidgets: {},
-			widgetsSetup: null,
-			editMode: false
+			sections: [],
+			widgets: null,
+			editMode: false,
+			viewDataInternal: this.viewData
 		}
 	},
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
-			widgetsSetup: Vue.computed(() => this.widgetsSetup),
+			widgetsSetup: Vue.computed(() => this.widgets),
 			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
+	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		}
+	},
 	methods: {
 		widgetAdd(section_name, widget) {
-			// TODO(chris): remove section_name? (change order of params => get rid of it)
-			this.$refs.widgetpicker
-				.getWidget()
-				.then(widget_id => {
-					widget.widget = widget_id;
-					widget.id = 'loading_' + String((new Date()).valueOf());
-					let loading = { ...widget };
-					loading.loading = true;
-					this.widgets.push(loading);
-					
-					this.$api
-						.call(ApiDashboardUser.addWidget(this.dashboard, widget))
-						.then(result => {
-							widget.id = result.data;
-							this.widgets.splice(this.widgets.indexOf(loading), 1);
-							this.widgets.push(widget);
-							this.originalWidgets[widget.id] = structuredClone(ObjectUtils.deepToRaw(widget));
-						})
-						.catch(this.$fhcAlert.handleSystemError);
-				})
-				.catch(() => {});
+			if (this.widgets === null) {
+				axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {params:{
+					db: this.dashboard
+				}}).then(res => {
+					res.data.retval.forEach(widget => {
+						widget.arguments = JSON.parse(widget.arguments);
+						widget.setup = JSON.parse(widget.setup);
+					});
+					this.widgets = res.data.retval;
+				}).catch(err => console.error('ERROR:', err));
+			}
+			this.$refs.widgetpicker.getWidget().then(widget_id => {
+				widget.widget = widget_id;
+				widget.id = 'loading_' + String((new Date()).valueOf());
+				let loading = {...widget};
+				loading.loading = true;
+				this.sections.forEach(section => {
+					if (section.name == section_name)
+						section.widgets.push(loading);
+				});
+				
+				axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
+					db: this.dashboard,
+					funktion_kurzbz: section_name,
+					widgets: [widget]
+				}).then(result => {
+					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
+					widget.id = newId;
+					this.sections.forEach(section => {
+						if (section.name == section_name) {
+							section.widgets.splice(section.widgets.indexOf(loading),1);
+							section.widgets.push(widget);
+						}
+					});
+				}).catch(error => {
+					console.error('ERROR: ', error);
+					alert('ERROR: ' + error.response.data.retval);
+				});
+			}).catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
 			for (var k in payload) {
-				for (var wid in this.widgets) {
-					if (this.widgets[wid].id == k) {
-						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
-						// NOTE(chris): remove internal props
-						for (var prop of ['_x','_y','_w','_h','index','id','preset'])
-							if (payload[k][prop])
-								delete payload[k][prop];
+				for (var i in this.sections) {
+					if (this.sections[i].name == section_name) {
+						for (var wid in this.sections[i].widgets) {
+							if (this.sections[i].widgets[wid].id == k) {
+								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
+								// NOTE(chris): remove internal props
+								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1,preset:1})
+									if (payload[k][prop])
+										delete payload[k][prop];
+								break;
+							}
+						}
 						break;
 					}
 				}
 				payload[k].widgetid = k;
 			}
-			this.$api
-				.call(Object.entries(payload).map(([key, widget]) => [
-					key,
-					ApiDashboardUser.addWidget(this.dashboard, widget)
-				]))
-				.then(result => {
-					const failed = result
-						.filter(o => o.status == 'rejected')
-						.map(o => o.reason.config.errorHeader);
-
-					this.widgets.forEach((widget, i) => {
-						if (failed.includes(widget.id)) {
-							this.widgets[i] = structuredClone(ObjectUtils.deepToRaw(this.originalWidgets[widget.id]));
-							/** NOTE(chris): if you wanna hide or unhide a
-							 * preset and it fails: switch around the hidden
-							 * value to revert it properly (checkboxes can't
-							 * really handle it otherwise)
-							 */
-							if (payload[widget.id].hidden !== undefined) {
-								this.widgets[i].hidden = payload[widget.id].hidden;
-								this.$nextTick(() => {
-									this.widgets[i] = structuredClone(ObjectUtils.deepToRaw(this.originalWidgets[widget.id]));
-								});
+			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
+				db: this.dashboard,
+				funktion_kurzbz: section_name,
+				widgets: payload
+			}).then(() => {
+				this.sections.forEach(section => {
+					if (section.name == section_name) {
+						section.widgets.forEach((widget, i) => {
+							if (payload[widget.id]) {
+								payload[widget.id].id = widget.id;
+								payload[widget.id].index = widget.index;
+								section.widgets[i] = payload[widget.id];
 							}
-						} else if (payload[widget.id]) {
-							payload[widget.id].id = widget.id;
-							payload[widget.id].index = widget.index;
-							this.widgets[i] = payload[widget.id];
-							this.originalWidgets[widget.id] = structuredClone(ObjectUtils.deepToRaw(this.widgets[i]));
-						}
-					});
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+						});
+					}
+				});
+			}).catch(error => {
+				// TODO(chris): revert placement on failure
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
 		},
 		widgetRemove(section_name, id) {
-			this.$api
-				.call(ApiDashboardUser.removeWidget(this.dashboard, id))
-				.then(() => {
-					this.widgets = this.widgets.filter(widget => widget.id != id);
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			axios.post(this.apiurl + '/Config/removeWidgetFromUserOverride', {
+				db: this.dashboard,
+				funktion_kurzbz: section_name,
+				widgetid: id
+			}).then(() => {
+				this.sections.forEach(section => {
+					if (section.name == section_name)
+						section.widgets = section.widgets.filter(widget => widget.id != id);
+				});
+			}).catch(error => {
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
 		}
 	},
 	created() {
 		this.$p.loadCategory('dashboard');
+		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
+			params: {
+				db: this.dashboard
+			}
+		}).then(res => {
+			this.widgets = res.data.retval;
+		}).catch(err => console.error('ERROR:', err));
 
-		this.$api
-			.call(ApiDashboardWidget.listAllowed(this.dashboard))
-			.then(res => {
-				this.widgetsSetup = res.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiDashboardUser.get(this.dashboard))
-			.then(res => {
-				const widgets = [];
-				const remove = [];
-
-				for (var wid in res.data.general.widgets) {
-					let widget = res.data.general.widgets[wid];
-					widget.id = wid;
-					if (widget.custom || widget.preset) {
-						widgets.push(widget);
-						this.originalWidgets[wid] = structuredClone(widget);
-					} else {
+		axios.get(this.apiurl + '/Config', {params:{
+			db: this.dashboard
+		}}).then(res => {
+			for (var name in res.data.retval) {
+				let widgets = [];
+				let remove = [];
+				for (var wid in res.data.retval[name].widgets) {
+					res.data.retval[name].widgets[wid].id = wid;
+					if (res.data.retval[name].widgets[wid].custom || res.data.retval[name].widgets[wid].preset)
+						widgets.push(res.data.retval[name].widgets[wid]);
+					else
 						remove.push(wid);
-					}
 				}
-
-				remove.forEach(wid => this.widgetRemove('general', wid));
-
-				this.widgets = widgets;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+				this.sections.push({
+					name: name,
+					widgets: widgets
+				});
+				remove.forEach(wid => this.widgetRemove(name, wid));
+			}
+			this.sections = this.sections.sort((section1, section2) => {
+				if(section1.name == 'custom')
+					return 1;
+				if (section2.name == 'custom')
+					return -1;
+				return section2.widgets.length - section1.widgets.length;
+			});
+		}).catch(err => console.error('ERROR:', err));
+	},
+	async beforeMount() {
+		if (!this.viewData.name || !this.viewData.uid) {
+			const res = await this.$api.call(ApiDashboard.getViewData());
+			this.viewDataInternal = res.data
+		}	
 	},
 	template: `
 	<div class="core-dashboard">
-		<h3>
-			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
+		<h3 v-show="viewDataInternal?.name">
+			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
+		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Item.js

@@ -1,7 +1,9 @@
 import BsModal from "../Bootstrap/Modal.js";
-import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
+import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
+import {absoluteJsImportUrl} from "../../helpers/UrlHelpers.js";
+
 export default {
 	name: 'Item',
 	components: {
@@ -70,14 +72,6 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
-		visible: {
-			get() {
-				return !this.hidden;
-			},
-			set(value) {
-				this.$emit('remove', this.hidden);
-			}
-		}
 	},
 	methods: {
 		unpin(){
@@ -150,14 +144,8 @@ export default {
 			this.isLoading = false;
 		},
 	},
-	setup() {
-		const { actions } = useCachedWidgetLoader();
-		return {
-			loadWidget: actions.load
-		};
-	},
 	async created() {
-		this.widget = await this.loadWidget(this.id);
+		this.widget = await CachedWidgetLoader.loadWidget(this.id);
 		let component = (await import(this.widget.setup.file)).default;
 		this.$options.components["widget" + this.widget.widget_id] = component;
 		this.component = "widget" + this.widget.widget_id;
@@ -199,7 +187,7 @@ export default {
 			</a>
 			<Transition>
 				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
+					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
 				</div>
 			</Transition>
 		</div>

public/js/components/Dashboard/Section.js

@@ -1,7 +1,7 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
-import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
+import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
 export default {
@@ -125,23 +125,23 @@ export default {
 		},
 		checkResizeLimit(item, w, h) {
 			// NOTE(chris): widgets needs to be loaded for this to work
-			let widget = this.widgetState[item.widget];
+			let widget = CachedWidgetLoader.getWidget(item.widget);
 			if (widget) {
-				let minmaxW = { ...widget.setup.width };
+				let minmaxW = widget.setup.width;
 				if (minmaxW.max)
 					minmaxW.min = minmaxW.min || 1;
 				else
-					minmaxW = { min: minmaxW, max: minmaxW };
+					minmaxW = {min:minmaxW,max:minmaxW};
 				if (w < minmaxW.min)
 					w = minmaxW.min; 
 				if (w > minmaxW.max)
 					w = minmaxW.max;
 
-				let minmaxH = { ...widget.setup.height };
+				let minmaxH = widget.setup.height;
 				if (minmaxH.max)
 					minmaxH.min = minmaxH.min || 1;
 				else
-					minmaxH = { min: minmaxH, max: minmaxH };
+					minmaxH = {min:minmaxH,max:minmaxH};
 				if (h < minmaxH.min)
 					h = minmaxH.min;
 				if (h > minmaxH.max)
@@ -151,7 +151,7 @@ export default {
 		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
+				BsConfirm.popup('Are you sure you want to delete this widget?').then(() => this.$emit('widgetRemove', this.name, item.id));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
@@ -199,13 +199,6 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
-	setup() {
-		const { state: widgetState } = useCachedWidgetLoader();
-
-		return {
-			widgetState
-		};
-	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;