 Johann Hoffmann
|
9042f9b83b
|
change fh logo visibility breakpoint class md -> sm; editable flag in profile based on looking at own profile or being an admin; scrollbar calc in profil app;
|
2024-11-13 17:27:50 +01:00 |
|
|
Johann Hoffmann
|
5d524c5fda
|
fix dashboard alert css by adding primevue3 in $includeArray in Dashboard view file
|
2024-11-13 14:14:11 +01:00 |
|
|
Johann Hoffmann
|
e43a890aff
|
Merge branch 'feature-25999/C4_cleanup' into feature-53416/stundenplan_eine_lva
# Conflicts:
# public/js/apps/Cis/Stundenplan.js
# public/js/components/DashboardWidget/Stundenplan.js
|
2024-11-13 11:17:43 +01:00 |
|
|
Johann Hoffmann
|
b0cd599999
|
WIP stundenplan widget tagesansicht
|
2024-11-13 10:41:50 +01:00 |
|
|
Harald Bamberger
|
f265e20dce
|
Merge branch 'feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp' into feature-25999/C4_cleanup
|
2024-11-12 11:21:16 +01:00 |
|
|
Harald Bamberger
|
c691d155c9
|
remove dependecy to legacy phrases from LvMenu controller, add legacy phrases needed in LvMenu controller
|
2024-11-12 11:05:13 +01:00 |
|
|
Johann Hoffmann
|
96335a7979
|
moved email template to fhtw addon; einheiten column visibility default false since pausen are not represented; backend code cleanup; phrase fix;
|
2024-11-11 09:56:43 +01:00 |
|
|
SimonGschnell
|
f304e79ee0
|
feature(Stundenplan): adds Tagesansicht for the Stundenplan
|
2024-11-08 15:18:10 +01:00 |
|
|
Harald Bamberger
|
1691c75a84
|
replace dependencies on legacy code with ci model functions
|
2024-11-07 19:18:08 +01:00 |
|
|
Andreas Österreicher
|
f68d18f0a8
|
Stundenplan Bugfix to also load Entries of Semester and Verband
|
2024-11-07 10:25:42 +01:00 |
|
|
Harald Bamberger
|
2b516d40c9
|
remove controllers, views and libraries for CisHtml since not used
|
2024-11-05 17:46:42 +01:00 |
|
|
Harald Bamberger
|
39cedfe6a0
|
remove controllers, views and libraries for CisHmvc since not used
|
2024-11-05 16:48:30 +01:00 |
|
|
Harald Bamberger
|
20e0e2e910
|
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_cleanup_merge_anrechnungen_bs5
|
2024-11-04 15:59:14 +01:00 |
|
|
Harald Bamberger
|
50880c696b
|
use getAuthUID function instead of get_uid, use new permission basis/cis and switch to Auth_Controller where possible
|
2024-11-04 15:41:02 +01:00 |
|
|
SimonGschnell
|
eafbdcfffe
|
refactor(Cis Menu): changes method name and checks if the CIS4_MENU_ENTRY constant is defined
|
2024-11-04 13:39:13 +01:00 |
|
|
Harald Bamberger
|
93ac45308f
|
Merge branch 'feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5' into feature-25999/C4_cleanup
|
2024-10-31 16:00:12 +01:00 |
|
|
Harald Bamberger
|
e78c2e1bf7
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-10-30 17:19:01 +01:00 |
|
|
Harald Bamberger
|
d4f3fbfc79
|
Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5
|
2024-10-30 16:45:07 +01:00 |
|
|
SimonGschnell
|
c5b81c22f9
|
adds the target for the lv menu in the studenplan modal and also replaces the tablesorter tables with tabulator5 in other content views
|
2024-10-30 11:31:39 +01:00 |
|
|
SimonGschnell
|
ff367339ea
|
makes MyLv more responsive
|
2024-10-29 14:31:20 +01:00 |
|
|
Harald Bamberger
|
ae80c3415d
|
betraege im Gehaltsbestandteil als string mit . als komma konvertieren, um zu verhindern, dass locale spezifische Betraege in der verschluesselten DB Spalte gespeichert werden
|
2024-10-29 10:37:00 +01:00 |
|
|
Harald Bamberger
|
1e55b13546
|
force use of insertamum column from antrag table
|
2024-10-28 15:58:20 +01:00 |
|
|
SimonGschnell
|
b9ccafe9db
|
uses the cis.php file for the anrechnungen url
|
2024-10-28 15:57:33 +01:00 |
|
|
SimonGschnell
|
5f078a76c6
|
renders the right header (cis or fhtw) conditionally based on the CIS4 constant
|
2024-10-28 14:54:26 +01:00 |
|
|
SimonGschnell
|
3eb2100b3d
|
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
|
2024-10-28 14:16:07 +01:00 |
|
|
SimonGschnell
|
fbf0417269
|
only adds the Events file from addons which are actually active and refactors the Lv Information into its own component
|
2024-10-28 14:15:45 +01:00 |
|
|
Johann Hoffmann
|
46c4a30408
|
css fix & header file import remove
|
2024-10-28 11:36:49 +01:00 |
|
|
Johann Hoffmann
|
e387671e09
|
added set language feature; phrasen plugin with optional reload if non responsive phrasen are used; stundenplan header mode & buttons reworked
|
2024-10-24 17:46:42 +02:00 |
|
|
Johann Hoffmann
|
32137479e9
|
activate email to assistenz on upload; redraw table in case of tabulator scroll bug; navigation.php $root var for Cis4 preperation
|
2024-10-24 15:07:08 +02:00 |
|
|
cgfhtw
|
9eb91574c3
|
semester
|
2024-10-24 11:08:22 +02:00 |
|
|
cgfhtw
|
2edfd1febc
|
Unterbrecher in serie problematik
|
2024-10-24 11:03:28 +02:00 |
|
|
Johann Hoffmann
|
805ed20a18
|
Merge branch 'feature-52360/C4_fh_logo_remove_and_extend_searchbar_mobile' into feature-52734/C4_moodle_link_stpl_widget_stpl_mylva
|
2024-10-22 17:52:57 +02:00 |
|
|
Harald Bamberger
|
8ba2a6852b
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
|
2024-10-22 11:04:07 +02:00 |
|
|
Johann Hoffmann
|
f3851da10d
|
add bootstrap class to only show fh logo in header on medium and greater displays; adjusted nav-user-btn css under mobile breakpoint to just take space of contained img and let searchbar flex growth apply to leftover width;
|
2024-10-21 16:02:54 +02:00 |
|
|
Johann Hoffmann
|
2e3bc855aa
|
Merge branch 'feature-25999/C4_cleanup' into feature-52735/C4_stundenplan_query_fix
|
2024-10-21 13:51:21 +02:00 |
|
|
Johann Hoffmann
|
728e2f9b3a
|
fix getStundenplanQuery query building if benutzer gruppen are empty;
|
2024-10-21 13:48:32 +02:00 |
|
|
Harald Bamberger
|
690080035a
|
fix umlauts in variable name
|
2024-10-21 13:05:47 +02:00 |
|
|
Johann Hoffmann
|
d8c4c6506a
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-10-21 10:21:42 +02:00 |
|
|
Harald Bamberger
|
9cd59a1250
|
add header version switch depending on CIS4 defined
|
2024-10-18 17:16:12 +02:00 |
|
|
Harald Bamberger
|
cf77a60b35
|
remove application/controllers/components/Antrag/* since not present in master any more
|
2024-10-18 16:57:03 +02:00 |
|
|
Harald Bamberger
|
0775fae67d
|
remove unnecessary comment
|
2024-10-18 16:49:52 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
Harald Bamberger
|
0ab1ec1fc8
|
Merge branch 'master' into feature-25999/C4
|
2024-10-17 14:49:43 +02:00 |
|
|
SimonGschnell
|
e475fe568e
|
adds the dashboard menu punkt and adds greeting to the dashboard view
|
2024-10-17 09:58:28 +02:00 |
|
|
Harald Bamberger
|
24ce443e95
|
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
|
2024-10-15 17:40:11 +02:00 |
|
|
Harald Bamberger
|
439ae5113d
|
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
|
2024-10-15 13:59:11 +02:00 |
|
|
Harald Bamberger
|
14aa98c223
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:46:17 +02:00 |
|
|
Harald Bamberger
|
e2cee7ffa3
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:44:56 +02:00 |
|
|
Andreas Österreicher
|
5774cb78c9
|
Merge branch 'feature-40816/Plausicheck_Anpassungen'
|
2024-10-15 10:28:38 +02:00 |
|
|
Harald Bamberger
|
27e3f1d1bc
|
take status rejected into account when calculating available semster slots for unterbrechung
|
2024-10-14 15:40:25 +02:00 |
|