Commit Graph

1197 Commits

Author SHA1 Message Date
Cris 438b7b5b9e Moved methods from Vertrag_model to Vertragvertragsstatus_model
Moved out and adapted methods which correspond to Vertragsstatus
from Vertrag_model to Vertragvertragsstatus_model.
2019-10-29 10:41:40 +01:00
Andreas Österreicher 22a517b88d Added LogsViewer to CI Menu 2019-10-29 06:51:36 +01:00
Andreas Österreicher 9e9612d317 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' 2019-10-28 16:28:57 +01:00
Cris 720f117312 Added/Extended PERMISSION-checks to Lehrauftraege
Added permission-checks to
. navigation
. controller methods
. tabulator data query
. cancel contract
2019-10-28 16:25:56 +01:00
alex 1971ec8ed1 - Infocenter.php bugfix: GET parameter list is separated by "&" and not by ? (params filter_id, reloadDataset) 2019-10-25 10:20:56 +02:00
Cris 30ef50fa4c Fixed: BIG AMOUNT of Lehrauftrage not causing POST param limit issue anymore
Before the number of params was overflowing POST param limitation of 1000.
Now data is json stringified on clientside to pack all data in only one
string. Adaptations were done also on serverside.
2019-10-24 15:57:50 +02:00
Cris cc28a92205 Added update of status icon directly after bestellen/erteilen/akzeptieren
Now the status icon and row formats are refreshed directly after the
bestell-/erteil-/akzeptieren-button was clicked.

Returning and updating vertrag_betrag in tabulator rows is needed to
detect when geaenderte have been updated and enable correct formatting.
2019-10-21 10:07:23 +02:00
Paolo 7daac696b3 - Renamed controller system/UDF.php to system/FAS_UDF.php
- Renamed view system/udf.php to system/fas_udf.php
- Adapted code with new names
- Added model system/FAS_UDF_model with only FAS functionalities
- Removed FAS functionalities from model system/UDF_model
- Fixed session problems in controller system/FAS_UDF
2019-10-15 15:40:47 +02:00
Cris 5ac6e4f01d Added Ausbildungssemester to CONTROLLER 2019-10-15 08:46:00 +02:00
Cris 1af0ed466b Added UPDATE contract logic to Controller orderLehrauftrag()
If a contract already exist and there is a difference between the
origin contract betrag and the lehrauftrag/projektbetreuer-betrag (after
FAS changes), the contract is updated.
2019-10-11 13:38:58 +02:00
Manfred Kindl 120ffb0319 Merge remote-tracking branch 'origin/master' 2019-10-07 18:59:36 +02:00
Manfred Kindl 753225e39e Studienplan-Sprache für Cronjob correctStudienplan 2019-10-07 18:52:07 +02:00
alex 72a3c2845f tablesorter filters saved in local storage in infocenter Übersicht are not deleted when using zurück button or freigegeben on infocenter details page. 2019-10-07 18:30:06 +02:00
alex 854dcb7cea - Infocenter: dataset in Übersicht is reloaded when clicking on back button from details page. 2019-10-03 16:23:19 +02:00
alex 38ae98cc36 - Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually 2019-10-02 17:19:31 +02:00
alex b5c1285fb4 - Infocenter filter dataset is reloaded anytime Infocenter menu is clicked for Übersicht, Frreigegeben or Reihungstestabsolviert 2019-10-02 15:48:42 +02:00
Andreas Österreicher c0afb92ddc Merge branch 'feature-4190/Cronjobs_log_in_database' 2019-10-02 14:29:53 +02:00
Andreas Österreicher 0dd82d42b3 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' 2019-10-02 10:57:58 +02:00
Cris 15370267c6 Minor code and GUI changes
. changed file name lehrauftrag to orderLehrauftrag
. changed order of buttons
Both for consistecy
2019-10-01 08:14:36 +02:00
Cris 4ad2fe7dfb Changed permission check: now using lehrauftrag_akzeptieren 2019-09-30 15:27:12 +02:00
Paolo 1273c32419 - Renamed controller system/JobsViewer.php to system/LogsViewer.php
- Renamed directory views/system/jobs to views/system/logs
- Changed FilterWidget query in view system/logs/logsViewerData.php to load all logs
- Added more filters in database to load different log types
2019-09-26 17:40:51 +02:00
Paolo 8210c3fdc7 Derived TableWidget from FilterWidget, added:
- libraries/TableWidgetLib
- widgets/TableWidget
- controllers/widgets/Tables
- public/js/TableWidget.js
2019-09-25 17:15:46 +02:00
hainberg 83dd828be7 Minor adaptation to changed method isMitarbeiter() 2019-09-25 14:13:16 +02:00
Cris d7cbc89d8b Added password validation to accept Lehraufträge in view & controller
. added password input field in view
. added password check in controller
. adapted ajax data object and logic to handle password check
2019-09-25 12:15:19 +02:00
Cris 30c60881a7 Changed check for inkludierte Lehre
Now inkludierte Lehre returns false when value is null (= freelancer
lector), else true (= fix employed lector)
This impacts the visibility of the column 'Betrag': hidden for fix
employed lectors, shown for freelancer lectors.
2019-09-25 09:53:52 +02:00
Cris 43452a2127 Hided column 'Betrag' if lector has inkludierte Lehre
If the lectors actual Verwendung has inkludierte Lehre, the tabulators
column betrag is hided.
2019-09-24 16:10:23 +02:00
Cris 9325edd326 Created Controller to accept Lehraufträge
Created index- and acceptLehrauftrag methods.
2019-09-24 10:06:03 +02:00
Andreas Österreicher b1815039fd Merge branch 'feature-2147/CallerLibrary_and_CallerModel_controllers' 2019-09-19 17:00:19 +02:00
Paolo 18a36ea497 Fixed controller api/v1/person/Benutzer 2019-09-19 14:33:02 +02:00
Cris efd5ae6411 Created Controller to approve Lehraufträge 2019-09-19 13:13:03 +02:00
Cris ad5309e273 Corrected SQL: bestellt/erteilt/akzeptiert in same row; added mitarbeiter_uid
. Corrected SQL to get bestellt/erteilt/akzeptiert in same row
  Before it was creating new row for each stati, which was wrong.

