Commit Graph

228 Commits

Author SHA1 Message Date
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
Andreas Österreicher c54bb2303d Fixed some PHP 5.3 incompatible Codeparts 2018-01-15 18:00:41 +01:00
alex 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
alex 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
alex fa3daa7a57 Created infocenter details page showing Person Stammdaten, Dokumente, Prestudent ZGVs, Logs and Notizen. 2017-12-18 14:01:42 +01:00
Paolo a8b86031af Merge branch 'filters' 2017-12-06 11:02:33 +01:00
Andreas Österreicher 5b54217733 Added new Logging System for Persons
Added a Wrapper to call CI functions from outside Codeigniter
2017-11-24 18:45:51 +01:00
Paolo ee3998f62e - Changed system/dbupdate_3.3.php to create table system.tbl_filters and what its needed
- Added model system/Filters_model to manage system.tbl_filters
- Removed method execQuery from model system/UDF_model
- Added property executedQueryMetaData to DB_Model
- Added property executedQueryListFields to DB_Model
- Added method getExecutedQueryListFields to DB_Model
- Added method getExecutedQueryMetaData to DB_Model
- Added method execReadOnlyQuery to DB_Model to execute read only queries from outside a model
- Changed DB_Model method _toPhp to store infos about an executed query into properties executedQueryMetaData and executedQueryListFields
- Updated library UDFLib to use execReadOnlyQuery
- Added widget FilterWidget to render and manage a filter into VileSci
- Added views widgets/filter/selectFields, widgets/filter/selectFilters and widgets/filter/tableDataset used by FilterWidget
2017-11-22 12:08:54 +01:00
Andreas Österreicher 9859a498ca Added new Function SearchPerson 2017-11-20 15:59:55 +01:00
Paolo 50b26ce762 Changed method getOERoot of MessageToken_model and method redirectByToken of controller to retrive the correct root of the organisation unit tree 2017-11-16 16:41:20 +01:00
Paolo 8ca79b6657 Changed method getOERoot of MessageToken_model to retrive the correct root of the organisation unit tree 2017-11-16 16:27:14 +01:00
Paolo 1f6a0fc386 Messages: Bug-Report von STP: Berechtigung
Now the controller Redirect/redirectByToken doesn't use anymore the OrganisationseinheitLib,
therefore authentication is not required anymore
2017-11-14 15:01:36 +01:00
Paolo 0bc0a09bf4 - Removed file system execute permission for all files (no directories)
- application/extensions file system permission now is 775
- application/logs file system permission now is 775
- Added extensions directory in application/: config, controllers, helpers, hooks, libraries, models, views and widgets
- Added view views/extensions/manage.php
- Added controller controllers/system/extensions/Manager.php
- Added library ExtensionsLib to manage extensions
- Added model models/system/Extensions_model.php
- Moved code related to print out info from MigrationLib to EPrintfLib
2017-11-13 10:45:49 +01:00
Paolo 4f818ccb42 - Changed method getMessagesByPerson Message_model to use the given oe_kurzbz as root of the organisation unit tree
- Changed methods getStudiengangBewerbung and getAppliedStudiengangFromNowOE of model Message_model to use the given oe_kurzbz as root of the organisation unit tree
- Changed methods getMessagesByUID, getCountUnreadMessages and getMessagesByPerson of model Recipient_model to use the given oe_kurzbz as root of the organisation unit tree
2017-10-03 11:31:02 +02:00
Paolo 3cf42c4545 - Moved all the code related to authentication to AuthLib
- Changed configuration files autoload.php and rest.php to use AuthLib
- Added new method getCheckUserAuth to controller CheckUserAuth.php
- Removed libraries/FHC_Auth.php
- Removed models/CheckUserAuth_model.php
- Removed include/AddonAuthentication.php
2017-09-25 17:11:44 +02:00
Paolo 1d1ca17dc1 Now the organisation unit parameter for methods:
- getMessagesByPersonID
    - getMessagesByUID
    - getSentMessagesByPerson
    - getCountUnreadMessages
