Commit Graph

1586 Commits

Author SHA1 Message Date
alex 89e724de0e added Kostenstellen retrievers by geschaeftsjahr 2018-04-30 17:57:48 +02:00
alex 0f8847593a renamed budget tables (permissions) 2018-04-30 17:56:00 +02:00
alex 18ef284aca Merge remote-tracking branch 'origin/master' 2018-04-30 17:32:22 +02:00
alex 3b33e52df4 added getChild and getParents methods to CI model 2018-04-30 17:32:08 +02:00
Andreas Österreicher ecaaa3cd19 Cronjob für Korrektur des Studienplanes korrigiert nun auch den
Studienplan der Reihungstestanmeldung
2018-04-30 09:44:40 +02:00
Paolo 999b4040a4 Moved JS function refreshSideMenu from views/widgets/filter/filter.php to include/js/infocenter/infocenterPersonDataset.js and adapted the code 2018-04-24 18:34:07 +02:00
Cris b7160b00fb Adapted curser pointer for notices
cursor changes now to pointer-symbol when hovering a notice
2018-04-23 14:58:29 +02:00
Paolo 5f3225588f Merge branch 'master' into permissions 2018-04-19 16:58:50 +02:00
alex ce3307bcf0 Merge remote-tracking branch 'origin/master' 2018-04-19 13:23:46 +02:00
alex 0acf6b84d7 moved permission checks for budget to extension 2018-04-19 13:23:33 +02:00
Paolo 9d5c9b443e Merge branch 'master' into permissions 2018-04-18 17:35:33 +02:00
Paolo 5b68f54328 ExtensionsLib:
- Private property SOFTLINK_TARGET_DIRECTORIES is now a two dimentional associative array
- The first index of this array is used to select the destination partial path where to link the given directory from the second index
- The second index is used to select all the target directories to be linked
- Adapted methods _delSoftLinks and _addSoftLinks to work with this new structure of SOFTLINK_TARGET_DIRECTORIES
- Added to SOFTLINK_TARGET_DIRECTORIES the entry DOC_ROOT => array('public')
2018-04-18 16:32:29 +02:00
alex fcaa447877 Merge remote-tracking branch 'origin/master' 2018-04-18 14:49:46 +02:00
alex 17bacc48c6 kostenstellen are retrieved only for permitted users, easier SQL statement, Geschaeftsjahr nex and current retrievement 2018-04-18 14:49:28 +02:00
Cris daab764a14 Added Notice-Update functionality
. added notice updates functionality by clicking on a row in the notice-table
. log "Notice updated" is set into log-table when note was updated successfully
2018-04-18 14:34:36 +02:00
Paolo db759fc72e PhrasesLib:
- Better code
- Added private method _extend_construct to extend the constructor
- Now is possible to instantiate the object PhrasesLib giving other parameters (like a second constructor)
- The new parameters are categories and language, used to retrive phrases from the DB
- Added new method 't' used to print out a phrase using the following parameters: category, phrase, replacement parameters, orgeinheit_kurzbz, orgform_kurzbz
- This method uses the CodeIgniter parser to replace parameters inside the phrase
2018-04-17 16:06:18 +02:00
Paolo 08c5733298 - Added method loadPhrases to FHC_Conroller as a wrapper to load phrases
- Added method getLanguage to Person_model to load the language for a user by the given UID
- Added comments to method getPhrasesByCategoryAndLanguage of system/Phrase_model, ORDER BY and more fields to SQL statement
2018-04-17 16:00:19 +02:00
Paolo 794fb7f6ac Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-04-17 13:13:11 +02:00
Paolo 874cbc9b92 Added method getPhrasesByCategoryAndLanguage to system/Phrase_model
It's used to retrived Phrases from DB using category and sprache as keys
2018-04-17 13:12:15 +02:00
Cris 898b15a6b6 Added view for "Freigegebene Bewerber" - not active yet
added 
. view for freigegebene bewerber
. controller calling the view
. navigation icons / text 

