Commit Graph

740 Commits

Author SHA1 Message Date
Harald Bamberger 9bfcbf3bf1 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-09-19 11:06:32 +02:00
Harald Bamberger cbe73ae37c Merge branch 'feature-31018/pv21_stundensaetze' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-09-19 10:42:11 +02:00
Andreas Österreicher 6fba58c113 Merge branch 'master' into feature-29835/UHSTAT1_Erfassung_der_UHSTAT1_Daten_ueber_das_Bewerbungstool 2023-09-07 14:56:18 +02:00
ma0048 a2a645b7c7 Merge remote-tracking branch 'origin/feature-29529/infocenter_anpassungen' into infocenter_2023_08_24
# Conflicts:
#	system/dbupdate_3.4.php
2023-08-24 11:00:16 +02:00
ma0048 b93cfbfa9e Merge remote-tracking branch 'origin/feature-27691/sammeltask_aenderung_bewerberdefinition' into infocenter_2023_08_24 2023-08-24 10:56:04 +02:00
ma0048 26e63160ba - bug fix, bescheibung 2023-08-24 10:38:46 +02:00
Werner Masik 799911b948 added method to fetch DV by ID 2023-08-17 16:14:53 +02:00
ma0048 c4377010b1 - pv21 stundensaetze hinzugefuegt 2023-08-14 14:14:37 +02:00
KarpAlex 1e082ed225 UHSTAT1 form: removed geburtsnation as it is saved in person table anyways, started to display existing uhstat data on form load 2023-07-27 17:13:31 +02:00
Harald Bamberger 270c9e1741 remove hasSequence again to avoid error, check vbs basedata and specialdata if not empty before update 2023-07-26 19:23:31 +02:00
Harald Bamberger 3eaefc88bd set hasSequence correct 2023-07-26 18:40:37 +02:00
Harald Bamberger ac5d6071cd extend VerttragsbestandteilLib to keep track on modified columns and only update dv, vbs and gbs when they differ from the status in the db 2023-07-26 16:27:34 +02:00
Cris 110d6bace3 Adapted backend logic to save/retrieve begruendung_ects and begruendung_lvinhalt 2023-07-20 13:42:53 +02:00
KarpAlex 68fbc13a69 added first version of uhstat1 form, added unique constraint for person_id in uhstat1daten table, added permissions for uhstat1daten sequence 2023-07-15 19:57:51 +02:00
Werner Masik 800b490c62 added function to get chart data 2023-07-04 18:10:00 +02:00
Andreas Österreicher ee7fe0251d - Script fuer den einmaligen Import der Gehaelter hinzugefuegt
- Migration der Vertraege angepasst damit alle Mitarbeiter auf einmal
  migriert werden koennen. Anpassung zur Unterscheidung der Zuordnung zum
Unternehmen
2023-07-03 18:32:34 +02:00
Harald Bamberger fb8172eda1 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-06-22 12:54:48 +02:00
Werner Masik bcdf29f57f added method to display rudimentary chart data 2023-06-06 16:25:04 +02:00
Harald Bamberger 88039c2327 Merge branch 'werner/vertragsbestandteile_delete' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-06-05 10:58:39 +02:00
Werner Masik 5b7a78e6d8 delete DV; improved GBT query 2023-06-05 10:42:59 +02:00
ma0048 f5ee097b72 - doppelte benutzer bug fix 2023-06-02 12:01:31 +02:00
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
KarpAlex 186412144d Merge branch 'master' into feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen 2023-05-21 17:38:49 +02:00
KarpAlex 696849062f Issues konfiguration: added GUI for assigning konfiguration to fehler 2023-05-21 17:34:11 +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
KarpAlex 1ec52e710a Plausichecks: enabled Fehlerkonfiguration for excluding certain Studiengänge from checks, changed comments 2023-05-14 21:19:39 +02:00
KarpAlex fd7c193894 added tables and model for issue Fehlerkonfiguration 2023-05-11 18:54:35 +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