Harald Bamberger
ec000fbf83
changes for aenderung and korrektur
2023-05-30 19:13:27 +02:00
Harald Bamberger
92672aaacf
adapt overlapping DVs Check to not consider current DV if edited, but consider karenzen
2023-05-25 15:47:16 +02:00
Harald Bamberger
38509d530a
prepare list of vbs with gbs
2023-05-24 17:54:04 +02:00
Werner Masik
24bf2f95a2
update vertragsbestandteile
2023-05-16 17:05:49 +02:00
Werner Masik
3940912830
fix attribute name valorisieren to valorisierung
2023-05-16 10:04:56 +02:00
Werner Masik
cd66397740
add current date to DV selection query
2023-05-16 10:03:50 +02:00
Werner Masik
4786ff503a
added organisation to current contract info
2023-05-09 17:24:18 +02:00
Harald Bamberger
de4c236817
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-05 13:11:16 +02:00
Andreas Österreicher
6c1a47955f
Merge branch 'feature-27949/infocenter_evaluieren_des_zurueckstellens_mit_einem_grund_zb_fuer_drittstaaten'
2023-05-05 07:48:53 +02:00
Harald Bamberger
e713cdac64
Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-04 15:03:13 +02:00
Harald Bamberger
2f07590461
Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten
2023-05-04 14:59:12 +02:00
Harald Bamberger
7fb0c14555
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-04 14:58:29 +02:00
Harald Bamberger
eb7b73fee9
cleanup according to current vertragsbestandteil db tables
2023-05-02 16:00:13 +02:00
Paolo
08de013c23
Fixes: code quality checks
2023-04-25 16:07:42 +02:00
Harald Bamberger
2163ddcdf5
add Interface IValidation, implement validate stub in all Vertragsbestandteile and Gehaltsbestandteil and DV
2023-04-25 09:22:03 +02:00
Harald Bamberger
a663fa9436
Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 11:30:32 +02:00
Harald Bamberger
48798e8309
Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen
2023-04-24 11:20:53 +02:00
Harald Bamberger
01ca8f6fb9
Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige
2023-04-24 11:18:40 +02:00
Harald Bamberger
0061cf255c
add GehaltsbestandteilLib
2023-04-12 15:22:10 +02:00
Andreas Österreicher
fca341ccf4
Migration von Verträgen speichert nun die Eintäge auch in der DB
...
Tippfehler in Models behoben
Berechtigungen für DV und VBS Sequence hinzugefügt
2023-04-06 07:34:26 +02:00
Werner Masik
c52cd05436
Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge'
2023-03-28 20:12:40 +02:00
Cris
8feec18ff7
Changed query to get Leitung of Lehrveranstaltung-Organisationseinheit (instead of 'Fachbereich')
2023-03-27 10:58:59 +02:00
ma0048
c365896865
- log eintrag hinzugefuegt, beim setzen auf park...
2023-03-16 13:57:17 +01:00
KarpAlex
9c1d58c447
Merge branch 'master' into feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token
2023-03-15 21:47:33 +01:00
Harald Bamberger
4f764b9dfa
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-03-10 14:13:28 +01:00
Cris
ef32586d86
Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen
2023-03-08 13:00:03 +01:00
Andreas Österreicher
c411b826d9
Merge branch 'feature-25518/bewerbungstool_messages_direkt_an_permesser'
2023-03-06 16:54:43 +01:00
Cris
d3f88597d9
Created Model Anrechnungszeitraum_model
...
Inserts / Updates / Deletes Anrechnungszeitraum
2023-03-06 13:19:15 +01:00
ma0048
62550423a3
- geparkt und onhold von der log tabelle in eine eigene tabelle verschoben
...
- nicht mehr benoetigte funktionen entfernt
- infocentertool angepasst
- bewerbungstool angepasst
- phrasen hinzugefuegt
2023-02-23 16:07:52 +01:00
Paolo
c831355012
- FilterWidget: now it is possible to provide the encryptedColumns parameter to specify which columns of a database table are encrypted, how to cast them and which password to use to decrypt them
...
- Added new constants PGSQL_BYTEA_TYPE, CRYPT_CONF_PASSWORDS, CRYPT_CAST, CRYPT_PASSWORD_NAME, CRYPT_SELECT_TEMPLATE, CRYPT_WHERE_TEMPLATE and CRYPT_WRITE_TEMPLATE to application/core/DB_Model.php
- Added new optional parameter encryptedColumns to application/core/DB_Model insert, update, load, loadWhere, execQuery, execReadOnlyQuery and _toPhp
- Added new private methods _addEncrypt, _addDecryptQuery and _addDecryptLoad to application/core/DB_Model.php
- core/DB_Model: now it is possible to provide the encryptedColumns parameter to specify which columns of a database table are encrypted, how to cast them and which password to use to decrypt them
- Adapted application/models/system/PersonLog_model.php
2023-02-08 13:33:40 +01:00
Andreas Österreicher
fd0eed8558
Merge branch 'feature-27665/infocenter_zgv_uebernehmen'
2023-02-06 15:49:18 +01:00
ma0048
e6269b121b
- fixed zgv uebernehmen
2023-02-06 13:04:32 +01:00
Andreas Österreicher
5441024c75
Merge branch 'feature-27363/infocenter_alte_dokumente_aus_dem_archiv_sichtbar'
2023-02-02 12:20:42 +01:00
Andreas Österreicher
b60e0b712f
Merge branch 'feature-25430/stammdaten_im_infocentertool_editierbar'
2023-02-02 10:32:36 +01:00
ma0048
3293a75a79
- berechtigungsabfragen angepasst
...
- fit programme aus der config holen
2023-01-30 11:51:15 +01:00
ma0048
50070bd2ad
- Dokumente aus dem Archiv im Infocenter-Tool nicht anzeigen
2023-01-26 10:41:44 +01:00
Werner Masik
f7d315d4cc
model classes for contract parts (Vertragsbestandteile)
2023-01-21 13:51:59 +01:00
Harald Bamberger
3818d5221c
first guess vertragsbestandteil library
2022-12-13 10:49:35 +01:00
Cris
10ed780b6c
Added method getFachbereichsleitungByLv to Lehrveranstaltung_model
...
Gets all fachbereichsleiter of a Lehrveranstaltung
2022-12-06 10:50:08 +01:00
KarpAlex
911035d5ad
added method getBetreuerart to Projektbetreuer model
2022-12-02 19:48:23 +01:00
KarpAlex
763b0bb756
renamed betreuerart of secondary examiner of bachelor thesis with Vorsitz from Senatspruefer to Senatsmitglied
2022-11-16 17:19:13 +01:00
ma0048
ab95544f9f
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25518/bewerbungstool_messages_direkt_an_permesser
2022-11-15 15:18:59 +01:00
KarpAlex
83b38b999d
Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat
2022-11-08 15:35:08 +01:00
ma0048
a8f6ca1670
Merge remote-tracking branch 'origin/master' into feature-25430/stammdaten_im_infocentertool_editierbar
...
# Conflicts:
# application/views/system/infocenter/infocenterDetails.php
2022-11-03 08:29:10 +01:00
ma0048
f7bd49b408
- master messages an studiengang, wenn bereits bestaetigt
...
- lehrgang messages direkt an lehrgang
2022-10-28 10:56:02 +02:00
Harald Bamberger
b3ce06cb90
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-10-24 15:21:11 +02:00
Manfred
409ccd7640
BugFix DISTINCT in getOrganisationunitsByPersonId
2022-10-24 12:21:40 +02:00
Harald Bamberger
50ab6ae5e9
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-10-24 11:02:52 +02:00
ma0048
0bd7d6f7c6
- editieren von stammdaten im infocentertool
2022-10-18 11:00:57 +02:00
KarpAlex
6d457fd573
added codex/Mobilitaet_model for bis.tbl_mobilitaet
2022-10-06 00:32:53 +02:00