 cgfhtw
|
b2ebb804a8
|
added multilanguage functions to DB_Model
|
2024-08-02 14:21:41 +02:00 |
|
|
Harald Bamberger
|
f064a29efc
|
Merge branch 'master' into feature-40743/Anrechnung_Config-fuer-zusaetzliche-Felder
|
2024-07-17 08:02:55 +02:00 |
|
|
Harald Bamberger
|
16ab9998b0
|
Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz
|
2024-07-11 14:44:44 +02:00 |
|
|
Harald Bamberger
|
115151473a
|
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
|
2024-07-11 11:57:45 +02:00 |
|
|
Cris
|
1139b251ef
|
Adapted Views to handle display of Begruendung-zur-Gleichwertigkeit fields
...depending on $config['explain_equivalence']
|
2024-07-11 10:52:51 +02:00 |
|
|
Cris
|
8c3b85066a
|
Adapted Controller RequestAnrechnung.php to handle Begruendung-zur-Gleichwertigkeit fields
...depending on $config['explain_equivalence']
|
2024-07-11 10:49:05 +02:00 |
|
|
Cris
|
0b48e94d3c
|
Added config variable $config['explain_equivalence'] (Begruendung zu Gleichwertigkeit)
...to display and enable 'Begründung zu Gleichwertigkeit'-fields
|
2024-07-11 10:44:12 +02:00 |
|
|
Harald Bamberger
|
2a537df687
|
Merge branch 'master' into feature-40285/Studstatus_Datum_der_Abmeldung_auf_den_3_Abmeldungsdokumenten
|
2024-07-09 10:35:40 +02:00 |
|
|
Harald Bamberger
|
dd0bdddbc6
|
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
|
2024-07-01 14:12:48 +02:00 |
|
|
cgfhtw
|
9c53a7a75b
|
PDF Download Button während Einspruchsfrist verbergen
|
2024-06-19 14:02:20 +02:00 |
|
|
Harald Bamberger
|
93d0f88b0d
|
function getDVByPersonUID: add dvendegrund_kurzbz and dvendegrund_anmerkung to select
|
2024-06-14 10:48:43 +02:00 |
|
|
Harald Bamberger
|
fd2474cc38
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-13 11:51:10 +02:00 |
|
|
Harald Bamberger
|
1e56707e5a
|
Merge branch 'feature-40415/Studstatus-UID_in_Sancho_Message_Abmeldung_StG_Ablauf_Einspruchsfrist'
|
2024-06-12 08:13:11 +02:00 |
|
|
Harald Bamberger
|
6816a300f6
|
Beschriftung korrigiert
|
2024-06-11 16:39:20 +02:00 |
|
|
Harald Bamberger
|
0b8191a435
|
Beschriftung zu IDs in Sancho Message hinzugefuegt
|
2024-06-11 16:26:52 +02:00 |
|
|
Harald Bamberger
|
f8d8a44a3c
|
student_uid zu sancho message Abmeldung StG Ablauf Einspruchsfrist
|
2024-06-11 14:47:54 +02:00 |
|
|
Cris
|
884d930e71
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-06-04 16:05:33 +02:00 |
|
|
Harald Bamberger
|
7b148b1a39
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-03 17:21:50 +02:00 |
|
|
Harald Bamberger
|
0cbb8997e2
|
migratecontract config und config check auch in MigrateHourlyRate verwenden
|
2024-06-03 17:14:55 +02:00 |
|
|
Harald Bamberger
|
9454bde14a
|
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
|
2024-05-29 15:19:23 +02:00 |
|
|
Harald Bamberger
|
a924c9d2bb
|
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
|
2024-05-29 11:49:11 +02:00 |
|
|
KarpAlex
|
d8ba92e343
|
Merge branch 'master' into feature-36963/BIS_check_duales_Studium
|
2024-05-27 19:42:48 +02:00 |
|
|
cgfhtw
|
d5e8227918
|
Bugfix: api/frontend/fas controller do not inherit from FHCAPI_Controller
|
2024-05-27 12:45:10 +02:00 |
|
|
Harald Bamberger
|
8cba0aec5a
|
vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert
|
2024-05-22 15:32:28 +02:00 |
|
|
Cris
|
aab198e355
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-05-22 11:03:34 +02:00 |
|
|
Harald Bamberger
|
f2a2469e6e
|
MigrateContract: keine ZeitaufzeichnungsVbs erstellen wenn za oder azg flag null ist. MigrateHourlyRate: kalkulatorische Stundensaetze nur migrieren wenn SAP Sync Tabelle existiert.
|
2024-05-15 17:25:26 +02:00 |
|
|
Cris
|
6d728ae0e7
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
# public/js/components/Tabs.js
# public/js/components/filter/Filter.js
|
2024-05-13 12:07:37 +02:00 |
|
|
Harald Bamberger
|
69b0b3601d
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-05-03 13:08:12 +02:00 |
|
|
Harald Bamberger
|
ef5040557d
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-29 09:37:06 +02:00 |
|
|
Harald Bamberger
|
2ea3597a10
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-04-25 15:11:41 +02:00 |
|
|
Harald Bamberger
|
08dd6a7783
|
add dvendegrund_kurzbz and dvendegrund_anmerkung when reading dvs from db
|
2024-04-25 15:11:16 +02:00 |
|
|
ma0048
|
8bac75ae52
|
- bug behoben, damit keine leeren "Status Abgewiesen gesetzt" Mails verschickt werden
|
2024-04-25 14:20:18 +02:00 |
|
|
Harald Bamberger
|
c33a11e952
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-24 08:30:25 +02:00 |
|
|
Harald Bamberger
|
5175dcdbe4
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-23 15:57:50 +02:00 |
|
|
Harald Bamberger
|
e11dd21a1e
|
add parameter dvendegrund_kurzbz and dvendegrund_anmerkung
|
2024-04-09 16:35:00 +02:00 |
|
|
KarpAlex
|
2132fe76ae
|
added Plausicheck: students in DUAL Studiengang should have set boolean value dual to true, plausicheck bugfixes (loading model, remove unnecessary property)
|
2024-04-03 17:39:00 +02:00 |
|
|
cgfhtw
|
d34ce78c94
|
s&d
|
2024-03-29 13:00:54 +01:00 |
|
|
Cris
|
ba1fa6add4
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-03-28 13:20:51 +01:00 |
|
|
Andreas Österreicher
|
058ed94c2b
|
Merge branch 'feature-36196/DVUH_Meldestatus_beruecksichtigen'
|
2024-03-26 11:34:26 +01:00 |
|
|
Harald Bamberger
|
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 |
|
|
Harald Bamberger
|
8a86bce567
|
Merge branch 'feature-33003/BIS_Meldung_Personal' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
|
2024-03-25 14:55:11 +01:00 |
|
|
Harald Bamberger
|
ad415ad665
|
deactivateDienstverhaeltnis: only set user to inactive if no other dv is active
|
2024-03-25 14:04:21 +01:00 |
|
|
Harald Bamberger
|
9f2dd82009
|
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
|
2024-03-25 13:08:10 +01:00 |
|
|
cgfhtw
|
c4942cc70e
|
Studstatus => FhcApi
|
2024-03-21 15:45:55 +01:00 |
|
|
cgfhtw
|
b147f73954
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-03-18 09:51:29 +01:00 |
|
|
Andreas Österreicher
|
2cce61ca6a
|
Korrekturen für Gehaltsimport
|
2024-03-15 13:37:07 +01:00 |
|
|
Harald Bamberger
|
77221e507f
|
set tabulator to fixed height, fix missing grund when editing unterbrechung
|
2024-03-14 11:42:39 +01:00 |
|
|
cgfhtw
|
bc5d42b310
|
Studstatus: ausbildungssemester in getAllPrestudentsWhereCommitteeExamFailed
|
2024-03-14 08:52:55 +01:00 |
|
|
cgfhtw
|
cba4c8e365
|
Studstatus: Fallback for antrag details
|
2024-03-13 16:46:10 +01:00 |
|
|
cgfhtw
|
f5bc8bdcb2
|
Studstatus: Unterbrechung: get semester for current status on new Antrag
|
2024-03-13 10:40:32 +01:00 |
|