Commit Graph

75 Commits

Author SHA1 Message Date
Paolo 1832f9a78a - Set reloadDataset = true when widget is loaded
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +01:00
Andreas Österreicher 084056a1a0 Merge branch 'feature-4825/Infocenter_zurückstellen_Farbe_intensiver' 2019-11-15 11:44:45 +01:00
alex 551eeaa004 - infocenter: different color for onhold - applicants so they can be better distinguished in infocenter uebersicht from parked 2019-11-06 16:38:45 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
alex fce3659573 - Infocenter Übersicht: zurückgestellte BewerberInnen werden grün markiert 2019-10-03 15:22:54 +02:00
alex 10e1539b22 infocenterData.php, infocenterFreigegebenData.php, infocenterReihungstestAbsolviertData.php: column data is retrieved from selected Studiensemester variable, and not from future Semesters 2019-09-27 14:36:18 +02:00
alex 67415a4707 - possible to read and write user Variables in Codeigniter
- added Variablenname_model, VariableLib, Variables controller
- Infocenter Übersicht - infocenterData, infocenterFreigegebenData, infocenterReihungstestAbsolviertData: added possibility of toggle of infocenter_studiensemester variable, only prestudents of selected Studiensemester are shown
2019-09-06 17:33:56 +02:00
raab ce61b30ec4 spalte anzahlaktepflicht, bugfixes 2019-05-24 13:03:44 +02:00
alex fdf80f2d7e InfocenterData, infocenterfreigegebendata, infocenterreihungstestabsolviertdata:
added log name "Login with user" to list of excluded logs for "last Action"
2019-04-18 17:15:21 +02:00
Andreas Österreicher f05ebf3946 Unlocking in Infocenter now always reloads the Dataset and jumps to the correct Filter 2019-04-17 09:15:41 +02:00
Andreas Österreicher ab7cdd0da4 Added additional degreeprograms to infocenter page 2019-02-06 18:23:38 +01:00
Paolo b58475d6c5 - FilterWidget can represents the retrieved data with tablesorter or pivotUI
- Added new constants to FiltersLib
- Added new parameter pivotui to FHC-Header to load JS and CSS for pivotUI
- Renamed constat WIDGET_URL_TABLE_DATASET to WIDGET_URL_DATASET_TABLESORTER in FilterWidget
- Added new constat WIDGET_URL_DATASET_PIVOTUI to FilterWidget
- Added new private properties _datasetRepresentation and _datasetRepresentationOptions to FilterWidget
- Renamed FilterWidget->loadViewTableDataset to loadViewDataset
- FilterWidget->loadViewDataset loads tablesorter or pivotUI view depending on the value of property _datasetRepresentation
- FilterWidget accepts two new parameter: datasetRepresentation and datasetRepOptions
- datasetRepresentation is required
- FilterWidget stores in session the _datasetRepresentation and _datasetRepresentationOptions properties
- Adapted view views/widgets/filter/filter to use loadViewDataset
- All views using FilterWidget have been adapted to use the required parameter datasetRepresentation
- Added new constats DATASET_REP_TABLESORTER and DATASET_REP_PIVOTUI to public/js/FilterWidget.js
- Added new private property _datasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
- Based on property _datasetRepresentation FilterWidget.js will represent the FilterWidget data with tablesorter or pivotUI
- Added new private method _renderDataset to FHC_FilterWidget in public/js/FilterWidget.js
- Renamed method _renderTableDataset to _renderDatasetTablesorter in FHC_FilterWidget in public/js/FilterWidget.js
- Added new method _renderDatasetPivotUI to FHC_FilterWidget in public/js/FilterWidget.js
- Added bew method _setDatasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
2019-02-05 10:38:22 +01:00
Paolo c839e8e4a1 - Added personid param for adding notiz
- Changed filesystem permissions
2019-02-05 10:34:36 +01:00
Gerald Raab 09a82b1a03 Diverse Filter für Infocenter angepasst 2018-12-18 16:30:59 +01:00
Andreas Österreicher 6e1986d191 Infocenter Filter für nicht abgeschickte Bewerbung korrigiert 2018-12-10 17:07:26 +01:00
Andreas Österreicher d5b1c9c643 Infocenter: Added Column ZGVNation to FilterPages 2018-12-04 15:45:51 +01:00
Andreas Österreicher 8bbe26a365 Infocenter: Added Gender Column to Filter Pages 2018-12-04 14:41:40 +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
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
Paolo 513815bbd2 Fixed wrong order of columns aliases in infocenterData and infocenterFreigegebenData 2018-11-28 14:57:54 +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
Paolo d72c581167 SQL statements improved in application/views/system/infocenter/infocenterData.php and application/views/system/infocenter/infocenterFreigegebenData.php 2018-11-21 17:43:21 +01: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 2cba129076 - Added method hasAtLeastOne to the library PermissionLib
- Adapted the method isAllowed of the library FiltersLib to use hasAtLeastOne
- Corrected/added comments
2018-06-29 11:51:16 +02:00
Andreas Österreicher 2fed75f175 Fixed PHP compatibility issues 2018-06-26 18:10:21 +02:00
Andreas Österreicher 84a0db4483 Fixed PHP Version compatibility 2018-06-18 11:27:10 +02:00
Paolo 0dde3095b2 Merge branch 'master' into permissions 2018-06-15 11:13:16 +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
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 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 d63a092287 Changes to the FilterWidget III 2018-06-06 11:46:26 +02:00
Paolo 0a71bce547 Changes to the FilterWidget 2018-05-29 18:05:22 +02:00
Gerald Raab ed5ee67cc0 Quickfix multiple Prestudent-Verwendung 2018-05-23 15:39:21 +02:00
Andreas Österreicher f9346a37fb PHP Version fix 2018-05-23 15:28:01 +02:00
alex ae052ec212 updated phrases for infocenter, layoutchanges phrasesupdate 2018-05-22 17:17:09 +02:00
Paolo a1b9e4e8b1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-05-18 13:11:24 +02:00
Paolo 13beae23cc - Added public/css/FilterWidget.css and public/css/NavigationWidget.css to define CSS for Filter and Navigation widgets
- Added public/js/FilterWidget.js and public/js/NavigationWidget.js to collect all the JS for Filter and Navigation widgets
- Added filterwidget and navigationwidget paramaters to FHC-Header to include the new CSS and JS for Filter and Navigation widgets
- Removed all CSS and JS from the views used from Filter and Navigation widgets
- Added method _getFilterUniqueId to controller Filters to generate a unique id for a filter based on fhc_controller_id and the current page
- Adapted the code in controller Filters to use _getFilterUniqueId
- Added method _getFilterUniqueId to widget FilterWidget to generate a unique id for a filter based on fhc_controller_id and the current page
- Adapted the code in widget FilterWidget to use _getFilterUniqueId
- Removed fhc_controller_id from menu generation in InfoCenter controller
- InfoCenter controller now gives as parameter fhc_controller_id to view infocenterDetails
- InfoCenter controller now gives as parameter fhc_controller_id to various redirect
- Views infocenter, infocenterData, infocenterDetails and infocenterFreigegeben:
	- including new JS and CSS to work with Navigation and Filter widgets
	- including AjaxLib (required by FilterWidget.js and NavigationWidget.js)
	- using fhc_controller_id in Details and unlockPerson links
