Commit Graph

1034 Commits

Author SHA1 Message Date
Paolo b2358c57d7 Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011 2026-02-09 12:35:59 +01:00
Paolo 6b7e061c87 Merge branch 'master' into feature-6237/Phrases_system_MkIII 2026-02-09 12:34:28 +01:00
Harald Bamberger 85a10e27cc fix setFirstStudent if GENERATE_ALIAS_STUDENT is false 2026-02-02 17:59:15 +01:00
Paolo 36823dac7d Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011 2026-01-13 17:11:14 +01:00
Paolo a1142136b2 Merge branch 'master' into feature-6237/Phrases_system_MkIII 2026-01-13 17:08:02 +01:00
Paolo a0c41c95cd Merge branch 'master' into feature-13011/installation_on_multiple_servers 2026-01-13 16:47:08 +01:00
Harald Bamberger c113c80862 fix calculation of next student matrikelnr aka personenkennzeichen and student uid 2025-12-22 21:11:05 +01:00
Harald Bamberger 0616236e00 bugfix: ZGV Übernahme bei Interessentenanlage, bestehende ZGVs die null sind ausfiltern 2025-12-18 12:48:08 +01:00
Harald Bamberger 50439ee6cc Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten 2025-12-09 11:37:57 +01:00
Paolo 7868c33c3d Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011 2025-11-13 09:55:40 +01:00
Paolo 3e303a6617 - ExtensionsLib->getInstalledExtensions returns only the extensions installed on the current server
- Better checks if no file has been uploaded
2025-11-13 09:53:06 +01:00
Paolo 4177c83c8e Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011 2025-11-03 16:33:16 +01:00
Paolo bc2fb32e3e Fixed phrases import from old system to the new one 2025-11-03 16:32:37 +01:00
Paolo 63810ccc81 Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011 2025-10-21 15:03:59 +02:00
Paolo 33047797fd Merge branch 'master' into feature-13011/installation_on_multiple_servers 2025-10-21 13:12:21 +02:00
Paolo e32ce9a7ec Merge branch 'master' into feature-6237/Phrases_system_MkIII 2025-10-21 13:11:51 +02:00
Andreas Österreicher 4407310f40 Merge branch 'master' into feature-67484/lvverwaltung_finetunning 2025-10-20 11:33:43 +02:00
Alexei Karpenko 07bcbee11b add Interessent: insertamum and insertvon when adding prestuden 2025-10-13 10:52:52 +02:00
Harald Bamberger e4943e0bb8 Merge branch 'feature-67550/CIS4_Profilupdate_Finetuning' 2025-10-07 16:22:09 +02:00
Harald Bamberger 4054a0cfee format Zutrittskarte Datum 2025-10-07 15:24:45 +02:00
Paolo 8a1ca9a598 Checked that the session is not an error in the FilterComponent 2025-10-07 13:33:49 +02:00
Harald Bamberger a1d616ff03 alter profilupdate api if heimatadresse is updated create new adress, readd missing isMitarbeiter info in frontend an provide/inject it 2025-10-06 18:27:19 +02:00
Alexei Karpenko 1c21e8f88d Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten 2025-10-06 16:54:41 +02:00
Alexei Karpenko 60a1d40048 prstudentlib incoming: removed addmeta (debugging) 2025-10-03 14:03:41 +02:00
Alexei Karpenko 8c6033fed6 add first incoming: correctly check lehrverband, moved creating of incoming prestudentstatus to prestudent lib 2025-10-03 14:02:53 +02:00
Alexei Karpenko 3a6fb08350 Creating of Interessenten: moved to PRestudentlib, renamed check to getPerson, corrected transaction handling, enabled creating of Incomings 2025-10-02 16:52:11 +02:00
Paolo 35b37dec55 Other filters are still working even if for one of them the user does not have permissions 2025-10-02 13:34:44 +02:00
Paolo a2d2025e4c Fixed 2025-10-02 13:33:47 +02:00
Harald Bamberger d148eaed11 ReservierungModel getRerservierungenMitarbeiter remove unused paramter ort_kurzbz, StundenplanLib only query reservations for logged in user if request is for the personal lv plan aka if ort_kurbz is empty 2025-10-01 16:19:15 +02:00
Harald Bamberger 6047b19f47 do not show contacts with type hidden in cis4 profile 2025-09-25 17:19:19 +02:00
ma0048 0f43e8eb7a autocomplete auf backend umgestellt
textarea formattedAnmerkung rausgenommen
ui angepasst
2025-09-24 14:27:01 +02:00
Paolo e98e708283 Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011 2025-09-22 11:57:15 +02:00
Paolo 513e9325e1 Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011 2025-09-22 11:11:48 +02:00
Paolo 9c60ab7be2 Merge branch 'master' into feature-13011/installation_on_multiple_servers 2025-09-22 11:00:30 +02:00
Paolo 0f82e73935 Fixed application/libraries/PhrasesLib.php->_appendPhraseToCategoryFile 2025-09-22 10:54:57 +02:00
Andreas Österreicher f97951966c Merge branch 'deploy_22_09_25_lvverwaltung' 2025-09-22 10:49:15 +02:00
Paolo 0c83bdfc68 Merge branch 'master' into feature-6237/Phrases_system_MkIII 2025-09-22 10:31:11 +02:00
Harald Bamberger 41143a6dfc profile functions use tbl_benutzerfunktion.beschreibung in column description, format date columns in profile tabulators, fix vuejs dev version warnings 2025-09-19 10:58:53 +02:00
Harald Bamberger 0577f3f8b9 Cis4 Profile only show current userfunctions with description from tbl_funktion 2025-09-18 18:46:11 +02:00
ma0048 6a31eade8b Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2025-09-18 15:04:01 +02:00
ma0048 57531d956d gruppen in eigenen tab verschoben
styling
phrases
2025-09-18 13:18:44 +02:00
Harald Bamberger bbfaf447f5 remove dependency to library from pv extension and do not delete salary history when gb is deleted since foreign key is configured on delete set null 2025-09-17 12:13:15 +02:00
Harald Bamberger 7e40e34212 remove DMS_PATH from original user filename 2025-09-16 17:40:27 +02:00
ma0048 7df383f45e hinzugefuegte spann class caps durch den parser entfernt 2025-08-28 08:36:20 +02:00
ma0048 2b7f56622c Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/organisation/Studienplan_model.php
#	application/models/person/Notiz_model.php
#	application/models/ressource/Mitarbeiter_model.php
#	public/js/components/Stv/Studentenverwaltung.js
#	public/js/components/Stv/Studentenverwaltung/Verband.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2025-08-07 11:03:05 +02:00
Harald Bamberger 8a1cbd754d Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4 2025-08-05 16:32:50 +02:00
Andreas Österreicher 72bb465ecf Fixed Document Archive und Signature 2025-08-05 09:25:34 +02:00
chfhtw 9b396088c3 Refactor LvPlan endpoints to be more granular 2025-08-04 14:09:27 +02:00
Harald Bamberger e727c03a42 fix current simple search with modified searchbar, let action always emit actionexecuted event on click to close search in combination with vue router 2025-08-04 13:42:51 +02:00
Harald Bamberger a429b20823 Merge branch 'feature-63192/FHC4-Studierendenverwaltung_Semsterauswahl_fuer_mehrere_Tabs_anpassen' into rc1_FHC4_C4 2025-08-01 16:26:01 +02:00