. Added mitarbeiter_uid column.

. Changed column names for better maintainance and understanding.
  (e.g. row_index instead of id)
2019-09-17 15:54:41 +02:00
Paolo c30135f197 Now MessageClient extends FHC_Controller and then starts the authentication 2019-09-17 10:38:25 +02:00
Paolo bf8b7e0ccd Added JobsViewer 2019-09-16 14:00:51 +02:00
hainberg 6b1e225991 Added private methods to send mail when ordering Lehrauftraege
These two methods will send email to 1. authorized Kompetenzleiter or
2. Departmentleiter with data about
. study semester
. study program
. amount of Lehrauftraege
2019-09-12 13:30:04 +02:00
Cris 0703984fa6 Added Controller method orderLehrauftrag 2019-09-12 13:26:29 +02:00
Paolo 5150c1fc44 Removed DBSkel changes from master branch 2019-09-12 10:41:40 +02:00
alex 67415a4707 - possible to read and write user Variables in Codeigniter
- added Variablenname_model, VariableLib, Variables controller
- Infocenter Übersicht - infocenterData, infocenterFreigegebenData, infocenterReihungstestAbsolviertData: added possibility of toggle of infocenter_studiensemester variable, only prestudents of selected Studiensemester are shown
2019-09-06 17:33:56 +02:00
alex 36ff38b0ee - FilterWidget: added method reloadDataset() for reload of dataset only 2019-09-06 17:29:22 +02:00
Unknown d5a743edad Merge branch 'master' into FASgendern 2019-09-06 15:14:19 +02:00
hainberg aad5f7bd5e Amended Lehrauftrag Controller - GUI with Tabulator-table
Amended the Lehrauftrag Controller GUI:
. corrected DB query
. corrected processing of GET-params
. corrected filter of tabulator (LE-ID caused problems -> now LE_ID)
. now stg are retrieved by permission entitlement of user
. implemented Tabulator filter and other properties/functions
. minor GUI adaptations
. added phrase
2019-08-29 14:19:01 +02:00
Cris 157237963b Lehrauftrag Controller [PRE-ALPHA-VERSION]
Started: Building the Lehrauftrag Controller.
2019-08-01 15:45:06 +02:00
Paolo d2e8b01e30 - codeigniter-restserver is now provided and loaded via composer (libraries/REST_Controller.php, config/rest.php, language/english/rest_controller_lang.php, libraries/Format.php, etc)
- Added new core controller core/RESTFul_Controller.php that extends REST_Controller and partially overrides part of the latter
- Changed application/config/rest.php to keep the minimal useful set of configs
- Controllers core/APIv1_Controller, controllers/api/v1/CheckUserAuth.php and controllers/api/v1/Test.php now extend core/RESTFul_Controller
- Changed method _remap interface for core/APIv1_Controller
- Removed application/core/REST_Controller.php
- Removed application/libraries/Format.php
- Removed application/language/english/rest_controller_lang.php
2019-07-31 14:46:31 +02:00
Paolo 6752dc649f Now is possible to have more than one FilterWidget in a single page 2019-07-17 11:38:47 +02:00
Paolo 2daf745ad5 - Moved controller system/Filters to widgets/Filters
- Renamed FiltersLib to FilterWidgetLib
- Adapted code in widgets/FilterWidget, public/js/FilterWidget.js and public/js/infocenter/infocenterPersonDataset.js
2019-07-10 14:39:59 +02:00
Andreas Österreicher 93a6652c5f Gradelist - Max-ECTS-Sum includes ECTS of assigned Courses without Grades 2019-07-05 17:07:06 +02:00
Paolo ddaa129bab - Removed controllers api/v1/system/CallerLibrary.php and api/v1/system/CallerModel.php
- Removed library libraries/CallerLib.php
2019-07-04 17:25:13 +02:00
Paolo c62b4dc018 - Added new public method setMessageRead to system/messages/MessageClient
- system/Recipient_model methods getReceivedMessages and getSentMessages now retrieve person_id from tbl_msg_status
- Added new public method setMessageRead to CL/Messages_model
- Improved code in public/js/messaging/read.js
2019-07-04 11:15:07 +02:00
Paolo 34dc82766a - Renamed public/js/messaging/messageClient.js to public/js/messaging/read.js
- Added new JS public/js/messaging/write.js used in view application/views/system/messages/ajaxWrite.php
- Added new public method write, listReceivedMessages, listSentMessages and sendMessageToOU to controller system/messages/MessageClient.php
- Removed private method _getReceiversByOekurzbz from MessageLib
- Fixed method sendMessageOU of MessageLib
- Added new public method prepareAjaxWrite to model CL/Messages_model
- Fixed method prepareAjaxReadReceived of model CL/Messages_model
- Added new public method prepareAjaxReadSent to model CL/Messages_model
- Changed method CL/Messages_model->_personLog interface
- Added new public method getOrganisationunitsByPersonId to crm/Prestudent_model
- Added new public method getReceivedMessages to model system/Recipient_model
- Changed getReceivedMessages method of model system/Recipient_model
- Changed view system/messages/ajaxRead.php
- Added new view system/messages/ajaxWrite.php
2019-06-28 19:01:25 +02:00
Paolo 5072088e0d Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2019-06-21 13:35:28 +02:00
Paolo 1cb9c28f7d - Added new controller system/messages/MessageClient used to read and write messages using a new GUI based on ajax and tabulator
- system/messages/MessageClient currently has only two methods: read and listMessages
- Added new view system/messages/ajaxRead.php used for the GUI to read messages
- Added new parameters to templates/FHC-Header: tabulator and momentjs
- Added new packages to composer: tabulator and momentjs
2019-06-19 17:53:51 +02:00