 ma0068
|
faa705408d
|
Merge master into feature-54564/FHC-4_Studierendenverwaltung_Abschlusspruefung
|
2024-12-18 13:12:57 +01:00 |
|
|
ma0068
|
9f5b3b6f32
|
Print Functionality and Phrases
|
2024-12-18 12:56:51 +01:00 |
|
|
Andreas Österreicher
|
a802e67faf
|
Merge branch 'pep_deploy'
|
2024-12-16 13:57:15 +01:00 |
|
|
Harald Bamberger
|
f62108f1d4
|
change concatenation of verband, use contact email in Stv search result, use dummy image when viewing anothers profile and foto is null or foto_sperre is not false
|
2024-12-13 12:09:16 +01:00 |
|
|
ma0048
|
70b44c2202
|
Merge branch 'feature-40717/pep_faktor' into pep_deploy
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-12-13 11:50:53 +01:00 |
|
|
Harald Bamberger
|
5a174e554a
|
use studentStv in Studentenverwaltung config, add aktiv to student and studentStv result, use studentStv in searchbar component, add searchbar_inaktiv css class, use aktiv to render inactive studentStv results with css class searchbar_inaktiv
|
2024-12-13 11:25:02 +01:00 |
|
|
SimonGschnell
|
a3840d4c77
|
update(Searchbar/Student):shows dummy image if the student has foto_spere true
|
2024-12-13 10:47:34 +01:00 |
|
|
SimonGschnell
|
9a1777d1aa
|
fix(_student searchfunction):fixes the sql logic for non active students
|
2024-12-12 15:35:56 +01:00 |
|
|
Harald Bamberger
|
80222b7186
|
Merge branch 'master' into feature-25999/SearchbarStudent
|
2024-12-12 14:55:41 +01:00 |
|
|
Harald Bamberger
|
d0266e7ef0
|
add vuejs3_dev to composer.json and ci javascript config file to switch between vuejs dev and prod version, alter FHC-Footer to use new config
|
2024-12-12 14:49:15 +01:00 |
|
|
SimonGschnell
|
df8d4de50b
|
fix(SearchbarLib/_student): the cis search does not include students that are not aktiv and has a seperate search function for the student search for the Cis and the studentverwaltung
|
2024-12-12 09:42:38 +01:00 |
|
|
SimonGschnell
|
85d59f18be
|
refactor(searchbar/Student): studiengang/verband/email are queried for the display in the searchbar component
|
2024-12-11 15:30:41 +01:00 |
|
|
ma0048
|
8127091e2e
|
- tags werden im fas nicht angezeigt
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
|
2024-12-11 13:25:38 +01:00 |
|
|
SimonGschnell
|
a357001648
|
feature(Searchbar/StudentenSuche): adds student to the searchbar options and adds shadow to the searchbar
|
2024-12-11 12:34:58 +01:00 |
|
|
Andreas Österreicher
|
034e1397e8
|
Merge branch 'feature-52814/infocenter_infocentermitarbeiter_spalte_beim_loeschen_des_dokuments'
|
2024-12-11 08:36:27 +01:00 |
|
|
Alexei Karpenko
|
cc99d2b378
|
Gruppenmanagement: added checks so only Gruppenmanager can edit groups
|
2024-12-10 12:03:58 +01:00 |
|
|
Harald Bamberger
|
1b445005af
|
remove addMeta debug info
|
2024-12-04 09:28:59 +01:00 |
|
|
Harald Bamberger
|
d30ba24d2f
|
add config cis_send_profil_update_mails, use it in profil update controllers
|
2024-12-04 09:15:44 +01:00 |
|
|
ma0068
|
7cff70e88d
|
update search Mitarbeiter, form
|
2024-12-04 08:34:36 +01:00 |
|
|
ma0048
|
19b56ff252
|
- tags
- phrases
- stundensatzbydatum
- filter nur count
|
2024-12-03 12:36:54 +01:00 |
|
|
ma0068
|
00d64f2c97
|
bugfix index Favorites
|
2024-12-02 08:54:35 +01:00 |
|
|
Johann Hoffmann
|
1ca0f35d29
|
news widget template carousel with menu update;
|
2024-11-29 15:24:33 +01:00 |
|
|
ma0068
|
bf6b6e4563
|
actions insert, update, delete, link Pruefungsprotokoll
|
2024-11-28 16:29:13 +01:00 |
|
|
Johann Hoffmann
|
1346466f79
|
Merge branch 'master' into feature-25999/C4_anwesenheiten_widget
|
2024-11-28 10:43:57 +01:00 |
|
|
Johann Hoffmann
|
beb40cfcc9
|
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_anwesenheiten_widget
|
2024-11-28 10:22:57 +01:00 |
|
|
Johann Hoffmann
|
39f1f825a5
|
fhcApi extendable & reactive; provide reactive viewdata from dashboard to widgets by inject/provide reworked news xslt in db; css change since overflow-auto is in xslt now; WIP anw widget;
|
2024-11-27 16:30:54 +01:00 |
|
|
ma0068
|
f398a5699f
|
merge into feature-54564
|
2024-11-27 15:14:48 +01:00 |
|
|
Andreas Österreicher
|
fd91a4cb85
|
Merge branch 'master' into feature-8482/Pruefungsprotokoll_zur_Einsicht_exportieren
|
2024-11-27 13:44:24 +01:00 |
|
|
ma0068
|
3318147ba0
|
Start tab Abschlusspruefung, Table and Form with Dropdowns and default data
|
2024-11-27 12:52:03 +01:00 |
|
|
SimonGschnell
|
24740d055e
|
feature(Sprache/Phrasen aendern): creates a Cis Sprachen component that lists all available Sprachen from the database and lets the user change the currently active language and persist it in the database
|
2024-11-26 16:26:29 +01:00 |
|
|
SimonGschnell
|
8983af4aef
|
refactor(Stundenplan_model/getStundenplanQuery):removes wrong comments
|
2024-11-25 19:59:39 +01:00 |
|
|
Harald Bamberger
|
290da9f2c0
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-11-25 17:09:53 +01:00 |
|
|
Harald Bamberger
|
766bec887a
|
check if constant CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN is defined
|
2024-11-25 16:29:41 +01:00 |
|
|
SimonGschnell
|
90bdb68175
|
fix(Stundenplan_model/getStundenplanQuery):changes how the OR sql statments are added to the query
|
2024-11-25 15:24:36 +01:00 |
|
|
Harald Bamberger
|
2ed24ca60f
|
remove unneeded controllers, views and vuejs apps
|
2024-11-25 13:48:33 +01:00 |
|
|
Harald Bamberger
|
6f1e61fa00
|
move contentid of cis4 menu root to ci config, remove unused controller components CisVue, modify CISVUE-Header to use config for cis4 menu root content id
|
2024-11-22 15:16:27 +01:00 |
|
|
Johann Hoffmann
|
d400f34e0f
|
missing phrasen
|
2024-11-21 15:21:33 +01:00 |
|
|
SimonGschnell
|
763d038b4c
|
fix(api/v1/Stundenplan/getStundenplan): fetches groups and studentlehrverbaende based on the date interval of the current and previous semesters
|
2024-11-21 12:19:22 +01:00 |
|
|
Harald Bamberger
|
05c52e41eb
|
search only for active orgunits and rooms, also search room description
|
2024-11-19 17:33:57 +01:00 |
|
|
Johann Hoffmann
|
d8af18673c
|
always show card header of widgets as in editMode but enable certain tools only when actually in editMode. editMode is active for dashboard not for section; less paddings overall in dashboard; deleted Section headers and put cog besides personal greeting; reformatted name var for greeting into generic viewData property;
|
2024-11-19 17:07:05 +01:00 |
|
|
SimonGschnell
|
d2466b032a
|
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
|
2024-11-19 12:51:50 +01:00 |
|
|
SimonGschnell
|
8d01995722
|
refactor(Studenplan Query):queries all studiensemester from start_date to end_date and matches the gruppen and studentlehrverbaende to the associated studiensemester in the query
|
2024-11-19 12:51:12 +01:00 |
|
|
SimonGschnell
|
5d5b2e5bc4
|
fix(FHCAPI_Controller): adjusts the php doc types of parameters
|
2024-11-19 11:35:20 +01:00 |
|
|
Johann Hoffmann
|
4cb3521361
|
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
|
2024-11-19 10:36:34 +01:00 |
|
|
Harald Bamberger
|
d6bdad27b2
|
move room specific stuff to searchconfig, add renderif method to be able to render actions conditionally via config, remove additional prop selectedtypes
|
2024-11-19 10:17:10 +01:00 |
|
|
Johann Hoffmann
|
b6a5e9b845
|
load stsemArray from Prestudentstati for select options;
|
2024-11-18 16:09:16 +01:00 |
|
|
Harald Bamberger
|
ad31e73212
|
reset Tabulator fontsize, combine page headings
|
2024-11-18 11:59:40 +01:00 |
|
|
Harald Bamberger
|
65c9d5a84c
|
adminZeitverfuegbarkeiten reset tabulator fontsize
|
2024-11-18 10:47:08 +01:00 |
|
|
Harald Bamberger
|
1e5d7e01af
|
reset font-size for tabulator on vilesci page
|
2024-11-15 15:57:00 +01:00 |
|
|
Harald Bamberger
|
78f216f9ad
|
fix syntax error
|
2024-11-15 15:55:42 +01:00 |
|