Commit Graph

470 Commits

Author SHA1 Message Date
Cris 38b195beeb Optimized Reihungstest-chronjob code
. Optimized code by retreiving data directly via model.
. Extended SQL query: study courses are now checked for active = true
2018-12-06 12:42:48 +01:00
Cris 41b55cf571 Added Reihungstest-chronjob -> sends info with Sancho mail
The job
-- checks if there are active studyplans which have no public placement tests assigned yet 
-- retrieves faculty and amount of free places for each public placement test date.

This information is then sent by email in Sancho design.
2018-12-05 16:58:38 +01:00
Andreas Österreicher d5b1c9c643 Infocenter: Added Column ZGVNation to FilterPages 2018-12-04 15:45:51 +01:00
Andreas Österreicher 0352660194 Infocenter Back Link links now correctly to Reihungstest absolviert Page
if origin is set
2018-12-04 14:37:53 +01:00
alex 09e452cf74 bewerber is unparked after sending reply message 2018-12-04 09:42:33 +01:00
Paolo d178164130 - Removed private methods _setNavigationMenuIndex, _fillCustomFilters and _fillFilters from controller organisation/Reihungstest.php
- Removed public method setNavigationMenuArrayJson from controller organisation/Reihungstest.php
- Removed JS include public/js/reihungstest/reihungstest.js from views/organisation/reihungstest/reihungstest.php
- Removed JS public/js/reihungstest/reihungstest.js
2018-12-03 14:53:25 +01:00
alex f7f13d3941 added information about statusgrund to freigeben log 2018-12-03 14:43:07 +01:00
Paolo 3abc592c81 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-12-03 14:09:50 +01:00
Paolo 03f74c2299 - Added new page "Reihungstest absolviert" to InfoCenter
- New const REIHUNGSTESTABSOLVIERT_PAGE in InfoCenter controller
- New permission reihungstestAbsolviert => 'infocenter' in InfoCenter controller
- Remove private method _setNavigationMenuFreigegeben from InfoCenter controller
- Added new private method _setNavigationMenu to InfoCenter controller
- Added new public method reihungstestAbsolviert to InfoCenter controller
- Changed method setNavigationMenuArrayJson in InfoCenter controller to include new page "Reihungstest absolviert"
- Changed method _setNavigationMenuIndex in InfoCenter controller to include new page "Reihungstest absolviert"
- Added orgform to column StgAbgeschickt in infocenterFreigegebenData.php
- Added new columns Statusgrund, ReihungstestAngetreten and ReihungstestApplied in infocenterFreigegebenData.php
- Added new filters for reihungstestAbsolviert in system/filtersupdate.php
- Changed freigegeben filters in system/filtersupdate.php
2018-12-03 13:33:57 +01:00
alex a28df53718 Infocenter changes
- new button for Freigabe zum Reihungstest, sending message to bewerber when freigabe
- button Freigabe for Studiengang with Statusgrund
- Ausbildungssemester can be saved
- Using Vorlagen for Freigabe Mail to assistance and message to bewerber
- Added Nation of address at details page
- Scroll to top button on details page
- moved messageList js to own file
2018-11-30 16:48:28 +01:00
Paolo 7a9eda3912 - Added new public method setNavigationMenu to controller system/Filters.php
- Method _setNavigationMenuFreigegeben of system/infocenter/InfoCenter controller now generate only the menu entry "Home"
- Added new const CUSTOM_MENU to FiltersLib to represent new FilterWidget parameter to specify if the menu for this filter is custom
- Added new consts NAV_MENU_FILTER_KEY, NAV_MENU_FILTER_NAME, NAV_MENU_CUSTOM_FILTER_KEY and NAV_MENU_CUSTOM_FILTER_NAME to FiltersLib as name and array keys of the filters menu array
- Added new const NAVIGATION_PAGE to FiltersLib which represents the navigation page parameter name
- Added new public method generateFilterMenu to FiltersLib to generate the filters menu structure array and stores it into the session
- Fixed methods setElementSessionMenu and setElementSessionHeader in NavigationLib
- Added new public method getFiltersByAppDatasetName to Filters_model to load all filters by their app and dataset_name
- Added new private property _customMenu to FilterWidget
- If _customMenu is NOT true then the new private method _setFilterMenu is called
- View infocenter/infocenterData.php: arranged the code differently and set customMenu as true
- View infocenter/infocenterFreigegebenData.php: arranged the code differently
- Added new global function refreshSideMenuHook to FilterWidget.js
- Renamed private method _getNavigationWidgetCalled to getNavigationPage in NavigationWidget.js
- Method refreshSideMenuHook of NavigationWidget.js now can accept parameters to give them to the ajax call
- In infocenterPersonDataset.js the function refreshSideMenuHook is declared only if the page is the index page
2018-11-30 14:58:38 +01:00
Andreas Österreicher a9f97cc755 Muted USort Warning-Output as Workaround for PHP 5.6 Bug 2018-11-29 07:23:35 +01:00
Paolo 874716921b - Removed static menu entries InfoCenter/index and InfoCenter/freigegeben from config/navigation.php
- Added new constant FILTER_ID to controllers/system/infocenter/InfoCenter.php
- Added new constant PREV_FILTER_ID to controllers/system/infocenter/InfoCenter.php
- Changed InfoCenter controller methods _setNavigationMenuIndex, _setNavigationMenuShowDetails and _setNavigationMenuFreigegeben to generate links with possibly parameter prev_filter_id
- Changed views system/infocenter/infocenterData.php and system/infocenter/infocenterFreigegebenData.php to generate links with possibly parameter prev_filter_id
2018-11-27 17:02:34 +01:00
Andreas Österreicher 608a86e049 Neue Übersichtsseite für Reihungstests hinzugefügt 2018-11-27 11:04:08 +01:00
Paolo a741ffbd41 - InfoCenter controller methods _fillFilters, _fillFiltersFreigegeben and _fillCustomFilters now use NavigationLib->oneLevel
- NavigationLib added parameter subscriptLinkHref to oneLevel
- NavigationWidget.js method _buildLeftMenuStructure now uses parameter subscriptLinkHref
2018-11-23 18:04:40 +01:00
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