45c3aad94d
Adapted query for infocenter parking, replaced null in parkdate with -, set min and max size for messages, increased msglist size, pager counts now only trs in tbody
2018-05-17 17:46:00 +02:00
6a67183738
added Parking feauture to infocenter
2018-05-16 20:00:19 +02:00
24d4c316e4
Merge remote-tracking branch 'origin/master'
2018-05-16 15:44:24 +02:00
024bb06b0f
improved currgeschaeftsjahrquery
2018-05-16 11:52:37 +02:00
4f993b06f4
Merge branch 'master' into permissions
2018-05-14 13:44:03 +02:00
03b298f1f5
Added translation fallback
...
. fallback 1:
if no entry or empty entry in user's language --> fallback to default language
. fallback 2:
if empty entry at all (even in default langage) --> fallback to phrasename
2018-05-09 12:39:19 +02:00
aa278e89f0
Infocenter details changes: popup for ZGV info, show Bewerbungsfriste(n), optimized mobile responsiveness, set dokumente to "akzeptiert" when freigegeben
2018-05-08 14:13:47 +02:00
e4cdac1acb
moved infocenter and sb admin js and css from include to public, get inactive parents/children oe is possible
2018-05-03 13:33:08 +02:00
89e724de0e
added Kostenstellen retrievers by geschaeftsjahr
2018-04-30 17:57:48 +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
ecaaa3cd19
Cronjob für Korrektur des Studienplanes korrigiert nun auch den
...
Studienplan der Reihungstestanmeldung
2018-04-30 09:44:40 +02:00
5f3225588f
Merge branch 'master' into permissions
2018-04-19 16:58:50 +02:00
0acf6b84d7
moved permission checks for budget to extension
2018-04-19 13:23:33 +02:00
9d5c9b443e
Merge branch 'master' into permissions
2018-04-18 17:35: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
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
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
fa795feee4
Kostenstellen can be retrieved by geschaeftsjahr (valid Kostenstellen), last Geschaeftsjahr can be retrieved
2018-04-12 16:03:28 +02:00
0da929dd4f
Konten can be retrieved by Kostenstelle
2018-04-11 10:54:17 +02:00
558b6106c0
Changed method getPersonFromStatus of Person_model to retrive also the UID(s) of the prestudent
2018-04-09 17:41:22 +02:00
d9b80b790d
Removed permission system from models
2018-03-29 12:13:08 +02:00
68f934a5d0
Removed Budget Tables from Core -> moved to Extension
...
Fixed Problem during Extension installation
2018-03-15 06:53:50 +01:00
8f6ee06b9d
added "zgv uebernehmen" for prefill of zgv with latest edited zgv, optimized sort of zgvs
2018-02-26 16:54:41 +01:00
53fcda3504
added infomail when interessent freigegeben
2018-02-23 10:06:46 +01:00
45485ee02a
Fixed Bug where wrong Messages are sent if they are not sent immediately
...
Messages are only sent with the Employee-Adress of the Sender instead of
the private Address. If the Sender is not an Employee, the Messages are
sent with the System-EMail
2018-02-21 23:27:24 +01:00
cca4fee51e
mark header red if locked by other person, locking is possible either generally (app null) or only for certain apps.
2018-02-21 13:44:44 +01:00
695e7f60af
added lock mechanism for persons, outsourced infocenter code to javascript
2018-02-20 18:05:36 +01:00
c987773f8f
removed line
2018-02-20 17:58:03 +01:00
1e4fc86be5
Fixed Broken Unit Tests
2018-02-16 11:43:59 +01:00
bc372a88e4
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-09 18:21:31 +01:00
a6247c464f
Removed Model of legacy Table
2018-02-09 15:19:33 +01:00
c57c953eaa
- Added methods deleteCustomFilter and _fillCustomFilters to controller InfoCenter
...
- Added method deleteCustomFilter to model Filters_model
- Changed parameter filterId to filter_id in FilterWidget, infocenterData
- Changed CSS and JS in views/widgets/navigationMenu.php to allow two links in one menu item
- Changed NavigationMenuWidget to allow two links in one menu item
2018-02-09 15:18:44 +01:00
e2e4f03c59
Removed Model of legacy Table
2018-02-09 15:16:53 +01:00
7af890b44c
- Better code in NavigationMenuWidget::printNavItem
...
- Custom filters are now loaded in InfoCenter
- filter_kurzbz is automatically generated
- Now is saved the filter description
- filter description is the same for every language
- Added method getCustomFiltersList to system/Filters_model.php
2018-02-07 13:36:54 +01:00
20455d264c
added message table, added tinymce editor to header and messageList
2018-02-05 15:00:54 +01:00
ad54f08a97
check if not abgewiesen or bestätigt before abweisen or bestätigen, removed Zustellung column, retrieve only zugestellte kontakte, log entrys starting uppercase
2018-02-01 16:53:19 +01:00
84bf884db7
write log entry when sending message
2018-02-01 16:16:32 +01:00
b9e7dc38cc
enabled sending messages with person ids as receivers, person data can be retrieved by uid, link in infocenter details to send message
2018-02-01 10:26:37 +01:00
8b28b48ff9
- Merged controller system/infocenter/InfoCenter.php into system/infocenter/InfocenterDetails.php
...
- Removed controller application/controllers/system/infocenter/InfocenterDetails.php
- Removed method _getFilterList from controller system/infocenter/InfoCenter.php
- Added method _setNavigationMenuArray to controller system/infocenter/InfoCenter.php to generate the array for the left menu
- Added public method getFilterList to model Filters_model
- Removed view application/views/widgets/navigation.php
- Removed widget application/widgets/navigation.php
- Widget application/widgets/FHC_navigation.php now is usable to print any menu from an array
2018-01-23 18:49:09 +01:00
5a0082ec11
added Studienplan Orgform and alternative Orgform (in "Anmerkung" field), Studienplansprache for display, Statusgrund Bezeichnung for Abgewiesener
2018-01-22 17:43:13 +01:00
3ccd38540d
updated CI person logging for Verarbeitungstätigkeit (taetigkeit_kurzbz)
2018-01-19 16:50:36 +01:00
78df57044e
Resturlaubstage, Mehrarbeitsstunden und Urlaubsanspruch pro Jahr
...
entfernt. Diese können bei Mitarbeitern jetzt nicht mehr verwaltet
werden
2018-01-18 09:01:49 +01:00
8f0b4c3114
infocenter: added confirmation popup when student freigegeben/abgewiesen, non-interessent or prestudenten with interessentenstatus confirmed are view-only (infoonly), added Nation data to Prestudent and akte, bugfixes
2018-01-17 11:45:23 +01:00
c54bb2303d
Fixed some PHP 5.3 incompatible Codeparts
2018-01-15 18:00:41 +01:00
0e6e6ab8ea
added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive
2018-01-10 09:53:34 +01:00
2b186d0c45
improved infocenter details, added bootstrap and admin theme (sb admin 2) , added zgv pruefung Status, Studiensemester and Ausbildungssemester, contacts in one table, nachzureichen and nachgereicht am columns
2018-01-08 09:55:13 +01:00
fa3daa7a57
Created infocenter details page showing Person Stammdaten, Dokumente, Prestudent ZGVs, Logs and Notizen.
2017-12-18 14:01:42 +01:00
a8b86031af
Merge branch 'filters'
2017-12-06 11:02:33 +01:00
alex