 Cris
|
ef32586d86
|
Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen
|
2023-03-08 13:00:03 +01:00 |
|
|
Cris
|
4a5e83fece
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2023-03-08 12:58:29 +01:00 |
|
|
Cris
|
ba0e084311
|
Integrated into FH Complete Navigation
|
2023-03-07 18:40:54 +01:00 |
|
|
Cris
|
a7f02548b0
|
Formatted date (of Anrechnungszeitraum Start and -Ende)
|
2023-03-07 17:57:39 +01:00 |
|
|
Cris
|
9882065b20
|
Removed tablesorter script
Not used.
|
2023-03-07 17:56:26 +01:00 |
|
|
Cris
|
058d01b6be
|
Added Berechtigung lehre/anrechnungszeitfenster
|
2023-03-07 17:37:50 +01:00 |
|
|
Cris
|
68a6554d19
|
Removed loading config Anrechnung
Not needed anymore. Using tbl_anrechnungszeitfenster now.
|
2023-03-07 17:20:20 +01:00 |
|
|
Cris
|
f8349a2a9b
|
Changed Bootstrap 5 -> Bootstrap 3
Tablewidget is not working fine with Bootstrap 5 by now.
|
2023-03-07 17:18:21 +01:00 |
|
|
Andreas Österreicher
|
08fffa5009
|
Merge branch 'feature-15029/Docsbox'
|
2023-03-07 16:27:16 +01:00 |
|
|
Andreas Österreicher
|
d06efc15a6
|
Removed Config because its in the global Config
|
2023-03-07 16:22:35 +01:00 |
|
|
Andreas Österreicher
|
58c3fba33a
|
Added Missing Config to enable Docsbox Conversion
|
2023-03-07 16:20:02 +01:00 |
|
|
Andreas Österreicher
|
bf6d0aca38
|
Merge branch 'master' into feature-15029/Docsbox
|
2023-03-07 15:57:14 +01:00 |
|
|
Cris
|
c78e715c3e
|
Added phrases 'bearbeitetVon', 'bearbeitetAm'
|
2023-03-07 14:07:14 +01:00 |
|
|
Cris
|
ba31a0b5b0
|
Changed HTML table to Tablewidget
|
2023-03-07 14:06:00 +01:00 |
|
|
Andreas Österreicher
|
c411b826d9
|
Merge branch 'feature-25518/bewerbungstool_messages_direkt_an_permesser'
|
2023-03-06 16:54:43 +01:00 |
|
|
Cris
|
479feea8aa
|
Changed way of checkíng Anrechnungszeitraum
Changed function isExpired to check Anrechnungszeitraeume of tbl_anrechnungszeitraum instead of using config entries.
|
2023-03-06 15:26:12 +01:00 |
|
|
Cris
|
043f09892a
|
Deleted hidden testing field
|
2023-03-06 15:22:56 +01:00 |
|
|
Cris
|
9e15668c37
|
Created page-header class
page-header class was dropped since Bootstrap 4.
Therefore added to css style
|
2023-03-06 13:25:14 +01:00 |
|
|
Cris
|
9c85877d3d
|
Added new phrases
.anrechnungenVerwalten
.anrechnungszeitraumFestlegen
.anrechnungszeitraumHinzufuegen
.anrechnungszeitraumSpeichern
.anrechnungszeitraumStart
.anrechnungszeitraumEnde
.errorStartdatumNichtInStudiensemester
.errorEndedatumNichtInStudiensemester
.errorStartdatumNachEndedatum
.frageSicherLoeschen
|
2023-03-06 13:24:03 +01:00 |
|
|
Cris
|
f8fb59e806
|
Created js to handle Anrechnungszeitraum
Handle:
. modals to add / update Anrechnungszeitraume
. AJAX calls to add / update / delete
|
2023-03-06 13:21:37 +01:00 |
|
|
Cris
|
d3f88597d9
|
Created Model Anrechnungszeitraum_model
Inserts / Updates / Deletes Anrechnungszeitraum
|
2023-03-06 13:19:15 +01:00 |
|
|
Cris
|
727d0b5876
|
Created GUI to admin Anrechnungszeitraume
Add / Update / Delete Anrechnungszeitraume
|
2023-03-06 13:18:23 +01:00 |
|
|
Cris
|
87a1b3647d
|
Created Controller AdminAnrechnung to admin Anrechnungszeitraume
Add / Update / Delete Anrechnungszeitraume
|
2023-03-06 13:16:27 +01:00 |
|
|
Cris
|
35c68d98a1
|
Created lehre.tbl_anrechnungszeitraum
|
2023-03-06 13:15:16 +01:00 |
|
|
Andreas Österreicher
|
90a518a70d
|
Merge branch 'bug-27845/rt_zeit_hinzufuegen_bug'
|
2023-02-28 15:45:48 +01:00 |
|
|
Cris
|
fe7cd05d57
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2023-02-22 10:10:10 +01:00 |
|
|
Andreas Österreicher
|
fd39312de6
|
Merge branch 'feature-28084/DVUH_issue_resolvers_different_folder'
|
2023-02-21 17:12:29 +01:00 |
|
|
KarpAlex
|
01a020d196
|
IssueResolver: renamed issue resolvers folder constant
|
2023-02-21 17:04:26 +01:00 |
|
|
Cris
|
844f72d3d4
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2023-02-21 16:05:06 +01:00 |
|
|
Andreas Österreicher
|
90ada0aaf8
|
Merge branch 'TechnikumWienAcademy-master'
|
2023-02-21 08:44:57 +01:00 |
|
|
Nikolaus Krondraf
|
dee4af2fb8
|
add parameters to generateUID()
|
2023-02-21 08:02:15 +01:00 |
|
|
ma0048
|
4d85d42a79
|
- gebiet zeit hinzufuegen fixed
- stammdaten abbrechen button fixed
|
2023-02-15 14:50:12 +01:00 |
|
|
Manfred
|
de81a5abbd
|
Merge remote-tracking branch 'origin/master'
|
2023-02-13 13:27:22 +01:00 |
|
|
Manfred
|
0fdf943085
|
Textanpassung an 30MB Uploadgrenze
|
2023-02-13 13:27:16 +01:00 |
|
|
Andreas Österreicher
|
ab5e656069
|
Anrechnungen: Link zu Dokumenten in der Übersicht korrigiert
|
2023-02-13 10:21:12 +01:00 |
|
|
Andreas Österreicher
|
8d3a9d86f3
|
DBUpdate Gegenchecks erweitert
|
2023-02-09 18:47:42 +01:00 |
|
|
Andreas Österreicher
|
3f5c6c4ee5
|
Merge branch 'bug-16636/Lv_Termine_im_FAS_falsch_ermittelt'
|
2023-02-09 17:11:21 +01:00 |
|
|
Andreas Österreicher
|
97023c547c
|
Merge branch 'feature-17512/Issues_Plausibilitaetspruefungen'
|
2023-02-09 16:14:49 +01:00 |
|
|
Andreas Österreicher
|
947cc3beff
|
Datenbankändungen von 3.3 nach 3.4 verschoben
|
2023-02-09 16:09:37 +01:00 |
|
|
Andreas Österreicher
|
151e9d2ca3
|
Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen
|
2023-02-09 16:04:33 +01:00 |
|
|
Harald Bamberger
|
381db6a93f
|
Merge branch 'feature-25561/Quellkursverknüpfung_und_wiederherstellung_f_LehrgangsLVs_der_Academy'
|
2023-02-09 11:20:07 +01:00 |
|
|
Paolo
|
7f97a58baa
|
Merge branch 'master' of github.com:FH-Complete/FHC-Core
|
2023-02-09 10:55:41 +01:00 |
|
|
Paolo
|
8ef07fd9b2
|
Fixed LogsViewer: check if request id is not null before using it to set the row color
|
2023-02-09 10:54:56 +01:00 |
|
|
Andreas Österreicher
|
569c8c929e
|
Merge branch 'feature-25177/ZeiterfassungMergedBrancheDeploy1'
|
2023-02-09 10:27:25 +01:00 |
|
|
Harald Bamberger
|
ba76ced168
|
Merge branch 'master' into feature-25561/Quellkursverknüpfung_und_wiederherstellung_f_LehrgangsLVs_der_Academy
|
2023-02-08 10:28:43 +01:00 |
|
|
Andreas Österreicher
|
0347ad9b10
|
Stunden werden auf NULL gesetzt wenn eine Zeitsperre bearbeitet wird die
keine Stunden zulässt
|
2023-02-07 18:48:22 +01:00 |
|
|
Andreas Österreicher
|
990bffeb2c
|
Merge branch 'feature-16899/Anwesenheitsliste_um_Geschlecht_erweitern'
|
2023-02-07 16:36:42 +01:00 |
|
|
Andreas Österreicher
|
78a66bfc74
|
Merge branch 'feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern'
|
2023-02-07 14:51:20 +01:00 |
|
|
Andreas Österreicher
|
9c349d9f1b
|
Merge branch 'master' into feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern
|
2023-02-07 14:46:24 +01:00 |
|
|
Andreas Österreicher
|
51b5cb8620
|
Merge branch 'bug-26015/OutgoingAufAnwesenheitslisteAnzeigenBeiMehrerenDatensaetzen'
|
2023-02-07 14:29:48 +01:00 |
|