Commit Graph

253 Commits

Author SHA1 Message Date
Cris df04e43ad0 Added Sancho Mail cronjob (CI)
. jobs/AmpelMail.php: 
  -- generates ampel mails for new and for overdue mails
  -- this script is run by the cronjob

. sancho_helper.php: 
  -- generates and sends Sancho Mails with Sancho Design and Layout using Sancho-mail-templates

. Ampel_model.php: functions to retrieve correct ampeln

. Sancho pictures: 
  -- sancho_header_neue_nachrichten_in_ampelsystem: is set by default
  -- sancho_header_TEMPLATE.xcf: template to quickly reproduce new sancho header images (change the text and export as jpg)
2018-06-20 14:48:28 +02:00
Paolo 2cbda912e3 - FiltersLib bugfix: now method generateDatasetQuery always build a query with no filters (no where clause) if the filters array is empty
- Added comments to Filters_model methods
- Removed method deleteCustomFilter from Filters_model
- Method getFilterList changed to load all the filters, removed default_filter = false from the where clause
2018-06-13 16:50:39 +02:00
Paolo db7d508d12 Cleaned code in getPhrasesByCategoryAndPhrasesAndLanguage 2018-06-11 13:47:03 +02:00
Paolo 3bc9062515 Fixed query in method getPhrasesByCategoryAndPhrasesAndLanguage of model Phrase_model 2018-06-11 13:44:18 +02:00
Cris 7facb7ab78 Improved PhrasesLib and Phrase_model
. optimized code in PhrasesLib.php
. secured method in Phrase_model with bindings
2018-06-06 15:12:42 +02:00
Paolo 894dc51e13 Enhancements 2018-06-06 14:53:24 +02:00
Paolo 7c5995c318 Code and comments improved 2018-05-29 15:57:10 +02:00
Cris 865eea2245 Added PHRASES translation for javascript
added:
. PhrasesLib.js: translate method for retreiving phrasentexte in users language with JS
. PhrasesLib.php: methods to retrieve data from Phrase_model and return as JSON
. Phrase_model: method to perform query for categories AND phrases-array AND language
. FHC-Header.php:
 -- included js lib
 -- generate global FHC_JS_PHRASES_STORAGE_OBJECT

Changes of other files: loading libs, inits,...
2018-05-29 14:13:00 +02:00
Paolo 15e350ea3a FilterWidget: extended the functionality of the default_filter flag
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
2018-05-24 12:37:50 +02:00
alex 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
alex 6a67183738 added Parking feauture to infocenter 2018-05-16 20:00:19 +02:00
Cris 24d4c316e4 Merge remote-tracking branch 'origin/master' 2018-05-16 15:44:24 +02:00
alex 024bb06b0f improved currgeschaeftsjahrquery 2018-05-16 11:52:37 +02:00
Cris 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
alex 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
alex 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
alex 89e724de0e added Kostenstellen retrievers by geschaeftsjahr 2018-04-30 17:57:48 +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 ecaaa3cd19 Cronjob für Korrektur des Studienplanes korrigiert nun auch den
Studienplan der Reihungstestanmeldung
2018-04-30 09:44:40 +02:00
alex 0acf6b84d7 moved permission checks for budget to extension 2018-04-19 13:23: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
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 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 fa795feee4 Kostenstellen can be retrieved by geschaeftsjahr (valid Kostenstellen), last Geschaeftsjahr can be retrieved 2018-04-12 16:03:28 +02:00
alex 0da929dd4f Konten can be retrieved by Kostenstelle 2018-04-11 10:54:17 +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 68f934a5d0 Removed Budget Tables from Core -> moved to Extension
Fixed Problem during Extension installation
2018-03-15 06:53:50 +01:00
alex 8f6ee06b9d added "zgv uebernehmen" for prefill of zgv with latest edited zgv, optimized sort of zgvs 2018-02-26 16:54:41 +01:00
alex 53fcda3504 added infomail when interessent freigegeben 2018-02-23 10:06:46 +01:00
Andreas Österreicher 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
alex 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
alex 695e7f60af added lock mechanism for persons, outsourced infocenter code to javascript 2018-02-20 18:05:36 +01:00
alex c987773f8f removed line 2018-02-20 17:58:03 +01:00
Andreas Österreicher 1e4fc86be5 Fixed Broken Unit Tests 2018-02-16 11:43:59 +01:00
Paolo bc372a88e4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-09 18:21:31 +01:00
Andreas Österreicher a6247c464f Removed Model of legacy Table 2018-02-09 15:19:33 +01:00
Paolo 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
Andreas Österreicher e2e4f03c59 Removed Model of legacy Table 2018-02-09 15:16:53 +01:00
Paolo 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
alex 20455d264c added message table, added tinymce editor to header and messageList 2018-02-05 15:00:54 +01:00
alex 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
alex 84bf884db7 write log entry when sending message 2018-02-01 16:16:32 +01:00
alex 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
Paolo 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
alex 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
alex 3ccd38540d updated CI person logging for Verarbeitungstätigkeit (taetigkeit_kurzbz) 2018-01-19 16:50:36 +01:00
Andreas Österreicher 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
alex 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