Commit Graph

8479 Commits

Author SHA1 Message Date
alex 3b07cdca73 added filter widget to tablesorter in Zeitsperren, replaced christianbach with mottie tablesorter 2018-01-25 17:10:16 +01:00
alex 94abad155e replaced scripts and stylesheet links with links to minified versions 2018-01-25 17:04:57 +01:00
Paolo f3be620e68 Fixed path for jquery-cookie 2018-01-25 12:56:53 +01:00
Paolo 73c4c6c722 Changed the color of the stripes for tables 2018-01-24 18:10:18 +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
Andreas Österreicher f61ca3cc36 Anzeigefehler bei Start und Endedatum im Jahresplan behoben 2018-01-24 15:12:23 +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
Manfred Kindl d0847dae7d Merge remote-tracking branch 'origin/master' 2018-01-23 16:00:35 +01:00
Manfred Kindl 304b37af0f Add index to tbl_akte 2018-01-23 16:00:29 +01:00
Paolo 03749d7890 Cleaning time gitignore 2018-01-23 12:16:07 +01:00
Andreas Österreicher d2dbcabc01 Wenn der Schlagwortdienst beim Upload von Arbeiten nicht erreichbar ist,
wird jetzt ein Hinweistext angezeigt anstatt einer leeren Seite
2018-01-23 11:25:55 +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 7235ce5f0a Merge remote-tracking branch 'origin/master' 2018-01-22 17:38:22 +01:00
alex 3a7b12a4ff made table responsive, condensed 2018-01-22 17:38:10 +01:00
Manfred Kindl ff64b4dec9 Merge remote-tracking branch 'origin/master' 2018-01-22 13:37:19 +01:00
Manfred Kindl acacf35c47 BugFix Usability 2018-01-22 13:37:12 +01:00
Manfred Kindl bfd70c0ed3 Testtool Edit Gebiet verbesserte Usability 2018-01-22 13:36:45 +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
alex c268983785 added verarbeitunstätigkeit "datenwartung", Person zusammenlegen is logged in personlog 2018-01-19 16:46:31 +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
Gerald Raab b51111c593 Zeitaufzeichnung gesperrt_bis in global_config ausgelagert 2018-01-19 15:49:10 +01:00
Gerald Raab e93ce04889 DienstF-Eintragungen mit CaseTime synchronisieren 2018-01-19 14:31:30 +01:00
Andreas Österreicher afc1a93db5 Interessenteneintraege im Verbandsbaum angepasst.
"ZGV erfuellt" Filter ist jetzt vor dem Filter "Status bestaetigt"
2018-01-19 10:04:46 +01:00
Andreas Österreicher f47898ccf1 Added missing PrimaryKey 2018-01-18 20:31:19 +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
cris-technikum f8cfab3c16 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-17 14:59:22 +01:00
cris-technikum 979991fac0 small additions / modifications 2018-01-17 14:59:17 +01:00
Manfred Kindl b4f67ec0d3 Added property "message" to logtype "processstate" 2018-01-17 13:54:38 +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