5c463c0866
add vordienstzeit to lohnguide
2026-04-06 22:25:13 +02:00
059b13938e
Merge branch 'master' into feature-70376/Lohnguide
2026-03-18 11:46:27 +01:00
6b816def31
add lohnguide to vertragsbestandteil SQL
2026-03-05 15:34:51 +01:00
e054f1222b
basic model and factory for lohnguide
2026-03-03 11:50:45 +01:00
fa807f37ae
gehaltsbestandteil chart data: spezialfall neuer Gehaltsbestandteil und sofort valorisiert
2026-02-12 14:47:07 +01:00
81725a0fe9
echterdv ueberprfung fixed
2025-10-02 14:27:14 +02:00
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
014a034ce8
add VB function to get last vb stunden before altersteilzeit
2025-07-03 14:53:53 +02:00
f96bfbe000
lehrfächerverteilung v1
2025-05-28 07:51:10 +02:00
9410388a7a
tune order by to sort nearest active dv first
2025-04-24 15:40:58 +02:00
a196da03d2
change order by to ensure latest dv is sorted first
2025-04-24 10:52:47 +02:00
e068abd124
rename functions since they manipulate data for using it in a chart
2025-01-28 18:35:25 +01:00
d7cbe475bf
Merge branch 'master' into feature-5534/Gehaltsgraph_Valorisierung
2025-01-28 17:39:19 +01:00
c5d79f750e
add parameter withvalorisationhistory to use valorisation history or not
2025-01-23 15:31:17 +01:00
af79090de0
modify to consider valorisation history, TODO cleanup valorisation tables dependency on FHC-Core-Personalverwaltung Extension
2025-01-22 17:18:22 +01:00
1853e44cf3
add valorized data for chart display
2025-01-21 12:58:09 +01:00
ce2d69fc82
Vertragsbestandteil Model: check if sap sync table present before executing select for sap organisationseinheit
2024-12-06 13:05:35 +01:00
8a9e040554
added Gehaltstyp model
2024-08-13 16:57:05 +02:00
93d0f88b0d
function getDVByPersonUID: add dvendegrund_kurzbz and dvendegrund_anmerkung to select
2024-06-14 10:48:43 +02:00
08dd6a7783
add dvendegrund_kurzbz and dvendegrund_anmerkung when reading dvs from db
2024-04-25 15:11:16 +02:00
d4bc5148a7
fix disappearing searchbar when session expires, add functions to fetch dvs at a certain duedate for valorisation
2024-03-25 16:53:03 +01:00
2cce61ca6a
Korrekturen für Gehaltsimport
2024-03-15 13:37:07 +01:00
7b9bfd70c8
make name of enc key more specific
2024-01-15 10:39:54 +01:00
a5d21b3b8d
extend DV overlap check
2023-11-28 12:43:25 +01:00
11926ca9b2
refactor creation of benutzerfunktiondata, add check for already used benutzerfunktionen in another vb
2023-11-20 09:19:32 +01:00
98eb3fbd8b
exclude werkvertrag from overlap check
2023-11-14 14:09:06 +01:00
05e2808f00
add Models for Vertragsbestandteiltyp and VertragsbestandteilFreitexttyp, implement IValidation Interface on AbstrcatBestandteil, add OverlapChecker checking for overlapping VBs against DB
2023-10-23 17:58:18 +02:00
eee6f918cd
add oe_typ_kurzbz and oe_typ_bezeichnung to use in labels
2023-10-19 13:05:02 +02:00
799911b948
added method to fetch DV by ID
2023-08-17 16:14:53 +02:00
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
3eaefc88bd
set hasSequence correct
2023-07-26 18:40:37 +02:00
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
800b490c62
added function to get chart data
2023-07-04 18:10:00 +02:00
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
bcdf29f57f
added method to display rudimentary chart data
2023-06-06 16:25:04 +02:00
88039c2327
Merge branch 'werner/vertragsbestandteile_delete' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-06-05 10:58:39 +02:00
5b7a78e6d8
delete DV; improved GBT query
2023-06-05 10:42:59 +02:00
ec000fbf83
changes for aenderung and korrektur
2023-05-30 19:13:27 +02:00
92672aaacf
adapt overlapping DVs Check to not consider current DV if edited, but consider karenzen
2023-05-25 15:47:16 +02:00
38509d530a
prepare list of vbs with gbs
2023-05-24 17:54:04 +02:00
24bf2f95a2
update vertragsbestandteile
2023-05-16 17:05:49 +02:00
3940912830
fix attribute name valorisieren to valorisierung
2023-05-16 10:04:56 +02:00
cd66397740
add current date to DV selection query
2023-05-16 10:03:50 +02:00
4786ff503a
added organisation to current contract info
2023-05-09 17:24:18 +02:00
eb7b73fee9
cleanup according to current vertragsbestandteil db tables
2023-05-02 16:00:13 +02:00
2163ddcdf5
add Interface IValidation, implement validate stub in all Vertragsbestandteile and Gehaltsbestandteil and DV
2023-04-25 09:22:03 +02:00
0061cf255c
add GehaltsbestandteilLib
2023-04-12 15:22:10 +02:00
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
c52cd05436
Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge'
2023-03-28 20:12:40 +02:00
f7d315d4cc
model classes for contract parts (Vertragsbestandteile)
2023-01-21 13:51:59 +01:00
Werner Masik