Commit Graph

8791 Commits

Author SHA1 Message Date
alex ea58df568f table footer line e.g. for sums 2018-04-30 17:58:25 +02:00
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 a8b4b51b0d Merge branch 'master' of github.com:FH-Complete/FHC-Core 2018-04-30 09:45:37 +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
Manfred Kindl c98b1d1f78 Merge remote-tracking branch 'origin/master' 2018-04-27 18:59:34 +02:00
Manfred Kindl 50fedfb889 FAS Studentenoverlay
- Columns Prestudent_ID and Person_ID shown as default
- Inactive Students marked grey
2018-04-27 18:59:22 +02:00
Andreas Österreicher b3e57e422f Problem behoben wodurch in der CIS Seite Redirect Seiten nicht korrekt
geoeffnet wurden wenn ein relativer Pfad verwendet wurde
2018-04-27 16:32:47 +02:00
Manfred Kindl 72459f1227 Revert "Coodle Farbcodierung"
This reverts commit 097218884c.
2018-04-27 16:15:38 +02:00
Manfred Kindl c7535f92c8 Merge remote-tracking branch 'origin/master' 2018-04-27 16:02:50 +02:00
Manfred Kindl ecf17a180b Neues File system_check_sql
Wenn im Ordner system/sql .sql-Files vorhanden sind, werden diese Ausgeführt und das Ergebnis per Mail an den Administrator geschickt. Dies soll als Check für systemkritische Abfragen, Checks, Inkonsistenzen, etc. dienen
2018-04-27 16:00:12 +02:00
Manfred Kindl e58c8110ce Trim auf Leerzeichen in Addon-Constructor 2018-04-27 15:57:45 +02:00
Manfred Kindl 120169ab37 Anzeige Vertretung in Urlaubsfreigabe-Übersicht 2018-04-27 15:56:54 +02:00
Manfred Kindl 6cb82ae911 BugFix Ersthelfer.php 2018-04-27 15:56:24 +02:00
Manfred Kindl 15180bd6f5 Notenverwaltung
- Hinweis an LektorInnen, wenn geänderte, nicht freigegebene Noten vorhanden sind
- Attribute "offiziell" und "bezeichung_mehrsprachig" in Klasse eingebaut
2018-04-27 15:55:48 +02:00
Manfred Kindl e527c9f6d7 Mlist_Generate
Initiales Löchen von inaktiven BenutzerInnen  berücksichtigt lehre-Atrribut statt Studiengang=0
2018-04-27 15:52:01 +02:00
Manfred Kindl 6b20891d97 Neue Vorlagen Ausbildungsvertrag 2018-04-27 15:50:16 +02:00
Manfred Kindl 5a39ae11f4 Studienordnung GUI
- Nächstes Studiensemester wird selected
- Gesetzte Studiensemester sind disabled
2018-04-27 15:48:49 +02:00
Manfred Kindl e2a542391a Studienplan Gültigkeit GUI
- Select für OrgForm
2018-04-27 15:48:26 +02:00
Manfred Kindl 32fb5efa59 Messagin-Tabellen in Personen-Zusammenlegen berücksichtigt 2018-04-27 15:44:23 +02:00
Manfred Kindl 097218884c Coodle Farbcodierung 2018-04-27 15:37:15 +02:00
Cris 51f6d4545f Added sancho ampel-erinnerungsmail 2018-04-25 11:24: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
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