-- navigation item "Freigegeben" DEACTIVATED UNTIL FILTER is revised (filter should return ALL freigegebene Bewerber)
2018-04-17 11:35:16 +02:00
Cris 63a56932e8 Adapted Freigabe-Button at ZGV Prüfung
Freigabe-button is now disabled:
. as long the application was not sent by the bewerber
. for all study programs that are not bachelor
2018-04-16 16:35:50 +02:00
Andreas Österreicher 0ea5d53b0a Replaced base_url with site_url 2018-04-13 14:10:09 +02:00
Andreas Österreicher 1b11ed75db - Moved Menu collapse Item to the bottom of the Menu
- Added Tooltip to collapse Icons
2018-04-13 14:09:21 +02:00
Paolo 280fb62b01 Changed the global JS object FHC_JS_DATA_STORAGE_OBJECT, called path and called method have been separeted into two different properties 2018-04-13 13:41:25 +02:00
Paolo 3d42622490 - Better code in controller system/Phrases
- Added new folder views/system/phrases
- Moved views phraseinhaltEdit.php, phrases.php, phrasesEdit.php, phrasesList.php and phrasesinhaltList.php from views/system/ to views/system/phrases/
- Adapted the code to work with this change
2018-04-12 18:14:01 +02:00
Gerald Raab c29c83efb0 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-04-12 16:39:28 +02:00
alex fa795feee4 Kostenstellen can be retrieved by geschaeftsjahr (valid Kostenstellen), last Geschaeftsjahr can be retrieved 2018-04-12 16:03:28 +02:00
Paolo 5992cedd9e FHC_Header:
- Added global variable called calledFrom that contains the URL path of the called controller + controller method
- Added function _generateJSDataStorageObject to generate the global JS object FHC_JS_DATA_STORAGE_OBJECT
- The global JS object is renamed from FHC_ADDON_DATA_STORAGE_OBJECT to FHC_JS_DATA_STORAGE_OBJECT
- Added funtion _generateAddonsJSsInclude to generate all the includes needed by the Addons
2018-04-12 13:21:57 +02:00
Paolo ec12fb21f2 InfoCenter:
- Renamed button Apply to "Apply filter"
- Button "Apply filter" same width of button "Save filter"
2018-04-12 12:24:16 +02:00
Gerald Raab 3505b13bcf Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-04-12 12:13:03 +02:00
Gerald Raab baf6503f2f Updated BaseSQL 2018-04-12 12:12:25 +02:00
Paolo 307c8a44f1 - Removed parameters hideHeader and hideSave from system/infocenter/infocenterData (they do not REALLY need)
- Now the JS function renderSelectedFilterFields can recognize the metadata text type
- Filter options panel beautified
2018-04-12 11:58:10 +02:00
Andreas Österreicher 9c14dc9774 Modified Site Navigation to Support Wildcard Entries 2018-04-12 11:53:51 +02:00
Paolo f9ac16e7b9 FilterWidget bugfix
- Now is possible to remove selected filters in "Filter options"
- Changed the class of the delte button from remove-filter (already used) to remove-selected-filter
- Added click event to remove-selected-filter class and the ajax call
2018-04-11 13:45:53 +02:00
alex 0da929dd4f Konten can be retrieved by Kostenstelle 2018-04-11 10:54:17 +02:00
alex 161d814472 added permissions for Budgetantragsverwaltung 2018-04-11 10:53:03 +02:00
Paolo 558b6106c0 Changed method getPersonFromStatus of Person_model to retrive also the UID(s) of the prestudent 2018-04-09 17:41:22 +02:00
Andreas Österreicher cdac13c33f Removed Extension Menu Entry from Core 2018-04-09 12:47:11 +02:00
Andreas Österreicher b56e728f49 Extensions can now extend the standard Navigation 2018-04-09 07:42:23 +02:00
Paolo 88a7228555 - Parameter requiredPermissions of FilterWidget now can be also an array
- All the permissions of this array will be checked until a valid one is found
2018-04-06 17:47:17 +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
Paolo 537f6a5c49 Added order by version DESC in method loadVorlagetext of VorlageLib 2018-03-29 14:44:23 +02:00
Paolo dda27c7d6e - Removed method isEntitled from PermissionLib
- Renamed method checkPermissions to isEntitled
- isEntitled: if the controller is called from the command line, then is always trusted
- Adapted controllers application/core/APIv1_Controller.php and application/core/FHC_Controller.php
2018-03-29 12:23:05 +02:00
Paolo 042f187818 Removed config entry fhc_acl from application/config/fhcomplete.php 2018-03-29 12:19:53 +02:00
Paolo bdafffbb1f Removed permission system from application/core/FS_Model.php 2018-03-29 12:18:55 +02:00
Paolo 4152a67d8f - Removed permission system from DB_Model and FHC_Model
- Removed method _isEntitled from DB_Model
- Removed method isEntitled from DHC_Model
2018-03-29 12:15:12 +02:00
Paolo d9b80b790d Removed permission system from models 2018-03-29 12:13:08 +02:00
Paolo 0906f5bc85 - No permission type is needed anymore in controllers CallerLibrary and CallerModel
- No permission type is anymore given as parameter to library CallerLib
- Removed method checkLibraryPermission from library CallerLib
- Adapted code in library CallerLib
2018-03-29 11:52:41 +02:00
Paolo e8bf6ad747 Changed the required permission to controllers CallerLibrary and CallerModel. 2018-03-28 18:41:38 +02:00
Paolo 1fcc878cb5 Added permissions array to every controller that extends APIv1_Controller
CheckUserAuth and Test controllers now extends directly the REST_Controller
2018-03-28 12:09:54 +02:00