of controller system/Message must be the root of the organisation unit tree
2017-09-20 11:33:41 +02:00
Paolo 6fca6e45eb - Added optional parameter oe_kurzbz to method getStudiengangBewerbung of controller organisation/Studiengang2
- Added optional parameter oe_kurzbz to method getStudiengangBewerbung of model organisation/Studiengang_model
2017-09-20 10:41:20 +02:00
Paolo 7c25d6474c Changed methods:
- getMessagesByPersonID
- getMessagesByUID
- getSentMessagesByPerson
- getCountUnreadMessages
of controller system/Message to get messages also with a given organisation unit
2017-09-19 19:02:55 +02:00
Paolo f7153aa6f5 - Changed config entry addons_aufnahme_url in fhcomplete.php. Now it's an array having an entry for each organisation unit root
- Changed redirectByToken method in controllers/Redirect, now:
	- Loads the root of the organisation unit tree using the oe_kurzbz present in the message, loaded using a token
	- Redirect to the related aufnahme using the organisation unit previously found
- Changed method send in system/Messages, now retrives the oe_kurzbz of the recipients/prestudents to store these oe_kurzbz in the table tbl_msg_message (used by FAS)
- Added method getRoot to library OrganisationseinheitLib to retrive the root of an organisation unit by the given oe_kurzbz
- Added method getOrganisationunits to model crm/Prestudent_model, retrives the oe_kurzbz using the given prestudent/s id/s
- Added some comments here and there
2017-09-19 17:34:00 +02:00
Paolo 5ff875917c Added method getAppliedStudiengangFromNowOE to get all the applied study courses for one person
- Starting from the current study semester
- For an organisation unit present in the organisation units tree that has as root the given parameter
2017-09-15 14:15:04 +02:00
Paolo 3e74029552 If the recipient is an employee and has a UID then send the email to UID@Domain 2017-09-07 13:43:56 +02:00
Paolo d8cd786079 - application/core/* -> CS compliant
- application/libraries/* -> CS compliant
- FHC_Model isEntitled method now return error() or success()
- Updated all code that uses isEntitled method from FHC_Model
- Removed Squiz.PHP.DisallowSizeFunctionsInLoops from CS ruleset
- Removed depracated method replace from DB_Model
- Removed unused method pgArrayPhp from DB_Model
- Renamed method arrayMergeIndex to _arrayCombine in DB_Model and set as private
- Added method _manageUDFs to DB_Model (a wrapper for UDFLib->manageUDFs)
2017-08-22 16:24:51 +02:00
Paolo b50aab2d33 - Moved all code related to UDF from DB_Model to UDFLib
- Changed method getUDFs in DB_Model
- Removed method getUDF
- Moved method _getUDFsDefinitions to UDF_model and renamed to getUDFsDefinitions
- Updated model UDF_model
- Updated controller system/UDF
- Updated DB_Model to be more CS compliant
2017-08-18 15:50:59 +02:00
Paolo e4160088e8 - Added headers where they were missing
- Added comments where needed
- Beautified the code where needed, more readable and more compliant to CS
- loadResource function in helper fhc_helper.php is not using anymore CI
- Moved all constants from UDFWidget to UDFLib
- Added constant SORT to UDFLib
- Renamed constant REGEX_LANGUAGE to FE_REGEX_LANGUAGE in UDFLib
- Better formatting and indentation of the code of WidgetLib (more compliant to CS)
- Added missing validation attributes to HTML widgets
- Added constant HTML_DEFAULT_VALUE to CheckboxWidget
- Unset parameter multiple in DropdownWidget constructor
- Changed value of constant REQUIRED in widget HTMLWidget
- Added protected property $htmlParameters to widget HTMLWidget
  (it works as alias to $this->_args[HTMLWidget::HTML_ARG_NAME] -> better code)
- Replaced $this->_args[HTMLWidget::HTML_ARG_NAME] with $this->htmlParameters in the widgets
- Changed the CSS class label[udf-required=true]::after to label[required-field=true]::after in widgets.css
- Better use of constants in UDFWidget: constants from HTMLWidget are used only for the HTML parameters,
  while constants from UDFLib are used only for UDF parameters
2017-08-17 11:51:40 +02:00
Paolo c351ef781a Changed method getAppliedStudiengangFromNow in Studiengang_model.
Now also takes into consideration the current semester
2017-08-08 11:17:33 +02:00
Paolo a56412d687 Merge branch 'udf' 2017-08-07 16:44:03 +02:00