- fhc_controller_id in not anymore a parameter for FilterWidget, adapted the code where FilterWidget is called
- AjaxLib: renamed method _getUrlParameter to getUrlParameter
- Removed function getUrlParameter from public/js/infocenter/infocenterDetails.js, now uses the method from AjaxLib
- Added fhc_controller_id where needed into public/js/infocenter/infocenterDetails.js
- public/js/infocenter/infocenterPersonDataset.js now uses getUrlParameter from AjaxLib
- Added paramater filter_page in infocenterPersonDataset.js when calling Filters/rowNumber
2018-05-18 12:10:14 +02:00
alex 45c3aad94d Adapted query for infocenter parking, replaced null in parkdate with -, set min and max size for messages, increased msglist size, pager counts now only trs in tbody 2018-05-17 17:46:00 +02:00
alex 6a67183738 added Parking feauture to infocenter 2018-05-16 20:00:19 +02:00
Cris 24d4c316e4 Merge remote-tracking branch 'origin/master' 2018-05-16 15:44:24 +02:00
Paolo 4f993b06f4 Merge branch 'master' into permissions 2018-05-14 13:44:03 +02:00
Gerald Raab 257c833d45 'Interessent rejected' ignored in list 2018-05-11 15:43:39 +02:00
Cris 1254e8d618 Added translation using phrases
. added translation functionality by
-- adding loadPhrases-method in Controllers
-- replacing hardcoded html-text with $this->p->t(...)
2018-05-09 12:36:35 +02:00
Paolo dba08d4d9e - Added the feature to the Infocenter controller to generate a unique identifier for each call of itself, and to keep using the identifier for the next calls in the same browser/tab
- Added the feature to the FilterWidget to use this identifier to create a different session for each FilterWidget
2018-05-03 12:33:01 +02:00
Paolo 9d5c9b443e Merge branch 'master' into permissions 2018-04-18 17:35:33 +02:00
Andreas Österreicher 0ea5d53b0a Replaced base_url with site_url 2018-04-13 14:10:09 +02:00
Gerald Raab baf6503f2f Updated BaseSQL 2018-04-12 12:12:25 +02:00
Paolo 49e24b0431 - Controller system/Filters now extends CI_Controller
- Added private method _isAllowed to controller system/Filters
- The method _isAllowed is called in the controller constructor and checks if the caller has the permission to read data with this instance of the FilterWidget
- The permission is given as parameter when calling the FilterWidget, the parameter is called requiredPermissions
- Updated the view system/infocenter/infocenterData to give the infocenter permission to the FilterWidget
- Changed the logic into the FilterWidget to manage the requiredPermissions parameter
2018-03-29 16:53:38 +02:00