Commit Graph

759 Commits

Author SHA1 Message Date
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 537f6a5c49 Added order by version DESC in method loadVorlagetext of VorlageLib 2018-03-29 14:44:23 +02:00
alex 350eae5985 Merge remote-tracking branch 'origin/master' 2018-03-27 13:44:33 +02:00
alex 8493638605 Added Studiengang and Orgform to Subject of Freigabemail 2018-03-27 13:44:09 +02:00
Paolo 546b3bfef3 Bugfix: removed redundant event binding for element remove-filter in view selecteFilters 2018-03-23 11:03:46 +01:00
Gerald Raab a1c4537540 Filter Infocenter angepasst 2018-03-23 09:57:01 +01:00
Andreas Österreicher 00c94778c1 Fixed Problem with Personal Filters 2018-03-22 10:03:06 +01:00
Gerald Raab a5fbd45357 Spalte Nation hinzgrfügt, Login with code wird für Liste ignoriert 2018-03-16 17:54:33 +01:00
Andreas Österreicher 3eebd1f3ed Extension Permission is now needed to see installed Extensions 2018-03-15 07:00:30 +01:00
Andreas Österreicher 68f934a5d0 Removed Budget Tables from Core -> moved to Extension
Fixed Problem during Extension installation
2018-03-15 06:53:50 +01:00
Paolo 55c5f87832 Changed the server name in config/fhcomplete for addons_aufnahme_url 2018-03-14 12:24:01 +01:00
alex 16631d7ad9 quickfix for collapsing menu - add click events only after ajax call execution (asynchronity can be a bitch...) 2018-03-14 11:28:57 +01:00
alex 95663c42aa added ZGV and document info to freigabe mail 2018-03-14 09:45:26 +01:00
Paolo dd610c83d9 - Added navigation.php in application/config to configure menus used by NavigationWidget
- Addded controller system/Navigation to retrive menus via ajax
- Renamed method _setNavigationMenuArray to setNavigationMenuArray and set as public in system/infocenter/InfoCenter
- Now the InfoCenter menu is stored in the session
- The menu is generated by the widget NavigationWidget via JS
- No need anymore to give as parameters to the views the menu arrays
2018-03-09 15:14:16 +01:00
Manfred Kindl 2724d54cd6 Vorlagen are now order Descending by Version 2018-03-09 12:15:50 +01:00
Manfred Kindl b2fcb12936 Merge remote-tracking branch 'origin/master' 2018-03-06 17:04:20 +01:00
Manfred Kindl 56d2686e72 Infocenter Notiz Button für Autotext
"Anmerkung zur Bewerbung"-Text wird automatisch eingefügt
- "Select..."-Option bei Preview nur wenn mehr als 1 Empfänger
2018-03-06 16:54:49 +01:00
Andreas Österreicher 3c7336a910 Infomails über neue Messages werden jetzt immer mit System-User versandt 2018-03-06 16:27:22 +01:00
Andreas Österreicher 9362f56b63 Modified Infocenter Filter 2018-03-06 15:44:33 +01:00
Andreas Österreicher 005739a093 Fehler behoben wodurch doppelte oder leere MessageVorlagen angezeigt
wurden
2018-03-05 18:56:06 +01:00
Paolo 237f6530b6 FilterWidget bugfix: correct generation of array columnsAliases in method sortSelectedFields of controller system/Filters 2018-03-02 12:53:37 +01:00
Paolo a999c8bf01 FilterWidget bugfix: correct generation of selectedFiltersAliases in method selectFilters of controller system/Filters 2018-03-02 12:29:55 +01:00
Andreas Österreicher 99f075ee2f Link zu Onlinebewerbung korrigiert 2018-03-02 11:44:55 +01:00
Andreas Österreicher 67d7deeffc Infocenter Spalten angepasst 2018-03-02 11:35:42 +01:00