Commit Graph

  • de4c236817 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter Harald Bamberger 2023-05-05 13:11:16 +02:00
  • 2c0e815fe8 add validations Harald Bamberger 2023-05-05 11:43:02 +02:00
  • f7ec0c4ce0 Merge branch 'feature-27946/infocenter_zusaetzliche_spalte_fuer_kaution' Andreas Österreicher 2023-05-05 08:53:17 +02:00
  • 42ff682700 add validations Harald Bamberger 2023-05-05 08:20:29 +02:00
  • 6c1a47955f Merge branch 'feature-27949/infocenter_evaluieren_des_zurueckstellens_mit_einem_grund_zb_fuer_drittstaaten' Andreas Österreicher 2023-05-05 07:48:53 +02:00
  • f84a75af4e Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter Harald Bamberger 2023-05-04 15:41:44 +02:00
  • defe4e2f93 Added new interface application/core/IEncryption.php Paolo 2023-05-04 15:33:08 +02:00
  • 1c0129466a Bugfix: added a check to DB_Model->_addEncrypt method on the parameter encryptedColumns Paolo 2023-05-04 15:23:51 +02:00
  • e713cdac64 Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter Harald Bamberger 2023-05-04 15:03:13 +02:00
  • 2f07590461 Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten Harald Bamberger 2023-05-04 14:59:12 +02:00
  • 7fb0c14555 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter Harald Bamberger 2023-05-04 14:58:29 +02:00
  • 4f03b61c6e - stunden bestandteil bei karenz mit 0 stunden verlaengern ma0048 2023-05-04 13:43:54 +02:00
  • 3b1d913006 Merge branch 'TechnikumWienAcademy-ku-prod-hotfix-221118' Andreas Österreicher 2023-05-04 09:46:02 +02:00
  • d2b6aab881 Changed: AZG-relvant an neue Vertragsstruktur angepasst Cris 2023-05-04 09:42:30 +02:00
  • 8e73638931 Changed: Check homeoffice an neue Vertragsstruktur angepasst Cris 2023-05-04 09:41:50 +02:00
  • dbee8d9689 Changed: Check homeoffice an neue Vertragsstruktur angepasst Cris 2023-05-04 09:39:12 +02:00
  • b43b7fe95d Added new Vertragsbestandteil Class and few methods Cris 2023-05-04 09:38:18 +02:00
  • 33c1cc80b2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core Cris 2023-05-04 09:26:44 +02:00
  • 58bae0953f dbupdate ma0068 2023-05-03 07:57:48 +02:00
  • eb7b73fee9 cleanup according to current vertragsbestandteil db tables Harald Bamberger 2023-05-02 16:00:13 +02:00
  • 487f6ccc14 - view angepasst - student_uid in tbl_bisio entfernt ma0048 2023-05-02 14:05:39 +02:00
  • fdc3265e97 Merge branch 'ku-prod-hotfix-221118' of https://github.com/TechnikumWienAcademy/FHC-Core-Academy into TechnikumWienAcademy-ku-prod-hotfix-221118 Andreas Österreicher 2023-05-02 11:28:15 +02:00
  • e3ec4cd5aa fix method names, handle insertamum updateamum insertvon updatevon in libs Harald Bamberger 2023-05-01 20:50:07 +02:00
  • 8efe601826 plausichecks gui bugfix: filter by Studiensemester and Studiengang possible again, removed unnecessary resolver params variable KarpAlex 2023-05-01 16:28:42 +02:00
  • 96d115e808 issues: added new filter for Personalverwaltung issues KarpAlex 2023-05-01 16:23:49 +02:00
  • 8b74420e4f - limit beim selecten ma0048 2023-04-30 21:28:47 +02:00
  • f2479c6f36 dbupdate für neue Zeitsperre ma0068 2023-04-28 08:05:30 +02:00
  • 9a4c61d1c3 Fixed Abgabetool Lecturer View Andreas Österreicher 2023-04-27 17:50:03 +02:00
  • a528018761 Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen Andreas Österreicher 2023-04-27 09:57:40 +02:00
  • eefffa8a0e - kaution spalte - fas abgeschickt am timestamp automatisch ausfuellen - zgvuberpruefung zeigt abgewiesene nicht an ma0048 2023-04-27 09:08:26 +02:00
  • 5bdfd447ac Berechtigungspruefung mittels mitarbeiter/zeitsperre:begrenzt, Update Berechtigung für Anzeige in Vilesci-Menue, Einbau Redirect ma0068 2023-04-26 16:17:23 +02:00
  • b4e4f91b22 more validation Harald Bamberger 2023-04-25 20:20:02 +02:00
  • 10fb68a532 Dienstverhaeltnis Class updated, VertragsbestandteilLib can save Dienstverhaeltnis Harald Bamberger 2023-04-25 17:23:57 +02:00
  • 910aa6969f Code quality check fixes Paolo 2023-04-25 16:10:57 +02:00
  • 08de013c23 Fixes: code quality checks Paolo 2023-04-25 16:07:42 +02:00
  • 7a4f55bb0c require interface IValidation Harald Bamberger 2023-04-25 09:27:40 +02:00
  • 2163ddcdf5 add Interface IValidation, implement validate stub in all Vertragsbestandteile and Gehaltsbestandteil and DV Harald Bamberger 2023-04-25 09:22:03 +02:00
  • da484fbbb0 - die letzten 5 tage werden geprueft anstatt nur der vortag - neue bewerbungen nach dem aufgenommen status werden nich automatisch abgewiesen ma0048 2023-04-25 08:45:16 +02:00
  • 39137d1348 Load a model in the filter component controller to have the DB functionalities ready Paolo 2023-04-24 17:07:40 +02:00
  • 5519f6af57 Merge branch 'merged_Anrechnungen_26625_27388_28278_28557' Harald Bamberger 2023-04-24 14:49:29 +02:00
  • d16a670726 Merge branch 'sonstiges-28665/Tabulator-PersistenceID-einbauen' into merged_Anrechnungen_26625_27388_28278_28557 Harald Bamberger 2023-04-24 14:42:21 +02:00
  • 54864da770 Merge branch 'bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen' into merged_Anrechnungen_26625_27388_28278_28557 Harald Bamberger 2023-04-24 12:12:05 +02:00
  • 64aa3c1250 Merge branch 'feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung' into merged_Anrechnungen_26625_27388_28278_28557 Harald Bamberger 2023-04-24 11:31:39 +02:00
  • a663fa9436 Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557 Harald Bamberger 2023-04-24 11:30:32 +02:00
  • aa572e8a22 Merge branch 'feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige' into merged_Anrechnungen_26625_27388_28278_28557 Harald Bamberger 2023-04-24 11:26:45 +02:00
  • 48798e8309 Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen Harald Bamberger 2023-04-24 11:20:53 +02:00
  • 01ca8f6fb9 Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige Harald Bamberger 2023-04-24 11:18:40 +02:00
  • 80eb64e418 Merge branch 'master' into feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung Harald Bamberger 2023-04-24 10:36:32 +02:00
  • ea79b92beb Merge branch 'master' into bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen Harald Bamberger 2023-04-24 10:35:22 +02:00
  • 42d6ea9bed Merge branch 'feature-28426/DiplomaSupplementMinimalVersionSS2023' Andreas Österreicher 2023-04-24 08:31:15 +02:00
  • b726f2ca5e Vertragsstunden mit 0.00 werden wie NULL behandelt Andreas Österreicher 2023-04-24 07:14:42 +02:00
  • 0a8432514c issues: added comment to getLanguageIndex method KarpAlex 2023-04-22 23:35:39 +02:00
  • 3122825b73 student issues list issueData: language index comes from tbl_sprache, limit results only to dvuh and core issues KarpAlex 2023-04-22 15:41:20 +02:00
  • bc8709f842 added filter for Personalverwaltung issue list KarpAlex 2023-04-21 17:59:24 +02:00
  • f54351c7a3 - added missing model ma0048 2023-04-20 16:38:56 +02:00
  • 82c2652148 Fix: code quality checks feature-18197/ReihungstestReminderLog Paolo 2023-04-20 15:05:45 +02:00
  • f39fb46b25 Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28089/plausichecks_in_extension_hinzufuegen KarpAlex 2023-04-20 13:19:16 +02:00
  • 5000be2a11 Added the not privileged Extension model Paolo 2023-04-19 16:10:09 +02:00
  • 4fcbf1fbbf ExtensionsLib now gets the list of installed extensions without using the privileged user Paolo 2023-04-19 16:07:59 +02:00
  • 48172216cc Zeilenzähler bei Statistik Manfred 2023-04-19 15:43:18 +02:00
  • 1fa215103c Insert- und Update-Daten bei Prestudentstatus im FAS Manfred 2023-04-19 15:42:51 +02:00
  • a128d57c60 Bugfix infocenter message list Paolo 2023-04-19 15:35:54 +02:00
  • 29c91a1cda FAS page to read messages wrongly displays the sender Paolo 2023-04-19 15:15:23 +02:00
  • a0b368683e - Remove global constant OU_SENDER_TEST_REMINDER from application/config/constants.php - Page for the Infocenter details messages block should use CL/Message_model logic - Page to read personal messages wrongly displays the sender - Page to read message with token wrongly displays the sender - All the pages should display the sender using the following logic: - If the sender id is set and it is not the system sender and the organization unit is not set then display the sender name + surname - If the sender id is set and it is not the system sender and the organization unit is set then display the sender name + surname - If the sender id is set and it is the system sender and the organization unit is set then display the organization unit - If the sender id is set and it is the system sender and the organization unit is not set then display "System sender" - The organization unit should firstly retrieved from the degree programs, if not available then from the organization units, if not available then display "System sender" - Centralized this logic in the CL/Message_model as much as possible Paolo 2023-04-19 13:51:53 +02:00
  • 932f5efb5c Merge branch 'master' into feature-18197/ReihungstestReminderLog Paolo 2023-04-18 14:29:05 +02:00
  • 138cfd662d added return Werner Masik 2023-04-18 13:50:07 +02:00
  • 535578c399 validation Harald Bamberger 2023-04-18 13:30:56 +02:00
  • c90da4b50e start to implement validation Harald Bamberger 2023-04-18 13:26:08 +02:00
  • 88c8b13208 Anzeige Urlaubsverwaltung Vilesci ausschließlich für user mit Oes mit Leitungsfunktionen ma0068 2023-04-18 08:10:42 +02:00
  • 8eb423414a Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen Paolo 2023-04-17 10:21:09 +02:00
  • 29485a090b removed remaining unit test for GUI Werner Masik 2023-04-14 15:51:58 +02:00
  • 5d668791f9 Projektphase in der Zeiterfassung werden temporär 7 Monate in die Vergangenheit anzgezeigt um die Erfassung von alten Einträgen zu ermöglichen Andreas Österreicher 2023-04-14 14:37:52 +02:00
  • 4f43b79ed5 default controller cgfhtw 2023-04-14 12:50:07 +02:00
  • d766e2fd01 console.warn => alert cgfhtw 2023-04-14 08:22:36 +02:00
  • e462a71b6d call parent constructor Harald Bamberger 2023-04-12 16:50:00 +02:00
  • 9e6d78dd1d set Dienstverhaeltnis_id and Vertragsbestandteil_id on child Gehaltsbestandteile when added or changed Harald Bamberger 2023-04-12 16:26:55 +02:00
  • 9b9393c118 gemeinsame Anzeige Wochensumme PFS und ER feature-27713/PflegeurlaubStundenweise ma0068 2023-04-12 16:16:10 +02:00
  • c2e956f7f3 use GehaltsbestandteilLib in VertragsbestandteilLib Harald Bamberger 2023-04-12 15:32:22 +02:00
  • 0061cf255c add GehaltsbestandteilLib Harald Bamberger 2023-04-12 15:22:10 +02:00
  • 2b03fcc930 removed GUI handling and renamed Gehaltsbestandteil to make it independend from Vertragsbestandteil Werner Masik 2023-04-12 09:41:07 +02:00
  • f1402c439c Adaptierungen Rahmenvertrag FHG ma0068 2023-04-12 08:15:55 +02:00
  • fe6a8d5625 fixed wrong JSON-Mapping for GUIOptions Werner Masik 2023-04-10 19:08:22 +02:00
  • e7f23643d4 fix data property name Harald Bamberger 2023-04-11 17:05:20 +02:00
  • c929fa8702 add freitext require, adapt freitext to current db Harald Bamberger 2023-04-11 16:59:21 +02:00
  • 92e23ea585 add requires for vbs zeitaufzeichnung and kuendigungsfrist Harald Bamberger 2023-04-11 16:47:44 +02:00
  • 3ff024fc69 fix date format Harald Bamberger 2023-04-11 15:51:23 +02:00
  • 234820490c variable names Harald Bamberger 2023-04-11 15:44:34 +02:00
  • 12c712c1b4 changed property names to match gui input Harald Bamberger 2023-04-11 15:22:40 +02:00
  • b50ca57907 extend VertragsbestandteilFunktion to be able to create a Benutzerfunktion entry before being persited Harald Bamberger 2023-04-11 15:10:24 +02:00
  • 9c801d2723 Merge branch 'benutzerberechtigungGUIneu' Manfred 2023-04-11 13:24:56 +02:00
  • dce81d614e Merge branch 'master' into benutzerberechtigungGUIneu Manfred 2023-04-11 13:23:09 +02:00
  • ed2aa6620e vuedatepicker added Harald Bamberger 2023-04-11 12:53:56 +02:00
  • 025b58dee3 throw Exception when storeVertragsbestandteil is rolled back to handle rollback in possible outer transaction Harald Bamberger 2023-04-11 11:05:15 +02:00
  • a63a79ab91 add param tableOnly & save for multiple components on one page cgfhtw 2023-04-07 14:10:30 +02:00
  • 4944a13bfc Fixed JS & CSS includes for the Extensions manager Paolo 2023-04-06 12:21:17 +02:00
  • 5465f26c80 - Fixed deletion of the uidx_extensions_name_version index in the system DB update scripts - Fixed creatation of uidx_extensions_name_version_server index in the system DB update scripts Paolo 2023-04-06 11:56:06 +02:00
  • 19d369c3c7 - im kalender mitarbeiter kurzbz statt uid anzeigen ma0048 2023-04-06 10:17:15 +02:00
  • fca341ccf4 Migration von Verträgen speichert nun die Eintäge auch in der DB Tippfehler in Models behoben Berechtigungen für DV und VBS Sequence hinzugefügt Andreas Österreicher 2023-04-06 07:34:26 +02:00
  • f325daab43 Merge branch 'bug-28917/AnwesenheitenLadezeiten' Andreas Österreicher 2023-04-05 16:30:55 +02:00
  • 326b53544a Übernahme Optimierung der Anwesenheitsabfrage von BFI Andreas Österreicher 2023-04-05 16:28:19 +02:00