Commit Graph

647 Commits

Author SHA1 Message Date
alex ad54f08a97 check if not abgewiesen or bestätigt before abweisen or bestätigen, removed Zustellung column, retrieve only zugestellte kontakte, log entrys starting uppercase 2018-02-01 16:53:19 +01:00
alex 84bf884db7 write log entry when sending message 2018-02-01 16:16:32 +01:00
alex b9e7dc38cc enabled sending messages with person ids as receivers, person data can be retrieved by uid, link in infocenter details to send message 2018-02-01 10:26:37 +01:00
alex 8eedae0df9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-30 16:53:15 +01:00
alex c7008c9ccd added Bewerbung Zugang, bewerbung abgeschickt, collapsible menu, Statusgrund entering is compulsory, restyled (button/text positions, colors, zebra widget of tablesorter) 2018-01-30 16:52:43 +01:00
oesi 458f78084c Fixed Filter query 2018-01-30 16:03:25 +01:00
oesi 9e2a02acf7 Fixed Filter compare 2018-01-30 15:55:48 +01:00
Andreas Österreicher 947dc61f19 Added new FH-Complete Start Page 2018-01-26 16:01:52 +01:00
Andreas Österreicher 35e300ca75 Added permission check to InfoCenter Main page 2018-01-26 16:01:09 +01:00
Andreas Österreicher cfb4c5ad74 Filter für Infocenter angepasst 2018-01-26 12:44:26 +01:00
alex 94abad155e replaced scripts and stylesheet links with links to minified versions 2018-01-25 17:04:57 +01:00
Paolo a768295db0 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-24 17:41:16 +01:00
alex fe8e5ed507 added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes 2018-01-24 17:29:12 +01:00
Paolo 6c607b5364 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-24 17:24:50 +01:00
alex 8ec02c7aaa Merge remote-tracking branch 'origin/master' 2018-01-24 17:18:13 +01:00
alex 785609584c check for null of prestudentstatus, typing mistake 2018-01-24 17:17:40 +01:00
Paolo 6456ad7b06 - Now composer install version >3 of components/jquery
- Added new entry in composer to install the version 2 of jquery
- Updated all the paths for jquery2
- Changed name of parameter jquery3 to jquery in FHC-Header
- Updated pages that use FHC-Header
- Removed components/bootstrap from composer
- Added twbs/bootstrap to composer
- Updated pages that use bootstrap with the correct path
2018-01-24 17:10:08 +01:00
Paolo 1ad45e4802 - Renamed widget FHC_navheader as NavigationHeaderWidget
- Renamed widget FHC_navigation as NavigationMenuWidget
- Added new widget NavigationWidget to create header and menu
- Renamed view fhcnavheader as navigationHeader
- Renamed view fhcnavigation as navigationMenu
- Added new view navigation
- InfoCenter controller creates the header array
- NavigationHeaderWidget print the header items from an array
2018-01-24 15:04:08 +01:00
Paolo 1bda0b6cad Removed unused files 2018-01-24 15:03:28 +01:00
Paolo 8b28b48ff9 - Merged controller system/infocenter/InfoCenter.php into system/infocenter/InfocenterDetails.php
- Removed controller application/controllers/system/infocenter/InfocenterDetails.php
- Removed method _getFilterList from controller system/infocenter/InfoCenter.php
- Added method _setNavigationMenuArray to controller system/infocenter/InfoCenter.php to generate the array for the left menu
- Added public method getFilterList to model Filters_model
- Removed view application/views/widgets/navigation.php
- Removed widget application/widgets/navigation.php
- Widget application/widgets/FHC_navigation.php now is usable to print any menu from an array
2018-01-23 18:49:09 +01:00
alex bd5dfe7e4c escaped HTML chars entered in textfields 2018-01-23 09:41:41 +01:00
alex 14a7b0a921 added Statusgrund Bezeichnung for Logging, replaced array constant for backwards compatibility 2018-01-23 09:41:09 +01:00
alex 8bfde2c4eb bigger nation column for infoonly (if long Nation), check for not existent Statusgrund 2018-01-22 17:56:58 +01:00
alex 5a0082ec11 added Studienplan Orgform and alternative Orgform (in "Anmerkung" field), Studienplansprache for display, Statusgrund Bezeichnung for Abgewiesener 2018-01-22 17:43:13 +01:00
alex 5725cc2dfe infocenter details page opening in same window 2018-01-22 17:39:09 +01:00
alex 3a7b12a4ff made table responsive, condensed 2018-01-22 17:38:10 +01:00
alex 8ad1c5a166 improved logging (english, logs Verarbeitunstaetigkeit, shows all logs for a person 2018-01-19 16:53:08 +01:00
alex 3ccd38540d updated CI person logging for Verarbeitungstätigkeit (taetigkeit_kurzbz) 2018-01-19 16:50:36 +01:00
Andreas Österreicher 1cbba8bdaa Lehrgänge aus Infocenter Filter ausgenommen 2018-01-19 16:22:37 +01:00
Andreas Österreicher 644d8941a2 Added missing permission 2018-01-19 16:20:47 +01:00
alex 9419fe8c3d Added widgets FHC navigation and FHC navheader (as seen in sb admin2 template), bootstrapped filter page, added filter widget to infocenter table 2018-01-18 16:20:59 +01:00
alex bcd2e7b0d8 replaced [] with array() (for old php version), removed comments 2018-01-18 15:55:46 +01:00
alex 4faa1fbc5b added greater than filter 2018-01-18 15:50:33 +01:00
alex 6ae6940201 hidden filter header, simplified SQL statement: Studiensemester ende greater now 2018-01-18 15:37:33 +01:00
Andreas Österreicher 78df57044e Resturlaubstage, Mehrarbeitsstunden und Urlaubsanspruch pro Jahr
entfernt. Diese können bei Mitarbeitern jetzt nicht mehr verwaltet
werden
2018-01-18 09:01:49 +01:00
alex 8f0b4c3114 infocenter: added confirmation popup when student freigegeben/abgewiesen, non-interessent or prestudenten with interessentenstatus confirmed are view-only (infoonly), added Nation data to Prestudent and akte, bugfixes 2018-01-17 11:45:23 +01:00
alex 2abdabd2e9 added sbadmin template as option in header 2018-01-17 11:18:30 +01:00
oesi fb7e8f40fd Added Permission to infocenter role 2018-01-17 11:16:18 +01:00
oesi f28a590743 Neue Rollen werden automatisch angelegt wenn diese nicht vorhanden sind 2018-01-17 10:57:31 +01:00
Andreas Österreicher 4885fc1ac8 Berechtigungsrolle für Infocenter hinzugefügt 2018-01-17 10:48:46 +01:00
Andreas Österreicher 5aafa2153b Tabelle für Verarbeitungstaetigkeiten hinzugefügt zur Kategorisierung
von Logeinträgen
2018-01-16 17:59:19 +01:00
Andreas Österreicher c54bb2303d Fixed some PHP 5.3 incompatible Codeparts 2018-01-15 18:00:41 +01:00
Andreas Österreicher 9669360b9a Infocenter Filter angepasst damit die korrekten Personen angezeigt
werden
2018-01-12 15:52:20 +01:00
alex 0e6e6ab8ea added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive 2018-01-10 09:53:34 +01:00
alex 2b186d0c45 improved infocenter details, added bootstrap and admin theme (sb admin 2) , added zgv pruefung Status, Studiensemester and Ausbildungssemester, contacts in one table, nachzureichen and nachgereicht am columns 2018-01-08 09:55:13 +01:00
alex a8a5b5e1ad Merge remote-tracking branch 'origin/master'
# Conflicts:
#	application/views/templates/FHC-Header.php
2018-01-05 12:46:56 +01:00
alex 00dbedc040 added jqueryui, bootstrap, fontawesome, datatables (new tablesorter) 2018-01-05 12:45:58 +01:00
Paolo e6d78d6d8d - Changed query to retrive data about persons & logs
- Added operator "set" and "not set" to FilterWidget for timestamp type
- FilterWidget store filterId into session
- FilterWidget load a filter from DB only if a different filter is required
2018-01-04 18:14:52 +01:00
Paolo f820fdf040 Correct CSS order in new FHC-Header 2018-01-03 11:30:51 +01:00
Paolo 628908b9e8 - FilterWidget now loads filter from DB only the first time
- Changed the query statement to load data from logs and person data
2017-12-21 16:26:23 +01:00