Commit Graph

8765 Commits

Author SHA1 Message Date
Andreas Österreicher a38db44a13 Merge branch 'signatur' 2018-04-19 14:32:57 +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
Andreas Österreicher 0d7464c541 Merge branch 'master' into signatur 2018-04-19 13:22:01 +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 eb70a8675c added Permissions for Verwalten and Genehmigen of Budgetanträge 2018-04-18 15:20:33 +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
Andreas Österreicher 4b58ed44ab Schnittstelle für Stipendienstelle löst die Organisationsform zusätzlich
über den Studienplan auf sofern keine direkte Organisationsform
eingetragen ist
2018-04-18 08:53:37 +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
Paolo ae3815fafd Added unique index uidx_phrasestext_phrase_id_sprache_orgeinheit_kurzbz_orgform_kurzbz on system.tbl_phrasetext,
using phrase_id, sprache, orgeinheit_kurzbz and orgform_kurzbz
2018-04-17 13:11:08 +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 94d2fb14b2 Changed View public.tbl_prestudentstatus to get anmeldungzumreihungstest
from new Table tbl_rt_person
2018-04-13 14:37:47 +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 f41d845df4 Merged system/dbupdate_3.3.php 2018-04-13 13:36:39 +02:00
Andreas Österreicher edba85f540 Merge branch 'master' into signatur 2018-04-12 18:52:16 +02:00
Andreas Österreicher 7d554be22f Removed NOT NULL Constraint ON public.tbl_student.matrikelnr 2018-04-12 18:51:21 +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
Paolo 2a71c4387f - Added new column category to system.tbl_phrase
- Added UNIQUE INDEX uidx_filters_app_dataset_name_filter_kurzbz
- Added comment to system.tbl_phrase.category
2018-04-12 18:12:08 +02:00
Paolo 83e4d6dc69 Added public/extensions/ to gitignore 2018-04-12 16:51:13 +02:00
Paolo 3e418e0d1d Created filesystem structure for public static content 2018-04-12 16:49:02 +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
alex 77a31aed2d Merge remote-tracking branch 'origin/master' 2018-04-11 13:50:33 +02:00
alex e97a8cd761 added geschaeftsjahrvon and geschaeftsjahrbis to kostenstelle, excluded extension tables from checksystem check 2018-04-11 13:49:50 +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 8411786fce asterisk for labels for required fields 2018-04-11 11:40:22 +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
alex 38f084eebe enabled arrow for bootstrap panels 2018-04-10 16:11:56 +02:00
Gerald Raab a4ff2d6285 Eintragung Ersatzruhe 2018-04-10 13:05:30 +02:00
Andreas Österreicher 3ff9ce208a Anzahl der Interessenten mit RT Anmeldung korrigiert in der Rückschau
für das vorherige Semester
2018-04-10 12:45:10 +02:00
Andreas Österreicher 167ee461bd Problem behoben wodurch nicht alle Studiengänge in der Bewerberstatistik
sichtbar waren
2018-04-10 08:54:26 +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
Andreas Österreicher cd82baf075 Problem behoben wodurch getStgKz nicht immer korrekte Daten
zurücklieferte wenn Berechtigungen über Rollen und Funktionen zugeteilt
sind
Berechtigungen für diverse Seiten angepasst
2018-04-06 09:45:49 +02:00