Commit Graph

875 Commits

Author SHA1 Message Date
Paolo bd101e154c Merge branch 'master' into permissions 2018-06-26 13:38:12 +02:00
Paolo 945d439426 - Added method _getNavigationArray to NavigationLib
- Adapted getMenuArray and getHeaderArray to use this new method
- Added comments
2018-06-26 13:35:21 +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
Paolo b65521199d - Navigation header array structure now is the same as the structure of the navigation menu array
- Implemented the sort logic and added the "sort" attribute to sort menu and header entries for the NavigationWidget
- Added the private method _sortArray to the NavigationLib to sort menu and header entries
- Added the "target" attribute to be used with the attribute "link" to build the link of a menu or header entry
- Now the header menu supports icons on the left side of the entry description
2018-06-20 18:12:38 +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 bf4829f324 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-06-15 10:01:39 +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
Paolo 8837083f10 - Added helper session_helper to add utility functions to manage the php session
- Adapted the library FiltersLib to use the session_helper
2018-06-14 16:59:14 +02:00
Paolo 2cbda912e3 - FiltersLib bugfix: now method generateDatasetQuery always build a query with no filters (no where clause) if the filters array is empty
- Added comments to Filters_model methods
- Removed method deleteCustomFilter from Filters_model
- Method getFilterList changed to load all the filters, removed default_filter = false from the where clause
2018-06-13 16:50:39 +02:00
Paolo 34296a436e Changed the menu entry for the left menu from "Züruck" to "Home" for the page system/infocenter/InfoCenter/infocenterFreigegeben 2018-06-13 16:45:36 +02:00
alex 249f273091 - beautified reply page
- added bootstrap "messageSent" page
- layout changes in messageWrite views
2018-06-12 17:24:24 +02:00
Gerald Raab 61dcf61e9e exclude Abgewiesene ohne Status bestätigt beim INteressenten, damit noch nicht
abgeschickte Bewerbungen wieder in Liste sind
2018-06-12 11:47:48 +02:00
Paolo c04126d4d5 Merge branch 'master' into permissions 2018-06-11 14:08:20 +02:00
Paolo 9f7dd9d394 FilterWidget: fixed authentication failure because the required permission was missing in the session 2018-06-11 14:07:21 +02:00
Paolo db7d508d12 Cleaned code in getPhrasesByCategoryAndPhrasesAndLanguage 2018-06-11 13:47:03 +02:00
Paolo 3bc9062515 Fixed query in method getPhrasesByCategoryAndPhrasesAndLanguage of model Phrase_model 2018-06-11 13:44:18 +02:00
Paolo abcdd37e90 - Now the FilterWidget always store the required permissions into the session to let the Filters controller to provide data even if the dataset is empty
- Now the _renderDropDown method of the FilterWidget.js checks the parameter to avoid errors
2018-06-08 18:28:40 +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 936cca98e6 Removed backup files 2018-06-08 15:28:29 +02:00
Paolo 8b312dcaf2 Merge branch 'master' into FilterWidget 2018-06-08 15:25:27 +02:00
Paolo 7d836a0147 - Added FiltersLib to contain all the shared logic of a FilterWidget
- Adapted Filters controller and FilterWidget to use this new lib
- Better memory usage in FilterWidget
- PhrasesLib now checks if categories is an empty array, it it is then avoid to call the method to load phrases (avoids an ugly error)
- Renamed the class FHC_PhraseLib to FHC_PhrasesLib (like the filename)
2018-06-08 15:17:38 +02:00
Paolo 99095920ed Fixed FHC-Header parameters includes in InfoCenter views 2018-06-07 10:11:26 +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
Cris 96be91f78e Merge branch 'phrases' 2018-06-06 15:14:33 +02:00
Cris 7facb7ab78 Improved PhrasesLib and Phrase_model
. optimized code in PhrasesLib.php
. secured method in Phrase_model with bindings
2018-06-06 15:12:42 +02:00
Paolo 894dc51e13 Enhancements 2018-06-06 14:53:24 +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
Cris efebfddd58 Added fallback to default language for phrases
. added fallback to default language in PhrasesLib.php
. fixed small issues concerning right translation in PhrasesLib.php
. all other files: adding translation for Infocenter overview + details page (client- and serverside)
2018-06-06 10:00:17 +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
Paolo 7c5995c318 Code and comments improved 2018-05-29 15:57:10 +02:00
Cris 865eea2245 Added PHRASES translation for javascript
added:
. PhrasesLib.js: translate method for retreiving phrasentexte in users language with JS
. PhrasesLib.php: methods to retrieve data from Phrase_model and return as JSON
. Phrase_model: method to perform query for categories AND phrases-array AND language
. FHC-Header.php:
 -- included js lib
 -- generate global FHC_JS_PHRASES_STORAGE_OBJECT

Changes of other files: loading libs, inits,...
2018-05-29 14:13:00 +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
Gerald Raab 505c15f558 Adapted base-sql 2018-05-24 15:13:32 +02:00