Commit Graph

2084 Commits

Author SHA1 Message Date
raab b5c1512d68 Merge branch 'master' into fb-3922/ZeitwunschZustimmung 2019-07-05 09:11:46 +02:00
alex 638a0a90a4 - Berechtigungscheck for reservation deletion on "meine Reservierungen anzeigen"-page corrected
- removed "Alle Reservierungen anzeigen" Link
2019-07-04 17:25:24 +02:00
raab 48c5713688 geteilte arbeitszeit konfigurierbar 2019-07-04 17:02:11 +02:00
Andreas Österreicher 12d0bbfa52 Fixed invalid Session Handling on Infoterminal Page 2019-07-03 18:07:29 +02:00
raab a8f7199ee8 nur für fixangestellte, neuer text 2019-07-01 15:53:57 +02:00
raab c4c361e94c Merge branch 'master' into fb-3922/ZeitwunschZustimmung 2019-07-01 15:52:49 +02:00
alex e0b5f0ba8e - Only assistance who created the reservation or for whom is reserved can delete reservierungen
- logging every time a reservation is deleted
2019-06-28 13:23:00 +02:00
Manfred Kindl 6799ea9d34 Show Betreuerart in Lehrveranstaltungsübersicht 2019-06-25 11:17:21 +02:00
Andreas Oesterreicher 7f92d89a67 Added additional configuration items
- CIS_LVPLAN_SAALPLAN_ANZEIGEN
	Hides Saalplan on Schedule Page
   - CIS_NOTENLISTE_OFFIZIELL_ANZEIGEN
	Only display official Grades in CIS Gradelist
2019-06-24 17:48:38 +02:00
raab 6ad63faa86 geteilte dienste 2019-06-24 14:43:08 +02:00
Nikolaus Krondraf 8c9827b9a2 Link zum Profil bei Suche wird für Mitarbeiter immer angezeigt 2019-06-24 10:43:55 +02:00
Nikolaus Krondraf 45636fa069 Prüfungsanmeldung ist nun für alle Studenten des Studiengangs möglich 2019-06-19 14:54:39 +02:00
Nikolaus Krondraf 73943f8188 Link zum Profil kann bei Suche deaktiviert werden 2019-06-17 13:22:47 +02:00
raab 8843462c7d load entry and display if exists 2019-06-14 11:49:50 +02:00
alex 8ded1aa746 fixed errormessage when lecturer_uids param is not set 2019-06-14 11:21:55 +02:00
Cris 041d1be048 Added GUI for acceptance of self-managed breaks + saving logic 2019-06-13 16:23:16 +02:00
Manfred Kindl cdfbf0c0ef Link to LV-Overview from lva-liste 2019-06-12 14:54:42 +02:00
Nikolaus Krondraf d827f895b2 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2019-06-07 11:19:27 +02:00
Nikolaus Krondraf da23fa77cc Bugfix fürs Auslesen der studiengang_kz 2019-06-07 11:19:10 +02:00
hainberg 033bb35f88 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2019-06-06 08:50:24 +02:00
Cris fab7c72dda Changed menu titles (BASIS -> Basisgebiete; Quereinstieg -> Quereinstiegsgebiete) 2019-06-06 08:50:15 +02:00
Cris eb3f814e09 Enhanced CSS for correct responsive testtool behaviour
Bootstrap, HTML- and CSS stylings were colliding and causing issues when
resizing the screen. This is fixed now.
2019-06-06 08:48:25 +02:00
Andreas Oesterreicher 57102409c9 Phrase Matrikelnummer auf Personenkennzeichen korrigiert 2019-06-05 11:41:50 +02:00
Nikolaus Krondraf 448bb1ed91 Anzeige der Erfolgs-/Fehlermeldung verlängert 2019-06-05 11:25:24 +02:00
Cris 0eead44c6a Fixed display for smaller screens
Now the answer-possibilities were compressed in an unreadable manner on
smaller screens. This is fixed now.
2019-06-03 16:47:23 +02:00
alex d341e5e1b1 Merge branch 'master' into stplreservierung 2019-05-21 18:32:33 +02:00
Manfred Kindl a8bd11b03c Testuser für Camus International in Testtool Login 2019-05-17 14:45:13 +02:00
raab ee7209266f CSV-Import um service_id erweitert 2019-05-17 09:28:04 +02:00
alex c0b448125d CIS Wochenplan Reservierung update
- Mitarbeiter autocomplete for reserving one hour for multiple Mitarbeiter at same time
- possible to delete Reservations directly in Wochenplan
2019-05-16 17:32:34 +02:00
alex f7a4c5795b - displaying Phrase "meine Reservierungen anzeigen" instead of "Meine Reservierungen löschen" 2019-05-16 17:27:38 +02:00
Cris 94b19d8bd1 Fixed to get question in language of the actual logged-in Master study
When logging in with a Master study, the system was retrieving the
studyplan/study of the highest priored applied Master study. This
behaviour should only occure for Bachelor studies and was leading to
incorrect language setting.

