928fe549bb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-05-03 13:14:37 +02:00
060e6fa8e9
Changed length of Column oe_kurzbz in system.tbl_filter
2018-05-03 13:05:24 +02:00
a2e109a1eb
Reactivated Freigegeben Page
2018-05-03 13:04:56 +02:00
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
4e90523ccc
Removed var_dumps and error_logs where not needed or placed a comment where they are needed
2018-05-03 12:31:56 +02:00
c4baa454aa
Added comment to application/helpers/fhc_helper.php
2018-05-03 12:26:50 +02:00
9ef544fe23
Merge remote-tracking branch 'origin/master'
2018-05-02 12:15:37 +02:00
47e7742b4e
BugFix
...
Berechtigungsproblem bei Funktion getAllOe()
2018-05-02 12:15:28 +02:00
83a29142b3
added jQuery treetable to composer
2018-04-30 18:09:27 +02:00
9e743089c2
table footer line e.g. for sums
2018-04-30 17:58:48 +02:00
ea58df568f
table footer line e.g. for sums
2018-04-30 17:58:25 +02:00
89e724de0e
added Kostenstellen retrievers by geschaeftsjahr
2018-04-30 17:57:48 +02:00
0f8847593a
renamed budget tables (permissions)
2018-04-30 17:56:00 +02:00
18ef284aca
Merge remote-tracking branch 'origin/master'
2018-04-30 17:32:22 +02:00
3b33e52df4
added getChild and getParents methods to CI model
2018-04-30 17:32:08 +02:00
a8b4b51b0d
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-04-30 09:45:37 +02:00
ecaaa3cd19
Cronjob für Korrektur des Studienplanes korrigiert nun auch den
...
Studienplan der Reihungstestanmeldung
2018-04-30 09:44:40 +02:00
c98b1d1f78
Merge remote-tracking branch 'origin/master'
2018-04-27 18:59:34 +02:00
50fedfb889
FAS Studentenoverlay
...
- Columns Prestudent_ID and Person_ID shown as default
- Inactive Students marked grey
2018-04-27 18:59:22 +02:00
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
72459f1227
Revert "Coodle Farbcodierung"
...
This reverts commit 097218884c
2018-04-27 16:15:38 +02:00
c7535f92c8
Merge remote-tracking branch 'origin/master'
2018-04-27 16:02:50 +02:00
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
e58c8110ce
Trim auf Leerzeichen in Addon-Constructor
2018-04-27 15:57:45 +02:00
120169ab37
Anzeige Vertretung in Urlaubsfreigabe-Übersicht
2018-04-27 15:56:54 +02:00
6cb82ae911
BugFix Ersthelfer.php
2018-04-27 15:56:24 +02:00
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
e527c9f6d7
Mlist_Generate
...
Initiales Löchen von inaktiven BenutzerInnen berücksichtigt lehre-Atrribut statt Studiengang=0
2018-04-27 15:52:01 +02:00
6b20891d97
Neue Vorlagen Ausbildungsvertrag
2018-04-27 15:50:16 +02:00
5a39ae11f4
Studienordnung GUI
...
- Nächstes Studiensemester wird selected
- Gesetzte Studiensemester sind disabled
2018-04-27 15:48:49 +02:00
e2a542391a
Studienplan Gültigkeit GUI
...
- Select für OrgForm
2018-04-27 15:48:26 +02:00
32fb5efa59
Messagin-Tabellen in Personen-Zusammenlegen berücksichtigt
2018-04-27 15:44:23 +02:00
097218884c
Coodle Farbcodierung
2018-04-27 15:37:15 +02:00
51f6d4545f
Added sancho ampel-erinnerungsmail
2018-04-25 11:24:40 +02:00
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
b7160b00fb
Adapted curser pointer for notices
...
cursor changes now to pointer-symbol when hovering a notice
2018-04-23 14:58:29 +02:00
a38db44a13
Merge branch 'signatur'
2018-04-19 14:32:57 +02:00
ce3307bcf0
Merge remote-tracking branch 'origin/master'
2018-04-19 13:23:46 +02:00
0acf6b84d7
moved permission checks for budget to extension
2018-04-19 13:23:33 +02:00
0d7464c541
Merge branch 'master' into signatur
2018-04-19 13:22:01 +02:00
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
eb70a8675c
added Permissions for Verwalten and Genehmigen of Budgetanträge
2018-04-18 15:20:33 +02:00
fcaa447877
Merge remote-tracking branch 'origin/master'
2018-04-18 14:49:46 +02:00
17bacc48c6
kostenstellen are retrieved only for permitted users, easier SQL statement, Geschaeftsjahr nex and current retrievement
2018-04-18 14:49:28 +02:00
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
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
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
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
794fb7f6ac
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-04-17 13:13:11 +02:00
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
alex