e3f10069ef
Adapted getUntergebene to allow to include also Mitarbeiter, who ended Dienstverhältnis/changed OE last month
...
These allows Vorgesetzte to still access their data, for example to be able to accept their November-Monatsliste (last working month)
in December (month to accept the November-Monatsliste)
2024-01-10 14:42:13 +01:00
97a020460d
Adapted: getVorgesetzteByDate to retrieve only the latest Vorgesetzte by a specific date
...
Added order by and limit to get only one and the most actual Vorgesetzte by given date.
Changed name. Before it was getVorgesetzteMonatTimesheet, but it is also used independently from timesheet.
2024-01-10 14:31:26 +01:00
5452dc6fe3
Adapted: getVorgesetzte retrieve only the latest Vorgesetzte
...
Added order by and limit to get only one and the most actual Vorgesetzte
2024-01-10 14:29:16 +01:00
d522389f76
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-08 11:47:17 +01:00
9460d2b2cd
removed reactivity warning 'Vue received a Component that was made a reactive object'
2023-12-29 17:09:38 +01:00
dcc0093987
sachaufwand_id_seq rechte fuer vilesci user
2023-12-21 14:49:50 +01:00
52b1598ab4
zusaetzlicher Teilzeittyp Wiedereingliederungsteilzeit
2023-12-21 14:44:07 +01:00
60ad46b2fb
and another dependency of Tabs
2023-12-20 15:24:56 +01:00
2a9181d28d
add another dependency of Tabs
2023-12-20 15:20:06 +01:00
1aa6d07559
add dependency for Tabs
2023-12-20 15:09:49 +01:00
d9cd3a0b1d
add files for manipulating tabs from feature-30660
2023-12-20 14:30:11 +01:00
00a1c66d86
Corrected: Tagesgenaue Prüfung auf AZG-relevant
2023-12-13 16:14:08 +01:00
bf20854878
Corrected: Tagesgenaue Prüfung auf Homeoffice
2023-12-13 14:09:20 +01:00
52cc0db5da
phrases for off time view
2023-12-11 21:28:52 +01:00
1797abdc5f
Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-11 13:22:58 +01:00
bb9eb31e6e
Adapted getWochenstunden in Vertragsbestandteil Class to handle Karenz
...
Karenzierte Dienstverhältnisse werden nicht zurückgegeben.
Dafür aber ein eventuelles 2.DV mit geringfügiger Beschäftigung neben der Karenz.
2023-12-11 13:11:33 +01:00
a361036aa9
Added method isKarenziert to Vertragsbestandteil Class
...
Prüft, ob MitarbeiterIn zum Abfragedatum karenziert ist.
Wenn kein Datum übergeben wird, wird das heutige Datum gesetzt.
2023-12-11 13:09:56 +01:00
26ab9ff221
Updated 3 Vertragsbestandteil-Methods: Set 'Order By' to retrieve very last active Vertragsbestandteil
2023-12-11 13:08:57 +01:00
28128ee35e
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-11 08:02:21 +01:00
9fa7e6e56c
modify label of Studiengaenge in Dropdown and Table
2023-12-07 17:12:38 +01:00
b6585dc186
add margin-right to prevent scrollbar from overlaying table
2023-12-07 16:05:52 +01:00
85a743b43a
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-07 08:03:34 +01:00
bd4a0af690
Removed 'Lehre Saldo anzeigen'
2023-12-06 13:31:06 +01:00
f18aa42966
Added function getWochenstunden to Vertragsbestandteil Class
2023-12-06 13:24:52 +01:00
83e3898b31
Merge branch 'feature-28269/Zeiterfassung-an-neue-Vertragsstruktur-anpassen' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-04 17:35:01 +01:00
7d701835cc
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-04 17:34:19 +01:00
4552050c8a
Changed: Allin Saldoanzeige an neue Vertragsstruktur angepasst
2023-12-04 17:30:10 +01:00
b6b8f0d182
Removed unused require_once files
2023-12-04 17:25:43 +01:00
483b6171c7
add space between firstname and surname
2023-12-01 09:39:46 +01:00
0e04138480
Merge branch 'feature-34998/Studierendenstatus_Mail_nicht_an_private_Adresse_schicken'
2023-11-30 15:04:10 +01:00
a3963248dd
s&d
2023-11-29 14:37:35 +01:00
8b55a7843d
altersteilzeit geblockt mit 0 Stunden zulassen
2023-11-29 07:33:38 +01:00
ff302e6173
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-28 13:08:14 +01:00
0f2f21aa19
Merge branch 'feature-34537/Phrasenmixin_als_Plugin'
2023-11-28 12:56:31 +01:00
bbd41f17cc
use textarea instead of pre
2023-11-28 12:53:44 +01:00
a5d21b3b8d
extend DV overlap check
2023-11-28 12:43:25 +01:00
a613abea39
fix kurzbz check
2023-11-28 12:18:13 +01:00
c123ad0578
Merge branch 'master' into feature-34537/Phrasenmixin_als_Plugin
2023-11-28 09:28:02 +01:00
a6f18ae424
Bugfix: parameter missing
2023-11-27 12:21:25 +01:00
71495877f3
Merge branch 'feature-29767/anpassung_abgabetool_fuer_vl'
2023-11-27 10:09:45 +01:00
b80df4f0eb
refactor benutzerfunktion handling
2023-11-27 07:37:19 +01:00
28e533fb3c
replace pre with textarea to fix reason being overlapped by scroll bar
2023-11-23 17:53:43 +01:00
a1aff9bd0c
Merge branch 'feature-34883/Studstatus_insertvon__bestaetigtvon_bei_Abbrechern'
2023-11-23 16:29:40 +01:00
66cbe5199a
correct phrasestext
2023-11-23 16:17:05 +01:00
b0d6212c5e
Merge branch 'feature-34922/NeuerAbmeldungsgrundPhrase'
2023-11-23 16:06:54 +01:00
c93a4d2fb5
Studstatus: Wiederholer Reminder 1 wird vermutlich mit einem Tag delay versandt
2023-11-23 15:51:35 +01:00
4932f21204
s&d
2023-11-23 15:37:01 +01:00
2d25e08227
Longtext ZGV ohne Hinweis auf Ausbildungsvertrag
2023-11-23 09:45:29 +01:00
d0bebeaa4a
neue Phrase MissingZGV, entfernen new lines
2023-11-23 09:16:56 +01:00
594dbdca21
Merge branch 'feature-34883/bestaetigtvon_bei_Abbrechern'
2023-11-22 17:08:20 +01:00
Cris