Commit Graph

455 Commits

Author SHA1 Message Date
Paolo 112e7127c9 Fixed typo 2018-11-23 15:15:17 +01:00
Andreas Österreicher 6a26609aef Datenverbund
- Added new Page to Manage missing bPK
- Improved Error Handling on DVB Class
2018-11-20 17:36:24 +01:00
Werner Masik 74f7a54c17 Add missing paranthesis 2018-11-05 22:02:41 +01:00
alex 2959e60df0 - beautified prio up/down arrows in infocenter
- infocenter freigabe/absage works with ajax now
- AjaxLib veil is displayed covering the whole page
- infocenter details studiengang kürzel is retrieved from studienordnung (if possible)
2018-11-02 18:22:57 +01:00
alex 3423830f60 - priority display and priority change possible on infocenterdetails page
- different sort order of zgvpruefungen (prestudenten)
2018-10-22 15:28:21 +02:00
Andreas Österreicher ace1e08e0b Switched to FHC-Controller to avoid notice on Job Execution 2018-07-20 10:26:20 +02:00
Paolo bb52aee900 - Moved spl_autoload_register from application/config/config.php to application/config/core_includes.php
- application/config/core_includes.php is included by index.ci.php
- Renamed the prefix of the helpers from "fhc_" to "hlp_"
- Adapted the helpers includes
2018-07-18 12:04:00 +02:00
Paolo 5635f1792c - Removed config file application/config/fhcomplete.php
- Moved config messages entries from fhcomplete.php to application/config/message.php
- Renamed the config entry addons_aufnahme_url to message_redirect_url
- Adapted application/controllers/Redirect.php to use this new entry
2018-07-17 17:13:12 +02:00
Andreas Österreicher 96f78a8446 URLs für Message Reply korrigiert 2018-07-17 09:30:32 +02:00
Andreas Österreicher 7b26e513be Fixed Problem while sending Ampel Mails 2018-07-12 14:14:08 +02:00
Paolo 04e2e1c54b - Moved functions from FHC-Header to fhc_header_helper
- Added function backwardCompatibleJSMsIe to fhc_header_helper for backward compatibility with older versions of MS IE
- FHC_Controller now loads helper fhc_header too
- Added afarkas/html5shiv and scottjehl/Respond to composer
- Rename function sendMail in fhc_sancho_helper.php to sendSanchoMail
2018-07-11 13:43:18 +02:00
Paolo 37ca34a6b5 - Renamed helpers to avoid conflicts with CI helpers
- Adapted helpers includes
2018-07-11 12:13:39 +02:00
Paolo 56524dcef2 Merge branch 'master' into permissions 2018-07-02 17:44:14 +02:00
Paolo 419e53a656 - Changed filtersupdate to better divide filters for infocenter overview and freigegeben
- Changed infocenterData to retrive overview filters
- Changed infocenterFreigegebenData to retrive freigegeben filters
- Changed InfoCenter controller to load overview and freigegeben filter's names into the left menu
2018-07-02 17:40:22 +02:00
Paolo 2b15c88410 - Moved the loading of the fhcauth from Filters controller to the library FiltersLib
- Added comments
2018-06-29 11:24:50 +02:00
Paolo 46e85a2317 Merge branch 'master' into permissions 2018-06-28 14:52:09 +02:00
Paolo 25e66bf9dd - Added function isEmptyString to fhc_helper
- Added function isEmptyArray to fhc_helper
- Adapted the code in application/* to use as much as possible this two new functions
- Removed the php function empty almost everywhere
2018-06-27 15:06:04 +02:00
Paolo d04b0450da - AuthLib is loaded only in fhcauth_helper, PermissionLib and REST_Controller
- Removed all the NOT usefull loads of helpers and libraries
- Fixed undefined index in controllers/system/UDF and model system/UDF_model
- APIv1_Controller now loads helper fhcauth
- FHC_Controller now loads ithe fhc and session helpers too
- Added/Fixed comments
- PermissionLib does NOT use anymore the getAuthUID function from the fhcauth helper, now relies on AuthLib directly
- REST_Controller loads directly the AuthLib when is needed
2018-06-27 13:12:46 +02:00
Paolo d8bcc25ac2 Now the helper message is loaded only by these controllers and models:
- APIv1_Controller
- FHC_Controller
- MessageToken_model
2018-06-27 11:10:40 +02:00
Andreas Österreicher 2a5e36021c Added Sorting Attribute to Infocenter Menu Entries 2018-06-27 10:02:27 +02:00
Paolo 737c9fa07e Merge branch 'master' into permissions 2018-06-26 14:02:54 +02:00
Andreas Österreicher bd0979a096 PHP Version compatibility Fixes 2018-06-26 13:42:54 +02:00
Paolo bd101e154c Merge branch 'master' into permissions 2018-06-26 13:38:12 +02:00
Andreas Österreicher c26289cff6 Tippfehler bei Zurück Button behoben 2018-06-26 11:22:15 +02:00
Paolo 51ab4feeea Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-06-26 10:55:28 +02:00
Paolo 70d865a703 - Better error message in method saveCustomFilter of Filters controller
- NavigationWidget.css: added margin-right to icons in the header menu
- FilterWidget.js: function sideMenuHook now calls the renamed refreshSideMenuHook function
- NavigationWidget.js:
	- Added comments
	- Renamed function _printNavItem to _buildLeftMenuStructure
	- Added funtion _buildHeaderMenuStructure to build the header menu
	- Added function refreshSideMenuHook to call a controller that will refresh the left menu array and GUI
- infocenterPersonDataset.js:
	- Renamed function refreshSideMenu to refreshSideMenuHook
	- Now this function calls the NavigationWidget -> refreshSideMenuHook function
2018-06-26 10:45:20 +02:00
Manfred Kindl 2adb4c91df Merge remote-tracking branch 'origin/master' 2018-06-25 18:15:02 +02:00
Manfred Kindl edbaf8d414 Infocenter Mail Notizen as list and with insertvon-user 2018-06-25 18:10:09 +02:00
Andreas Österreicher 10740a22ef Bugfix Ampelinfomail wenn Vorlaufzeit oder Verfallszeit Null ist
Pfad zu Ampelverwaltung korrigiert
Anzeige des Ampel Popup überarbeitet
2018-06-25 16:13:26 +02:00
Paolo 94563d379f Merge branch 'master' into permissions 2018-06-21 15:19:59 +02:00
Cris df04e43ad0 Added Sancho Mail cronjob (CI)
. jobs/AmpelMail.php: 
  -- generates ampel mails for new and for overdue mails
  -- this script is run by the cronjob

. sancho_helper.php: 
  -- generates and sends Sancho Mails with Sancho Design and Layout using Sancho-mail-templates

. Ampel_model.php: functions to retrieve correct ampeln

. Sancho pictures: 
  -- sancho_header_neue_nachrichten_in_ampelsystem: is set by default
  -- sancho_header_TEMPLATE.xcf: template to quickly reproduce new sancho header images (change the text and export as jpg)
2018-06-20 14:48:28 +02:00
Paolo 9a33e44491 - Replaced "index.ci.php" with $this->config->item('index_page')
- Replaced base_url that contains "index.ci.php" with site_url
- Replaced APP_ROOT with base_url or site_url where needed
- InfoCenter controller added comments and improved the code
2018-06-19 16:34:23 +02:00
Andreas Österreicher 84a0db4483 Fixed PHP Version compatibility 2018-06-18 11:27:10 +02:00
Paolo 08efaf840c - Missing permissions in the InforCenter controller
- If filters are not present for the Freigegeben page, now the page does not crash
2018-06-18 10:49:34 +02:00
Paolo 079ee7bfbd Removed unnecessary permissions check from the InfoCenter controller 2018-06-15 11:50:06 +02:00
Paolo c5cce4d0a0 Fixed missing permissions on controller InfoCenter 2018-06-15 11:33:13 +02:00
Paolo 0dde3095b2 Merge branch 'master' into permissions 2018-06-15 11:13:16 +02:00
Paolo 264ec9be9e InfoCenter: fixed relative URLs and HTTP GET parameters 2018-06-15 11:04:24 +02:00
Paolo 0f798faab5 - Removed navigation left menu entry for page system/infocenter/InfoCenter/showDetails from navigation config
- Changed URI of path from system/infocenter/InfoCenter/infocenterFreigegeben to system/infocenter/InfoCenter/freigegeben in navigation config
- Moved the logic from Navigation controller to NavigationLib
- Added private method _loadNavigationLib to Navigation controller to load the NavigationLib with parameters
- Navigation controller now extends FHC_Controller
- Added NavigationLib to collect all the logic used by the NavigationWidget components
- Remove the handle of the fhc_controller_id from the NavigationWidget.js
- NavigationWidget.js now uses better tools that came from the AjaxLib
- Adapted InfoCenter controller to work with the new tools from NavigationWidget
- infocenterPersonDataset.js->refreshSideMenu now uses the parameter navigation_page in the ajax call
- Renamed InfoCenter controller method from infocenterFreigegeben to freigegeben
- Now methods index, freigegeben and showDetails generates their own left menu
- showDetails generate a left menu based on the origin page (index or freigegeben)
- freigegeben uses its own filters now
- Added view infocenterFreigegebenData.php
2018-06-14 18:36:21 +02:00
alex 249f273091 - beautified reply page
- added bootstrap "messageSent" page
- layout changes in messageWrite views
2018-06-12 17:24:24 +02:00
Paolo 81e4f2968e Merge branch 'master' into permissions
- Added new core controller called Auth_Controller that extends FHC_Controller and manage the authentication
- All the controllers that were extending the CI_Controller now they extend the FHC_Controller
- All the controllers that were extending the FHC_Controller now they extend the Auth_Controller
- Added the method isAllowed to the FiltersLib to check if the authenticated user has the required permissions
- FilterWidget and controller Filters are using the method isAllowed from the FiltersLib
2018-06-08 17:53:12 +02:00
Paolo dbd25d98bd FilterWidget: fixes and improvements 2018-06-06 17:50:28 +02:00
alex 5f2b02c441 - persondatasetjs works with ajaxlib
- added js object to persondatasetjs
- no locking when details accessed from freigegeben
- tablesorter filter remains when getting back from details page
2018-06-06 15:54:39 +02:00
Paolo 20b824b816 Changes to the FilterWidget IV 2018-06-06 13:45:33 +02:00
Paolo d63a092287 Changes to the FilterWidget III 2018-06-06 11:46:26 +02:00
Paolo 20bffadbc4 Changes to the FilterWidget II 2018-06-04 17:23:40 +02:00
Paolo 0a71bce547 Changes to the FilterWidget 2018-05-29 18:05:22 +02:00
alex dc580c9526 controllerid is also passed when freigegeben or abgesagt (important to keep filter!) 2018-05-29 17:44:58 +02:00
alex 282b822b63 - adapted infocenterdetails to work with new ajaxlib
- layout change infocenter dataset
- wrapping objects around javascript code
2018-05-25 15:10:50 +02:00
Paolo 15e350ea3a FilterWidget: extended the functionality of the default_filter flag
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
2018-05-24 12:37:50 +02:00