Now if user logs in with a Master study, the actual studyplan/study and
the correct language setting are retrieved.
2019-05-14 16:34:37 +02:00
Cris 6cc99bf2b9 Appended errormessage when retrieving invalid Gebiete
Now if the method check_gebiete() returns false, a userfriendly
errormessage will be displayed.
2019-05-14 15:25:51 +02:00
Cris e3ace2c462 Gebiete Navigation: Filtered out rejected studies
Fixed SQL query.
Now rejected studies are filtered out and will not be shown up in the
navigation.
2019-05-14 11:01:52 +02:00
Cris b0cabff783 Optimized GUI
- Widened left navigation width to avoid width scrolling.
- Removed column 'Reihungstest' informing what kind of test
  needs to be solved (Basic / Quereinstieg)
- Status now multilingual
- Renamend 'Quereinsteiger' to 'Quereinstieg'
- Nav-button of Quereinsteiger-Studiengänge in new color
2019-05-14 10:57:03 +02:00
Cris 3f423898f9 Added alert when test includes MathML format and browser is not Firefox
By the moment applicants should absolve the tests using Firefox Browser
to ensure the correct display MathML. If they use another browser, they
will now get an alert.
2019-05-09 12:49:20 +02:00
Andreas Österreicher a9d59918ce Abgabetool
- Handbuch verlinkt auf Wiki
- Fehler behoben wodurch Projektarbeiten doppelt in der Studierendensicht angezeigt wurden
- Hinweis beim Upload hinzugefügt damit keine Unterschriebenen Dokumente hochgeladen werden.
2019-05-08 11:28:14 +02:00
Cris e2cea2ab58 Translated new text components in RT-Tool starting page
. Translated new text components into English. Now the starting page is
available in German and English.

. Minor HTML-tag correction at login.php.
2019-05-06 15:48:57 +02:00
Nikolaus Krondraf 6d20102723 Status 'offen' wird nur angezeigt wenn Benotung aktiviert ist 2019-05-03 13:23:15 +02:00
cris-technikum ea4bdaef07 Fixed wrong menu item width in RT-Tool Menu (for active items)
When a group of gebiete have been started, then menu items were styled wrong.
Now it is well-formed.
2019-04-30 17:31:48 +02:00
cris-technikum 2f38ab228b Fixed display of master-study on starting page.
Added missing cells and data for Status and Reihungstest.
Removed var_dump.
2019-04-30 17:24:45 +02:00
Cris 625109071b Fixed wrong menu item width in RT-Tool Menu.
When a group of gebiete were answered, then menu items were styled wrong.
Now it is well-formed.
2019-04-30 17:05:41 +02:00
Cris eae51147f4 Styled same margin-top for start-, einleitung- and frage-page in RT-tool. 2019-04-30 17:02:44 +02:00
Cris 4b89a5dbe8 Styled frage page of Reihungstesttool.
Slightly styled frage page according to starting page style changes.
Added bootstrap.
2019-04-30 16:41:07 +02:00
cris-technikum 58e2d3f000 Styled starting page of Reihungstesttool
The starting page (login.php) is well-formed.

Still missing translations of new text inputs.
2019-04-30 16:37:51 +02:00
Cris 4a0170d726 Fixed Select language for menu in Reihungstesttool (CHROME Incompatibility)
Now the select menu is working also on CHROME Browser.

Also added Bootstrap.
2019-04-30 16:28:57 +02:00
Cris d569ad59a9 Changed path of Lehrtätigkeitsbestätigung (cis -> content) 2019-04-29 12:04:17 +02:00
Cris 80afb74be9 Modified RT-menu: Styled logout link
Now the logout link is also integrated in the menu.
2019-04-25 13:14:57 +02:00
Cris 0738a0aee1 Marked studies that were rejected for the Reihungstest
Now the studies, that were rejected for the Reihungstest
(Prestudentstatus 'Abgewiesener'), are marked as rejected on the
Reihungstest-starting page.
2019-04-25 11:39:24 +02:00
Cris f5433a2a73 Modified RT-menu: Styled start/intro links
Now the start and intro links are styled like buttons and integrated in
the menu navigation.
2019-04-25 10:36:40 +02:00
Cris 617ed24073 Modified menu of Quereinstiegsgebiete
Now the menu of Quereinstiegsgebiete is clustered and displayed by study.
2019-04-24 16:52:20 +02:00