Compare commits

...

3534 Commits

Author SHA1 Message Date
Harald Bamberger d0f3cee7de add permissions for vw_oe_path 2024-07-29 18:11:13 +02:00
Harald Bamberger e6684a0116 add db view that contains oe path 2024-07-29 17:41:24 +02:00
Harald Bamberger 965e23dba7 Merge branch 'feature-40743/Anrechnung_Config-fuer-zusaetzliche-Felder' 2024-07-17 14:08:55 +02:00
Harald Bamberger f064a29efc Merge branch 'master' into feature-40743/Anrechnung_Config-fuer-zusaetzliche-Felder 2024-07-17 08:02:55 +02:00
Harald Bamberger 6dd1dc62bf Merge branch 'feature-39592/vereinfachte_Sicht_fuer_Assistenz' 2024-07-16 20:59:48 +02:00
Harald Bamberger fcacd2a660 Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz 2024-07-16 14:23:16 +02:00
Harald Bamberger 8c9ed2c52c Textaenderung 2024-07-16 14:19:32 +02:00
Harald Bamberger 36aab1b579 Merge branch 'feature-36555/Studstatus_HinweistextFAS_Pruefungsdatum' 2024-07-16 14:11:34 +02:00
Harald Bamberger 3c50ffd945 remove unnecessary style 2024-07-16 14:07:44 +02:00
Harald Bamberger bf1f0428ea use textbox to retain layout 2024-07-15 19:06:19 +02:00
Harald Bamberger f49161420d try to improve layout 2024-07-15 18:18:53 +02:00
Harald Bamberger 464dbba457 add missing api js files 2024-07-11 18:43:31 +02:00
Harald Bamberger 9d455c35d0 Betriebsmittel.js: use arrow function for dynamic ajaxParams, Filter.js: remove required from filterType 2024-07-11 18:32:47 +02:00
Harald Bamberger 3f84024ce8 uncomment null check, layout of hint 2024-07-11 17:35:18 +02:00
Harald Bamberger 16ab9998b0 Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz 2024-07-11 14:44:44 +02:00
Harald Bamberger 115151473a backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-07-11 11:57:45 +02:00
Cris a23b133217 Adapted requestAnrechnung.js to handle submit data and events on Begruendung-zur-Gleichwertigkeit fields
...depending on $config['explain_equivalence']
2024-07-11 10:54:43 +02:00
Cris 1139b251ef Adapted Views to handle display of Begruendung-zur-Gleichwertigkeit fields
...depending on $config['explain_equivalence']
2024-07-11 10:52:51 +02:00
Cris 8c3b85066a Adapted Controller RequestAnrechnung.php to handle Begruendung-zur-Gleichwertigkeit fields
...depending on $config['explain_equivalence']
2024-07-11 10:49:05 +02:00
Cris 0b48e94d3c Added config variable $config['explain_equivalence'] (Begruendung zu Gleichwertigkeit)
...to display and enable 'Begründung zu Gleichwertigkeit'-fields
2024-07-11 10:44:12 +02:00
Harald Bamberger 46ea054bac change text, add config to show hint or not, styling 2024-07-10 15:52:57 +02:00
Cris 03205674aa Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-07-10 15:51:51 +02:00
Harald Bamberger 8b254b3967 Merge branch 'master' into feature-36555/Studstatus_HinweistextFAS_Pruefungsdatum 2024-07-09 11:52:07 +02:00
Harald Bamberger c4ef0f998c Merge branch 'feature-40285/Studstatus_Datum_der_Abmeldung_auf_den_3_Abmeldungsdokumenten' 2024-07-09 11:49:41 +02:00
Harald Bamberger 37fb9dd851 use date that seems more stable than one that depends on a config entry that may change over time and then change the date in previous documents 2024-07-09 11:38:16 +02:00
Harald Bamberger 2a537df687 Merge branch 'master' into feature-40285/Studstatus_Datum_der_Abmeldung_auf_den_3_Abmeldungsdokumenten 2024-07-09 10:35:40 +02:00
Harald Bamberger dd0bdddbc6 backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-07-01 14:12:48 +02:00
Cris e8fe3c2eff Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-06-26 11:53:28 +02:00
Andreas Österreicher b56e8c5f9f Im Abschlusspruefung Karteireiter wird in der Liste bei der Beurteilung jetzt die
Bezeichnung der Note angezeigt anstatt der Kurzbz
2024-06-21 13:02:55 +02:00
cgfhtw 9c53a7a75b PDF Download Button während Einspruchsfrist verbergen 2024-06-19 14:02:20 +02:00
Harald Bamberger 1f36a08f05 Merge branch 'merge_37107_37133_39212' 2024-06-19 11:41:11 +02:00
cgfhtw 631a552708 Datum bei Abmeldung d Stud PDF 2024-06-19 10:55:48 +02:00
Harald Bamberger ea9c35a64b Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212 2024-06-19 10:28:39 +02:00
Harald Bamberger 04c006a733 do not create dummy manual events 2024-06-19 10:28:03 +02:00
Harald Bamberger aff1f9126f Merge branch 'master' into merge_37107_37133_39212 2024-06-19 09:45:05 +02:00
cgfhtw a8acf91980 Datum bei Abmeldung Fristablauf d WH PDF 2024-06-19 09:21:13 +02:00
Andreas Österreicher fb77ab67e7 Prüfungshonorare im Notenkarteireiter zeigen nur aktive Mitarbeiter an 2024-06-19 09:05:08 +02:00
Harald Bamberger d3a277f9fb Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212 2024-06-19 08:52:03 +02:00
Harald Bamberger 0aa53f64ff db Aenderungen Gegenpruefung hinzugefuegt 2024-06-19 08:51:34 +02:00
cgfhtw 3e0c15e18f Datum bei Abmeldung d StgL PDF 2024-06-18 11:12:12 +02:00
Cris 538c2e09ce Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-06-17 14:20:43 +02:00
Harald Bamberger e05fa0f4d8 Merge branch 'master' into merge_37107_37133_39212 2024-06-14 11:50:32 +02:00
Harald Bamberger c3278ad30f add app softwarebereitstellung to prevent checksystem errors when adding phrases for softwarebereitstellung while not having installed the extension 2024-06-14 11:49:43 +02:00
Harald Bamberger e4326e00e4 Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212 2024-06-14 11:02:25 +02:00
Harald Bamberger 93d0f88b0d function getDVByPersonUID: add dvendegrund_kurzbz and dvendegrund_anmerkung to select 2024-06-14 10:48:43 +02:00
Harald Bamberger 1c385d22cd Merge branch 'feature-37133/Gehaltsbaender' into merge_37107_37133_39212 2024-06-14 10:41:48 +02:00
Harald Bamberger 24786c6ae6 Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212 2024-06-13 13:30:38 +02:00
Harald Bamberger 0e5d4b30ed Merge branch 'master' into feature-37133/Gehaltsbaender 2024-06-13 13:26:48 +02:00
Harald Bamberger 4e233f760d Merge branch 'master' into feature-37107/Fristenmanagement 2024-06-13 13:26:02 +02:00
Harald Bamberger fd2474cc38 Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV 2024-06-13 11:51:10 +02:00
Andreas Österreicher 20eee62c19 Merge branch 'sonstiges-40279/SWB-Lizenzserverport' 2024-06-13 11:13:30 +02:00
Werner Masik eb327c3adc update Handyverwaltung filter 2024-06-12 14:52:22 +02:00
Harald Bamberger 1e56707e5a Merge branch 'feature-40415/Studstatus-UID_in_Sancho_Message_Abmeldung_StG_Ablauf_Einspruchsfrist' 2024-06-12 08:13:11 +02:00
Harald Bamberger 6816a300f6 Beschriftung korrigiert 2024-06-11 16:39:20 +02:00
Harald Bamberger 0b8191a435 Beschriftung zu IDs in Sancho Message hinzugefuegt 2024-06-11 16:26:52 +02:00
Harald Bamberger f8d8a44a3c student_uid zu sancho message Abmeldung StG Ablauf Einspruchsfrist 2024-06-11 14:47:54 +02:00
Cris cd0eacf947 Updated phrases: Added phrases 'lizenzserverPort' and 'raumSwZuordnung' 2024-06-11 13:52:03 +02:00
Cris dd47cd2a7c Updated filter: Added lizenzserver_kurzbz and lizenzserver_port to SoftwareManagement filter 2024-06-11 13:51:03 +02:00
Cris a4b77fc43f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-06-11 11:32:47 +02:00
Andreas Österreicher f943ae7566 Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' 2024-06-10 14:05:49 +02:00
Cris f1547b069d Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2024-06-10 13:37:46 +02:00
Cris ac7dc1599c Corrected path to init.js.php 2024-06-10 13:37:14 +02:00
Andreas Österreicher 46b7dc1ce7 Dauer für die Anzeige von abgelaufenen Projekten in der Zeitaufzeichnung
auf 2 Monate verlängert
2024-06-07 10:19:12 +02:00
Werner Masik cd8fffd2f7 added filter update for Handyverwaltung 2024-06-04 16:20:43 +02:00
Cris 125a2da9b3 Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2024-06-04 16:16:49 +02:00
Cris 884d930e71 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2024-06-04 16:05:33 +02:00
Cris 49045c06af Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-06-04 16:04:19 +02:00
Harald Bamberger 7b148b1a39 Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV 2024-06-03 17:21:50 +02:00
Harald Bamberger 0cbb8997e2 migratecontract config und config check auch in MigrateHourlyRate verwenden 2024-06-03 17:14:55 +02:00
Cris 512002c0e8 Created init.js file and changed link url in stpl_week to open Software-Raumsuche by OrtKurzbz 2024-06-03 16:40:35 +02:00
Cris 9652f48044 Added phrases 'zugeklappt', 'softwareliste', 'raumverfuegbarkeit' 2024-06-03 16:27:31 +02:00
Harald Bamberger 9454bde14a backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-05-29 15:19:23 +02:00
Harald Bamberger a924c9d2bb backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-05-29 11:49:11 +02:00
Andreas Österreicher 5453579c7b Merge branch 'feature-36963/BIS_check_duales_Studium' 2024-05-28 09:29:44 +02:00
KarpAlex d8ba92e343 Merge branch 'master' into feature-36963/BIS_check_duales_Studium 2024-05-27 19:42:48 +02:00
cgfhtw d5e8227918 Bugfix: api/frontend/fas controller do not inherit from FHCAPI_Controller 2024-05-27 12:45:10 +02:00
Harald Bamberger 8cba0aec5a vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert 2024-05-22 15:32:28 +02:00
Cris aab198e355 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2024-05-22 11:03:34 +02:00
Cris 559a6b317d Fixed multiple display of child software 2024-05-21 14:44:41 +02:00
Cris 66a80697c2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-05-21 14:21:34 +02:00
Werner Masik 706dad6df6 added DV Ende 2024-05-16 21:58:34 +02:00
Harald Bamberger f2a2469e6e MigrateContract: keine ZeitaufzeichnungsVbs erstellen wenn za oder azg flag null ist. MigrateHourlyRate: kalkulatorische Stundensaetze nur migrieren wenn SAP Sync Tabelle existiert. 2024-05-15 17:25:26 +02:00
Cris c4c17f69c7 Added phrase softwaretypKurzbz 2024-05-14 13:41:33 +02:00
Cris 8a0d2a2f10 Refactored Tabs title assignment to utilize computed property
This is necessary to render language phrases correctly
2024-05-13 14:02:05 +02:00
Cris 6d728ae0e7 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	public/js/components/Tabs.js
#	public/js/components/filter/Filter.js
2024-05-13 12:07:37 +02:00
Cris 58f52dfaae Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-05-13 11:07:16 +02:00
Cris 5643607845 Added phrases 'statusErfolgreichUebertragen' and 'statusUebertragenMsg' to Softwarebereitstellung app 2024-05-13 11:06:32 +02:00
Harald Bamberger 93b111af93 fix handleSystemError is not a function 2024-05-06 16:48:38 +02:00
Harald Bamberger 6a8a96b748 fix long lasting request getPrestudents to block browser when timedout once 2024-05-06 16:04:45 +02:00
Harald Bamberger 69b0b3601d Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV 2024-05-03 13:08:12 +02:00
Andreas Österreicher 40c0393bc0 Voller Name der Kritikalität des Services wird angezeigt im
Servicekatalog
2024-05-02 16:31:34 +02:00
Andreas Österreicher c6193530db Merge branch 'feature-39288/Servicekatalog_Kritikalitaet' 2024-05-02 16:27:09 +02:00
Harald Bamberger 3a3d28e9e6 Merge branch 'feature-37246/APIs_Konsolidierung' 2024-04-30 21:45:48 +02:00
Harald Bamberger 3b8776f947 Merge branch 'master' into feature-37246/APIs_Konsolidierung 2024-04-30 16:26:15 +02:00
Andreas Österreicher 23255ed84f Merge branch 'feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen' 2024-04-30 16:17:00 +02:00
Andreas Österreicher a3b5996c50 Stundensatz wird abhängig vom Studiensemester der Projektarbeit /
Lehreinheit ermittelt
2024-04-30 16:16:03 +02:00
Andreas Österreicher a606add6eb Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen 2024-04-30 10:55:58 +02:00
KarpAlex 18dabf26e4 service uebersicht in cis: loading only one moodle config instead of all addon configs to avoid php notices 2024-04-29 14:00:30 +02:00
Harald Bamberger ef5040557d Merge branch 'master' into feature-37246/APIs_Konsolidierung 2024-04-29 09:37:06 +02:00
Andreas Österreicher 8999b59f4e Renamed Field 2024-04-26 13:41:33 +02:00
Harald Bamberger 2ea3597a10 Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV 2024-04-25 15:11:41 +02:00
Harald Bamberger 08dd6a7783 add dvendegrund_kurzbz and dvendegrund_anmerkung when reading dvs from db 2024-04-25 15:11:16 +02:00
Andreas Österreicher d55cb56a1a Merge branch 'bug-39609/automatischer_abgewiesener_status_setzen' 2024-04-25 14:24:43 +02:00
ma0048 8bac75ae52 - bug behoben, damit keine leeren "Status Abgewiesen gesetzt" Mails verschickt werden 2024-04-25 14:20:18 +02:00
Werner Masik 3b06519f2f updated phrases for salary range 2024-04-24 15:25:42 +02:00
Werner Masik c15a350392 moved dbUpdate for gehaltsband to extension 2024-04-24 14:55:22 +02:00
Harald Bamberger c33a11e952 Merge branch 'master' into feature-37246/APIs_Konsolidierung 2024-04-24 08:30:25 +02:00
Harald Bamberger 844c07be9c Merge branch 'feature-39174/Studstatus_AbmeldungStglFuerUnterbrecher' 2024-04-24 08:25:51 +02:00
Harald Bamberger 5175dcdbe4 Merge branch 'master' into feature-37246/APIs_Konsolidierung 2024-04-23 15:57:50 +02:00
Andreas Österreicher 0655118f2b Merge branch 'feature-39349/tdb_phrasen' 2024-04-19 10:38:39 +02:00
Alexei Karpenko 412bb10a06 Servicekatalog: renamed Kategorie column to Kritikalität in vilesci, added column Kritikalitaet in cis overview 2024-04-18 15:38:22 +02:00
Andreas Österreicher 3a4492671d Fixed Signing Documents via CIS 2024-04-18 08:53:22 +02:00
Werner Masik b2deea6962 added db schema for Gehaltsbaender 2024-04-17 16:40:12 +02:00
Andreas Österreicher 8a115626ba CDATA bei Lernergebnisse hinzugefügt 2024-04-16 10:33:27 +02:00
Andreas Österreicher 20aba9aa90 Merge branch 'feature-27349/DiplomaSupplementQuereinstiegerRahmenvertrag' 2024-04-16 10:22:48 +02:00
Andreas Österreicher 8057ecbc60 Merge branch 'feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten' 2024-04-15 15:41:53 +02:00
cgfhtw e0c7691e04 missing catch 2024-04-11 15:14:15 +02:00
Andreas Österreicher c03e6deb95 Removed useless code 2024-04-10 16:45:46 +02:00
ma0068 941dce6032 Diplomasupplement: Adaptierung Wording Niveau 2024-04-10 14:48:04 +02:00
Harald Bamberger 94224f7ef7 dvendegrund Ablauf durch Zeit added 2024-04-10 14:28:07 +02:00
Cris f51f006377 Corrected phrase anmerkungIntern 2024-04-10 14:07:41 +02:00
Andreas Österreicher 637392c844 Merge branch 'master' into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten 2024-04-10 09:56:58 +02:00
Harald Bamberger e11dd21a1e add parameter dvendegrund_kurzbz and dvendegrund_anmerkung 2024-04-09 16:35:00 +02:00
Harald Bamberger 1a1cd76bc4 add grant on hr.tbl_dvendegrund to user vilesci 2024-04-09 15:42:00 +02:00
Harald Bamberger a9818e1f63 add initial values to hr.tbl_dvendegrund 2024-04-09 15:27:47 +02:00
Harald Bamberger 56900e31db add table hr.tbl_dvendegrund, add columns dvendegrund_kurzbz and dvendegrund_anmerkung to hr.tbl_dienstverhaeltnis 2024-04-09 15:08:32 +02:00
Andreas Österreicher e41eada893 Removed unused Code 2024-04-09 14:08:58 +02:00
Andreas Österreicher a32e78c9b8 Merge branch 'master' into feature-27349/DiplomaSupplementQuereinstiegerRahmenvertrag 2024-04-09 13:53:37 +02:00
Cris 1d0c2be449 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-04-09 11:33:38 +02:00
Andreas Österreicher bdb0a5702d Fehler behoben wodurch keine Note im Freigabemail angezeigt wurde
Fehler behoben wodurch keine Punkteübernahme bie Nachprüfungen möglich
war
2024-04-09 11:24:44 +02:00
Harald Bamberger 026a276c02 add grant on frist_id sequence 2024-04-09 11:11:03 +02:00
Harald Bamberger 3b41df5ddc Merge branch 'master' into feature-37107/Fristenmanagement 2024-04-09 10:44:02 +02:00
Andreas Österreicher 8a9477eaf0 Fixed PHP7.4 Warning 2024-04-08 12:54:05 +02:00
Werner Masik f2ba0fd469 update phrases and added events for fristenmanagement 2024-04-07 00:33:25 +02:00
Andreas Österreicher 257c7a5aac Projektzeitenexport für Administration/HR im Vilesci hinzugefügt 2024-04-05 14:14:13 +02:00
ma0048 753a193be1 - added phrases for bpks details 2024-04-04 15:41:18 +02:00
KarpAlex 2132fe76ae added Plausicheck: students in DUAL Studiengang should have set boolean value dual to true, plausicheck bugfixes (loading model, remove unnecessary property) 2024-04-03 17:39:00 +02:00
Cris cfe73b361e Sorted project phases by start date and bezeichnung in Zeitaufzeichnung
Sorted within dropdown
2024-04-03 15:13:32 +02:00
Cris a2791fecd1 Sorted projects in alphabetical order in Zeitaufzeichnung
Sorted within dropdown and in project cvs export file.
2024-04-03 13:10:30 +02:00
Cris d2a8d59f6d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-04-03 12:59:00 +02:00
Cris 9907ee2267 Added phrase global/zeilenAuswaehlen 2024-04-03 11:45:43 +02:00
Werner Masik 5cabac62d7 add frist events for befristung 2024-04-02 18:33:37 +02:00
cgfhtw 8ffc8a20d3 s&d 2024-03-29 14:27:45 +01:00
cgfhtw d34ce78c94 s&d 2024-03-29 13:00:54 +01:00
kindlm 5d49516b77 Merge branch 'ReportingFilterParameter' 2024-03-28 13:56:07 +01:00
kindlm 538264e577 Merge branch 'master' into ReportingFilterParameter 2024-03-28 13:55:29 +01:00
kindlm 2f99457283 GET-Parameter auch für Text übernehmen 2024-03-28 13:54:45 +01:00
Cris ba1fa6add4 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2024-03-28 13:20:51 +01:00
Cris 8d8e45b6de Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-28 13:20:16 +01:00
Cris 05516f2952 Fixed: issue with component tabs not recognizing loaded phrases
Vue.computed ensures loading phrase reactively when phrases are loaded
2024-03-28 13:19:31 +01:00
Cris d34f5b92f4 Added new phrases for softwarebereitstellung- and for core app 2024-03-28 13:14:34 +01:00
Andreas Österreicher 4ccf2aebcc Prüfungstyp Termin3 wird nicht automatisch angelegt 2024-03-27 12:57:17 +01:00
Manfred 21b05394c8 Merge branch 'master' into ReportingFilterParameter 2024-03-26 17:24:07 +01:00
kindlm 7240a97d6e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-26 17:16:57 +01:00
kindlm e469f54901 Typ "Text" bei vordefinierten Filtern ergänzt 2024-03-26 17:16:44 +01:00
Andreas Österreicher 42ddea9f51 Fixed Typ in Variable Name 2024-03-26 16:37:13 +01:00
Andreas Österreicher 058ed94c2b Merge branch 'feature-36196/DVUH_Meldestatus_beruecksichtigen' 2024-03-26 11:34:26 +01:00
Harald Bamberger a95c2fe47e studstatus switch fullname to have surname first 2024-03-26 11:27:44 +01:00
Andreas Österreicher 1e9a681c9a Gegencheck für tbl_tmp_store und tbl_audit_log entfernt da dies Tabellen
aus der Personalveraltung Extension sind
Gegencheck für Habiliation hinzugefügt
2024-03-26 09:19:36 +01:00
Harald Bamberger aabc10d1fc Merge branch 'master' of github.com:FH-Complete/FHC-Core 2024-03-25 16:54:00 +01:00
Harald Bamberger d4bc5148a7 fix disappearing searchbar when session expires, add functions to fetch dvs at a certain duedate for valorisation 2024-03-25 16:53:03 +01:00
Andreas Österreicher fe1ea63496 Merge branch 'feature-33294/StudienerfolgsbestaetigungAbbrecher' 2024-03-25 15:59:12 +01:00
Harald Bamberger 2a26765ff6 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' 2024-03-25 15:05:46 +01:00
Harald Bamberger 5413292529 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-03-25 14:55:46 +01:00
Harald Bamberger 8a86bce567 Merge branch 'feature-33003/BIS_Meldung_Personal' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-03-25 14:55:11 +01:00
Harald Bamberger ad415ad665 deactivateDienstverhaeltnis: only set user to inactive if no other dv is active 2024-03-25 14:04:21 +01:00
Andreas Österreicher 6a6db4292f Merge branch 'feature-18571/EntwicklungsteamBisMeldung' 2024-03-25 13:54:42 +01:00
Andreas Österreicher 5fd4ded184 Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung 2024-03-25 13:12:35 +01:00
Harald Bamberger 9f2dd82009 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-03-25 13:08:10 +01:00
cgfhtw 06b0529813 Autocomplete: empty message 2024-03-22 09:10:13 +01:00
cgfhtw c4942cc70e Studstatus => FhcApi 2024-03-21 15:45:55 +01:00
Cris bc798bd0b4 Added uniqueId prop to Filter.js to fix URL using apiFunctionParameters.filterUniqueId 2024-03-20 09:58:25 +01:00
Cris f6eceb892d Added label property 'class' to Input.js
...which fixes style issues when creating input-group buttons using the Input.js component
2024-03-20 09:52:26 +01:00
Cris 6eae83f4eb Added primevues autocomplete slot template to Input.js
Now, when using the Input Component with type 'autocomplete', it is possible to add also primevues built in slot templates there
2024-03-20 09:50:03 +01:00
Cris 842e62b0dd Fixed Input.js error causing to keep last entries' first letter in form inputs, even when formdata was emptied 2024-03-20 09:42:23 +01:00
Cris 10e57dae2d Adapted style of .tabulator-cell .btn to be squared and increased padding 2024-03-20 09:38:08 +01:00
cgfhtw 69803cdb0d Phrasen: Bugfix - correct function for multiple categories 2024-03-20 08:27:26 +01:00
Werner Masik 426a439552 added sort column to frist 2024-03-20 00:13:55 +01:00
cgfhtw 4e6b7a845b FhcApi: use errorHeader for multiple calls 2024-03-19 16:54:14 +01:00
cgfhtw 30efd55d6c FhcApi: settle handled Promises & discard them in FhcAlert 2024-03-19 16:53:36 +01:00
Manfred e1b5a86390 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-19 15:55:00 +01:00
Manfred be0d73cd22 Sortierung der Studiensemester absteigend; Ziel-Studiensemester passt sich automatisch an 2024-03-19 15:54:54 +01:00
cgfhtw 8f0e837fb7 Phrasen Plugin: Bugfix this 2024-03-19 08:45:10 +01:00
cgfhtw b147f73954 Merge branch 'master' into feature-37246/APIs_Konsolidierung 2024-03-18 09:51:29 +01:00
Andreas Österreicher 2cce61ca6a Korrekturen für Gehaltsimport 2024-03-15 13:37:07 +01:00
kindlm 1d81a4c2e8 Buttonbeschriftung geändert um barrierefreier zu sein 2024-03-14 17:08:03 +01:00
kindlm 79a1e6a7fd Merge branch 'benutzerberechtigungGUIneu' 2024-03-14 16:41:53 +01:00
kindlm 7bec921018 Merge branch 'master' into benutzerberechtigungGUIneu 2024-03-14 16:40:07 +01:00
kindlm d9caf746a1 Rechte-GUI verbesserungen
- Inaktive und WaWi-Einträge ausgblenden
- Kopie-Anmerkung verkürzt
- Inaktive OE Kennzeichnen
- Link ins CIS-Profil
- Shortcut zum einfügen von Datum und Kürzel
- "Mitarbeiter" ist default bei Benutzersuche
- GUI-Verbesserungen bei Rollenvergleich
2024-03-14 16:39:01 +01:00
Harald Bamberger bacfbd33f3 Merge branch 'feature-36016/Studstatus_QMB' 2024-03-14 12:37:21 +01:00
Harald Bamberger 77221e507f set tabulator to fixed height, fix missing grund when editing unterbrechung 2024-03-14 11:42:39 +01:00
cgfhtw bc5d42b310 Studstatus: ausbildungssemester in getAllPrestudentsWhereCommitteeExamFailed 2024-03-14 08:52:55 +01:00
cgfhtw cba4c8e365 Studstatus: Fallback for antrag details 2024-03-13 16:46:10 +01:00
Harald Bamberger af79736d67 documents use ausbildungssemester from prestudentstatus in semester of antrag, fix missing grund when editing unterbrechung 2024-03-13 16:16:23 +01:00
cgfhtw f5bc8bdcb2 Studstatus: Unterbrechung: get semester for current status on new Antrag 2024-03-13 10:40:32 +01:00
cgfhtw 673fd889fe Studstatus: get details without whitelist 2024-03-13 10:39:51 +01:00
cgfhtw ab7a5bac68 Unterbrechung studienjahr und semester anzeige 2024-03-13 08:37:40 +01:00
Werner Masik e28627a676 removed verantwortlich column from tbl_frist 2024-03-12 17:34:13 +01:00
Harald Bamberger 4c8486af22 use correct config property 2024-03-12 14:36:27 +01:00
Harald Bamberger d05df01178 move load lib from function handleAbmeldungenStglDeadline to constructor as its also used in handleWiederholerDeadline 2024-03-12 13:22:01 +01:00
Harald Bamberger 7bdf5b832b Merge branch 'master' into feature-36016/Studstatus_QMB 2024-03-12 11:32:25 +01:00
Harald Bamberger 9504b713fc add missing insertvon to phrases definition 2024-03-12 11:31:12 +01:00
Andreas Österreicher 8d2d1c049a Removed wrong Semicolon 2024-03-12 08:28:16 +01:00
cgfhtw ac39ce8e71 Studstatus create view: fallback for studierendenantrag_id 2024-03-11 15:27:34 +01:00
cgfhtw 6acf65b49f Form Component: expose _defaultErrorHandlers 2024-03-11 15:24:48 +01:00
cgfhtw 40c98b1dcc FHCAPI Controller: optional status param for error function 2024-03-11 15:23:54 +01:00
cgfhtw b359a77a8d Comments 2024-03-11 09:56:34 +01:00
cgfhtw d259c0d35c Fetch: more robust error handling 2024-03-11 09:46:59 +01:00
cgfhtw 011b4a83eb Filter => FhcApi 2024-03-11 09:46:39 +01:00
Harald Bamberger 664fe3830f Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2024-03-08 11:39:02 +01:00
Harald Bamberger b17f253273 Tabs component: add flex-grow-1 class to use available space 2024-03-08 11:37:23 +01:00
Harald Bamberger d9e44c8c23 Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2024-03-08 11:08:40 +01:00
cgfhtw 85f9b14326 Comments 2024-03-07 16:56:37 +01:00
cgfhtw 5f77bdd6fc Spelling 2024-03-07 16:56:30 +01:00
cgfhtw d2eadb98ce Navigation => FhcApi 2024-03-07 16:56:14 +01:00
cgfhtw 291f32bfe2 Tabs => FhcApi 2024-03-07 14:35:29 +01:00
cgfhtw f539ed8977 Depricated comment 2024-03-07 08:54:28 +01:00
cgfhtw 20619311e3 Use fhcApi in Searchbar 2024-03-07 08:50:27 +01:00
cgfhtw 4ac46d19e9 Testsearch view: naming convention 2024-03-07 08:23:29 +01:00
cgfhtw dad459e023 Testsearch: Codequality 2024-03-07 08:18:49 +01:00
cgfhtw 8f6fbda4cf Testsearch: Bugfixes 2024-03-07 08:11:58 +01:00
Andreas Österreicher b753a05f0e Anpassungen am Import Script für Gemeinden von FHB übernommen 2024-03-07 08:10:17 +01:00
cgfhtw b6723e92d8 Code Quality 2024-03-07 08:01:11 +01:00
cgfhtw 1344ab987e Options for custom FhcApiFactory 2024-03-06 16:52:42 +01:00
cgfhtw 1dcece8563 Use Factory for Phrasen 2024-03-06 16:52:10 +01:00
cgfhtw f2ebf25640 Use new FhcApiFactory Folder 2024-03-06 16:51:25 +01:00
cgfhtw f6427f57b8 Use FHCAPI Controller for Phrasen 2024-03-06 16:49:35 +01:00
cgfhtw 68459e086a Auth_Controller special permissions 2024-03-06 16:15:04 +01:00
Cris 03e166dc89 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
#	system/filtersupdate.php
2024-03-06 14:07:19 +01:00
Cris 0940ea77de Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-06 13:59:06 +01:00
cgfhtw 872ef7c31c Move Phrasen API 2024-03-06 13:02:34 +01:00
cgfhtw e89aa824d2 FHCAPI_Controller extends Auth_Controller + auth error handling in FhcApi 2024-03-06 11:48:15 +01:00
cgfhtw 1b65378d6c Auth_Controller private functions 2024-03-06 11:47:34 +01:00
Werner Masik 77666e5210 added column verantwortlich_uid 2024-03-06 08:27:39 +01:00
KarpAlex 1085b9243d Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2024-03-05 17:07:17 +01:00
Harald Bamberger 3d6b2eb202 add app fhctemplate if it does not exist 2024-03-05 17:04:43 +01:00
Harald Bamberger 5ad3510af6 add use of phrasen plugin to apps 2024-03-05 16:47:29 +01:00
Harald Bamberger d5d190777a Merge branch 'feature-34543/UX_Template' 2024-03-05 16:46:48 +01:00
Cris 7f735e9a10 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-05 13:05:03 +01:00
Andreas Österreicher 7524d054db Merge branch 'feature-36530/bis_internationalisierung_codextabelle_neuerungen' 2024-03-05 13:04:25 +01:00
Andreas Österreicher 6869c147ef Beim deaktivieren von Benutzern wird Updateaktivam und Updateaktivvon
gesetzt
2024-03-05 11:32:30 +01:00
Werner Masik c60f7ed8b0 dbUpdate for fristenmanagement completed 2024-03-01 15:43:15 +01:00
Manfred e32d464b7f Merge branch 'master' into benutzerberechtigungGUIneu 2024-03-01 15:28:10 +01:00
Manfred 2e4f2709ed Merge branch 'RechteAnpassen' into benutzerberechtigungGUIneu 2024-03-01 15:27:11 +01:00
SimonGschnell 474c4ad34f removes file that belongs to CIS_Profil 2024-03-01 10:53:06 +01:00
Werner Masik 7a6d095b78 create db tables for fristenmanagement 2024-02-29 17:09:59 +01:00
kindlm 621429798c Abschlussgrad in Studienblatt erst aus Studienordnung ermitteln 2024-02-29 09:50:58 +01:00
cgfhtw 6500708f90 Code Quality 2024-02-29 09:02:20 +01:00
cgfhtw 2d2098984a Pause feature 2024-02-29 08:34:58 +01:00
Harald Bamberger c4d4f55d06 use tabulator5 simple theme to get smaller tables 2024-02-28 18:22:35 +01:00
Andreas Österreicher a4a06507dc Merge branch 'feature-229015/SAPByD_EBCL_Buchungen_sollen_auf_eigene_Kostenstelle_zugeordnet_werden' 2024-02-28 15:08:57 +01:00
Andreas Österreicher 23b1a76190 Merge branch 'feature-36148/tdb_uebersicht_erweitert_und_job_bug' 2024-02-28 13:43:19 +01:00
Cris f94b1700e7 Renamed filter- and phrases app for Fhc-Core-Extension
Renamed from extension to fhctemplate
2024-02-28 13:38:59 +01:00
Harald Bamberger 45f2593b13 fix bug with excel showing file error when switching to editmode 2024-02-27 13:54:58 +01:00
Andreas Österreicher e243980ae6 Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung 2024-02-26 15:58:49 +01:00
Andreas Österreicher 4862168b8d Merge branch 'feature-36986/fas_filter_reihungstest_dual' 2024-02-26 14:49:46 +01:00
Andreas Österreicher 93f1bc752b Merge branch 'feature-36744/uebersetzungen_payments_karteireiter' 2024-02-26 12:57:18 +01:00
cgfhtw 4bbac35540 Status colors 2024-02-26 11:56:29 +01:00
ma0048 aa6c5c50c2 - fas filter gefixt 2024-02-26 09:03:06 +01:00
Alexei Karpenko d9ec506c86 Codextabelle Mobilitaetsprogramm Neuerungen: changed name of some programs, set correct sichtbar and sichtbar_outgoing booleans 2024-02-23 16:54:51 +01:00
Cris 296741b584 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-02-22 11:17:38 +01:00
Cris c232eddf89 Added filter and phrases for Fhc-Core-Extension 2024-02-22 11:17:27 +01:00
Werner Masik fff0e937cc added Method to end DV and deactivate Benutzer 2024-02-21 16:23:39 +01:00
SimonGschnell 2d1e8a829d userdata changes 2024-02-21 13:50:38 +01:00
cgfhtw c034efb8b0 Unterbrechung bei laufender Unterbrechung 2024-02-21 09:19:56 +01:00
ma0048 6f92698631 - bewerbungstool payments uebersetzungen anpassungen 2024-02-20 17:01:49 +01:00
Werner Masik cd64df28bb added phrase for habilitation 2024-02-20 15:02:14 +01:00
cgfhtw 72d166a050 FHCAPI Controller: multipart upload 2024-02-20 08:38:29 +01:00
KarpAlex dfe0434cce added new mobilitaetsprogramm codes 2024-02-19 17:59:20 +01:00
cgfhtw 013664db70 FhcApi Controller: new helper functions 2024-02-19 15:23:43 +01:00
cgfhtw 469b3e9833 Form Input: auto classes 2024-02-19 15:23:13 +01:00
cgfhtw 8ad2908ca9 UploadDms: Delete Button styles 2024-02-19 15:23:00 +01:00
cgfhtw 6aebbada06 Form Input: only setFeedback on last radio/checkbox in production mode 2024-02-19 10:39:18 +01:00
Andreas Österreicher e433ca3d9b Fehlende Gegenpruefungen im DB Check hinzugefuegt 2024-02-19 09:22:54 +01:00
Andreas Österreicher 7962e181df Merge branch 'feature-21620/Neues_Feld_zum_Erfassen_des_ESI' 2024-02-19 08:58:49 +01:00
Andreas Österreicher 126defadb7 Link hinzugefügt beim Zusammenlegen von Personen wenn beide Personen
UHSTAT ausgefüllt haben damit diese direkt verglichen und gelöscht
werden können.
Fehlende DB checks hinzugefügt
2024-02-16 14:59:53 +01:00
Andreas Österreicher 01c3a67762 Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI 2024-02-16 14:11:02 +01:00
cgfhtw 658212a6eb Show Antrag to Student when finished 2024-02-16 13:28:26 +01:00
cgfhtw ab2fc11797 PDF Download Wiederholung Deadline 2024-02-16 11:44:27 +01:00
Andreas Österreicher cbf71a416f Deprecated Spalte Gesamtstunden aus Projektarbeitsexport entfernt 2024-02-16 11:23:20 +01:00
cgfhtw 75e05d6eed PDF Download korrektur 2024-02-16 09:27:42 +01:00
cgfhtw 70386a58f3 Tabs Component: removed TODOs 2024-02-16 08:53:34 +01:00
Cris caa7ad6cc4 Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-34543/UX_Template 2024-02-15 09:54:51 +01:00
cgfhtw 3322f5115a FhcApi: Clean return value 2024-02-15 09:41:11 +01:00
cgfhtw f5b5f39689 FhcApi: return value 2024-02-14 16:00:48 +01:00
Cris 8f81426fa4 Corrected error when using alertMultiple and handleSystemMessage 2024-02-13 14:54:42 +01:00
cgfhtw 091d8509f0 Send E-Mails after Wiederholer deadline 2024-02-13 14:53:58 +01:00
Cris 6140e15139 Removed unused tabulatorAdditionalColumns property. Instead additional cols like 'action buttons' are now checked by index. 2024-02-13 14:53:01 +01:00
Cris acb29c5c69 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	application/views/templates/FHC-Footer.php
#	composer.json
#	public/js/components/Bootstrap/Modal.js
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00
Cris 91f43665fd Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-02-13 10:54:14 +01:00
Cris 4d8dbb2e78 Created Core BaseLayout Component 2024-02-13 10:52:11 +01:00
Cris 565f89c884 Added phrases anrechnung, geloescht and aenderungGespeichert 2024-02-13 10:51:37 +01:00
Cris e6774024b9 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-02-12 11:25:07 +01:00
Andreas Österreicher b4d6a46426 Fixed Typo in phrase 2024-02-09 15:18:14 +01:00
Andreas Österreicher bffaea8dda Merge branch 'feature-36028/uebersetzungen_zahlungen' 2024-02-09 12:50:45 +01:00
Andreas Österreicher f5dacefbbe Merge branch 'master' into feature-36028/uebersetzungen_zahlungen 2024-02-09 12:50:00 +01:00
Andreas Österreicher 752408aa3a Fixed LineEndings 2024-02-09 12:49:14 +01:00
Andreas Österreicher e34ff8819c Merge branch 'feature-33981/testtool_text_kopieren_verhindern_erschweren' 2024-02-09 11:11:41 +01:00
cgfhtw ce9ebee57d CSS: fhc-header w/o bottom border 2024-02-09 11:10:03 +01:00
Andreas Österreicher 0a8a17e49f Merge branch 'feature-36197/reihungstest_auswertung_bewerberstatus_setzen' 2024-02-09 10:48:51 +01:00
cgfhtw 8c6c2b7e11 FilterCmpt: defaults & Bugfix 2024-02-09 09:32:02 +01:00
cgfhtw 6e85b37b0f Tabs: optional border 2024-02-09 09:31:26 +01:00
cgfhtw c3ec909448 CSS improvements 2024-02-09 09:30:59 +01:00
Manfred ba972c1d8a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-02-08 16:36:52 +01:00
Manfred ddfe0843de Defaultwert "aggregators "aus Statistik entfernt, weil Fehler wenn leer 2024-02-08 16:36:45 +01:00
Harald Bamberger 5279a7d45a Merge branch 'feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden' 2024-02-08 08:48:26 +01:00
Harald Bamberger 7dfb0429ae Merge branch 'master' into feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden 2024-02-08 08:25:11 +01:00
Harald Bamberger f67a106357 Merge branch 'feature-35637/Studstatus-Wiederholungsdeadline_abbrecher_status_current_semester' 2024-02-08 08:15:19 +01:00
Andreas Österreicher 1d300a604f Funktion zum Migrieren der Habiliation hinzugefügt 2024-02-08 08:03:34 +01:00
Andreas Österreicher 912f62dc01 Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2024-02-08 08:03:00 +01:00
Harald Bamberger 32ed034ad2 Merge branch 'master' into feature-35637/Studstatus-Wiederholungsdeadline_abbrecher_status_current_semester 2024-02-08 08:00:22 +01:00
kindlm 36d4879b90 Hinweistext für Lehrauftragsannahme ergänzt 2024-02-07 16:35:21 +01:00
Cris bc0f7f7087 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-02-07 15:50:50 +01:00
kindlm 72197bf993 Merge branch 'master' into RechteAnpassen 2024-02-07 12:58:43 +01:00
kindlm e01d97849a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-02-07 12:58:13 +01:00
cgfhtw 2f79ae1ece Form/Validation bugfix: dismiss cache problem (correct solution) 2024-02-07 09:19:19 +01:00
cgfhtw a2c5ebb291 Fhc.css: fhc-header 2024-02-07 09:13:21 +01:00
cgfhtw 1f3e283d3c Code cleanup 2024-02-07 09:12:47 +01:00
cgfhtw eb69f77113 Form/Validation bugfix: dismiss cache problem 2024-02-07 09:12:06 +01:00
cgfhtw 6bc6c7c074 Form/Input: Injection defaults 2024-02-07 09:11:20 +01:00
Andreas Österreicher 3b97d8d93f Merge branch 'bug-36275/vertrag_oezuordnung' 2024-02-06 12:42:44 +01:00
Andreas Österreicher 1b70d70edd - Pruefung hinzugefuegt ob eine Person Vorgesetzte oder indirekt
Vorgesetzte einer anderen Person ist
- Bei mehreren OEZuordnungen wird bevorzugt die nicht karenzierte
  ermittelt
2024-02-06 12:40:11 +01:00
Andreas Österreicher b5024b86ea OEZuordnung wird priorisiert ermittelt bei Karenzen 2024-02-05 18:54:33 +01:00
kindlm 238208f252 Zeitwünsche mit mitarbeiter/zeitwuensche einsehen 2024-02-05 16:39:53 +01:00
KarpAlex 1c2c12f0a5 Bismeldestichtag Model: added getByStudiensemester method 2024-02-02 18:41:18 +01:00
cgfhtw dfbd67c52b Form/Input: Multiple radios/checkboxes 2024-02-01 15:43:36 +01:00
cgfhtw fe798506a6 raw_input_stream as array instead of stdobj & terminateWithSuccess 2024-02-01 08:59:35 +01:00
cgfhtw 51e556a731 Remove textarea+ & Form.send()
Add $clearValidationForName()
2024-02-01 08:58:32 +01:00
Andreas Österreicher a193a7a1c8 Naming Convention korrigiert fuer DBUpdate File 2024-02-01 08:50:06 +01:00
Andreas Österreicher 53fc8fc807 Berechtigungen für Entwicklungsteam ins Studiengangsverwaltungs Addon
verschoben
2024-02-01 08:38:55 +01:00
Andreas Österreicher ef64aa7da2 - Fehler behoben wodurch Entwicklugnsteam nicht gespeichert werden konnte
wenn das Endedatum leer ist.
- Entwicklungsteam update aus alten DB-Update entfernt
2024-02-01 08:20:10 +01:00
kindlm ac9b36cc1a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-01-31 16:02:41 +01:00
kindlm 1b3c509ee8 Rechte in Rollen kopieren 2024-01-31 16:02:29 +01:00
Andreas Österreicher fae185958b Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung 2024-01-31 13:27:58 +01:00
Cris 02f0c54f10 Adapted Filter.js to ensure displaying tabulator 'formatter' columns not provided by filtersupdate filter definition
...like rowSelection checkboxes or custom formatted action buttons
2024-01-31 13:25:44 +01:00
Andreas Österreicher 559835becd Merge branch 'feature-35653/personensuche_deaktivieren' 2024-01-31 12:50:30 +01:00
Andreas Österreicher 603ef170ba Merge branch 'feature-34728/notenauswahl_im_fas_deaktivierte_noten_durchstreichen' 2024-01-31 12:33:02 +01:00
Andreas Österreicher cd7478539d Merge branch 'master' into feature-34728/notenauswahl_im_fas_deaktivierte_noten_durchstreichen 2024-01-31 12:29:23 +01:00
ma0048 ef3c680e91 - auswertung_fhtw funktionen "Zu Bewerber machen" entfernt 2024-01-31 12:28:03 +01:00
cgfhtw 2dbdf41086 FHC-Api: finetuning 2024-01-31 09:39:51 +01:00
Cris 7e14fff7f3 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-01-30 17:18:55 +01:00
Cris 6bd834c509 Added filter AnrechnungTable (for testing) 2024-01-30 17:05:03 +01:00
Cris aa06a97eb3 Corrected alertMultiple to display all messages
Before it stucked with only the first message. Now all messages are displayed.
2024-01-30 17:04:02 +01:00
Cris b868024175 Corrected wrong variable name in FhcAlert handleSystemMessage 2024-01-30 17:00:49 +01:00
Andreas Österreicher bea14724b0 Phrasen für Anrechnungen korrigiert 2024-01-30 16:56:19 +01:00
cgfhtw ef3ee76fa1 Form Validation 2024-01-30 11:39:17 +01:00
cgfhtw 272c4d5ccc FhcApi cleanup 2024-01-30 11:39:08 +01:00
cgfhtw 30bd6ea6a4 FhcApi Plugin + Form updates 2024-01-30 10:42:48 +01:00
cgfhtw b010cbb35d FhcAlert: CSS 2024-01-30 10:42:12 +01:00
cgfhtw ea9e58a640 Bugfix: Typo 2024-01-30 10:41:45 +01:00
ma0048 5e99ff9c8b - uebersicht erweitert
- job angepasst
2024-01-29 14:29:39 +01:00
Andreas Österreicher 1d779feb4b Merge branch 'feature-35202/internationalisierungsmassnahmen_wording_anpassen_fuer_akzeptieren' 2024-01-26 10:50:59 +01:00
cgfhtw 1fec3543cd FHCAPI Controller 2024-01-25 16:41:05 +01:00
ma0048 cd37972cad - ubersetzuengen hinzugefuegt 2024-01-25 12:54:57 +01:00
Harald Bamberger cf40f33fc6 prevent returning html entities in sanitizeProblemChars helper 2024-01-25 12:44:20 +01:00
Harald Bamberger 72bcb919aa prevent returning html entities in sanitizeProblemChars helper 2024-01-25 12:41:32 +01:00
Cris 4706b16a99 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-01-25 10:40:09 +01:00
cgfhtw afc995b4bd Form Input modelValue dummy 2024-01-25 10:29:19 +01:00
Andreas Österreicher 70303dbec6 CI Environment im CIS Config hinzugefügt 2024-01-25 10:19:40 +01:00
Andreas Österreicher 89f5613373 Fehler behoben wodurch die Homeoffice Checkbox nicht angezeigt wurde
wenn die Person keinen Projekten zugeordnet ist
Fehler behoben wodurch die Homeoffice Checkbox am ersten Tag der
Homeofficegültigkeit nicht
korrekt angezeigt wurde
2024-01-24 07:02:28 +01:00
Harald Bamberger 7d4bc9c1d0 change => to >= in sql comparison 2024-01-23 14:21:04 +01:00
Cris 693d59e8bc Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-01-23 09:57:51 +01:00
cgfhtw e2a66d5143 Fragment Component 2024-01-23 09:43:41 +01:00
cgfhtw 41e5c52d2f Css updates 2024-01-23 09:42:33 +01:00
cgfhtw be82d9b6cb Tabs Component update 2024-01-23 09:32:26 +01:00
cgfhtw d66a6567b0 Form Components 2024-01-23 09:29:47 +01:00
Harald Bamberger e90f0c75fa fix missing entries due to missing prestudentstatus for target semester 2024-01-22 13:47:35 +01:00
Harald Bamberger a3a28a428c Merge branch 'feature-35636/Studstatus-Leitung_AntragId_sort_by_number' 2024-01-22 12:54:39 +01:00
Andreas Österreicher 3b85729b6f Syntaxfehler und Styling korrigiert 2024-01-19 15:27:04 +01:00
cgfhtw 1b27dbcb5f Bugfix: WH Antrag Prüfungstest kleiner vs kleiner gleich 2024-01-19 13:17:41 +01:00
kindlm 363ec9aa2f Merge branch 'master' into benutzerberechtigungGUIneu 2024-01-18 20:33:42 +01:00
kindlm 146b62d185 Filter in GET-Parameter 2024-01-18 20:33:03 +01:00
kindlm f298814619 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-01-18 20:31:31 +01:00
Werner Masik 304caf9157 added time recording query 2024-01-18 12:30:35 +01:00
Cris af010a51e9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-01-17 11:33:54 +01:00
Andreas Österreicher 125a0174b9 Berechtigung für Web User zu Freitextbestandteilen hinzgefügt damit die Zeitaufzeichnung auf
AllIn prüfen kann
2024-01-17 07:41:17 +01:00
Andreas Österreicher c7e86950f4 FreierDV auf Darunterliegenden externerLehrender geändert da freierdv
nicht zu einem Dienstverhaeltnis zugeordnet werden soll
2024-01-17 07:36:28 +01:00
Andreas Österreicher 69e6c4ca29 Fehler beim Laden von Reports mit mehreren Variablen behoben 2024-01-16 17:01:09 +01:00
Harald Bamberger 6c95e31bae remove files moved to FHC-Core-Personalverwaltung Extension 2024-01-16 11:52:13 +01:00
Harald Bamberger 9552077209 Merge branch 'deploy-PV21' 2024-01-16 11:36:57 +01:00
Harald Bamberger 514ac2050f Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-15 18:18:35 +01:00
Harald Bamberger 34a083d0ee update Logik beim Beenden von DVs verwenden 2024-01-15 18:16:54 +01:00
ma0048 a2905c3e93 - scheduler angepasst
- config erweitert um mahnsperre und zahlungsbedingungen
- fas config hinzugefuegt
2024-01-15 12:25:34 +01:00
ma0048 a9bae3f17d - zgv class erweitert um nur aktive zu holen 2024-01-15 11:58:10 +01:00
Harald Bamberger bed5a62d82 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-15 11:23:11 +01:00
Harald Bamberger 7b9bfd70c8 make name of enc key more specific 2024-01-15 10:39:54 +01:00
Harald Bamberger 3b952b3838 Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-15 10:36:34 +01:00
Cris 579c1c6aff Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-01-15 10:28:10 +01:00
Harald Bamberger 45c5b4fd37 Merge branch 'deploy-PV21' of github.com:FH-Complete/FHC-Core into deploy-PV21 2024-01-12 16:17:06 +01:00
Harald Bamberger 57af22a623 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-12 16:16:56 +01:00
Harald Bamberger d95e972e6c Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of github.com:FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-12 16:15:15 +01:00
Harald Bamberger 8824ffd182 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-12 16:14:40 +01:00
Harald Bamberger 81244a06ca antrag_prestudentstatus_whitelist_abmeldung damit Unterbrecher sich auch abmelden koennen 2024-01-12 16:13:19 +01:00
Harald Bamberger 8d5cb39a3d Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-12 14:57:01 +01:00
Harald Bamberger a49394f456 fix sql 2024-01-12 14:47:40 +01:00
Harald Bamberger 5a2ddbe2b2 use new hr tables depending on config DIENSTVERHAELTNIS_SUPPORT 2024-01-12 14:44:26 +01:00
Harald Bamberger fc89224dc8 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-11 09:46:30 +01:00
cgfhtw 0f06c8a386 s&d 2024-01-11 08:34:10 +01:00
cgfhtw 13b5b017b8 Expose Antrag Id 2024-01-11 08:34:00 +01:00
cgfhtw 981f6970bc Status severity for "Abgemeldet" 2024-01-11 08:33:43 +01:00
Cris f40862c019 Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-10 17:16:32 +01:00
Harald Bamberger 7f4ae3a378 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-10 15:01:48 +01:00
Harald Bamberger d5f6ee2265 improve search to handle multiword search 2024-01-10 15:00:16 +01:00
Cris 73ba14cdec Removed unused function check_isVorgesetzter
This was replaced by using getVorgesetzer / getVorgesetzterByDate method.
2024-01-10 14:44:33 +01:00
Cris e3f10069ef Adapted getUntergebene to allow to include also Mitarbeiter, who ended Dienstverhältnis/changed OE last month
These allows Vorgesetzte to still access their data, for example to be able to accept their November-Monatsliste (last working month)
in December (month to accept the November-Monatsliste)
2024-01-10 14:42:13 +01:00
Harald Bamberger 37493d1af7 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21 2024-01-10 14:40:18 +01:00
Cris 97a020460d Adapted: getVorgesetzteByDate to retrieve only the latest Vorgesetzte by a specific date
Added order by and limit to get only one and the most actual Vorgesetzte by given date.
Changed name. Before it was getVorgesetzteMonatTimesheet, but it is also used independently from timesheet.
2024-01-10 14:31:26 +01:00
Cris 5452dc6fe3 Adapted: getVorgesetzte retrieve only the latest Vorgesetzte
Added order by and limit to get only one and the most actual Vorgesetzte
2024-01-10 14:29:16 +01:00
Harald Bamberger 36f97bafd6 Merge branch 'feature-30659/SearchBar_Controller_sollte_Berechtigungen_berücksichtigen_können' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-10 14:19:37 +01:00
Harald Bamberger dff97f7c53 Merge branch 'feature-34874/pv21_fas_stundensaetze' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-10 14:18:25 +01:00
Harald Bamberger 49d24d74b0 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-10 13:54:06 +01:00
cgfhtw e907c0b596 Studstatus: use current semester in WiederholerDeadline Job 2024-01-09 15:05:05 +01:00
cgfhtw 2faf310105 Studstatus: Leitungsansicht Sortierung AntragId 2024-01-09 13:40:48 +01:00
ma0048 125bf40fd1 - personensuche im cis ueber die globale suche mithilfe einer config deaktivierbar
- vereinfachte logik fuer die profi link anzeige ueber die globale suche
2024-01-09 12:00:11 +01:00
Harald Bamberger 64279bace2 change function type from volatile to stable for public.get_rolle_prestudent 2024-01-09 09:40:56 +01:00
Harald Bamberger fde1623dc0 Merge branch 'feature-35545/Studstatus_Status_Abgemeldet' 2024-01-08 18:23:10 +01:00
Harald Bamberger 3687f63189 Merge branch 'feature-35411/Studstatus_Query_Performance' 2024-01-08 17:42:20 +01:00
Cris d522389f76 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-01-08 11:47:17 +01:00
cgfhtw 5b62271711 s&d 2024-01-02 09:36:28 +01:00
Werner Masik 9460d2b2cd removed reactivity warning 'Vue received a Component that was made a reactive object' 2023-12-29 17:09:38 +01:00
cgfhtw 43813b3ef0 getActiveStgs 2023-12-27 10:51:57 +01:00
cgfhtw aa5868826f getAntraege 2023-12-27 10:26:42 +01:00
KarpAlex 2c16e293a0 Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2023-12-24 00:00:27 +01:00
KarpAlex 3e7d917184 deleted anrechnung von outgoing lvs file in dbupdate folder 2023-12-22 19:07:15 +01:00
cgfhtw f03d218872 s&d 2023-12-22 14:49:40 +01:00
Harald Bamberger 151012fedf AntragJob: nur Personen die eine Aufforderung oder einen Reminder zur Wiederholung erhalten haben und die Frist abgelaufen ist zum Abbrecher machen 2023-12-22 11:08:56 +01:00
ma0068 e7703f3c9b neues Attribut abschlussbeurteilung_deutsch 2023-12-22 07:55:29 +01:00
Andreas Österreicher 1530726b0a Merge branch 'feature-20037/reihungstestjob_neue_studienplaene_werden_nicht_korrekt_zugeordnet' 2023-12-21 15:44:58 +01:00
ma0048 250434b806 Merge remote-tracking branch 'origin/master' into feature-20037/reihungstestjob_neue_studienplaene_werden_nicht_korrekt_zugeordnet 2023-12-21 15:41:28 +01:00
Harald Bamberger dcc0093987 sachaufwand_id_seq rechte fuer vilesci user 2023-12-21 14:49:50 +01:00
Harald Bamberger 52b1598ab4 zusaetzlicher Teilzeittyp Wiedereingliederungsteilzeit 2023-12-21 14:44:07 +01:00
Andreas Österreicher 2e742a7913 Merge branch 'feature-29144/Prestudent_status_nach_Bismeldung_sperren_2' 2023-12-21 13:29:02 +01:00
Harald Bamberger 5bfa8ca53c Merge branch 'feature-35066/Studstatus_divers' 2023-12-20 19:57:33 +01:00
ma0048 ef117fbe12 - neue vorlage beim akzeptieren
- neuer filter
- button "alle geplanten markieren"
2023-12-20 16:02:44 +01:00
Harald Bamberger 60ad46b2fb and another dependency of Tabs 2023-12-20 15:24:56 +01:00
Harald Bamberger 2a9181d28d add another dependency of Tabs 2023-12-20 15:20:06 +01:00
Harald Bamberger 1aa6d07559 add dependency for Tabs 2023-12-20 15:09:49 +01:00
Harald Bamberger d9cd3a0b1d add files for manipulating tabs from feature-30660 2023-12-20 14:30:11 +01:00
Andreas Österreicher 29d7a97ee8 Wording korrigiert 2023-12-20 14:26:30 +01:00
Andreas Österreicher 20f9f52eef Doppelten Composer Eintrag entfernt 2023-12-20 14:11:49 +01:00
Andreas Österreicher 72217d9793 Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren_2 2023-12-20 14:06:18 +01:00
Andreas Österreicher c400e112fd Merge branch 'feature-35007/Text_zu_UHSTAT_Formular_hinzufuegen' 2023-12-20 13:43:23 +01:00
cgfhtw 3f88bba9bb Negative Prüfungen sortiert und bei bestehenden Anträgen nach Antragsdatum und Stdsem gefiltert 2023-12-20 12:06:45 +01:00
cgfhtw ca55b63e01 Load Language before Anträge 2023-12-20 09:30:44 +01:00
cgfhtw ba7f60b16e Filter Beschriftung 2023-12-20 09:18:44 +01:00
cgfhtw 6c0fa3fed3 Leitungsansicht: Aktiv Default & korrekter Filter beim Neuladen der Seite 2023-12-20 09:14:58 +01:00
Harald Bamberger a02e79a33a fix sancho mail template kurzbz too long 2023-12-19 18:14:08 +01:00
KarpAlex 8b9c023781 Personen zusammenlegen: Rueckstellungen are checked 2023-12-18 17:51:05 +01:00
KarpAlex e60157dd9b Personen zusammenlegen: uhstat1daten are checked 2023-12-18 17:16:20 +01:00
KarpAlex f6e7d2858a Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI 2023-12-18 17:01:25 +01:00
cgfhtw f4194c251a loadActiveForStudiengaenge eigene Funktion 2023-12-18 14:27:32 +01:00
cgfhtw d8dc19ef2f Merge branch 'master' into feature-35066/Studstatus_divers 2023-12-18 14:19:50 +01:00
Andreas Österreicher 7868c2e073 Merge branch 'feature-35019/visual_library_abgabetool_nutzungsbedingungen_fuer_epub' 2023-12-18 13:32:41 +01:00
ma0048 55fbf40374 - abgabetool text anpassungen
- nutzungsbedingungen
- delay config hinzugefuegt
- required inputs hinzugefuegt
2023-12-18 09:20:01 +01:00
cgfhtw e698564202 StudStatus: Toggle "nur aktive anzeigen" 2023-12-14 11:28:19 +01:00
Cris 00a1c66d86 Corrected: Tagesgenaue Prüfung auf AZG-relevant 2023-12-13 16:14:08 +01:00
Harald Bamberger adc66695e4 Merge branch 'feature-34727/Studstatus_Studienplaene_w_multiple_languages' 2023-12-13 16:05:04 +01:00
Harald Bamberger 9e59caf7bc Merge branch 'master' into feature-34727/Studstatus_Studienplaene_w_multiple_languages 2023-12-13 15:10:21 +01:00
Cris bf20854878 Corrected: Tagesgenaue Prüfung auf Homeoffice 2023-12-13 14:09:20 +01:00
Andreas Österreicher a75234165b Merge branch 'hotfix_Anrechnungsantraege-in-zukuenftigen-Studiensemester-ermoeglichen' 2023-12-12 14:45:18 +01:00
Andreas Österreicher 18f88b7697 Merge branch 'infocenter_2023_12_04' 2023-12-12 13:27:05 +01:00
Andreas Österreicher 5c3f5b26d3 Composer Lock aktualisiert und neuen Config Eintrag für Zahlungstypen
hinzugefügt
2023-12-12 13:25:10 +01:00
cgfhtw 14c24005fe Wiederholung wenn Studierende das letze Semester wiederholen 2023-12-12 11:02:12 +01:00
Werner Masik 52cc0db5da phrases for off time view 2023-12-11 21:28:52 +01:00
ma0048 289358ac6e - inaktive noten durchgestrichen im fas 2023-12-11 13:46:18 +01:00
ma0048 8f46613620 - kopieren von fragen erschweren 2023-12-11 13:30:39 +01:00
Cris 1797abdc5f Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-12-11 13:22:58 +01:00
Cris bb9eb31e6e Adapted getWochenstunden in Vertragsbestandteil Class to handle Karenz
Karenzierte Dienstverhältnisse werden nicht zurückgegeben.
Dafür aber ein eventuelles 2.DV mit geringfügiger Beschäftigung neben der Karenz.
2023-12-11 13:11:33 +01:00
Cris a361036aa9 Added method isKarenziert to Vertragsbestandteil Class
Prüft, ob MitarbeiterIn zum Abfragedatum karenziert ist.
Wenn kein Datum übergeben wird, wird das heutige Datum gesetzt.
2023-12-11 13:09:56 +01:00
Cris 26ab9ff221 Updated 3 Vertragsbestandteil-Methods: Set 'Order By' to retrieve very last active Vertragsbestandteil 2023-12-11 13:08:57 +01:00
Harald Bamberger 28128ee35e Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-12-11 08:02:21 +01:00
Harald Bamberger 9fa7e6e56c modify label of Studiengaenge in Dropdown and Table 2023-12-07 17:12:38 +01:00
Harald Bamberger b6585dc186 add margin-right to prevent scrollbar from overlaying table 2023-12-07 16:05:52 +01:00
Harald Bamberger 85a743b43a Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-12-07 08:03:34 +01:00
kindlm a246513597 Spalte Organisationseinheit 2023-12-06 18:18:34 +01:00
Manfred a2e6927740 Merge branch 'master' into benutzerberechtigungGUIneu 2023-12-06 18:11:07 +01:00
kindlm 13092be05c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-12-06 18:07:26 +01:00
kindlm c87ae7e74d Suche Person in OE; OE in Rechteliste OE-Suche 2023-12-06 18:06:46 +01:00
Manfred d35223c1a3 Merge branch 'master' into benutzerberechtigungGUIneu 2023-12-06 18:04:25 +01:00
Cris 8a29146fc2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-12-06 14:42:45 +01:00
cgfhtw b15adf7b23 Revert "task-35010: Abmeldung d. StG Pre-Abbrecher Statusgrund nach zurückgezogen wieder rückgängig machen"
This reverts commit 3e9dcf2911.
2023-12-06 14:32:29 +01:00
cgfhtw b6b21d54fc Pre-Abbrecher Statusgrund nach zurückgezogen wieder rückgängig machen 2023-12-06 14:26:59 +01:00
Cris bd4a0af690 Removed 'Lehre Saldo anzeigen' 2023-12-06 13:31:06 +01:00
Cris f18aa42966 Added function getWochenstunden to Vertragsbestandteil Class 2023-12-06 13:24:52 +01:00
cgfhtw 3e9dcf2911 task-35010: Abmeldung d. StG Pre-Abbrecher Statusgrund nach zurückgezogen wieder rückgängig machen 2023-12-06 09:46:34 +01:00
kindlm 32459ccff8 Statistik Load TimeLimit auf 600 gesetzt
Default Parameter bei Statistik aktualisiert
2023-12-05 14:38:07 +01:00
cgfhtw 98de634393 s&d 2023-12-05 09:27:20 +01:00
Cris 83e3898b31 Merge branch 'feature-28269/Zeiterfassung-an-neue-Vertragsstruktur-anpassen' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-12-04 17:35:01 +01:00
Cris 7d701835cc Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-12-04 17:34:19 +01:00
Cris 4552050c8a Changed: Allin Saldoanzeige an neue Vertragsstruktur angepasst 2023-12-04 17:30:10 +01:00
Cris b6b8f0d182 Removed unused require_once files 2023-12-04 17:25:43 +01:00
ma0048 f3be186c5a Merge branch 'feature-27398/Offene_Rechnungen_im_Bewerbungstool_anzeigen' into infocenter_2023_12_04 2023-12-04 12:46:16 +01:00
ma0048 ab5d0693eb Merge branch 'feature-16354/TinyMCE_move_to_new_version' into infocenter_2023_12_04
# Conflicts:
#	composer.lock
2023-12-04 12:44:10 +01:00
ma0048 a4417bdd98 Merge remote-tracking branch 'origin/feature-32978/bewerberstatus_cronjob_aktivieren' into infocenter_2023_12_04 2023-12-04 12:33:25 +01:00
ma0048 a8efe3c109 Merge remote-tracking branch 'origin/feature-33037/bewerbungstool_textanpassung' into infocenter_2023_12_04 2023-12-04 12:32:55 +01:00
ma0048 4ceca78ebc Merge remote-tracking branch 'origin/feature-33185/statusfilter_im_fas_fuer_neuen_bewerber_prozess' into infocenter_2023_12_04 2023-12-04 12:32:34 +01:00
ma0048 af1db47e1d Merge remote-tracking branch 'origin/feature-33250/messages_von_reihungstestverwaltungsseite_aus_schicken' into infocenter_2023_12_04 2023-12-04 12:29:43 +01:00
ma0048 fa80c49eba Merge remote-tracking branch 'origin/feature-33714/erhoehter_studienbeitrag_fuer_drittsaatenangehoerig' into infocenter_2023_12_04 2023-12-04 12:29:17 +01:00
Harald Bamberger 483b6171c7 add space between firstname and surname 2023-12-01 09:39:46 +01:00
Harald Bamberger 0e04138480 Merge branch 'feature-34998/Studierendenstatus_Mail_nicht_an_private_Adresse_schicken' 2023-11-30 15:04:10 +01:00
cgfhtw a3963248dd s&d 2023-11-29 14:37:35 +01:00
ma0048 ea14fa1a4b - infocenter kaution spalte angepasst
- infocenter abgewiesen nachricht spalte angepasst
2023-11-29 13:05:49 +01:00
Harald Bamberger 8b55a7843d altersteilzeit geblockt mit 0 Stunden zulassen 2023-11-29 07:33:38 +01:00
KarpAlex 734ab45264 UHSTAT form: added SVNR text 2023-11-29 01:06:42 +01:00
Cris 1310dea4a5 Changed Tabulators new-Button to btn-primary color 2023-11-28 18:55:14 +01:00
Cris be0e2a6dca Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-11-28 18:49:37 +01:00
Harald Bamberger ff302e6173 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-28 13:08:14 +01:00
Harald Bamberger 0f2f21aa19 Merge branch 'feature-34537/Phrasenmixin_als_Plugin' 2023-11-28 12:56:31 +01:00
Harald Bamberger bbd41f17cc use textarea instead of pre 2023-11-28 12:53:44 +01:00
Harald Bamberger a5d21b3b8d extend DV overlap check 2023-11-28 12:43:25 +01:00
Werner Masik a613abea39 fix kurzbz check 2023-11-28 12:18:13 +01:00
Harald Bamberger c123ad0578 Merge branch 'master' into feature-34537/Phrasenmixin_als_Plugin 2023-11-28 09:28:02 +01:00
ma0048 6b2d728143 - textänderung 2023-11-28 08:57:30 +01:00
cgfhtw a6f18ae424 Bugfix: parameter missing 2023-11-27 12:21:25 +01:00
Andreas Österreicher 71495877f3 Merge branch 'feature-29767/anpassung_abgabetool_fuer_vl' 2023-11-27 10:09:45 +01:00
Harald Bamberger b80df4f0eb refactor benutzerfunktion handling 2023-11-27 07:37:19 +01:00
Harald Bamberger 28e533fb3c replace pre with textarea to fix reason being overlapped by scroll bar 2023-11-23 17:53:43 +01:00
Harald Bamberger a1aff9bd0c Merge branch 'feature-34883/Studstatus_insertvon__bestaetigtvon_bei_Abbrechern' 2023-11-23 16:29:40 +01:00
Harald Bamberger 66cbe5199a correct phrasestext 2023-11-23 16:17:05 +01:00
Harald Bamberger b0d6212c5e Merge branch 'feature-34922/NeuerAbmeldungsgrundPhrase' 2023-11-23 16:06:54 +01:00
cgfhtw c93a4d2fb5 Studstatus: Wiederholer Reminder 1 wird vermutlich mit einem Tag delay versandt 2023-11-23 15:51:35 +01:00
cgfhtw 4932f21204 s&d 2023-11-23 15:37:01 +01:00
ma0068 2d25e08227 Longtext ZGV ohne Hinweis auf Ausbildungsvertrag 2023-11-23 09:45:29 +01:00
ma0048 801780de29 - wording 2023-11-23 09:24:34 +01:00
ma0068 d0bebeaa4a neue Phrase MissingZGV, entfernen new lines 2023-11-23 09:16:56 +01:00
Harald Bamberger 594dbdca21 Merge branch 'feature-34883/bestaetigtvon_bei_Abbrechern' 2023-11-22 17:08:20 +01:00
cgfhtw 8142982ac7 s&d 2023-11-22 14:57:24 +01:00
cgfhtw ca2256bb32 Fix: Better handling of uninitialized variables 2023-11-22 14:57:06 +01:00
Harald Bamberger ad8a18ed7d change lvzuweisungurl to use VILESCI_ROOT if defined for Sancho_Mail_Antrag_W_New 2023-11-22 13:08:47 +01:00
ma0048 cc589a401c - stundensaetze fas 2023-11-22 12:47:33 +01:00
Harald Bamberger 58fa399436 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-21 21:29:18 +01:00
Werner Masik cccdfa1ac8 extracted function for generation employee kurzbz 2023-11-21 17:45:20 +01:00
Andreas Österreicher d67d71abd5 Beträge am Lehrauftrag werden Abhängig von der Vertragsart angezeigt und nicht mehr
anhand der Inkludierten Lehre
2023-11-21 11:20:05 +01:00
cgfhtw 73e8761728 Bugfix: Lvzuweisung - DB Errors in production 2023-11-21 10:46:23 +01:00
Andreas Österreicher 5263ffbb7b Lehreinheiten Vorrückung berücksichtigt neue Vertragsstruktur und
Stundensätze
2023-11-21 09:53:00 +01:00
cgfhtw cc779f3d27 finish 2023-11-21 08:48:34 +01:00
ma0048 2158e7a28d - wording
- standardwert
- absage infocenter
2023-11-20 11:55:05 +01:00
Harald Bamberger 11926ca9b2 refactor creation of benutzerfunktiondata, add check for already used benutzerfunktionen in another vb 2023-11-20 09:19:32 +01:00
Andreas Österreicher 72210867a5 Suche an neue Vertragsstruktur angepasst und Feature-Toggle Config
hinzugefügt zum Umschalten zwischen alter und neuer Vertragsstruktur
2023-11-17 14:43:23 +01:00
Andreas Österreicher 9f2eeabdd1 BIS-Verwendung aus Lehrtaetigkeitsbestaetgung entfernt da nicht vewendet 2023-11-17 14:07:18 +01:00
Andreas Österreicher 66d8db7987 Berechtigung für Zugriff auf HR Schema für Web User hinzugefügt 2023-11-17 13:55:32 +01:00
cgfhtw a82df1058d Phrasen Plugin: async loadCategory function & use Vue.computed() 2023-11-16 15:23:40 +01:00
KarpAlex cf85cb084f dbupdate habilitation: added file to dbupdate3.4, code formatting 2023-11-15 20:51:44 +01:00
ma0068 9fdef54efc Funktion json2odt für newline Qualifikationsziele 2023-11-15 14:24:47 +01:00
ma0068 dc76ae8506 neue Tags addon_aktiv und lernergebnisse 2023-11-15 09:44:25 +01:00
Harald Bamberger f9cf1a5b32 change perstistenceID to force new settings in browser localstorage 2023-11-14 22:55:29 +01:00
Harald Bamberger b7c60fe1ef Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of github.com:FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-14 14:09:16 +01:00
Harald Bamberger 98eb3fbd8b exclude werkvertrag from overlap check 2023-11-14 14:09:06 +01:00
Andreas Österreicher 7f3b1417fd Neuen Gehaltstyp für Zusatzvereinbarung hinzugefügt
Anpassung am Gehaltsimport:
- All-In Bestandteile werden als Zulage importiert
- Zusatzvereinbarungen im neuem Typ Zusatzvereinbarung
- Import funktioniert jetzt auch für Personen die ihr DV nicht mit
  Monatsersten starten sondern ein paar Tage später
2023-11-14 13:37:03 +01:00
Harald Bamberger d6ce81462f Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of github.com:FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-14 10:36:25 +01:00
Harald Bamberger 7640d4024f alter handling of benutzerfunktion and vertragsbestandteilfunktion 2023-11-14 10:36:01 +01:00
ma0048 1b19c2c306 - feature-34579
- gehaltsabrechnung umbenannt
- historie uid hinzugefuegt
2023-11-13 14:21:35 +01:00
cgfhtw 5b2bfb9340 Code optimizing 2023-11-13 09:52:04 +01:00
Harald Bamberger f2208aa684 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-10 17:01:37 +01:00
Harald Bamberger 89c546f74f fix resize-handle in right column header 2023-11-10 15:29:50 +01:00
Harald Bamberger 18f36c9d23 update tabulator5 to version 5.5.2 to get better behaviour of frozen right column 2023-11-10 15:16:40 +01:00
cgfhtw cb009529af Mixin auf Plugin ändern 2023-11-10 14:46:18 +01:00
cgfhtw e56ccffe8d Bugfixes: Studstatus 2023-11-10 14:30:41 +01:00
cgfhtw 479d1a900f Orgform PDFs 2023-11-09 14:19:36 +01:00
Harald Bamberger 1d2a92f37f Merge branch 'feature-34545/Bug_StudStatus_Orgform_falsch' 2023-11-09 13:46:07 +01:00
cgfhtw 46855c9547 Blacklist für Noten 2023-11-09 13:37:56 +01:00
cgfhtw 85f178fcf3 remove var_dump 2023-11-09 13:26:54 +01:00
Cris 9111a10414 Changed Tabulators new-Button to btn-primary color 2023-11-09 12:25:44 +01:00
Cris 410dc022d4 Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-09 12:21:30 +01:00
Harald Bamberger 441a95de7e Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-11-09 12:12:26 +01:00
Harald Bamberger 4bfc26006b Merge branch 'feature-28886/Filter_Component_vs_Table_Component' 2023-11-09 11:48:51 +01:00
KarpAlex 3a8216577f added column habilitation to tbl_mitarbeiter 2023-11-09 10:53:04 +01:00
Harald Bamberger 95fa0cfbf6 change date handling benutzerfunktion 2023-11-08 11:57:57 +01:00
cgfhtw 05744f3921 Bugfix 2023-11-08 09:35:23 +01:00
Werner Masik 3b5f2e6494 added delete for Gehaltsabrechnung 2023-11-08 09:22:14 +01:00
Harald Bamberger 178a383c04 fix typo 2023-11-07 16:26:18 +01:00
Harald Bamberger e4a99b4c84 upgrade datepicker to version 7.2.0, change Dienstverhaeltnis class to honor checkoverlap flag 2023-11-07 11:04:39 +01:00
Werner Masik a806df72e8 increased REST TIMEOUT constant to 5000 2023-11-07 10:52:01 +01:00
Werner Masik 9c1cc947e6 removed superfluous library for multiselect 2023-11-07 10:46:38 +01:00
Werner Masik 624df81da1 add primevue multiselect 2023-11-07 10:33:37 +01:00
Andreas Österreicher fad475fb64 Fixed Loading Lehraufträge with Postgresql 15 2023-11-06 09:00:28 +01:00
ma0048 e0a2fba209 - erhoehte studiengebuehr hinzugefuegt & filter 2023-11-03 11:37:58 +01:00
ma0048 6e18d2ee2b - rt verwaltung message an prestudent 2023-11-03 11:22:27 +01:00
Harald Bamberger c7508d2b8c Merge branch 'master' of github.com:FH-Complete/FHC-Core 2023-11-02 16:50:06 +01:00
Harald Bamberger c12169557b rename vuepic/vue-datepicker to vuejs/vuedatepicker 2023-11-02 16:49:38 +01:00
Harald Bamberger 5a8a7d2401 add multiselect used by pv21 2023-11-02 08:19:33 +01:00
Harald Bamberger f956db5889 Merge branch 'feature-34495/LinkSammelmailStgl' 2023-10-31 13:34:57 +01:00
ma0068 8971f79a77 Verwendung von APP_ROOT 2023-10-31 13:23:56 +01:00
ma0068 fdb4eb5e7d Link Stgl Sammelmail 2023-10-31 13:16:25 +01:00
Cris f7ffbfb914 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-10-31 13:01:41 +01:00
Cris d37a8f1357 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-10-31 12:58:03 +01:00
Andreas Österreicher ccace2f826 Fehler beim Laden der Lehrauftragsliste korrigiert mit Postgres15 2023-10-31 11:16:53 +01:00
Cris c494dd1cdc Added handleFormErrors- and resetFormErrors method to FhcAlert Plugin 2023-10-31 10:41:00 +01:00
Cris 5a002c0f04 Minor change: Adapted mail-text 2023-10-31 10:40:06 +01:00
Andreas Österreicher 2254aa3643 Merge branch 'bug-34481/infocenter_bug_rueckstellung' 2023-10-31 08:34:11 +01:00
ma0048 684a741f2a - bugfix 2023-10-31 08:33:10 +01:00
Harald Bamberger f53bca1ba6 Merge branch 'feature-33948/Studstatus_CSV_Export' 2023-10-27 10:47:10 +02:00
Harald Bamberger 2ed6f30bea Merge branch 'feature-33947/Studierendenantraege_SammelmailAnAssistenz' 2023-10-27 10:45:35 +02:00
Cris fbb00be7cd Added slot 'search' to Filterwidget.js
Slot to inject a autoselect / inputfield to search tabulator, if tabulator should stay empty until search results are provided. (Example: performance reasons if too many data; search for multiple at once)
2023-10-25 12:55:35 +02:00
Cris c6d82fe029 Minor style change of confirmDelete message 2023-10-25 12:49:37 +02:00
Cris 6b2150b066 Fixed: unknown 'fhcerror' to this 2023-10-25 12:48:00 +02:00
Cris 007ee49844 Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-10-24 15:51:10 +02:00
cgfhtw 73cbaf77f1 CSV Options adjusted for German MS Office 2023-10-24 14:16:13 +02:00
cgfhtw 22453c71b4 fhcAlert: slight improvements 2 2023-10-24 13:35:50 +02:00
cgfhtw d57fd9eb60 fhcAlert: slight improvements 2023-10-24 12:23:12 +02:00
ma0068 aead4f3380 Assistenz als CC zu SammelmailSTGL hinzugefügt 2023-10-24 10:44:17 +02:00
Harald Bamberger 05e2808f00 add Models for Vertragsbestandteiltyp and VertragsbestandteilFreitexttyp, implement IValidation Interface on AbstrcatBestandteil, add OverlapChecker checking for overlapping VBs against DB 2023-10-23 17:58:18 +02:00
KarpAlex c9331771b3 lock Prestudentstatus after Bismeldestichtag in FAS: possible to edit student with prestudentstatus check permission, all fields are greyed out when not editable, changed BIS-Meldestichtagsverwaltung menu point text 2023-10-23 16:39:33 +02:00
Andreas Österreicher dc496deadd Merge branch 'bug-33290/ZeitsperreEndeDatumFehlenderMaxwert' 2023-10-23 16:18:54 +02:00
Andreas Österreicher ecba22acfc Merge branch 'master' of github.com:FH-Complete/FHC-Core 2023-10-23 15:03:21 +02:00
Andreas Österreicher 01ca583167 Vertragsstunden werden auf 2 Nachkommastellen gerundet anstatt auf 1 2023-10-23 15:02:34 +02:00
ma0048 a1ee027ea4 - phrasen 2023-10-23 09:51:04 +02:00
Harald Bamberger 548a3e39b9 change label 2023-10-20 15:50:48 +02:00
Harald Bamberger 479df7189c add oetyp to oe and kst labels in search results 2023-10-19 16:38:15 +02:00
cgfhtw b01cd99a93 Plugin: Fhc Alert 2023-10-19 14:10:55 +02:00
Harald Bamberger eee6f918cd add oe_typ_kurzbz and oe_typ_bezeichnung to use in labels 2023-10-19 13:05:02 +02:00
ma0048 6a008fc5da - filter hinzugefuegt 2023-10-17 16:38:05 +02:00
Cris c0b4ad2633 Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-10-17 11:38:29 +02:00
Cris d85bbac19b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-10-17 11:32:01 +02:00
Cris 0f80b9d31b Added Primevue-Toast and -Confirmdialog libraries to FHC-Footer 2023-10-17 11:30:35 +02:00
Harald Bamberger 1bc957821e Merge branch 'bug-29815/ModifyCoodleIcalTerminbestaetigungen' 2023-10-17 07:27:30 +02:00
Andreas Österreicher 22d3b08a06 Escaping von LVs mit Sonderzeichen 2023-10-16 11:08:34 +02:00
Andreas Österreicher 60ee3ec8f0 UID Generierung bei Incoming um Nachname, Vorname ergänzt 2023-10-16 10:26:23 +02:00
Harald Bamberger dcb308a535 change datum_von of benutzerfunktion if vb gueltig_ab is earlier 2023-10-13 16:45:30 +02:00
Harald Bamberger 52dd2c56a2 Merge branch 'bhdev-studstatus' 2023-10-12 16:24:20 +02:00
Harald Bamberger d06819f25f comment out info_ studierendenantrag phrase 2023-10-12 16:07:20 +02:00
Harald Bamberger b5c0c14e2a fix typo 2023-10-11 19:20:40 +02:00
Andreas Österreicher 41a51ee286 Allin und Befristung wird mit Titel und Anmerkung migriert 2023-10-11 16:50:18 +02:00
Harald Bamberger 7042427110 fix sql _mitarbeiter_ohne_zuordnung 2023-10-11 16:11:19 +02:00
cgfhtw 56f26e6ebe Bugfix: FilterCmpt: reload function 2023-10-11 15:39:14 +02:00
cgfhtw 9d31cdffe6 Bugfix: handle reload event of Table.js 2023-10-11 14:59:54 +02:00
cgfhtw 95d3b6ac5b Bugfix: Phrasen: local variable has overwritten function parameter 2023-10-11 14:57:44 +02:00
cgfhtw af89ec3942 Bugfix: Phrasen: local variable has overwritten function parameter 2023-10-11 14:44:24 +02:00
cgfhtw c3b6a77dad switch visibility only for not frozen columns with title 2023-10-11 13:18:33 +02:00
cgfhtw 16fdb0de69 cleanup 2023-10-11 13:17:45 +02:00
cgfhtw 9db6874dc4 CSS for tabulator 2023-10-11 13:17:32 +02:00
cgfhtw ebdd6a2040 Bug: Wiederholer Reminder werden nicht versandt - Fehlerquelle Datumsbereich wenn Prüfungen mehr als ein Monat verteilt 2023-10-10 14:16:32 +02:00
cgfhtw 6137cf3347 Remove unnecessary comment 2023-10-10 14:11:21 +02:00
cgfhtw b5ce0ba7ed Remove unnecessary comment 2023-10-10 13:12:51 +02:00
cgfhtw 5010a1653a cleaner config 2023-10-10 13:09:43 +02:00
cgfhtw 0a25982fa2 Do not allow frozen columns to be invisible 2023-10-10 13:09:28 +02:00
cgfhtw c5b246dc8e CSS table row hovering 2023-10-10 13:08:43 +02:00
Werner Masik 229d34d168 phrases update 2023-10-09 20:29:54 +02:00
Werner Masik 15225d0b03 added Benutzerfunktion CRUD methods 2023-10-09 20:29:54 +02:00
Werner Masik bf85534011 phrases update 2023-10-09 20:29:54 +02:00
Werner Masik 2298823f70 added phrarses for job functions 2023-10-09 20:29:54 +02:00
Harald Bamberger a4d0653c44 add IF NOT EXISTS to schema and extension creation 2023-10-09 15:49:59 +02:00
cgfhtw 17d5cff178 slightly better css 2023-10-09 15:13:00 +02:00
KarpAlex af678b3c56 added vue datepicker to composer 2023-10-09 14:29:38 +02:00
Harald Bamberger 2a72d48dea update composer.lock for php7.0 2023-10-09 11:48:50 +02:00
Harald Bamberger c1a53a1be3 do not use phrases from FHC_JS_PHRASES_STORAGE_OBJECT at all 2023-10-09 11:47:02 +02:00
Harald Bamberger 4cc8b555d2 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-10-09 11:38:37 +02:00
Harald Bamberger 3ab8fd22f4 minor layout changes 2023-10-06 20:22:05 +02:00
ma0068 23aeba4620 Verwendung von datetime-funktionen anstelle von strtotime, Adaptierung config-eintrag, update Phrasen 2023-10-06 12:30:14 +02:00
ma0048 e30ad887c9 - msg an alle moeglich 2023-10-05 10:26:19 +02:00
Andreas Österreicher cda93ce85b Fixed PHP81 Warning on Loading Adresses 2023-10-05 08:14:32 +02:00
Harald Bamberger c1171bc716 add user_language to FHC_JS_DATA_STORAGE_OBJECT 2023-10-04 12:20:44 +02:00
Harald Bamberger b618ad247a Merge branch 'feature-33459/Studierendenstatusverwaltung_Unterbrechung_Studiensemester' 2023-10-02 16:45:44 +02:00
ma0048 6c8b3b4ec4 - nur an markierte msg moeglich 2023-10-02 14:12:03 +02:00
cgfhtw ad191f3f90 Optische Verbesserungen select field 2023-10-02 11:06:53 +02:00
cgfhtw 54bcf83781 s&d 2023-10-02 11:06:34 +02:00
Werner Masik cc7067d8e5 updated phrases 2023-09-29 15:28:19 +02:00
Andreas Österreicher c828fe2ee4 Version für Legacy BPK Schnittstelle angepasst 2023-09-29 12:58:30 +02:00
ma0048 dc78660433 - fix for fas 2023-09-29 09:49:12 +02:00
ma0068 8fe72ebcf5 neues Element last_prestudentstatus for studienerfolg.xml 2023-09-28 16:47:44 +02:00
Harald Bamberger a237cb1808 check if there are any entries 2023-09-28 15:58:35 +02:00
Harald Bamberger af3588aa61 revert commented lines for the moment until there is a better solution 2023-09-28 15:45:03 +02:00
Harald Bamberger 867a1e94c7 Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' 2023-09-28 14:37:04 +02:00
Harald Bamberger 137c5f28ec modify Phrasen.js so that it can be used by composition api and does not use legacy categories at all 2023-09-28 14:27:35 +02:00
ma0068 f9af5638f5 Update Config: Format in Tagen für Validierung JS 2023-09-28 09:31:40 +02:00
KarpAlex 285af0a7f4 composer: updated datepicker 2023-09-27 13:52:31 +02:00
ma0048 2d963c92cc - msg aus rtverwaltung moeglich 2023-09-27 10:38:44 +02:00
ma0068 4fcf4a57d1 Adaptierung rdfs mit CDATA 2023-09-27 09:57:39 +02:00
ma0068 1809ff3008 accept days, weeks, month and years in config 2023-09-27 08:30:03 +02:00
Werner Masik 909fc896cd added phrases 2023-09-26 22:38:12 +02:00
Werner Masik 5827bde6b0 update phrasen 2023-09-26 15:27:50 +02:00
Werner Masik 822e269f88 add composable wrapper for phrasen mixin 2023-09-26 15:25:49 +02:00
Harald Bamberger f5bbc8a0c0 do not use category from window.FHC_JS_PHRASES_STORAGE_OBJECT since it is propably not complete 2023-09-26 15:11:16 +02:00
Harald Bamberger 67a61c5d2a add phrase to try vue Phrasen 2023-09-26 11:46:48 +02:00
Harald Bamberger f3809b01b2 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-09-26 11:14:47 +02:00
Harald Bamberger 5febccba8a port phrases mixin and Endpoint from branch feature-27351/Digitalisierung_Formulare_Neu 2023-09-26 11:12:15 +02:00
Harald Bamberger d8bd100dbb Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu 2023-09-25 16:53:33 +02:00
Harald Bamberger 31426d3c5e Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu 2023-09-25 16:50:40 +02:00
KarpAlex 972e9b7025 UHSTAT1 form: nations with sperre = true are not loaded 2023-09-25 16:45:39 +02:00
ma0068 be3e4e552b Adapt diffTageMax 2023-09-25 15:44:48 +02:00
ma0068 b1f3916e49 Adaptierung bismax-Validierung 2023-09-25 15:33:17 +02:00
ma0068 746ee76a3b Validierungen Von- und Bis-Felder vilesci 2023-09-25 15:11:14 +02:00
ma0068 f71b0e500e Adaptierung Berechnung diff 2023-09-25 14:15:33 +02:00
ma0068 9eeeeca62c Fix format 2023-09-25 09:54:49 +02:00
ma0068 9b11b19cf9 Zeitsperre: Maxwert bei Bisdatum 2023-09-22 13:33:54 +02:00
Cris 4e11e12c99 Removed aktiv column from SoftwareManagement Filter
Not used anymore.
2023-09-21 14:40:50 +02:00
Cris fa3a718ad4 Added getAutocompleteSuggestions method to OE Model
Get OEs by eventQuery string. Use with autocomplete event queries.
2023-09-21 14:40:05 +02:00
ma0068 e886b4742b Neue Mailvorlagen Sancho_Mail_Antrag_U_Student(SB) 2023-09-19 14:56:30 +02:00
Harald Bamberger 9bfcbf3bf1 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-09-19 11:06:32 +02:00
Harald Bamberger cbe73ae37c Merge branch 'feature-31018/pv21_stundensaetze' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-09-19 10:42:11 +02:00
Andreas Österreicher 4242f75fde Hiweistext bei Geburtsdatumsformat korrigiert bei Testclient 2023-09-18 12:35:45 +02:00
Andreas Österreicher 47c956bf1e Geburtsdatum Format korrigiert 2023-09-18 12:22:21 +02:00
ma0068 cdb351b66b Delete Testdata and outputs 2023-09-18 10:37:14 +02:00
Andreas Österreicher 418a149840 Merge branch 'TechnikumWienAcademy-master' 2023-09-14 13:12:08 +02:00
ma0048 91f3197c24 - added link option
- styling
2023-09-14 11:56:26 +02:00
nkrondraf e8c7ecf1ee Besuch der LV kann nun 3 Semester in Vergangenheit liegen für Prüfungsanmeldung 2023-09-14 10:50:04 +02:00
nkrondraf 2a77fb361a raise version number of API to 0.6 2023-09-14 10:32:09 +02:00
Andreas Österreicher 96f8ee33a9 Merge branch 'feature-29835/UHSTAT1_Erfassung_der_UHSTAT1_Daten_ueber_das_Bewerbungstool' 2023-09-12 11:05:37 +02:00
Werner Masik 2c92ec3e60 added overlaypanel and datatable 2023-09-07 22:29:29 +02:00
Andreas Österreicher 38da37980d Fehlerhaftes Escaping korrigiert damit inserts mit
standard_conforming_strings funktioniert
2023-09-07 15:34:55 +02:00
Andreas Österreicher 6fba58c113 Merge branch 'master' into feature-29835/UHSTAT1_Erfassung_der_UHSTAT1_Daten_ueber_das_Bewerbungstool 2023-09-07 14:56:18 +02:00
ma0048 0e1f4148f5 - anpassungen fuer bewerberautofill 2023-09-07 14:34:20 +02:00
KarpAlex 4175ecc209 UHSTAT1 form: added firstname and lastname of student 2023-09-05 16:49:19 +02:00
Andreas Österreicher 3e7abf9a45 Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung 2023-09-05 14:33:31 +02:00
ma0048 07deb7b6c5 - textanpassung 2023-09-04 13:34:42 +02:00
cgfhtw 7f0d716bd8 Finale Finalisierung Emailvariablen 2023-08-31 09:25:17 +02:00
cgfhtw 60246100e6 Bugfix: missing phrases 2023-08-31 09:24:43 +02:00
cgfhtw f81c9939f7 config default wert korrigiert 2023-08-31 08:39:21 +02:00
ma0068 1b1f45e690 bugfix Studiengang 2023-08-31 08:33:17 +02:00
Andreas Österreicher fc4915a6ee Merge branch 'feature-32834/infocenter_zusammenfuehren' 2023-08-31 08:11:22 +02:00
Andreas Österreicher ca79bb1f82 Merge branch 'TechnikumWienAcademy-master' 2023-08-30 16:22:04 +02:00
Nikolaus Krondraf 2fe9bda46b längeres Gültigkeitsdatum hinzugefügt 2023-08-30 14:40:52 +02:00
ma0068 20aaefffb1 Finalisierung Emailvariablen 2023-08-29 16:50:02 +02:00
Andreas Österreicher 86aac2388d Als Admin wird nun die Buchungsnummer im Konto Karteireiter im FAS
angezeigt damit diese einfach kopiert werden kann
2023-08-25 11:04:06 +02:00
Andreas Österreicher f3453670b3 Problem behoben wodurch der Plausicheck abgebrochen hat wenn
Studiengänge für den GebDatum Check exkludiert wurden.
2023-08-25 09:50:37 +02:00
Manfred b23eaa2967 Merge remote-tracking branch 'origin/master' 2023-08-24 14:28:58 +02:00
Manfred 6e2c5acc6f Eintrag Archiv für AbschlussdokumentLehrgaenge 2023-08-24 14:28:46 +02:00
ma0048 f8bbdf4b35 Merge remote-tracking branch 'origin/feature-28746/reihungstestjob_fallweise_wird_anzahlung_f_studienbeitrag_buchung_nicht_angelegt' into infocenter_2023_08_24 2023-08-24 11:00:34 +02:00
ma0048 a2a645b7c7 Merge remote-tracking branch 'origin/feature-29529/infocenter_anpassungen' into infocenter_2023_08_24
# Conflicts:
#	system/dbupdate_3.4.php
2023-08-24 11:00:16 +02:00
ma0048 2dbbadea2e Merge remote-tracking branch 'origin/feature-30956/auswertung_reihungstest_excel_problem' into infocenter_2023_08_24 2023-08-24 10:59:16 +02:00
ma0048 0f5c261528 Merge remote-tracking branch 'origin/feature-30693/infocenter_aufgenommen_filter' into infocenter_2023_08_24 2023-08-24 10:56:18 +02:00
ma0048 b93cfbfa9e Merge remote-tracking branch 'origin/feature-27691/sammeltask_aenderung_bewerberdefinition' into infocenter_2023_08_24 2023-08-24 10:56:04 +02:00
ma0048 7609554a74 Merge remote-tracking branch 'origin/feature-26667/reihungstestanmeldung_fuer_master_interessentinnen_ueber_online_bewerbungstool' into infocenter_2023_08_24 2023-08-24 10:55:47 +02:00
ma0048 26e63160ba - bug fix, bescheibung 2023-08-24 10:38:46 +02:00
ma0048 7c365cea81 - title aenderung 2023-08-24 08:01:36 +02:00
ma0048 db96dd1388 - bug fix 2023-08-24 07:56:49 +02:00
Manfred c440711145 Teilgebiete-Übersicht mit Spalten mehrsprachig und Offset 2023-08-22 15:53:19 +02:00
Andreas Österreicher 16366d976d Merge branch 'bug-32636/maillib_email_number_per_time_range' 2023-08-22 15:51:39 +02:00
Manfred ac945ab540 studiensemester_kurzbz in GET-Parameter eingefügt 2023-08-22 15:51:17 +02:00
Andreas Österreicher 0b51239f8c Fixed SQL Error when sending Anrechnungen Recommendation Reminder 2023-08-22 15:24:12 +02:00
Andreas Österreicher 45816c0352 Merge branch 'feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende' 2023-08-22 14:50:32 +02:00
Andreas Österreicher 73a9d34fba Merge branch 'feature-29838/Anrechnungen-Sammelmail-fuer-LV-Leitung' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende 2023-08-22 14:42:52 +02:00
Andreas Österreicher ac10473b08 Merge branch 'master' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende 2023-08-22 14:40:56 +02:00
Andreas Österreicher 571ae5f6e5 Merge branch 'master' into feature-29838/Anrechnungen-Sammelmail-fuer-LV-Leitung 2023-08-22 14:40:23 +02:00
Cris 057b003977 Merge remote-tracking branch 'origin/feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende
# Conflicts:
#	system/phrasesupdate.php
2023-08-22 13:42:32 +02:00
cgfhtw e6be6e19d1 Abmeldung PDF-Vorlage: Studiensemester added 2023-08-22 11:30:54 +02:00
cgfhtw 754ed07621 anzeige Lehrverband nach setUnterrbrecher im Fas 2023-08-22 11:18:47 +02:00
cgfhtw bf6fc52fcf Studierendenseite: Reihenfolge WH, Unterbrechung, Abmeldung; wording von du du auf indirekt 2023-08-22 11:18:35 +02:00
cgfhtw 294bfeb2e4 Sancho Mail Antrag_W_Student
Aufnahme der angerechneten bzw. neu zu absolvierenden LVs
2023-08-22 11:18:05 +02:00
cgfhtw b9bf2487c2 Stg-Ansicht: Status styled as link
Stg-Ansicht: Status styled as link
2023-08-22 11:13:56 +02:00
cgfhtw 8da161120f Abmeldung (Stg): Suche auch nach student_uid 2023-08-22 11:11:38 +02:00
ma0048 f9f0e238c6 - bug fix 2023-08-22 10:58:23 +02:00
ma0068 b468f01d0e Lv-zuweisung Breite vergrössert, Prestudent Status Unterbrechungssemester vor Vorrückung 2023-08-18 11:34:38 +02:00
Werner Masik 799911b948 added method to fetch DV by ID 2023-08-17 16:14:53 +02:00
ma0068 376ce0e440 WH: nur positive Noten bei intern angerechnet zulassen 2023-08-17 14:13:30 +02:00
ma0068 4a505631de Kein Verzicht bei Wiederholung 2023-08-17 13:54:34 +02:00
ma0068 1d938ea33d Anzeige following Studiensemester Wiedereinstieg 2023-08-17 13:46:58 +02:00
ma0068 70aa0a9c9c neue Mail an Assistenz: AbbrecherStgl 2023-08-17 13:18:06 +02:00
ma0068 743ba83148 Anzeige Studiensemester Abmeldung 2023-08-17 11:18:51 +02:00
ma0068 c7d2608cce Adaptierung Buttons: Zurückziehen Stgl und Ausblenden Anträge STGL nicht genehmigt Studentview 2023-08-17 11:10:09 +02:00
ma0068 672ee59ba5 neuer Hinweistext mit Einspruchsfrist für Abmeldung Stgl 2023-08-17 10:34:28 +02:00
cgfhtw 95e8859896 Bug Hotfix 2023-08-17 09:50:33 +02:00
ma0068 9aa5f701f7 phrasenupdate 2023-08-17 09:24:15 +02:00
ma0068 fcd3733f3c AbmeldungStgl GrundDropdown 2023-08-17 09:12:30 +02:00
KarpAlex fab1022c49 tbl_uhstat1daten: added primary key, removed abgeschicktamum (instead: own sync table) 2023-08-16 17:40:00 +02:00
KarpAlex b8aadab509 UHSTAT1 form: add insertamum and insertvon when inserting data 2023-08-16 11:12:09 +02:00
Harald Bamberger 08f79b69cb Merge branch 'feature-25003/NotenimportFuerNachpruefung' 2023-08-16 08:11:10 +02:00
Harald Bamberger 7bc1e8cdd9 Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung 2023-08-16 07:57:56 +02:00
KarpAlex e784400943 uhstat1 data save: added uid 2023-08-16 01:21:05 +02:00
KarpAlex 8122ab0292 simplified error message for invalid status dates 2023-08-15 19:27:39 +02:00
KarpAlex c62198b4b5 UHSTAT form: added delete button for employees with permission, edit and delete buttons are only shown if user has permission 2023-08-15 18:27:30 +02:00
KarpAlex d200fc1961 bis tbl_uhstat1daten: added insertamum, insertvon, updateamum, updatevon and abgeschicktamum 2023-08-15 17:19:12 +02:00
ma0048 c4377010b1 - pv21 stundensaetze hinzugefuegt 2023-08-14 14:14:37 +02:00
ma0048 913f45fcda - auswertung_fhtw um studiengang typ erweitert 2023-08-14 11:53:36 +02:00
KarpAlex 3ea74ab23c Bismeldestichtage GUI: improved datepicker, correct Studiensemester sort, insertamum is set when inserting 2023-08-10 23:15:44 +02:00
Cris e1c23fc6fa Added Filter ImageVerwaltung 2023-08-10 11:34:54 +02:00
cgfhtw 353e2deaf7 AbortController 2023-08-10 11:02:45 +02:00
Harald Bamberger 597e074bbd Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-08-09 11:13:02 +02:00
Cris b7a3d2dcb4 Removed column 'actions' from filtersupdate 2023-08-09 10:57:06 +02:00
Cris 49e4aa78e9 Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-08-09 10:43:57 +02:00
cgfhtw f9be090bbf Studierendenansicht: nur STGs anzeigen bei denen ein Status "Student" vorhanden ist. 2023-08-08 16:59:42 +02:00
cgfhtw b77e715bdb Font Awesome + Buttons in Studierendenansicht korrigiert 2023-08-08 16:26:15 +02:00
cgfhtw c9e947831e PDF Unterbrechung: Auch in status EmailVersandt abrufbar 2023-08-08 16:16:09 +02:00
cgfhtw 44141ce8d8 PDF Download "Abmeldung durch Stgl" 2023-08-08 16:08:15 +02:00
cgfhtw 9dc36af7fc Umlaute & Genehmigt => Bestätigt 2023-08-08 15:37:20 +02:00
cgfhtw 5c018e204e Lv Popup optische Verbesserungen 2023-08-08 15:12:23 +02:00
cgfhtw 61c6245e1a Phrasen: Antrag => Bekanntgabe 2023-08-08 14:39:05 +02:00
cgfhtw da0dc0e053 Missing Phrase Category in Controller 2023-08-07 13:05:13 +02:00
KarpAlex 4a2cdaf52a added primevue autocomplete 2023-08-04 14:46:53 +02:00
cgfhtw d0d42a6a15 Unterbrecher - Wiedereintrittssemester Dropdown 2023-08-04 14:11:03 +02:00
Harald Bamberger 9550457b24 Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu 2023-08-03 18:20:05 +02:00
Harald Bamberger d1eaebba33 Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu 2023-08-03 18:18:43 +02:00
Cris 56230e3752 Changed button-color of Tabulators Header-'ADD Button' to primary color 2023-08-03 09:45:45 +02:00
Cris 4e17be39f6 Added column 'actions' to filtersupdate 2023-08-03 09:44:28 +02:00
KarpAlex 2f001987f3 Filter.js additional columns: additional columns are displayed based on field name, not title 2023-08-02 19:14:58 +02:00
Manfred d689e8fb2f Tablesorter, Datepicker und Spalte mit Lehrform in ueberbuchung.php 2023-08-02 18:24:11 +02:00
KarpAlex 553f2feaa4 filter component: enabled nested tabulator 2023-08-02 16:22:10 +02:00
Cris b70011436e Added column 'softwarestatus_kurzbz' to filtersupdate 2023-08-02 13:39:47 +02:00
KarpAlex d50ba773fe UHSTAT 1 form: correct authentification (from bewerbungstool or with permission), beautified success and error messages, added Rechtsbelehrung, simplified parameter checking 2023-08-01 19:26:36 +02:00
Manfred 392112977c Merge remote-tracking branch 'origin/master' 2023-08-01 18:24:44 +02:00
Manfred f5703a2438 Kleine Anpassungen Testtool-Auswertung
- %-Spalte in Auswertung Detail
- Vorschlag-Nummer in Auswertung_detail_frage
2023-08-01 18:23:24 +02:00
Harald Bamberger 8eeb0d9ca7 gehaltsbestandteillib set uid to pgsql 2023-08-01 14:37:07 +02:00
Harald Bamberger c8703d3215 write current uid to pgsql settings variable 2023-08-01 13:03:05 +02:00
Cris b5a81b540f Added Begruendung ECTS and Begruendung LV Inhalt to STGL- and Lectors Detail-Views 2023-07-31 13:53:24 +02:00
Cris 4c75f908b9 Added card 'ECTS Berechnung Referenzbeispiele' to Infobox 2023-07-31 12:50:06 +02:00
Cris 83bf874156 Removed link 'ECTS Berechnung Referenzbeispiele' 2023-07-31 12:48:56 +02:00
Paolo 043a2538b7 Updated 2023-07-31 12:12:59 +02:00
Cris dd392caef7 Adapted max/min length for Begruendung ECTS and Begruendung LVinhalt 2023-07-31 11:44:19 +02:00
Cris 096b436d54 Added phrases for Begruendung ECTS and Begruendung LVinhalt 2023-07-31 11:43:24 +02:00
Cris 44182af5fa Formatted Tabulator Header: Abstaende vergroessert
Abstand Titel zu Actionbuttons und zwischen Actionbuttons untereinander vergroessert
2023-07-31 09:30:45 +02:00
cgfhtw af24ef1517 Bug: neue Unterbrechung 2023-07-31 09:08:33 +02:00
KarpAlex cfb034bc69 uhstat form: disabled input fields if uhstat entry already saved 2023-07-28 22:39:50 +02:00
KarpAlex 349e9b9442 UHSTAT1 form: removed geburtsstaat from database table, data is shown if uhstat entry already exists 2023-07-28 22:15:26 +02:00
KarpAlex 1e082ed225 UHSTAT1 form: removed geburtsnation as it is saved in person table anyways, started to display existing uhstat data on form load 2023-07-27 17:13:31 +02:00
KarpAlex 459f068765 bismeldestichtag gui: added icon to delete button, added id field 2023-07-26 20:59:05 +02:00
Harald Bamberger 270c9e1741 remove hasSequence again to avoid error, check vbs basedata and specialdata if not empty before update 2023-07-26 19:23:31 +02:00
Harald Bamberger 3eaefc88bd set hasSequence correct 2023-07-26 18:40:37 +02:00
Harald Bamberger bbe1fe2d49 refactor markDirty check 2023-07-26 17:41:23 +02:00
Harald Bamberger 18e82225ce handle vertragsbestandteil_kurzbz different for insert and update 2023-07-26 17:28:37 +02:00
Harald Bamberger ac5d6071cd extend VerttragsbestandteilLib to keep track on modified columns and only update dv, vbs and gbs when they differ from the status in the db 2023-07-26 16:27:34 +02:00
ma0048 91f79b2021 - aufgenommen filter infocenter fuer lehrgaenge 2023-07-26 13:27:51 +02:00
cgfhtw 02b64ad6a7 Assistenz kann eigene Abmeldungen Zurückziehen 2023-07-25 13:59:18 +02:00
cgfhtw 7239113847 Optionaler Grund bei Einspruch ablehnen 2023-07-25 13:42:38 +02:00
cgfhtw 8c98cea114 semicolon 2023-07-25 13:37:03 +02:00
ma0068 6eaa8c4c01 Codesniffer and MassDetector 2023-07-24 16:04:46 +02:00
KarpAlex f5ace15f7b added phrases to UHSTAT1 form 2023-07-24 14:15:22 +02:00
Cris 74b1ca0614 Added phrases for Begruendung ECTS and Begruendung LVinhalt 2023-07-24 10:24:21 +02:00
cgfhtw 5d97abc6ac Mails 2023-07-20 16:55:09 +02:00
cgfhtw b4370ece82 Comment added 2023-07-20 15:07:46 +02:00
cgfhtw 8923a099cc Sammelmail Stgl & Calltoactions in Student view 2023-07-20 15:04:49 +02:00
cgfhtw 5670bac3f6 Don't allow canceling of Stg Abmeldungen 2023-07-20 15:04:18 +02:00
cgfhtw 35d01b042e Bug canCancel in abmeldung->edit missing 2023-07-20 15:00:42 +02:00
Cris 110d6bace3 Adapted backend logic to save/retrieve begruendung_ects and begruendung_lvinhalt 2023-07-20 13:42:53 +02:00
Cris 54d819e1ea Adapted GUI to display and save begruendung_ects and begruendung_lvinhalt 2023-07-20 13:38:52 +02:00
Cris 8bb3b6d53c DB Update: added 2 attributes to tbl_anrechnung
- begruendung_ects (text)
- begruendung_lvinhalt (text)
2023-07-20 10:48:03 +02:00
Cris 550df4fbd8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-07-19 15:56:49 +02:00
Cris 1aae75312e Merge remote-tracking branch 'origin/feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-07-19 10:30:31 +02:00
KarpAlex d88ff104a3 filter component: added property tabulatorAdditionalColumns for displaying additional columns not in filter 2023-07-18 19:11:10 +02:00
Paolo 6a7903ef05 - Changed the controller components/SearchBar.php constructor to _not_ start the authentication when the AuthLib is loaded and to check if the user is logged
- Added constant ERROR_NOT_AUTH to libraries/SearchBarLib.php
2023-07-18 16:01:03 +02:00
KarpAlex c2962f51e1 Bismeldestichtag gui: added vue date picker 2023-07-17 21:03:51 +02:00
ma0068 5e6262da56 Config für Datum Start Digitalisierung, finish handleWiederholerDeadline, start Sammelmail an Stgl 2023-07-17 16:29:03 +02:00
ma0048 5f096b58b7 - STG beim nicht vorhanden Master RT anzeigen 2023-07-17 13:52:06 +02:00
KarpAlex c6fee48c8c bismeldestichtage GUI: correct date format on row click 2023-07-17 12:31:45 +02:00
Paolo 88b01075c4 Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten 2023-07-17 12:13:45 +02:00
KarpAlex 7ab5d3add6 Bismeldestichtage Management GUI: added row delete button 2023-07-17 12:11:15 +02:00
Paolo 75fb0f2d4a - include/filter.class.php -> loadValues now calls the superclass protected method replaceSQLDecryptionPassword to replace password variables with their values
- include/statistik.class.php -> loadData now calls the superclass protected method replaceSQLDecryptionPassword to replace password variables with their values
- Added new functions hasSQLDecryption and isSQLDecryptionValid to include/functions.inc.php
- Script vilesci/statistik/filter_details.php and vilesci/stammdaten/statistik_details.php now do not allow to store SQL strings that contain PostgreSQL decryption functions using a clear password
2023-07-17 12:06:37 +02:00
Paolo 2cc0283d25 Added new protected method replaceSQLDecryptionPassword to include/basis_db.class.php 2023-07-17 12:04:26 +02:00
KarpAlex 68fbc13a69 added first version of uhstat1 form, added unique constraint for person_id in uhstat1daten table, added permissions for uhstat1daten sequence 2023-07-15 19:57:51 +02:00
ma0068 073cd6cb23 neue Tags für Anzeige Semester in Anrechnungen 2023-07-14 14:17:05 +02:00
cgfhtw a96d99bcd1 Sammelmails: draft 2023-07-13 16:51:54 +02:00
cgfhtw a53ca81784 Wording Änderung bei Studierendenansicht Wiederholung 2023-07-13 16:51:14 +02:00
cgfhtw b04aefc105 Unterbrechung nur für das Aktuelle und kommende Semester 2023-07-13 16:13:40 +02:00
Harald Bamberger 2b4a4d12a9 handle empty teilzeittyp_kurzbz 2023-07-13 15:08:51 +02:00
cgfhtw 9d0801676d Bug: Studierenden-Ansicht: Abmeldung bearbeiten bei mehrfachen Abmeldungen 2023-07-13 14:44:51 +02:00
cgfhtw c8fc6c747f Table height & Bug: Allowed/Shown Stgs in Component 2023-07-13 13:57:17 +02:00
cgfhtw f8da119ad7 Abmeldung: Einspruch Abgelehnt handling 2023-07-13 11:48:25 +02:00
Harald Bamberger 545b9cb0de modify searchbar add category for employess without kst and oe assignment 2023-07-13 11:35:42 +02:00
ma0048 3192a1b3f2 - job hinzugefuegt um bewerber status automatisch zu setzen
- fas filter hinzugefugt
2023-07-12 09:47:01 +02:00
ma0068 6f1eed6696 Abbrecher 2dos: Änderungen Wordings, neue Statusgründe preabbrecher, durchStgl, durchStud, update setAbbrecher 2023-07-11 17:01:22 +02:00
ma0048 533291bf33 - bug fix
- neue sortierung
- neue spalte
- sqls abfragen angepasst
2023-07-11 14:17:51 +02:00
ma0068 f438d240f9 Update Wording Antrag -> Verwaltung, Genehmigen-> Bestätigen, Überspringen Button Ausblenden 2023-07-11 13:07:54 +02:00
cgfhtw 1aa78386f4 erledigte TODOs entfernt 2023-07-11 08:33:05 +02:00
Harald Bamberger 02291a51e9 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-07-10 17:21:48 +02:00
Andreas Österreicher f4c8f00c8f Added AuthLib to Searchbar Component 2023-07-10 17:18:30 +02:00
cgfhtw 2213fed5b2 Phrasen 2023-07-10 16:39:20 +02:00
Andreas Österreicher 477da65817 Laden der Organisationseinheiten bei Berechtigungszuordnung behoben 2023-07-10 15:17:09 +02:00
cgfhtw cb1c4d01e0 phrasen: dokumente 2023-07-10 14:45:31 +02:00
cgfhtw 3219f43e6d Fehlerhafte Anzeige bei Download von Anträgen 2023-07-10 14:36:54 +02:00
cgfhtw 25258f7d87 E-Mail Reminder für Wiederholer sollen an die FH Adresse des Studierenden geschickt werden 2023-07-10 14:27:50 +02:00
cgfhtw 15786dd772 CIS URLs in Sancho mails 2023-07-10 14:03:03 +02:00
cgfhtw e6a1ea621e Bug: Semester in PDFs 2023-07-10 13:52:29 +02:00
cgfhtw eee3aa08e4 Zugriffsrechte für Abbrecher & Unterbrecher 2023-07-10 13:52:05 +02:00
Cris 0d690b60b6 Merge remote-tracking branch 'origin/feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-07-10 11:28:31 +02:00
cgfhtw 1006132451 Infomail 2023-07-10 11:19:21 +02:00
cgfhtw 3fce448451 Abmeldung durch Stgl: status => typ 2023-07-10 10:19:06 +02:00
cgfhtw 5eca034911 clean up 2023-07-10 09:29:00 +02:00
cgfhtw 761af30a75 speed up student selection 2023-07-10 09:21:12 +02:00
cgfhtw 573a8d8e33 composer lock 2023-07-10 09:09:46 +02:00
Manfred 1bca1a8dc3 Merge branch 'benutzerberechtigungGUIneu' 2023-07-07 12:48:07 +02:00
Manfred 94ff4b717d Versehentlich gelöschte Zeile wieder ergänzt 2023-07-07 12:46:06 +02:00
KarpAlex b7a1add2f3 bismeldestichtage gui: removed filters, now just simple tabulator 2023-07-07 02:12:14 +02:00
KarpAlex 8a1de56dc2 Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-29144/Prestudent_status_nach_Bismeldung_sperren 2023-07-06 22:54:48 +02:00
Manfred 5e88ccb5d7 Merge branch 'master' into benutzerberechtigungGUIneu 2023-07-06 18:09:45 +02:00
Manfred 9651903200 Diverse Titel und Textkorrekturen bei Rechte-Skripten 2023-07-06 18:08:06 +02:00
Manfred af9418d456 Anmerkung und Insertdaten bei Rolleberechtigung
+ Vergleichsskript für Rechte in einzelnen Rollen
2023-07-06 18:05:24 +02:00
Andreas Österreicher f35f41a049 Merge branch 'feature-29794/Lehrauftraege_Spalte-Stundensatz-fuer-STGL-und-KFL' 2023-07-06 15:44:16 +02:00
Andreas Österreicher 398b9f9d8f Merge branch 'feature-30393/Remove_check_tbl_benutzer.aktiv_in_AuthLib' 2023-07-06 14:14:47 +02:00
Andreas Österreicher cb4ce6dab6 Anzeige Lehre Saldo in der Zeitaufzeichnung deaktiviert 2023-07-06 13:30:43 +02:00
KarpAlex 539efcb6ec added Modal.js to Bootstrap components 2023-07-06 12:03:38 +02:00
Paolo d4450e1ae1 Removed check of the tbl_benutzer.aktiv field in the AuthLib 2023-07-05 15:07:05 +02:00
Andreas Österreicher f7dac04dae Merge branch 'feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen' 2023-07-05 13:36:23 +02:00
ma0068 1e0e93dfa3 Autocomplete Add-Button Finish 2023-07-05 13:20:46 +02:00
cgfhtw 61856473ea Leitungsansicht Autocomplete 1st draft 2023-07-05 08:30:33 +02:00
Harald Bamberger c81404b210 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-07-04 18:12:23 +02:00
Werner Masik 800b490c62 added function to get chart data 2023-07-04 18:10:00 +02:00
cgfhtw 3ca80904ea Verbesserungen Unterbrecher bestätigen 2023-07-04 15:59:43 +02:00
KarpAlex ddf72af139 Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-07-04 14:43:28 +02:00
cgfhtw 3798720ee0 +emit: click:new 2023-07-04 14:38:20 +02:00
Cris 06b929381d Merge remote-tracking branch 'origin/feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	system/filtersupdate.php
2023-07-04 13:48:21 +02:00
cgfhtw 7eed07a682 LV zuweisung & anzeige: handle semester above max_semester & anmerkung bug 2023-07-04 13:37:54 +02:00
KarpAlex fc147f577a filter.js: fix for nested tabulator: set columns before set data, filtersupdate: renamed columns 2023-07-04 12:17:15 +02:00
KarpAlex 388400338e Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software 2023-07-04 12:16:06 +02:00
cgfhtw ff93cb26fe Bug: status 2023-07-04 11:10:26 +02:00
cgfhtw b39fa7667e Remove TODO 2023-07-04 11:09:55 +02:00
cgfhtw 16356d8a5c reverse order setColumns & setData 2023-07-04 10:42:06 +02:00
cgfhtw 64ce3d1f6a Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung' 2023-07-04 10:34:14 +02:00
Andreas Österreicher 51d8a18565 MigrateSalary Problem behoben wodurch das Ende eines Gehaltsbestandteils
nicht korrekt gesetzt wurde wenn mehrere DVs vorhanden sind
2023-07-04 10:30:59 +02:00
Andreas Österreicher ee7fe0251d - Script fuer den einmaligen Import der Gehaelter hinzugefuegt
- Migration der Vertraege angepasst damit alle Mitarbeiter auf einmal
  migriert werden koennen. Anpassung zur Unterscheidung der Zuordnung zum
Unternehmen
2023-07-03 18:32:34 +02:00
KarpAlex 71e86cfcde filter.js bugfixes: saving customfilter, and set columns before data (necessary e.g. for nested tabulator) 2023-07-03 11:45:15 +02:00
Cris d5d7797eb7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-07-03 09:58:54 +02:00
Cris 7356b17688 Added SW-ID column to SW-Table 2023-07-03 09:37:32 +02:00
KarpAlex f6661fabea bismeldestichtage GUI: added delete button again (for now...) 2023-06-30 13:33:52 +02:00
KarpAlex 74814db900 Bismeldestichtag Management: improved GUI layout, studiensemester is optional for "bismeldestichtag reached" check 2023-06-29 19:19:00 +02:00
KarpAlex 18d25069f3 tbl_bismeldestichtag: removed edit permissions for web user 2023-06-29 19:17:38 +02:00
ma0048 f49771ec7f - berechtigungen fuer die sequence hinzugefuegt 2023-06-29 12:10:50 +02:00
KarpAlex 097010290d Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren 2023-06-29 11:47:56 +02:00
Harald Bamberger 2a3eba6441 Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung 2023-06-28 16:26:54 +02:00
KarpAlex 0a961d8e95 UHSTAT1 bis.tbl_abschluss: added default values for in_oesterreich boolean 2023-06-27 11:00:13 +02:00
Andreas Österreicher 5213ab44ff Merge branch 'TechnikumWienAcademy-master' 2023-06-27 09:34:07 +02:00
Andreas Österreicher c89f375015 Removed ServicePing Config for Second LDAP 2023-06-27 09:33:23 +02:00
nkrondraf d6cce60b8f add LDAP service ping configuration to second LDAP server 2023-06-27 08:25:14 +02:00
KarpAlex a54c7a3492 UHSTAT1 data: added tables 2023-06-26 19:15:27 +02:00
Andreas Österreicher efdd81ac0d Problem behoben wodurch keine Fotoliste erstellt werden konnte wenn eine
Person kein Foto hochgeladen hat
2023-06-26 13:45:10 +02:00
Andreas Österreicher 635494b303 Merge branch 'TechnikumWienAcademy-master' 2023-06-26 11:22:18 +02:00
Nikolaus Krondraf e200cd4455 add LDAP service ping configuration 2023-06-26 10:46:45 +02:00
Harald Bamberger fb8172eda1 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-06-22 12:54:48 +02:00
ma0048 a81ceb51b8 - rt sperre vor dem login moeglich 2023-06-22 10:23:00 +02:00
Harald Bamberger 24a29ca565 add validation, use correct function names, add vertragsbestandteil_id to stdclass 2023-06-21 16:47:51 +02:00
Harald Bamberger 1ffab39f05 match naming of properties and db columns 2023-06-21 15:21:42 +02:00
Manfred ee011ef201 OE-Suche verbessert 2023-06-21 11:03:33 +02:00
Andreas Österreicher fb84fb62f7 Merge branch 'TechnikumWienAcademy-ku-prod' 2023-06-21 08:27:21 +02:00
Andreas Österreicher c85bf159ff Merge branch 'ku-prod' of https://github.com/TechnikumWienAcademy/FHC-Core-Academy into TechnikumWienAcademy-ku-prod 2023-06-21 08:26:20 +02:00
Manfred 55fe358d9b Merge branch 'master' into benutzerberechtigungGUIneu 2023-06-20 13:53:10 +02:00
Cris 17c2004a39 Adapted: Check for config 'fbl' in Job to send Sammelmail only to LV-Leitung (no fallback to other lectors) 2023-06-20 13:36:42 +02:00
Cris 82019bb77f Deactivated: einzelne Empehlungsanfrage-Mails an Lektoren deaktiviert 2023-06-20 10:54:40 +02:00
Cris 4e22b1ac1c Added: New Job sendMailRecommendationRequests
Send Sancho mail to LV-Leitung (fallback Lectors) that were requested for recommendation yesterday.
2023-06-19 15:03:38 +02:00
KarpAlex f29d5a7b50 Bismeldestichtage management: added menu entry, changed size of filter widget table to auto 2023-06-17 21:00:52 +02:00
KarpAlex f0d0c0837a added Filter for Software Management 2023-06-17 20:51:33 +02:00
ma0048 d9eb0f5704 - kennzeichen beim zusammenlegen uebernehmen 2023-06-16 11:30:03 +02:00
Cris 050a4214f9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-06-14 13:45:34 +02:00
KarpAlex f865d09033 manage Bismeldestichtage: added possibility to delete a report target date 2023-06-13 16:14:38 +02:00
nkrondraf fb3247c91e performance optimizations 2023-06-13 14:44:01 +02:00
nkrondraf da4ab6bf49 performance optimizations 2023-06-13 14:06:57 +02:00
KarpAlex 7bc8e22906 plausichecks: removed empty lines and unnecessary comments 2023-06-12 22:40:09 +02:00
KarpAlex ab5dc7b1ac plausichecks: removed plausicheck lib, instead, methods are directly in the library for the fehler 2023-06-12 22:32:09 +02:00
ma0048 e26ba1d219 - spalte gesamtstunden erteilt hinzugefuegt 2023-06-12 09:22:32 +02:00
KarpAlex fe9bf1dc8a Bismeldestichtag: prestudentstatus is displayed as inaktive in FAS list if Stichtag is reached, fixed comments 2023-06-11 11:07:28 +02:00
KarpAlex e6b47266b9 Added GUI for adding Bismeldestichtag 2023-06-10 21:40:28 +02:00
KarpAlex f95c5ec7cf added overview for editing Bismeldestichtage 2023-06-07 19:25:23 +02:00
KarpAlex df64ad30eb Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren 2023-06-07 18:48:38 +02:00
KarpAlex dd98434522 added new right for editing bismelden property, disabled bismelden checkbox in FAS if no right 2023-06-07 13:33:43 +02:00
KarpAlex c490aa0040 Revert "hide bismelden checkbox if no keine_studstatuspruefung right"
This reverts commit ae1817fc7b.
2023-06-07 13:31:30 +02:00
Harald Bamberger b33f890c62 fix freitext anmerkung, add validation to vbfreitext 2023-06-07 07:59:12 +02:00
Harald Bamberger 3d2dd25755 add condition for ending vbs and gbs 2023-06-06 17:21:05 +02:00
Werner Masik bcdf29f57f added method to display rudimentary chart data 2023-06-06 16:25:04 +02:00
Harald Bamberger ff6ddf8c46 add methods to end dv 2023-06-06 16:24:49 +02:00
KarpAlex c9c6955198 issue configuration: enabled deletion of single configuration values, updated fehlermonitoring phrases 2023-06-05 19:29:27 +02:00
KarpAlex ae1817fc7b hide bismelden checkbox if no keine_studstatuspruefung right 2023-06-05 16:36:01 +02:00
Harald Bamberger 42a6dd7508 current composer.lock 2023-06-05 16:18:29 +02:00
Andreas Österreicher bce7e6ce7f Merge branch 'feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen' 2023-06-05 11:03:09 +02:00
Harald Bamberger 88039c2327 Merge branch 'werner/vertragsbestandteile_delete' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-06-05 10:58:39 +02:00
Werner Masik 5b7a78e6d8 delete DV; improved GBT query 2023-06-05 10:42:59 +02:00
Harald Bamberger dd0ef74fe0 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-06-05 10:42:52 +02:00
KarpAlex 42197c39ed FAS prestudents status: check is Meldestichtag is reached and disable input if it is, bismeldestichtag table: added sequence primary key 2023-06-03 15:18:06 +02:00
ma0048 f5ee097b72 - doppelte benutzer bug fix 2023-06-02 12:01:31 +02:00
ma0068 9e883a48a0 Adaptierungen Icalfiles Coole 2023-06-02 09:02:47 +02:00
Cris 0994b2cc8f Added: Added column 'Stundensatz' in 'Lehrauftrag erteilen' 2023-06-01 12:18:14 +02:00
Cris 7c2d235960 Adapted: Show column 'Stundensatz' in 'Lehrauftrag bestellen' 2023-06-01 12:17:21 +02:00
Cris 73774b0c5d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-06-01 11:16:06 +02:00
ma0048 afebd44b78 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten 2023-06-01 10:21:26 +02:00
ma0048 9f13f876ef - swd.php entfernt 2023-06-01 07:39:56 +02:00
ma0048 bf344df8d6 - abgabetool anpassungen 2023-06-01 07:12:40 +02:00
Harald Bamberger b9325875a1 Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung 2023-05-31 16:43:16 +02:00
Harald Bamberger a9666a5f55 Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung 2023-05-31 16:41:53 +02:00
Harald Bamberger 1d63f7aa53 Merge branch 'feature-25003/NotenimportFuerNachpruefung_bhmod' into feature-25003/NotenimportFuerNachpruefung 2023-05-31 16:32:37 +02:00
Harald Bamberger ec000fbf83 changes for aenderung and korrektur 2023-05-30 19:13:27 +02:00
Andreas Österreicher a5110893ea Dateien die größer als 30MB sind werden nicht automatisch geprüft ob
diese eine Signatur enthalten da dies Dokumente sind die manuell
hochgeladen wurden um das UploadLimit der Arbeit zu umgehen.
2023-05-30 11:59:46 +02:00
Manfred 1ea45269bd Merge branch 'master' into benutzerberechtigungGUIneu 2023-05-25 17:07:08 +02:00
Manfred de4fe258fd Merge remote-tracking branch 'origin/master' 2023-05-25 17:06:22 +02:00
Manfred b5d0cc9626 Klasse "form-control" bei Typ Datepicker ergänzt 2023-05-25 17:06:16 +02:00
KarpAlex 0a179c963f bismeldestichtag: added meldestichtag_id to table, created bismeldestichtag class, improved comment for prestudentstatuschecks in studentDBML 2023-05-25 16:35:44 +02:00
Harald Bamberger a47a746940 add require for vertragsbestandteil_karenz 2023-05-25 15:53:40 +02:00
Harald Bamberger 92672aaacf adapt overlapping DVs Check to not consider current DV if edited, but consider karenzen 2023-05-25 15:47:16 +02:00
Cris 4f6c60af3a Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-25 12:18:48 +02:00
Cris e7571dffab Minor Adaptation: Suche statt Search, Settings button Layout korrigiert 2023-05-25 12:17:06 +02:00
Cris f08072133c Fixed: Suchcontainer nicht mehr verschoben
Groesse und Alignment an Suchfeld gebunden.
2023-05-25 12:15:24 +02:00
Cris 542b6cc985 Adapted: Image-Thumbnails entfernt
Stattdessen class 'rounded'. Passt besser zu FHC CD.
2023-05-25 12:13:40 +02:00
Cris b9e9399ca2 Adapted: Icon-Layout in Vertical Split
. etwas vergroessert um besser mit der Maus zu greifen
. Icon und Icon-Farbe geaendert
2023-05-25 12:12:37 +02:00
Harald Bamberger fce192cd3c remover popper from composer.lock 2023-05-25 11:08:37 +02:00
Harald Bamberger 80d194cfc0 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
- remove popper from composer introduced in branch feature-25562, but master included bootstrap.bundle in the meanwhile to have popper available
2023-05-25 11:04:20 +02:00
Harald Bamberger 38509d530a prepare list of vbs with gbs 2023-05-24 17:54:04 +02:00
Andreas Österreicher 34715712f3 App für Personalverwaltung hinzugefügt 2023-05-24 16:26:53 +02:00
cgfhtw be331d6200 Styles 2023-05-24 12:05:36 +02:00
KarpAlex f6f2defc8c Bismeldestichtag: added table 2023-05-23 18:48:18 +02:00
Werner Masik 5f198114f7 added popperjs because bootstrap5 requires it 2023-05-23 17:03:13 +02:00
KarpAlex 4b2e3c2f6b Merge branch 'master' into feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen 2023-05-23 16:22:05 +02:00
Harald Bamberger 09bc985431 Notenumrechnung beim Punkteimport, Fehlermeldung wenn Note oder Punkte fehlen. 2023-05-23 16:08:50 +02:00
cgfhtw 94a15093ac New Button 2023-05-23 15:26:49 +02:00
Cris 9124422635 Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-23 15:17:14 +02:00
cgfhtw d10a229b59 Slot for action buttons 2023-05-23 14:56:31 +02:00
KarpAlex de43e69ccf plausichecks GUI: added fehlercode to recognise fehler in fehler monitoring issues 2023-05-23 14:29:38 +02:00
ma0048 f993780ec3 - texte und anzeige angepasst 2023-05-23 13:17:27 +02:00
Cris b624d91119 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-05-23 12:20:57 +02:00
Andreas Österreicher 7a005a9141 Merge branch 'feature-10001/tempus_kurzbz_bei_reservierungen_anzeigen' 2023-05-22 15:50:37 +02:00
Andreas Österreicher cc8be23f7e Merge branch 'master' into feature-10001/tempus_kurzbz_bei_reservierungen_anzeigen 2023-05-22 15:47:57 +02:00
KarpAlex 86e032b27f Fehler Monitoring: added fehler kurzbz to be displayeed 2023-05-22 14:31:40 +02:00
cgfhtw 429c595e04 Reload Button 2023-05-22 11:59:26 +02:00
KarpAlex 0d6ad6aab0 issue konfiguration: added phrases, bugfix displaying correct configuration for correct app 2023-05-22 00:20:01 +02:00
KarpAlex 186412144d Merge branch 'master' into feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen 2023-05-21 17:38:49 +02:00
KarpAlex 696849062f Issues konfiguration: added GUI for assigning konfiguration to fehler 2023-05-21 17:34:11 +02:00
cgfhtw 4154df1704 Property to Enable/disable the download button 2023-05-19 14:47:05 +02:00
ma0068 5001713d16 Erzwingen von Reload nach jeder Freigabe 2023-05-19 07:51:25 +02:00
ma0048 311d235fda - abgewiesene gesperrt von spalte 2023-05-17 16:35:22 +02:00
ma0048 2f573263ba - abfrage ob der pruefling bereits gesperrt ist 2023-05-17 16:00:34 +02:00
ma0048 54de577eee - ausblenden des warnings 2023-05-17 15:08:52 +02:00
ma0048 8584be651b - sperren von rts bearbeitet 2023-05-17 15:06:39 +02:00
ma0048 08c594148b - details bei abgewiesenen 2023-05-17 08:41:04 +02:00
Werner Masik 24bf2f95a2 update vertragsbestandteile 2023-05-16 17:05:49 +02:00
Werner Masik a198a740f4 fix json_serialize 2023-05-16 17:04:37 +02:00
cgfhtw 76fd425027 assert valid nw-new-entry listener if side-menu is enabled 2023-05-16 14:12:46 +02:00
cgfhtw 38f2bb89a4 readability 2023-05-16 10:40:58 +02:00
cgfhtw 1568e619a5 Split the component to improve the quality, readability and maintainability 2023-05-16 10:33:31 +02:00
cgfhtw 2b363119c5 Split the component to improve the quality, readability and maintainability 2023-05-16 10:33:05 +02:00
Werner Masik 3940912830 fix attribute name valorisieren to valorisierung 2023-05-16 10:04:56 +02:00
Werner Masik cd66397740 add current date to DV selection query 2023-05-16 10:03:50 +02:00
Andreas Österreicher da5494ad35 Merge branch 'feature-24913/TabelleRaumtypNeuesAttributAktiv' 2023-05-15 16:44:38 +02:00
Andreas Österreicher d3be5a7805 Merge branch 'feature-29051/DokumentvorlageAufSonderzeichenUeberpruefen' 2023-05-15 16:32:22 +02:00
Andreas Österreicher 06f62b19b4 Merge branch 'feature-27043/cis_lvinfo_cis_private_lehre_ects_preview_fehlt' 2023-05-15 16:06:55 +02:00
Andreas Österreicher 4844da317f Merge branch 'feature-25917/studienbeastigung_in_englischer_sprache' 2023-05-15 15:42:06 +02:00
Andreas Österreicher 00f555b141 Vorlage umbenannt 2023-05-15 15:34:32 +02:00
Andreas Österreicher d3ec6cad1d Merge branch 'master' into feature-25917/studienbeastigung_in_englischer_sprache 2023-05-15 15:13:47 +02:00
Andreas Österreicher a64fafb6ad Merge branch 'feature-28402/popper_in_bootstrap5' 2023-05-15 14:58:02 +02:00
Andreas Österreicher 9180244e0d Merge branch 'feature-27362/fas_filter_status_bestaetigt_reihungstestanmeldung' 2023-05-15 14:52:36 +02:00
Andreas Österreicher 5c79951f00 Merge branch 'feature-27107/Vilesci_Erfassung_Abwesenheiten_Reinigung' 2023-05-15 14:07:41 +02:00
Manfred 388a265db7 Neues Template "contentmittitel_filterwidget" in Suche ergänzt 2023-05-15 12:11:01 +02:00
Manfred d4653bc89f Neue Rechte anlegen und bestehende bearbeiten 2023-05-15 12:10:25 +02:00
KarpAlex 1ec52e710a Plausichecks: enabled Fehlerkonfiguration for excluding certain Studiengänge from checks, changed comments 2023-05-14 21:19:39 +02:00
KarpAlex fd7c193894 added tables and model for issue Fehlerkonfiguration 2023-05-11 18:54:35 +02:00
Manfred 040cd09691 Merge branch 'master' into benutzerberechtigungGUIneu 2023-05-11 18:26:24 +02:00
Manfred c5e1674264 FAS-Studentensuche verbessert, um Personen ohne Vorname zu findenwerden 2023-05-11 18:14:24 +02:00
Manfred e96a3506a8 Coodle ics für Terminzusagen jetzt mit verschlüsseltem Token
Details zur Umfrage in den Kalenderdaten
2023-05-11 18:02:17 +02:00
ma0068 01046637fa merge master into feature-18571/Entwicklungsteam 2023-05-11 09:18:32 +02:00
ma0068 fe6746e6bc Ergänzung DB-update um Berechtigung stgv/edit Entwicklungsteam 2023-05-11 09:14:42 +02:00
ma0068 28baa49f6d Validierung Sonderzeichen Dokumentvorlagen 2023-05-10 08:18:05 +02:00
KarpAlex 96172c67fd PlausicheckProducerLib: corrected method description comment 2023-05-09 23:16:24 +02:00
Werner Masik 4786ff503a added organisation to current contract info 2023-05-09 17:24:18 +02:00
Harald Bamberger 7045827450 bufix Urlaubsanspruch 2023-05-09 16:14:01 +02:00
Cris 81e51c2b92 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-05-09 11:58:43 +02:00
Andreas Österreicher e97d2d89d6 Added Config to Enable/Disable Signature Check in Abgabetool 2023-05-08 16:54:46 +02:00
Andreas Österreicher 2cb4ee9879 Merge branch 'feature-19172/Abgabetool_digitale_signatur_pruefen' 2023-05-08 15:50:59 +02:00
Andreas Österreicher 4c5241dd95 Bei fehlender Signatur in Enduploads wird ein Mail an den Studiengang
geschickt
2023-05-08 15:37:30 +02:00
ma0068 c086eddfae update Abfrage, delete testfiles 2023-05-08 14:18:07 +02:00
ma0068 33e313a633 update Abfrage 2023-05-08 12:12:42 +02:00
KarpAlex c6fe7a3d6a Merge branch 'master' into feature-28089/plausichecks_in_extension_hinzufuegen 2023-05-06 02:03:07 +02:00
KarpAlex 94a126f64e plausichecks: made some core plausichecks warnings instead of errors 2023-05-05 17:29:30 +02:00
Andreas Österreicher 1b57df7a52 Korrektur der Ermittlung des Sommersemesters wenn die Personalmeldung
für vergangene Semester erstellt wird.
2023-05-05 17:19:35 +02:00
Andreas Österreicher 451a21e84e Zugriffsberechtigungen korrigiert damit der Zugriff auf die eigenen
Zeitsperren nicht möglich ist ohne Berechtigung
2023-05-05 16:57:22 +02:00
Harald Bamberger d361c4eb26 use img-thumbnail css class instead of rounded circle 2023-05-05 15:47:23 +02:00
Harald Bamberger d131212d22 composer update 2023-05-05 14:20:07 +02:00
Harald Bamberger de4c236817 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-05 13:11:16 +02:00
Harald Bamberger 2c0e815fe8 add validations 2023-05-05 11:43:02 +02:00
Andreas Österreicher f7ec0c4ce0 Merge branch 'feature-27946/infocenter_zusaetzliche_spalte_fuer_kaution' 2023-05-05 08:53:17 +02:00
Harald Bamberger 42ff682700 add validations 2023-05-05 08:20:29 +02:00
Andreas Österreicher 6c1a47955f Merge branch 'feature-27949/infocenter_evaluieren_des_zurueckstellens_mit_einem_grund_zb_fuer_drittstaaten' 2023-05-05 07:48:53 +02:00
Harald Bamberger f84a75af4e Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-04 15:41:44 +02:00
Paolo defe4e2f93 Added new interface application/core/IEncryption.php 2023-05-04 15:33:08 +02:00
Paolo 1c0129466a Bugfix: added a check to DB_Model->_addEncrypt method on the parameter encryptedColumns 2023-05-04 15:23:51 +02:00
Harald Bamberger e713cdac64 Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-04 15:03:13 +02:00
Harald Bamberger 2f07590461 Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten 2023-05-04 14:59:12 +02:00
Harald Bamberger 7fb0c14555 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-04 14:58:29 +02:00
ma0048 4f03b61c6e - stunden bestandteil bei karenz mit 0 stunden verlaengern 2023-05-04 13:43:54 +02:00
Andreas Österreicher 3b1d913006 Merge branch 'TechnikumWienAcademy-ku-prod-hotfix-221118' 2023-05-04 09:46:02 +02:00
Cris d2b6aab881 Changed: AZG-relvant an neue Vertragsstruktur angepasst 2023-05-04 09:42:30 +02:00
Cris 8e73638931 Changed: Check homeoffice an neue Vertragsstruktur angepasst 2023-05-04 09:41:50 +02:00
Cris dbee8d9689 Changed: Check homeoffice an neue Vertragsstruktur angepasst 2023-05-04 09:39:12 +02:00
Cris b43b7fe95d Added new Vertragsbestandteil Class and few methods
. load()
. isZAPflichtig() -- Check ob im übergebenen Monat ZApflichtig.
. getZAPflichtig() -- Holt alle Vertragsbestandteile, die ZApflichtig sind
. isAllin() -- Check, ob im übergebenen Monat Vertragsbestandteil AllIn hat.
2023-05-04 09:38:18 +02:00
Cris 33c1cc80b2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-05-04 09:26:44 +02:00
ma0068 58bae0953f dbupdate 2023-05-03 07:57:48 +02:00
Harald Bamberger eb7b73fee9 cleanup according to current vertragsbestandteil db tables 2023-05-02 16:00:13 +02:00
Andreas Österreicher fdc3265e97 Merge branch 'ku-prod-hotfix-221118' of https://github.com/TechnikumWienAcademy/FHC-Core-Academy into TechnikumWienAcademy-ku-prod-hotfix-221118 2023-05-02 11:28:15 +02:00
Harald Bamberger e3ec4cd5aa fix method names, handle insertamum updateamum insertvon updatevon in libs 2023-05-01 20:50:07 +02:00
KarpAlex 8efe601826 plausichecks gui bugfix: filter by Studiensemester and Studiengang possible again, removed unnecessary resolver params variable 2023-05-01 16:28:42 +02:00
KarpAlex 96d115e808 issues: added new filter for Personalverwaltung issues 2023-05-01 16:23:49 +02:00
ma0048 8b74420e4f - limit beim selecten 2023-04-30 21:28:47 +02:00
ma0068 f2479c6f36 dbupdate für neue Zeitsperre 2023-04-28 08:05:30 +02:00
Andreas Österreicher 9a4c61d1c3 Fixed Abgabetool Lecturer View 2023-04-27 17:50:03 +02:00
Andreas Österreicher a528018761 Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen 2023-04-27 09:57:40 +02:00
ma0048 eefffa8a0e - kaution spalte
- fas abgeschickt am timestamp automatisch ausfuellen
- zgvuberpruefung zeigt abgewiesene nicht an
2023-04-27 09:08:26 +02:00
ma0068 5bdfd447ac Berechtigungspruefung mittels mitarbeiter/zeitsperre:begrenzt, Update Berechtigung für Anzeige in Vilesci-Menue, Einbau Redirect 2023-04-26 16:17:23 +02:00
Harald Bamberger b4e4f91b22 more validation 2023-04-25 20:20:02 +02:00
Harald Bamberger 10fb68a532 Dienstverhaeltnis Class updated, VertragsbestandteilLib can save Dienstverhaeltnis 2023-04-25 17:23:57 +02:00
Paolo 08de013c23 Fixes: code quality checks 2023-04-25 16:07:42 +02:00
Harald Bamberger 7a4f55bb0c require interface IValidation 2023-04-25 09:27:40 +02:00
Harald Bamberger 2163ddcdf5 add Interface IValidation, implement validate stub in all Vertragsbestandteile and Gehaltsbestandteil and DV 2023-04-25 09:22:03 +02:00
ma0048 da484fbbb0 - die letzten 5 tage werden geprueft anstatt nur der vortag
- neue bewerbungen nach dem aufgenommen status werden nich automatisch abgewiesen
2023-04-25 08:45:16 +02:00
Paolo 39137d1348 Load a model in the filter component controller to have the DB functionalities ready 2023-04-24 17:07:40 +02:00
Harald Bamberger 5519f6af57 Merge branch 'merged_Anrechnungen_26625_27388_28278_28557' 2023-04-24 14:49:29 +02:00
Harald Bamberger d16a670726 Merge branch 'sonstiges-28665/Tabulator-PersistenceID-einbauen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 14:42:21 +02:00
Harald Bamberger 54864da770 Merge branch 'bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 12:12:05 +02:00
Harald Bamberger 64aa3c1250 Merge branch 'feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 11:31:39 +02:00
Harald Bamberger a663fa9436 Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 11:30:32 +02:00
Harald Bamberger aa572e8a22 Merge branch 'feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 11:26:45 +02:00
Harald Bamberger 48798e8309 Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen 2023-04-24 11:20:53 +02:00
Harald Bamberger 01ca8f6fb9 Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige 2023-04-24 11:18:40 +02:00
Harald Bamberger 80eb64e418 Merge branch 'master' into feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung 2023-04-24 10:36:32 +02:00
Harald Bamberger ea79b92beb Merge branch 'master' into bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen 2023-04-24 10:35:22 +02:00
Andreas Österreicher 42d6ea9bed Merge branch 'feature-28426/DiplomaSupplementMinimalVersionSS2023' 2023-04-24 08:31:15 +02:00
Andreas Österreicher b726f2ca5e Vertragsstunden mit 0.00 werden wie NULL behandelt 2023-04-24 07:14:42 +02:00
KarpAlex 0a8432514c issues: added comment to getLanguageIndex method 2023-04-22 23:35:39 +02:00
KarpAlex 3122825b73 student issues list issueData: language index comes from tbl_sprache, limit results only to dvuh and core issues 2023-04-22 15:41:20 +02:00
KarpAlex bc8709f842 added filter for Personalverwaltung issue list 2023-04-21 17:59:24 +02:00
ma0048 f54351c7a3 - added missing model 2023-04-20 16:38:56 +02:00
KarpAlex f39fb46b25 Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28089/plausichecks_in_extension_hinzufuegen 2023-04-20 13:19:16 +02:00
Manfred 48172216cc Zeilenzähler bei Statistik 2023-04-19 15:43:18 +02:00
Manfred 1fa215103c Insert- und Update-Daten bei Prestudentstatus im FAS 2023-04-19 15:42:51 +02:00
Werner Masik 138cfd662d added return 2023-04-18 13:50:07 +02:00
Harald Bamberger 535578c399 validation 2023-04-18 13:30:56 +02:00
Harald Bamberger c90da4b50e start to implement validation 2023-04-18 13:26:08 +02:00
ma0068 88c8b13208 Anzeige Urlaubsverwaltung Vilesci ausschließlich für user mit Oes mit Leitungsfunktionen 2023-04-18 08:10:42 +02:00
Paolo 8eb423414a Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen 2023-04-17 10:21:09 +02:00
Werner Masik 29485a090b removed remaining unit test for GUI 2023-04-14 15:51:58 +02:00
Andreas Österreicher 5d668791f9 Projektphase in der Zeiterfassung werden temporär 7 Monate in die Vergangenheit anzgezeigt um die Erfassung von alten Einträgen zu ermöglichen 2023-04-14 14:37:52 +02:00
cgfhtw d766e2fd01 console.warn => alert 2023-04-14 08:22:36 +02:00
Harald Bamberger e462a71b6d call parent constructor 2023-04-12 16:50:00 +02:00
Harald Bamberger 9e6d78dd1d set Dienstverhaeltnis_id and Vertragsbestandteil_id on child Gehaltsbestandteile when added or changed 2023-04-12 16:26:55 +02:00
Harald Bamberger c2e956f7f3 use GehaltsbestandteilLib in VertragsbestandteilLib 2023-04-12 15:32:22 +02:00
Harald Bamberger 0061cf255c add GehaltsbestandteilLib 2023-04-12 15:22:10 +02:00
Werner Masik 2b03fcc930 removed GUI handling and renamed Gehaltsbestandteil to make it independend from Vertragsbestandteil 2023-04-12 09:41:07 +02:00
ma0068 f1402c439c Adaptierungen Rahmenvertrag FHG 2023-04-12 08:15:55 +02:00
Werner Masik fe6a8d5625 fixed wrong JSON-Mapping for GUIOptions 2023-04-11 17:07:20 +02:00
Harald Bamberger e7f23643d4 fix data property name 2023-04-11 17:05:20 +02:00
Harald Bamberger c929fa8702 add freitext require, adapt freitext to current db 2023-04-11 16:59:21 +02:00
Harald Bamberger 92e23ea585 add requires for vbs zeitaufzeichnung and kuendigungsfrist 2023-04-11 16:47:44 +02:00
Harald Bamberger 3ff024fc69 fix date format 2023-04-11 15:51:23 +02:00
Harald Bamberger 234820490c variable names 2023-04-11 15:44:34 +02:00
Harald Bamberger 12c712c1b4 changed property names to match gui input 2023-04-11 15:22:40 +02:00
Harald Bamberger b50ca57907 extend VertragsbestandteilFunktion to be able to create a Benutzerfunktion entry before being persited 2023-04-11 15:10:24 +02:00
Manfred 9c801d2723 Merge branch 'benutzerberechtigungGUIneu' 2023-04-11 13:24:56 +02:00
Manfred dce81d614e Merge branch 'master' into benutzerberechtigungGUIneu 2023-04-11 13:23:09 +02:00
Harald Bamberger ed2aa6620e vuedatepicker added 2023-04-11 12:53:56 +02:00
Harald Bamberger 025b58dee3 throw Exception when storeVertragsbestandteil is rolled back to handle rollback in possible outer transaction 2023-04-11 11:05:15 +02:00
cgfhtw a63a79ab91 add param tableOnly & save for multiple components on one page 2023-04-07 14:10:30 +02:00
ma0048 19d369c3c7 - im kalender mitarbeiter kurzbz statt uid anzeigen 2023-04-06 10:17:15 +02:00
Andreas Österreicher 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
2023-04-06 07:34:26 +02:00
Andreas Österreicher f325daab43 Merge branch 'bug-28917/AnwesenheitenLadezeiten' 2023-04-05 16:30:55 +02:00
Andreas Österreicher 326b53544a Übernahme Optimierung der Anwesenheitsabfrage von BFI 2023-04-05 16:28:19 +02:00
Andreas Österreicher 1a3d651759 Merge branch 'feature-27403/DVUH_Plausicheck_fuer_Personen_ohne_Konto_Buchungen' 2023-04-05 15:33:36 +02:00
Paolo e46d5a2433 application/views/templates/FHC-Footer.php now includes the bootstrap5 bundle JS 2023-04-05 15:22:49 +02:00
Andreas Österreicher 995b3ecb18 Merge branch 'feature-28539/Projektarbeitsbeurteilung_Anpassungen' 2023-04-05 15:10:54 +02:00
ma0068 43f613b0bc Änderung FHStG auf FHG 2023-04-05 13:32:32 +02:00
Werner Masik 783cb289cd added Unit-Tests; changed IDs of organisationseinheit in VertragsGUI 2023-04-04 18:51:06 +02:00
Manfred 5226da2652 Neues Template Content mit Titel und Filterwidget 2023-04-04 17:37:47 +02:00
Manfred 15049640c6 Input-styling 2023-04-04 17:37:01 +02:00
Manfred 0d5a7aee35 Aktive als Default 2023-04-04 17:36:36 +02:00
Manfred cfa71c852c Styleanpassung inaktive 2023-04-04 17:36:18 +02:00
KarpAlex a1a9b10ee1 plausicheck issues: enabled generic passing of different parameters, not just core plausicheck specific. moved studiensemester param to specific PlausiIssueProducer controller 2023-04-04 16:17:18 +02:00
ma0048 fb57ea5838 - splitten von reihungstest uebersichten 2023-04-04 15:57:33 +02:00
ma0048 d93c19913b - spalte fuer kaution hinzugefuegt 2023-04-04 15:07:23 +02:00
Harald Bamberger 80d5d09ed5 fix styling of textarea in import popup 2023-04-04 08:07:03 +02:00
Werner Masik c613c6dc43 small fix to prevent error when $encryptedColumns is null 2023-04-03 13:37:12 +02:00
Cris 9e4489093c Adapted & updated Tabulator default options (PersistenceID now changeable / Updates for options in Tabulator 4.9)
. Adapted
.. PersistenceID now changeable
.. check: only set default option if not set in tabulator

. Updates in version 4.9:
.. persistentLayout => persistence
.. getVisibility() => isVisible()
2023-03-29 10:29:06 +02:00
Werner Masik c52cd05436 Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge' 2023-03-28 20:12:40 +02:00
Cris 772e60c944 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-03-28 13:52:23 +02:00
Manfred 9527fd006f Rechte-Detailansicht 2023-03-27 17:08:22 +02:00
Cris bbd5962fd4 Deleted deprecated FBL-files 2023-03-27 11:19:34 +02:00
Cris 47fba23a5e Enhanced queries 2023-03-27 11:11:03 +02:00
Cris 75aff023d3 Corrected Mehrsprachigkeits-variable 2023-03-27 11:08:07 +02:00
Cris 8183144251 Corrected query to retrieve Leitung 2023-03-27 11:06:22 +02:00
Cris 1e00f2683e Corrected check 'isEmpfehlungsberechtigt'
Fachbereichsleiter are always empfehlungsberechtigt.
2023-03-27 11:05:03 +02:00
Cris d8fc724b10 Changed: Now passing config-variable to views
...instead of loading config into view.
2023-03-27 11:02:24 +02:00
Cris 8feec18ff7 Changed query to get Leitung of Lehrveranstaltung-Organisationseinheit (instead of 'Fachbereich') 2023-03-27 10:58:59 +02:00
Manfred cff3cab075 Merge branch 'master' into benutzerberechtigungGUIneu 2023-03-27 10:55:58 +02:00
Manfred 55e47d8b62 Merge remote-tracking branch 'origin/master' 2023-03-27 10:53:23 +02:00
Manfred f72da812d7 Ganzer SQL Filterbar 2023-03-27 10:53:18 +02:00
Manfred 17adaf79b0 Nur verplanbare LV-Teile werden gezählt; Studiengangsfilter 2023-03-27 10:52:35 +02:00
Manfred 84b1f1c81a Multi-Endedatum setzen, Jquery Checkboxes adaptiert 2023-03-27 10:50:00 +02:00
ma0068 76c4c4a0e9 Termin 3 als pruefungstyp in lehre.tbl_pruefungstyp in dbupdate hinterlegt 2023-03-27 08:15:29 +02:00
ma0068 3e056ebf3d Notenimport Nachprüfung und 3.Termin: Ergänzung um nicht numerische Noten 2023-03-24 15:21:01 +01:00
KarpAlex 903f3d2f37 generateESI Job bugfixes (correct models, Ids in error logs), added insertvon 2023-03-23 17:50:32 +01:00
Paolo 25313a8f52 Code quality check fixes 2023-03-23 14:34:37 +01:00
Cris fbcf9d9778 Fixed: Now flagging correctly ALL Studiengänge with Schreibberechtigung
Before Schreibberechtigung was not set correctly true/false and displayed wrong in table.
Therefore fixed query.
2023-03-23 09:10:04 +01:00
KarpAlex cd6443d9c0 -added scheduler for generating and saving ESI -first version of generateESI job 2023-03-22 17:41:15 +01:00
Paolo 1b53b17b48 Merge branch 'master' into feature-16354/TinyMCE_move_to_new_version 2023-03-22 16:43:56 +01:00
Cris b7661b200e Removed unnecessary code 2023-03-22 15:45:06 +01:00
Cris 26ed20b1f5 Changed 'Schreibberechtigt'-column for STGL: Now showing ALL by default 2023-03-22 15:44:00 +01:00
Cris f94274ae1c Optimized Mehrsprachigkeit-query
Removed unnessecary type conversions
2023-03-22 14:08:46 +01:00
Cris a78b4507da Added missing phrasen 2023-03-22 09:42:04 +01:00
ma0048 651bd9e37a - nicht notwendige permission fuer funktion geloescht 2023-03-21 16:57:33 +01:00
ma0048 7336525021 - rueckstelldatum default zwei wochen 2023-03-21 16:56:35 +01:00
KarpAlex 230ebcaf9a added table public.tbl_kennzeichen and kennzeichentyp for managing person Ids 2023-03-20 17:01:58 +01:00
Cris 8035176e8b Fixed: Old Anrechnungen sometimes failed to open
...this is fixed now
2023-03-20 13:48:23 +01:00
Cris e4fca1b823 Merge branch 'master' into feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung 2023-03-20 11:32:14 +01:00
Cris b59b00dbe4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-03-20 11:31:33 +01:00
Cris 455d7e9aa2 Restored general Ablehnungstext in Lector & STGL Overview with explenation 2023-03-20 11:30:05 +01:00
Cris ca502488b7 Small text adaption of phrases 2023-03-20 11:20:37 +01:00
Cris 7f99b26e48 Added new phrases
.genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis
.empfehlungNegativKenntnisseNichtGleichwertigWeilHinweis
2023-03-20 11:05:57 +01:00
KarpAlex b827d8cbea Projektarbeit Abgabetool: Text is displayed for student instead of note if Projektarbeit Benotung is saved, but not abgeschickt (sent) 2023-03-17 17:33:18 +01:00
Andreas Österreicher 279ddddfc8 Wochenstunden auf numeric korrigiert, Diverse NOT NULL Constraints
hinzugefügt
2023-03-17 09:53:41 +01:00
Andreas Österreicher 8f37d24693 Fixed Typo in Column Dienstverhaeltnis 2023-03-17 08:29:21 +01:00
ma0048 598f6b4b09 - nur zukuenftige eintraege markieren 2023-03-16 17:16:31 +01:00
ma0048 2c4dc542b6 - parken und zustellen anzeige in eine spalte zsmgefasst 2023-03-16 17:09:00 +01:00
Andreas Österreicher 4787159071 Merge branch 'feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token' 2023-03-16 15:13:07 +01:00
ma0048 c365896865 - log eintrag hinzugefuegt, beim setzen auf park... 2023-03-16 13:57:17 +01:00
Andreas Österreicher 71e8742cc8 Merge branch 'TechnikumWienAcademy-master' 2023-03-16 11:25:57 +01:00
KarpAlex 813cca99e2 improved plausicheck getOrgformStgUngleichOrgformPrestudent, so it checks orgform for current prestudent, is valid only for mischform, includes more prestudent statuses 2023-03-16 10:15:40 +01:00
nkrondraf de1ae7e46c correct file path for pictures 2023-03-16 09:40:16 +01:00
Cris d606418072 Set focus on all Begruendungs-textareas
This makes it easier to directly add and complete Begruendungen.
Changed in STGL and Lecotors Overview and Detailview
2023-03-16 09:05:49 +01:00
Cris d69788e8d2 Added 'Andere Begründung' to STGL and Lector Detailview 2023-03-16 09:02:43 +01:00
Cris 4a009f3cef Set ZGV-column visible 2023-03-16 09:01:24 +01:00
KarpAlex 9c1d58c447 Merge branch 'master' into feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token 2023-03-15 21:47:33 +01:00
Andreas Österreicher b2a6db9ed3 Added NOTNULL Constrait to tbl_gehaltsabrechnung.gehaltsbestandteil_id 2023-03-15 17:26:04 +01:00
Cris 792d1980fe Removed general Ablehnungstext in Lector & STGL Overview
Ablehnungstext was changed in former commit in order to make sure to add personal reason.
This is done in Detail sites.
Therefore the generally written Ablehnungstext is now removed from Overview sites.
2023-03-15 14:49:34 +01:00
Andreas Österreicher 9d8adaba26 Ermittlung des Projektbetreuer Stundensatz an Config angepasst 2023-03-14 13:05:10 +01:00
Andreas Österreicher 1165f4407e Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen 2023-03-14 12:53:08 +01:00
Andreas Österreicher a413064d80 Erstversion für Vertragsmigration 2023-03-14 11:46:07 +01:00
ma0048 22cd1e075a - rueckstellgruende umbenannt
- sort in der tabelle hinzugefuegt
- anzeige angepasst
2023-03-14 10:19:07 +01:00
Andreas Österreicher e67e7309cb Merge branch 'feature-3878/temput_ganztaegige_zeitsperren_erzeugen_keine_kollision' 2023-03-13 16:24:45 +01:00
Andreas Österreicher 6e1c602658 Merge branch 'feature-6329/NotenfreigabeMailAufNoReplyAendern' 2023-03-13 15:55:15 +01:00
Andreas Österreicher d8ab7036a6 noreply auf no-reply geändert 2023-03-13 15:54:48 +01:00
Andreas Österreicher 4899c62863 Merge branch 'master' into feature-6329/NotenfreigabeMailAufNoReplyAendern 2023-03-13 15:50:38 +01:00
Andreas Österreicher c85d98f681 Neues HR Schema und Vertragstabellen 2023-03-10 17:44:15 +01:00
Harald Bamberger 4f764b9dfa Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-03-10 14:13:28 +01:00
ma0068 7a554b0d0c Adaptierung Berechnung ECTS 2023-03-10 12:49:34 +01:00
Harald Bamberger cca82d2961 problem with switching presets and problem with vanishing gehaltsbestandteile solved 2023-03-10 08:21:59 +01:00
Harald Bamberger c62d89d25c add default settings for childs, add option to hide fields 2023-03-09 16:46:15 +01:00
Cris 1da8881905 Added new Ablehnungstext and checks to Lector Detail View
. Changed Ablehnungstext
. Trim text and focus on textarea to fasten editing
. Check if forgot to add own Begründungstext
2023-03-09 16:11:37 +01:00
Cris 3e092bf375 Added new Ablehnungstext and checks to STGL Detail View
. Changed Ablehnungstext
. Trim text and focus on textarea to fasten editing
. Check if forgot to add own Begründungstext
2023-03-09 16:11:04 +01:00
Cris 8a7bcab2c6 Added new phrases to reject Empfehlung / Anrechnung 2023-03-09 16:05:27 +01:00
Harald Bamberger 6a65468bb0 refactored to allow grouping elements in tabs, while maintaining json structure 2023-03-09 14:59:07 +01:00
Cris 6644564738 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-03-09 09:31:53 +01:00
Cris 31b6ff9954 Removed unnecessary code and added phrase
Unnecessary since implementation of tabulator
2023-03-09 09:27:16 +01:00
ma0068 345cc6cf83 Adaptierung Attribut studPlan 2023-03-09 08:19:05 +01:00
Manfred 81f279964c Tooltip für Anmerkung 2023-03-08 15:03:31 +01:00
Manfred 9830025853 Merge branch 'master' into benutzerberechtigungGUIneu 2023-03-08 14:58:46 +01:00
Manfred 18d760886a Update-Details bei Reservierungen im Tempus anzeigen 2023-03-08 14:54:51 +01:00
Manfred 265244c5af Offsetpunkte in Fragenübersicht anzeigen 2023-03-08 14:54:29 +01:00
Manfred 4ceaffa617 Kopierfunktion für Räume 2023-03-08 14:54:13 +01:00
Harald Bamberger 84ca798dad add format to set text as format for date columns and highlight them 2023-03-08 13:50:33 +01:00
Cris bae6675efe Removed config vars start and end of Application period
Removed
.'submit_application_start'
.'submit_application_ende'
2023-03-08 13:02:08 +01:00
Cris ef32586d86 Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen 2023-03-08 13:00:03 +01:00
Cris 4a5e83fece Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-03-08 12:58:29 +01:00
Cris ba0e084311 Integrated into FH Complete Navigation 2023-03-07 18:40:54 +01:00
Cris a7f02548b0 Formatted date (of Anrechnungszeitraum Start and -Ende) 2023-03-07 17:57:39 +01:00
Cris 9882065b20 Removed tablesorter script
Not used.
2023-03-07 17:56:26 +01:00
ma0068 eee4faa241 Adaptierungen Matr_nr als zusätzliches Feld, LVS statt ALVS, Herausfiltern von nicht studienplanrelevanten LVs 2023-03-07 17:47:40 +01:00
Cris 058d01b6be Added Berechtigung lehre/anrechnungszeitfenster 2023-03-07 17:37:50 +01:00
Cris 68a6554d19 Removed loading config Anrechnung
Not needed anymore. Using tbl_anrechnungszeitfenster now.
2023-03-07 17:20:20 +01:00
Cris f8349a2a9b Changed Bootstrap 5 -> Bootstrap 3
Tablewidget is not working fine with Bootstrap 5 by now.
2023-03-07 17:18:21 +01:00
Andreas Österreicher 08fffa5009 Merge branch 'feature-15029/Docsbox' 2023-03-07 16:27:16 +01:00
Andreas Österreicher d06efc15a6 Removed Config because its in the global Config 2023-03-07 16:22:35 +01:00
Andreas Österreicher 58c3fba33a Added Missing Config to enable Docsbox Conversion 2023-03-07 16:20:02 +01:00
Andreas Österreicher bf6d0aca38 Merge branch 'master' into feature-15029/Docsbox 2023-03-07 15:57:14 +01:00
Cris c78e715c3e Added phrases 'bearbeitetVon', 'bearbeitetAm' 2023-03-07 14:07:14 +01:00
Cris ba31a0b5b0 Changed HTML table to Tablewidget 2023-03-07 14:06:00 +01:00
Andreas Österreicher c411b826d9 Merge branch 'feature-25518/bewerbungstool_messages_direkt_an_permesser' 2023-03-06 16:54:43 +01:00
Cris 479feea8aa Changed way of checkíng Anrechnungszeitraum
Changed function isExpired to check Anrechnungszeitraeume of tbl_anrechnungszeitraum instead of using config entries.
2023-03-06 15:26:12 +01:00
Cris 043f09892a Deleted hidden testing field 2023-03-06 15:22:56 +01:00
ma0068 83896113d8 Anpassungen rdf diplomasupplement 2023-03-06 15:02:44 +01:00
Cris 9e15668c37 Created page-header class
page-header class was dropped since Bootstrap 4.
Therefore added to css style
2023-03-06 13:25:14 +01:00
Cris 9c85877d3d Added new phrases
.anrechnungenVerwalten
.anrechnungszeitraumFestlegen
.anrechnungszeitraumHinzufuegen
.anrechnungszeitraumSpeichern
.anrechnungszeitraumStart
.anrechnungszeitraumEnde
.errorStartdatumNichtInStudiensemester
.errorEndedatumNichtInStudiensemester
.errorStartdatumNachEndedatum
.frageSicherLoeschen
2023-03-06 13:24:03 +01:00
Cris f8fb59e806 Created js to handle Anrechnungszeitraum
Handle:
. modals to add / update Anrechnungszeitraume
. AJAX calls to add / update / delete
2023-03-06 13:21:37 +01:00
Cris d3f88597d9 Created Model Anrechnungszeitraum_model
Inserts / Updates / Deletes Anrechnungszeitraum
2023-03-06 13:19:15 +01:00
Cris 727d0b5876 Created GUI to admin Anrechnungszeitraume
Add / Update / Delete Anrechnungszeitraume
2023-03-06 13:18:23 +01:00
Cris 87a1b3647d Created Controller AdminAnrechnung to admin Anrechnungszeitraume
Add / Update / Delete Anrechnungszeitraume
2023-03-06 13:16:27 +01:00
Cris 35c68d98a1 Created lehre.tbl_anrechnungszeitraum 2023-03-06 13:15:16 +01:00
ma0048 7bb340a415 - checksystem auf 3.4 umgebaut
- vilesci raumtypen inaktive raumtypen werden markiert
- tempus karteireiter ort zeigt nur aktive raumtypen an
- raumsuche auf aktive raumtypen eingeschraenkt
2023-03-01 10:44:47 +01:00
Andreas Österreicher 90a518a70d Merge branch 'bug-27845/rt_zeit_hinzufuegen_bug' 2023-02-28 15:45:48 +01:00
ma0048 37364d9775 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-24913/TabelleRaumtypNeuesAttributAktiv 2023-02-28 13:55:08 +01:00
Harald Bamberger 220617f14f enhance guioptions to be able to disable selected fields and hide gehaltsbestandteile add link 2023-02-28 10:50:40 +01:00
ma0048 3076753a19 - preview.php verlinkung entfernt
- lvincoming.php entfernt
2023-02-28 08:59:30 +01:00
ma0048 22fbe098ec - studienbestaetigung fuer abbrecher angepasst 2023-02-27 15:01:18 +01:00
ma0048 012e7b9691 - kollision bei ganztaetigen zeitsperren 2023-02-27 11:35:04 +01:00
ma0048 6d1d4cb74b - uebernahme von zurueckgestellten und geparkten personen hinzugefuegt 2023-02-27 11:32:55 +01:00
KarpAlex 601eae1e95 extension plausicheck bugfix: extension name is correctly passed to plausicheckproducerlib 2023-02-24 17:43:36 +01:00
KarpAlex a667ddaf5e Plausichecks: removed/changed comments 2023-02-24 13:32:37 +01:00
KarpAlex 4f2ca62d05 Issues: enabled extensions to produce own plausichecks, IssueResolver: moved directory names to constants, deleted unused IIssueExistsChecker 2023-02-23 19:27:45 +01:00
ma0048 62550423a3 - geparkt und onhold von der log tabelle in eine eigene tabelle verschoben
- nicht mehr benoetigte funktionen entfernt
- infocentertool angepasst
- bewerbungstool angepasst
- phrasen hinzugefuegt
2023-02-23 16:07:52 +01:00
Harald Bamberger 7ae41ac965 pass config to gueltigkeit in formheader 2023-02-22 10:27:39 +01:00
Cris fe7cd05d57 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-02-22 10:10:10 +01:00
Harald Bamberger 2672ebc61c sharedstate for gueltigkeit, mode to set gueltigkeits reflect or ignore or set shared gueltigkeit, add vertragsbestandteil kuendigungsfrist 2023-02-22 09:36:45 +01:00
Andreas Österreicher fd39312de6 Merge branch 'feature-28084/DVUH_issue_resolvers_different_folder' 2023-02-21 17:12:29 +01:00
KarpAlex 01a020d196 IssueResolver: renamed issue resolvers folder constant 2023-02-21 17:04:26 +01:00
Paolo 2b9af86955 - Added examples to application/config/db_crypt.php
- core/DB_Model->_addDecryptLoad fixed when checking the condition if the used operator is made of two characters
2023-02-21 16:11:49 +01:00
Cris 844f72d3d4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-02-21 16:05:06 +01:00
Andreas Österreicher 90ada0aaf8 Merge branch 'TechnikumWienAcademy-master' 2023-02-21 08:44:57 +01:00
Nikolaus Krondraf dee4af2fb8 add parameters to generateUID() 2023-02-21 08:02:15 +01:00
Werner Masik 785b824d6f add missing extension .js 2023-02-20 16:25:19 +01:00
KarpAlex 88dee31289 added Plausicheck CORE_STUDENTSTATUS_0015 for finding persons without Konto Buchungen (charges), Plausichecks GUI: generic plausicheck error text is displayed if not defined erroroccured, instead of success message 2023-02-20 11:40:55 +01:00
Paolo 2729b60b39 - Added new constants SESSION_ENCRYPTED_COLUMNS and ENCRYPTED_COLUMNS to libraries/TableWidgetLib
- Changed libraries/TableWidgetLib->getDataset to accept the new parameter encryptedColumns
- Added new private method _encryptedColumns to widgets/TableWidget
- widgets/TableWidget now calls tablewidgetlib->getDataset now giving the encryptedColumns parameter
- widgets/TableWidget stores in the session the encryptedColumns parameter
2023-02-20 11:31:19 +01:00
Harald Bamberger 0413528798 cleanup form, add preset functionality for structure and data, use same JSON for preset and formoutput - prepare for save and restore before persisting to db 2023-02-17 16:05:35 +01:00
Paolo 9b8a1ba096 - Added new constants SESSION_ENCRYPTED_COLUMNS and ENCRYPTED_COLUMNS to libraries/FilterCmptLib
- Added new private property _encryptedColumns to libraries/FilterCmptLib
- libraries/FilterCmptLib: execReadOnlyQuery is now called providing the parameter _encryptedColumns to read database encrypted columns
2023-02-17 14:01:09 +01:00
Werner Masik f80ecd9aa2 fix missing extension 2023-02-17 10:41:35 +01:00
Harald Bamberger facee3076d first guess vue vertragsbestandteil und gehaltsbestandteil components 2023-02-15 15:55:37 +01:00
ma0048 4d85d42a79 - gebiet zeit hinzufuegen fixed
- stammdaten abbrechen button fixed
2023-02-15 14:50:12 +01:00
KarpAlex accccbd362 Projektarbeitsbeurteilung abgabe_lektor_details: added explanatory text below when "grade" (benoten) button is disabled 2023-02-13 17:04:21 +01:00
Manfred de81a5abbd Merge remote-tracking branch 'origin/master' 2023-02-13 13:27:22 +01:00
Manfred 0fdf943085 Textanpassung an 30MB Uploadgrenze 2023-02-13 13:27:16 +01:00
Manfred feb14a9f39 Anpassung Speicherbutton, Tooltips, Alertmessages 2023-02-13 11:27:54 +01:00
Andreas Österreicher ab5e656069 Anrechnungen: Link zu Dokumenten in der Übersicht korrigiert 2023-02-13 10:21:12 +01:00
Andreas Österreicher 8d3a9d86f3 DBUpdate Gegenchecks erweitert 2023-02-09 18:47:42 +01:00
Andreas Österreicher 3f5c6c4ee5 Merge branch 'bug-16636/Lv_Termine_im_FAS_falsch_ermittelt' 2023-02-09 17:11:21 +01:00
Andreas Österreicher 97023c547c Merge branch 'feature-17512/Issues_Plausibilitaetspruefungen' 2023-02-09 16:14:49 +01:00
Andreas Österreicher 947cc3beff Datenbankändungen von 3.3 nach 3.4 verschoben 2023-02-09 16:09:37 +01:00
Andreas Österreicher 151e9d2ca3 Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen 2023-02-09 16:04:33 +01:00
Harald Bamberger 381db6a93f Merge branch 'feature-25561/Quellkursverknüpfung_und_wiederherstellung_f_LehrgangsLVs_der_Academy' 2023-02-09 11:20:07 +01:00
Paolo 7f97a58baa Merge branch 'master' of github.com:FH-Complete/FHC-Core 2023-02-09 10:55:41 +01:00
Paolo 8ef07fd9b2 Fixed LogsViewer: check if request id is not null before using it to set the row color 2023-02-09 10:54:56 +01:00
Andreas Österreicher 569c8c929e Merge branch 'feature-25177/ZeiterfassungMergedBrancheDeploy1' 2023-02-09 10:27:25 +01:00
Paolo c831355012 - FilterWidget: now it is possible to provide the encryptedColumns parameter to specify which columns of a database table are encrypted, how to cast them and which password to use to decrypt them
- Added new constants PGSQL_BYTEA_TYPE, CRYPT_CONF_PASSWORDS, CRYPT_CAST, CRYPT_PASSWORD_NAME, CRYPT_SELECT_TEMPLATE, CRYPT_WHERE_TEMPLATE and CRYPT_WRITE_TEMPLATE to application/core/DB_Model.php
- Added new optional parameter encryptedColumns to application/core/DB_Model insert, update, load, loadWhere, execQuery, execReadOnlyQuery and _toPhp
- Added new private methods _addEncrypt, _addDecryptQuery and _addDecryptLoad to application/core/DB_Model.php
- core/DB_Model: now it is possible to provide the encryptedColumns parameter to specify which columns  of a database table are encrypted, how to cast them and which password to use to decrypt them
- Adapted application/models/system/PersonLog_model.php
2023-02-08 13:33:40 +01:00
Harald Bamberger ba76ced168 Merge branch 'master' into feature-25561/Quellkursverknüpfung_und_wiederherstellung_f_LehrgangsLVs_der_Academy 2023-02-08 10:28:43 +01:00
Andreas Österreicher 0347ad9b10 Stunden werden auf NULL gesetzt wenn eine Zeitsperre bearbeitet wird die
keine Stunden zulässt
2023-02-07 18:48:22 +01:00
Andreas Österreicher 990bffeb2c Merge branch 'feature-16899/Anwesenheitsliste_um_Geschlecht_erweitern' 2023-02-07 16:36:42 +01:00
Andreas Österreicher 78a66bfc74 Merge branch 'feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern' 2023-02-07 14:51:20 +01:00
Andreas Österreicher 9c349d9f1b Merge branch 'master' into feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern 2023-02-07 14:46:24 +01:00
Andreas Österreicher 51b5cb8620 Merge branch 'bug-26015/OutgoingAufAnwesenheitslisteAnzeigenBeiMehrerenDatensaetzen' 2023-02-07 14:29:48 +01:00
Andreas Österreicher 366aca2b1c Merge branch 'bug-26740/FAS_Reiter_Anwesenheit' 2023-02-07 14:21:24 +01:00
Andreas Österreicher de5b701532 Problem beim CSV Import behoben wodurch der Import ohne
Projekt-Zuordnung nicht möglich war
2023-02-07 09:01:29 +01:00
Andreas Österreicher b17c6e29e5 Merge branch 'master' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2023-02-06 16:23:48 +01:00
Andreas Österreicher fd0eed8558 Merge branch 'feature-27665/infocenter_zgv_uebernehmen' 2023-02-06 15:49:18 +01:00
ma0048 e6269b121b - fixed zgv uebernehmen 2023-02-06 13:04:32 +01:00
Andreas Österreicher 5441024c75 Merge branch 'feature-27363/infocenter_alte_dokumente_aus_dem_archiv_sichtbar' 2023-02-02 12:20:42 +01:00
Andreas Österreicher f46ff9c97a Merge branch 'feature-11058/fas_unterrichtsnummer_ungleich_lehreinheit_id' 2023-02-02 12:12:12 +01:00
Andreas Österreicher 0cfcb58a58 Merge branch 'feature-25900/krankenstaende_abteilung_und_unternehmen_hinzufuegen' 2023-02-02 12:05:46 +01:00
Andreas Österreicher 92fb2f40cd Merge branch 'feature-26298/unr_problem_im_tempus_fas' 2023-02-02 11:50:40 +01:00
Andreas Österreicher 858ab16bc7 Merge branch 'feature-26104/standort_kurzbz_im_fas_anzeigen' 2023-02-02 11:45:50 +01:00
Andreas Österreicher b2e148d330 Bugfix Standort 2023-02-02 11:45:03 +01:00
Andreas Österreicher 463c6bd97a Merge branch 'feature-25431/zgv_master_eingabe_sperren' 2023-02-02 11:27:25 +01:00
Andreas Österreicher 2fdd136aa9 Merge branch 'feature-24683/reihungstest_zeit_für_gebiete_zuruecksetzen_nach_dem_entsperren_eines_teilnehmers' 2023-02-02 11:20:48 +01:00
Andreas Österreicher 6643fae82c Merge branch 'feature-24682/reihungstest_zugangscode_fuer_login' 2023-02-02 11:06:42 +01:00
Andreas Österreicher 94854592fb Merge branch 'feature-26425/konto_buchung_vorhanden_warning_namen_anzeigen' 2023-02-02 10:38:14 +01:00
Andreas Österreicher b60e0b712f Merge branch 'feature-25430/stammdaten_im_infocentertool_editierbar' 2023-02-02 10:32:36 +01:00
Andreas Österreicher 2b3842df29 Merge branch 'feature-27513/infocenter_fit_anpassung' 2023-01-31 12:29:56 +01:00
Andreas Österreicher e019faabe4 Merge branch 'feature-27480/international_skills_text_anpassungen' 2023-01-30 14:57:22 +01:00
ma0048 3293a75a79 - berechtigungsabfragen angepasst
- fit programme aus der config holen
2023-01-30 11:51:15 +01:00
ma0048 c8df6633af - text anpassungen 2023-01-27 08:56:47 +01:00
KarpAlex c136a0afdb phrasesupdate: added phrase for projektarbeitsbeurteilung weightening notice, changed phrases for total points for correct upper case 2023-01-26 18:55:41 +01:00
KarpAlex 7eda91d0a2 Merge branch 'master' into feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token 2023-01-26 17:38:34 +01:00
ma0048 44bfe52529 - fas filter hinzugefuegt 2023-01-26 11:35:22 +01:00
ma0048 50070bd2ad - Dokumente aus dem Archiv im Infocenter-Tool nicht anzeigen 2023-01-26 10:41:44 +01:00
Manfred a9e235678c Filter Widget in Tabellen 2023-01-24 21:13:36 +01:00
Paolo 0401821422 Merge branch 'master' into feature-15029/Docsbox 2023-01-23 13:32:51 +01:00
Werner Masik f7d315d4cc model classes for contract parts (Vertragsbestandteile) 2023-01-21 13:51:59 +01:00
Werner Masik fd5ce62b0e added timeline widget 2023-01-21 13:50:45 +01:00
Manfred c8fb2080da Studiengangsfilter bei Fragenübersicht 2023-01-20 10:46:22 +01:00
ma0068 d59b3736a2 Test personalmeldung xml 2023-01-18 13:15:56 +01:00
KarpAlex 73dc39b9d8 added phrases for Projektarbeitsbeurteilung language dropdown 2023-01-17 20:45:05 +01:00
Manfred 194d141539 Merge branch 'VorrueckungLetztesSemester' 2023-01-17 16:01:54 +01:00
Manfred 04584fdec9 Merge branch 'master' into VorrueckungLetztesSemester 2023-01-17 15:59:12 +01:00
Manfred f0b1c14ea4 Contents unchanged 2023-01-17 15:57:01 +01:00
Harald Bamberger 3fb20cf61e Merge branch 'bug-27193/Pause_fehlt_-_Falsche_Anzeige' 2023-01-16 16:10:54 +01:00
Cris 5872612d86 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2023-01-16 13:10:33 +01:00
Paolo 4fa1193948 - Added new CI config file application/config/db_crypt.php, it is loaded by core/DB_Model
- Added new constant ENCRYPTION_PASSWORDS to application/core/DB_Model.php
- Added new protected properties passwordName and encryptedColumns to core/DB_Model
- Added new private methods _isCryptoEnabledAndValid, _getCipher, _encrypt and _decrypt to core/DB_Model
- core/DB_Model properties insert and update now are making use of _encrypt()
- core/DB_Model properties loadWhere and loadTree now are making use of _decrypt()
2023-01-16 12:10:49 +01:00
Harald Bamberger f15e89c451 ignore DienstreiseMT entries when calculating Pausenfehler 2023-01-16 10:24:09 +01:00
Manfred f52c9ed3c2 Anpassung der Errormessage 2023-01-13 15:29:59 +01:00
Cris 8bd007b6ea Merged Fachbereichsleitungs-files into core files
. approveAnrechnungUebersichtData_fbl.php into approveAnrechnungUebersichtData.php
. reviewAnrechnungUebersichtData_fbl.php into reviewAnrechnungUebersichtData.php
2023-01-12 09:38:41 +01:00
Cris f2231fcba2 Disabled recommendation buttons if Lector is not empfehlungsberechtigt
If lector should see Anrechnung but not give a recommendation (because is not the LV-Leitung),
then recommendation buttons are disabled.
2023-01-11 18:13:14 +01:00
Cris 3f4efbcd16 Added function isEmpfehlungsberechtigt to AnrechnungLib
Checks if user is allowed to recommend Anrechnung.
2023-01-11 18:05:49 +01:00
Cris fb4f9981f0 Corrected: Anzeige aller LV-Leitungen, an die Empfehlung gesendet wurde
In der STGL Anrechnungs-Detailsicht wurde bisher nur die erste LV-Leitung
aus dem Ergebnisarray ausgelesen. Nun werden alle angezeigt.
2023-01-11 13:52:44 +01:00
Cris d1319a23ad Added: STGLs sehen jetzt nur Anrechnungen von STGs, für die sie eine Berechtigung haben
Es gibt eine neue Spalte 'schreibberechtigt' in der Anrechnungentabelle.
Defaultmäßig werden nur 'schreibberechtigte' Anrechnungen angezeigt, wo STGL
die Berechtigung auf die OE hat.
Über den Filter können aber auch alle angezeigt werden.
2023-01-11 13:47:23 +01:00
Cris 29f1760a7c Added: LektorInnen sehen jetzt nur Anrechnungen, für die sie eine Empfehlung abgeben dürfen
Es gibt eine neue Spalte 'empfehlungsberechtigt' in der Anrechnungentabelle.
Defaultmäßig werden nur 'empfehlungsberechtigt' Anrechnungen angezeigt, wo LektorIn:
- LV Leitung der LV ist ODER
- die LV keine LV-Leitung hat
Über den Filter können aber auch alle angezeigt werden.
2023-01-11 13:45:18 +01:00
ma0048 ed99325bb9 - anpassungen fuer master bewerbungen 2023-01-10 09:04:53 +01:00
Manfred c1b40608c1 Merge branch 'master' into VorrueckungLetztesSemester 2023-01-09 16:38:49 +01:00
Manfred 2ca9f29c0d Englischen Bachelor-Leitfaden entfernt 2023-01-09 15:52:12 +01:00
KarpAlex 9c40452562 fas lv list: improved speed of query getting the lv by relocating studienplan exists check 2023-01-05 18:25:15 +01:00
Werner Masik 030b459b0a make Vertragbestandteil JsonSerializable (because json_encode would otherwise output null) 2022-12-30 18:36:10 +01:00
KarpAlex 6d05df876b lehrstunde.class.php: added with clause to getStundenplanData for speedup, removed brackets, added comments 2022-12-23 20:18:19 +01:00
KarpAlex b8e973c313 lehrstunde get Stundenplan data: removed var_dump 2022-12-23 02:45:48 +01:00
KarpAlex 514205c171 lehrstunde get Stundenplan: changed how data for students is retrieved, so that correct gruppen, lektoren etc can be displayed 2022-12-23 02:44:22 +01:00
KarpAlex 19ebe3cfa8 lehrstunde getstudienplan method: added studiensemester to "special groups" test for students 2022-12-21 17:43:42 +01:00
KarpAlex 103b93a2b8 getStundenplandata method: student lehreinheiten are taken from Studienplan, not view vw_studentlehrverband 2022-12-20 22:22:36 +01:00
ma0068 9070a81f25 Änderung der From-Adresse auf noreply 2022-12-19 14:09:40 +01:00
ma0068 08ebcf591a Adaptierung Legende Fotoliste 2022-12-16 11:50:14 +01:00
ma0068 00446cdb33 Erweiterung Anwesenheitsliste um Geschlecht 2022-12-16 08:37:04 +01:00
ma0048 d9098179a2 - ermoeglicht es master bewerber sich ueber das bewerbungstool anzumelden 2022-12-14 12:40:38 +01:00
KarpAlex 48ee451a38 changed method projektarbeitIsCurrent to adapt to changes for master (weightening of points), kept old check as projektarbeitIsCurrentBeforeWeightening method 2022-12-13 17:25:42 +01:00
Harald Bamberger 3818d5221c first guess vertragsbestandteil library 2022-12-13 10:49:35 +01:00
Manfred db53de363c Merge branch 'master' into benutzerberechtigungGUIneu 2022-12-12 10:07:03 +01:00
Manfred 603abd5458 Merge remote-tracking branch 'origin/master' 2022-12-12 09:41:07 +01:00
Manfred cb9eaa7694 Last Status Abgewiesener ergänzt, Felder BPK und Matrikelnummer ergänzt 2022-12-12 09:40:02 +01:00
ma0068 7c17ac4ea7 Erweiterung Abfrage in Klasse Anwesenheit um wahlname 2022-12-12 08:32:51 +01:00
ma0048 ad19e0ed75 - im fas die unr hinzugefuegt 2022-12-12 07:55:36 +01:00
KarpAlex 46f7fc2883 Merge branch 'feature-19154/Beurteilungsformulare_Pruefungssenat' into feature-26516/Beurteilungsformulare_Gewichtung_bei_Master_Beurteilungen 2022-12-07 17:51:04 +01:00
KarpAlex 77361fc5f1 Projektarbeitsbeurteilungen: added phrass "gewichtet" 2022-12-07 17:40:20 +01:00
Cris 8d221be050 Adapt view to use Fachbereichsleitung-DataView 2022-12-06 15:53:15 +01:00
Cris 40c7e1c9f0 Created new Approve Anrechnung Uebersicht for Fachbereichsleitung 2022-12-06 15:52:30 +01:00
Cris 32bdeec02e Added date check for Fachbereichsleitung in Tabulator query 2022-12-06 15:49:04 +01:00
Cris 91a2bf4f21 Merge branch 'bugfix/STGL-kann-alte-Anrechnungen-nicht-sehen' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige 2022-12-06 14:15:15 +01:00
Cris c3e3d8e9d7 Added Fachbereichsleitung permission check to read Anrechnung and download Document 2022-12-06 14:05:42 +01:00
Cris 8735318545 Enhanced code readability 2022-12-06 14:03:22 +01:00
Cris 21060b31dc Bugfixed error message when LV has no lectors and only one recommendation is requested 2022-12-06 14:01:24 +01:00
Cris e148d8c2f4 Added function to get Fachbereich as mail receivers 2022-12-06 13:54:56 +01:00
Cris d3a1ed222c Adapted to send mails only if config['mail'] is TRUE 2022-12-06 13:43:11 +01:00
Cris 0197e5b175 Adapted STGL Views to display Fachbereichsleitung (as 'Empfaenger') after recommendation 2022-12-06 13:33:28 +01:00
Cris fe2601b29a Adapt view to use Fachbereichsleitungs-DataView 2022-12-06 13:25:25 +01:00
Cris 4a87fb49e9 Created new Review Anrechnung Uebersicht Tabulator for Fachbereichsleitung 2022-12-06 13:22:48 +01:00
Cris 88246c443a Added function getFachbereichleitung to AnrechnungLib
...plus adaptation to getEmpfehlungData to use this function.
2022-12-06 10:53:21 +01:00
Cris 10ed780b6c Added method getFachbereichsleitungByLv to Lehrveranstaltung_model
Gets all fachbereichsleiter of a Lehrveranstaltung
2022-12-06 10:50:08 +01:00
Cris cee15a68ba Added config['fbl'] and config['send_mail'] to anrechnungen
. config['fbl'] enables Fachbereichsleitung instead of LektorInnen
. config['send_mail'] enables sending Info Mails
2022-12-06 10:48:52 +01:00
KarpAlex 579eda8680 Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat 2022-12-02 19:57:28 +01:00
KarpAlex 911035d5ad added method getBetreuerart to Projektbetreuer model 2022-12-02 19:48:23 +01:00
ma0068 1aada9694e Anzeige EW-Team: nur aktuelle Eintraege oder Eintraege ohne Zeitraum 2022-12-02 12:44:53 +01:00
KarpAlex 41eaee41af getIncomingOrGsFoerderrelevant: studiensemester is checked only for prestudent status 2022-12-01 17:18:18 +01:00
ma0048 d24bc36bf7 - freischaltcode beim RT hinzugefuegt 2022-12-01 11:07:47 +01:00
ma0048 6215786565 - zeit staffelung hinzugefuegt 2022-12-01 10:20:10 +01:00
KarpAlex 7d1267732f IncomingOrGsFoerderrelevant plausicheck: added first version of issue resolver, renamed from IncomingAndGsFoerderrelevant 2022-11-30 17:53:36 +01:00
KarpAlex d1ac2e0424 added plausicheck "getIncomingUndGsFoerderrelevant" 2022-11-30 17:26:50 +01:00
ma0068 1c0e74e828 Testvarianten zur Anzeige von EW-Team in Personalmeldung 2022-11-30 10:38:40 +01:00
Cris ca217f1869 Fixed: Downloadlink erzeugt nach Page Reload keine Fehlermeldung mehr 2022-11-29 18:10:39 +01:00
ma0068 8baa5b74dd Revert "personalmeldung.php mit masterstand überschrieben, um letztes commit rückgängig zu machen"
This reverts commit 39572452a0.
2022-11-29 10:39:20 +01:00
ma0068 39572452a0 personalmeldung.php mit masterstand überschrieben, um letztes commit rückgängig zu machen 2022-11-29 10:26:31 +01:00
ma0048 381fa2ed7e - bei der warnung buchung vorhanden, name hinzugefuegt 2022-11-29 10:17:32 +01:00
ma0068 d1a8ec7490 Erweiterung und OrderBy der Abfragen um Dauer Auslandsaufenthalt 2022-11-29 08:15:22 +01:00
Cris 7cdb7688c4 Fixed: Vergangene Anrechnungen können jetzt eingesehen werden
Manche vergangene Anrechnungen konnten nicht eingesehen werden, weil
die Zuordnung der Studenten zu den Lehrveranstaltungen aufgelöst bzw. geändert werden.
Gefixt, indem nun bei einer bestehenden Anrechnung die bei der Anrechnung hinterlegten Lehrveranstaltung
herangezogen wird.
2022-11-28 17:27:39 +01:00
ma0068 561e4ea21a Erweiterung von Studiengangs_kz_Array um Start und Ende Entwicklungsteam 2022-11-28 10:56:20 +01:00
Cris 72c0f97218 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-11-28 10:28:01 +01:00
ma0048 a2f65373cd - fixed bug 2022-11-24 06:57:56 +01:00
KarpAlex 33eb1cb6af removed comment in Plausichecks.php controller 2022-11-23 16:21:05 +01:00
ma0048 37cbe5e8f7 - le details disablen bis der rebuild fertig ist 2022-11-23 07:24:48 +01:00
ma0068 a88e5cbdc2 Ergänzung Prüftabelle um entwicklungsteam_id 2022-11-22 12:22:48 +01:00
ma0068 f9d5a6a6a5 Adaptierungen fuer CheckSystem, dbupdate3.4 2022-11-22 12:14:54 +01:00
Andreas Österreicher 37ec8d84e5 Merge branch 'Monika70-studentenexpoertextended' 2022-11-22 11:18:50 +01:00
Andreas Österreicher 817d2842cc Changed Escaping of Parameter 2022-11-22 11:17:57 +01:00
Szabo Mónika 9d43279089 Update studentenexportextended.xls.php
mit Anmerkung erweitern
2022-11-22 10:03:40 +01:00
Andreas Österreicher 60a651c220 Merge branch 'feature-25183/lv_evaluierung_uebersichtsseite_langsam' 2022-11-21 16:36:50 +01:00
Andreas Österreicher 462e77d27d Merge branch 'feature-24768/fas_zgv_bezeichnung' 2022-11-21 16:17:28 +01:00
Andreas Österreicher 920fcc0e42 Merge branch 'feature-246/notizen_bei_lehrveranstaltungen_werden_nicht_korrekt' 2022-11-21 16:11:21 +01:00
ma0068 01ad28021f Fix mergeErrors mitarbeiter.class und dbupdate3.3 2022-11-21 16:10:19 +01:00
Andreas Österreicher 9f8d9f1df6 Merge branch 'bug-25904/studentenmeldung_xml_standort_code_Ambiguitaet' 2022-11-21 15:53:58 +01:00
Andreas Österreicher 7cd4eaf5a2 Merge branch 'bug-26144/Bewerberdaten_BIS_Export_XL_Error' 2022-11-21 15:47:51 +01:00
Andreas Österreicher 5e1ed8fa14 Bugfix für Statistiken mit Array Parametern 2022-11-21 15:39:32 +01:00
Andreas Österreicher 3c99d627e1 Merge branch 'feature-19835/BewerbungstoolKeineZGVAbbrecher' 2022-11-21 15:27:36 +01:00
KarpAlex fec45f7b75 separated Bewerbermeldung from Studierenden BIS Meldung, bugfix: correct Bewerber numbers for correct Studiengänge are displayed, renamed ZugangMaCode Element to ZugangMaStgCode 2022-11-18 18:41:02 +01:00
Nikolaus Krondraf 7ef7b86d30 Studierende können sich frühestens 2 Monate vor Prüfung anmelden 2022-11-18 11:11:35 +01:00
Nikolaus Krondraf 1ec742b8fe typo 2022-11-18 10:05:38 +01:00
Nikolaus Krondraf 01107e361f Studierende können sich frühestens 2 Monate vor Prüfung anmelden 2022-11-18 10:01:39 +01:00
Manfred 82b9f595c3 Merge remote-tracking branch 'origin/master' 2022-11-17 13:57:54 +01:00
Manfred d84f53e5c3 GS-Button zum Kopieren bestehender Einträge 2022-11-17 13:57:52 +01:00
Cris deeb1cdb5e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-11-17 10:42:13 +01:00
KarpAlex 763b0bb756 renamed betreuerart of secondary examiner of bachelor thesis with Vorsitz from Senatspruefer to Senatsmitglied 2022-11-16 17:19:13 +01:00
ma0048 ac370197e1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25430/stammdaten_im_infocentertool_editierbar 2022-11-15 15:29:15 +01:00
ma0048 ab95544f9f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25518/bewerbungstool_messages_direkt_an_permesser 2022-11-15 15:18:59 +01:00
ma0048 6e6406fb2b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25431/zgv_master_eingabe_sperren 2022-11-15 15:17:55 +01:00
ma0048 00fb8366b3 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25183/lv_evaluierung_uebersichtsseite_langsam 2022-11-15 15:16:21 +01:00
ma0048 8e72b83448 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-24768/fas_zgv_bezeichnung 2022-11-15 15:14:53 +01:00
ma0048 98ec75dc94 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-24683/reihungstest_zeit_für_gebiete_zuruecksetzen_nach_dem_entsperren_eines_teilnehmers 2022-11-15 15:14:04 +01:00
ma0048 9601ac5116 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-246/notizen_bei_lehrveranstaltungen_werden_nicht_korrekt 2022-11-15 15:13:25 +01:00
ma0048 406e1bebfe Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-20037/reihungstestjob_neue_studienplaene_werden_nicht_korrekt_zugeordnet 2022-11-15 15:11:44 +01:00
ma0048 75f8c4e909 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten 2022-11-15 15:09:29 +01:00
ma0048 d70c0dcae3 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern 2022-11-15 15:08:01 +01:00
ma0068 540fc4bede 26198 Notenimport ausschliesslich bei vorhandener Note 2022-11-15 11:22:47 +01:00
KarpAlex 8bbbd8cb8d studentenmeldung bugfix: Erhalter Kz is correctly exported 2022-11-14 18:13:49 +01:00
KarpAlex 048c164394 studentenmeldung.php: correct order - Studenten first, then Bewerber 2022-11-14 17:57:20 +01:00
Andreas Österreicher 6c918be121 Merge branch 'bug-26144/Bewerberdaten_BIS_Export_XL_Error' 2022-11-14 10:50:18 +01:00
KarpAlex 2c743cb37b studentenmeldung.php: Export of Bewerberdaten works for allBaMa and Studiengaenge 2022-11-11 23:41:12 +01:00
Andreas Österreicher 471242cb97 Added Index for tbl_webservicelog.execute_time to increase performance 2022-11-11 15:03:48 +01:00
Harald Bamberger 7df9576481 add tabulator header filters to logsviewer 2022-11-11 15:02:39 +01:00
ma0068 a412db7356 Attribut raumtyp_aktiv als boolean parsen 2022-11-11 14:27:06 +01:00
Paolo ac1df7691a - Added new view application/views/system/messages/FAShtmlWriteTemplate.php to be used with FAS/SeaMonkey and TinyMCE3
- Replaced TinyMCE V4 with V5
- Dropped TinyMCE V4
- Added new JS public/js/messaging/fasMessageWrite.js to be included by application/views/system/messages/FAShtmlWriteTemplate.php
2022-11-11 13:54:25 +01:00
ma0068 ddfb3cdb4e Formatierungen Urlaubstool 2022-11-11 11:25:42 +01:00
ma0048 119a521913 - standort kurzbz im fas anzeigen, wenn die bezeichnung null ist 2022-11-11 10:56:36 +01:00
Andreas Österreicher b69e79685d Merge branch 'master' into feature-24768/fas_zgv_bezeichnung 2022-11-11 09:53:23 +01:00
Andreas Österreicher 7558614145 Merge branch 'feature-25557/inaktive_lektorinnen_im_lehrauftrags_dropdown_kennzeichnen' 2022-11-11 09:41:18 +01:00
KarpAlex f0b36610b7 Projektarbeitsbeurteilung: added phrases, updated filter for uebersicht-page 2022-11-10 19:38:16 +01:00
ma0068 f72afe473c 26112 Vilesci-Kein Löschen von Zeitsperren bei abgeschickter Monatsliste möglich 2022-11-10 15:02:13 +01:00
ma0068 f766f36095 26113 Änderung Mails Zeitsaldo 2022-11-10 11:43:27 +01:00
ma0068 74fb245757 26114 Änderung Mailtext Urlaub neu 2022-11-10 11:20:36 +01:00
Andreas Österreicher 4e3e425491 Mailversand bei Urlaubstool korrigiert 2022-11-09 11:58:31 +01:00
KarpAlex 29809b6bf1 moved Beurteilungsformulare Pruefungssenat changes to dbupdate_3.4 2022-11-08 16:15:16 +01:00
KarpAlex 83b38b999d Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat 2022-11-08 15:35:08 +01:00
ma0048 8df802b74a - die Abteilung und das Unternehmen werden im CSV angezeigt 2022-11-08 14:45:02 +01:00
Paolo 9c0d70fe89 Removed version 4 of tinymce 2022-11-08 12:01:05 +01:00
ma0048 a9d065044d - Inaktive LektorInnen im Lehrauftrags-Dropdown kennzeichnen 2022-11-07 12:17:09 +01:00
ma0048 c3ff32a9d6 - unterschiedliche farbmarkierungen hinzugefuegt 2022-11-07 11:16:27 +01:00
Paolo 50bf478f0b If the title is not provided to the FilterComponent then the title div is not rendered 2022-11-04 14:06:50 +01:00
Paolo 317a1f87fa Added colors to the LogsViewer app 2022-11-04 13:56:54 +01:00
ma0048 592fd7ac10 Merge remote-tracking branch 'origin/master' into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten 2022-11-04 10:49:27 +01:00
ma0048 180e24b916 - studienbestaetigung in englischer sprache hinzugefuegt
- odt files angepasst im core
2022-11-04 10:37:38 +01:00
KarpAlex ebb3a6de1f plausichecks view: adapted to vue update - set correct cs and css includes, removed body 2022-11-03 15:33:05 +01:00
cgfhtw 4dd983c105 Phrases 2022-11-03 12:52:31 +01:00
KarpAlex 35b23bcba4 Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen 2022-11-03 12:07:51 +01:00
KarpAlex 71c953bac7 studentenmeldung: standort_code is retrieved and set in xml correctly (first prestudent, then studiengang) 2022-11-03 12:04:46 +01:00
ma0048 ffec6a5422 - stammdaten editierbar 2022-11-03 09:55:38 +01:00
ma0068 9b79a2f446 Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung 2022-11-03 08:48:05 +01:00
ma0068 314e71a2d0 Merge branch 'master' into feature-24913/TabelleRaumtypNeuesAttributAktiv 2022-11-03 08:46:05 +01:00
ma0048 a8f6ca1670 Merge remote-tracking branch 'origin/master' into feature-25430/stammdaten_im_infocentertool_editierbar
# Conflicts:
#	application/views/system/infocenter/infocenterDetails.php
2022-11-03 08:29:10 +01:00
ma0048 651a4a97e7 - stammdaten editierbar 2022-11-02 16:50:53 +01:00
ma0068 d7897d7129 Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen 2022-11-02 16:18:23 +01:00
ma0068 5d847ccd38 Merge branch 'master' into feature-19835/BewerbungstoolKeineZGVAbbrecher 2022-11-02 15:56:04 +01:00
ma0068 c47d2c93fe Merge branch 'master' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-11-02 15:05:25 +01:00
Cris 7b5e5562b5 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-11-02 10:56:55 +01:00
Andreas Österreicher 1c0b21cb74 JS Includes Korrigiert für Prüfungsprotokolle und UDFs 2022-10-31 16:30:41 +01:00
Andreas Österreicher 15b2c469e2 Restricted Access 2022-10-31 15:31:50 +01:00
Andreas Österreicher 771395cbbf Versionsnummer auf 3.4 erhöht. Extension installer Prüft auf
Minimalversion vom Core. Neue Ordnerstruktur für Checksystem
2022-10-31 15:16:30 +01:00
ma0048 f0fd071e31 - notizen ausblenden 2022-10-31 13:44:17 +01:00
Andreas Österreicher 989a7b8720 Neuen Config für BASE_LOCATION hinzugefügt 2022-10-31 13:23:03 +01:00
Andreas Österreicher 556e58e78e Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' 2022-10-31 11:29:51 +01:00
ma0048 f7bd49b408 - master messages an studiengang, wenn bereits bestaetigt
- lehrgang messages direkt an lehrgang
2022-10-28 10:56:02 +02:00
Harald Bamberger c9aba38803 change name of column StdKst to Standardkostenstelle 2022-10-28 07:01:39 +02:00
ma0068 c7f477555c Adaptierungen DB und Dropdowns Fas Lehrveranstaltungen 2022-10-27 15:17:29 +02:00
ma0048 4518eab1a8 - stammdaten include 2022-10-25 07:14:47 +02:00
ma0048 9192befce1 - stammdaten include 2022-10-25 07:08:29 +02:00
ma0048 572e53f554 - addon angepassst fuer die stammdaten 2022-10-25 07:02:13 +02:00
Harald Bamberger b3ce06cb90 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-10-24 15:21:11 +02:00
Manfred 73dd6e6dc1 Autocomplete in Berechtigungrolle 2022-10-24 14:27:54 +02:00
Manfred 5e9b5b2ce5 Direktlink auf Rolle 2022-10-24 14:27:34 +02:00
Manfred bf8aa6c4ac Student im Max-Semester nicht vorrücken 2022-10-24 12:23:03 +02:00
Manfred 409ccd7640 BugFix DISTINCT in getOrganisationunitsByPersonId 2022-10-24 12:21:40 +02:00
Manfred b89494f80a Merge remote-tracking branch 'origin/master' 2022-10-24 12:18:31 +02:00
Harald Bamberger 50ab6ae5e9 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-10-24 11:02:52 +02:00
KarpAlex 7a1f36cb5e issuesData Fehlermonitoring: changed order for issue display, first by error type, then by status 2022-10-23 18:02:59 +02:00
ma0048 53dc6b3c63 - tag closed 2022-10-21 11:07:52 +02:00
ma0048 1609543a31 - lv evaluierung ubersichtsseite optimiert 2022-10-20 14:01:31 +02:00
Manfred aadd6b0d92 Anzahl Rechte zählen 2022-10-18 16:48:27 +02:00
ma0048 0bd7d6f7c6 - editieren von stammdaten im infocentertool 2022-10-18 11:00:57 +02:00
ma0068 47d3ab33e7 Adaptierung Vorlage Notenliste.xls um Nachprüfung und Termin3 2022-10-18 09:17:07 +02:00
KarpAlex 336f32bee0 issues: removed unnecessary unique constraint on fehlercode and fehler_kurzbz, added NOT NULL constraint on fehler_kurzbz together with fehlercode_extern 2022-10-17 18:12:34 +02:00
KarpAlex c96baac859 Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen 2022-10-17 17:11:17 +02:00
ma0068 8754c46575 Refactor Import Termin2 und Termin3 2022-10-17 14:34:11 +02:00
Werner Masik 235f15e9f7 removed primeflex.mini.css 2022-10-17 12:36:08 +02:00
Werner Masik 4480b6ce57 removed 'Bottom Panel' text from verticalSplitter because it is shown on empty pages 2022-10-17 12:36:08 +02:00
Werner Masik 23b228c085 added primeflex css classes 2022-10-17 12:36:08 +02:00
ma0068 4f71a274e2 Update Überprüfungen ZGV mit get_rolle_prestudent() 2022-10-17 08:36:36 +02:00
ma0068 458117fced Funktion existsZGV: prestudents mit Last Status Abbrecher werden nicht berücksichtigt 2022-10-14 16:24:45 +02:00
ma0068 382da823e4 Erweiterung Funktion existsZGV um LastStatusPrestudent 2022-10-14 16:12:41 +02:00
ma0048 bfb24320d7 - editieren der ZGV Master nur noch mit eigenen Recht moeglich 2022-10-14 11:11:25 +02:00
ma0068 ce3cea5515 Validierungen Format Datum, Matrikelnr, StudentId, Note 2022-10-13 15:36:08 +02:00
ma0068 29fc5181bf Importfunktion Termin3 2022-10-13 10:16:26 +02:00
ma0068 035d196ae5 Logik Matrikelnummer StudentenId 2022-10-13 08:04:10 +02:00
ma0068 54411f4de7 Benotungstool: Importfunktion Termin2 2022-10-12 15:06:07 +02:00
KarpAlex 2504c91cd9 AusbildungssemPrestudentUngleichAusbildungssemStatus Plausicheck: added student_uid to fehlertext, changed order of ausbildungssemester in fehlertext 2022-10-12 12:36:34 +02:00
KarpAlex c7c0bbfb49 Merge branch 'feature-17512/Issues_Plausibilitaetspruefungen' of github.com:FH-Complete/FHC-Core into feature-17512/Issues_Plausibilitaetspruefungen 2022-10-12 11:56:02 +02:00
ma0048 492562efdf - zeit hinzufuegen fuer den pruefling 2022-10-12 11:46:03 +02:00
KarpAlex 65c6466465 PlausicheckLib: -run check InaktiverStatusAktiverStatus always for current semester -removed unused result variables, todo comment 2022-10-12 11:23:51 +02:00
ma0048 a2c2eddf0d - sql angepasst 2022-10-12 11:18:05 +02:00
Cris 82cbc63096 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-10-11 09:51:45 +02:00
Andreas Österreicher 30fbeda1ba Merge branch 'master' into feature-15029/Docsbox 2022-10-11 09:32:24 +02:00
ma0048 1b49ea2a20 - rt job angepasst 2022-10-11 08:23:49 +02:00
Paolo 08a58b919a Added the operations equal and not equal for strings in the FilterComponent 2022-10-10 14:55:49 +02:00
Paolo ba5fb29d13 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-10-10 14:44:31 +02:00
Andreas Österreicher 6a2f570ffa Merge branch 'feature-20088/BIS_Studiengangsmeldung_Anpassungen' 2022-10-10 14:42:43 +02:00
Paolo aead693675 - Removed not used methods sortSelectedFields, removeSelectedField and addSelectedField from controllers/components/Filter
- Removed not used methods sortSelectedFields, addSelectedField and removeSelectedField from libraries/FilterCmptLib
- CSS fixes for FilterComponent and NavigationComponent
- Removed not used API calls from public/js/components/filter/API.js
- Added second level menu entries to the NavigationComponent
- Added new property side-menu to the FilterComponent to render the filters selection via the NavigationComponent or directly from the FilterComponent
- FilterComponent:
	- Column positioning is now managed by tabulator
	- Splitted the column selection from the filter options
	- Added the rendering of the filters selection via an optional dropdown
	- Changed the usability and the look of the filter options
	- German translation
2022-10-10 14:38:02 +02:00
Andreas Österreicher 617fa1c450 Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen 2022-10-10 14:27:39 +02:00
KarpAlex f2f960fd43 Plausichecks: added comments, fixed bug for studiengang parameter in GbDatumWeitZurueck check 2022-10-08 01:40:14 +02:00
KarpAlex fb5656833a added plausichecks to navigation menu, improved plausichecks GUI responsiveness, made it centered 2022-10-07 18:22:06 +02:00
KarpAlex b067c97beb Plausichecks: changed texts of some Plausichecks for better understanding, AbschlussstatusFehlt check: Studiensemester not necessary for resolving, checking for melderelevant for fehler StgPrestudentUngleichStgStudienplan 2022-10-07 18:05:25 +02:00
ma0068 18cdbb8f6d Merge branch 'feature-19041/ZeitausgleichSanchoMail' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 09:09:54 +02:00
ma0068 7d3a12fd1c Merge feature-16658/NeueVertragsartAllIn into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 09:03:20 +02:00
ma0068 36b4964d53 Merge branch 'feature-16655/StundensaldoAllin' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 08:51:00 +02:00
ma0068 11a208de55 Merge branch 'feature-15943/VilesciLoeschenVonUrlaubenBeiAbgeschicktenMonatslistenVerhindern' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 08:49:17 +02:00
ma0068 2f5e9d80da Merge branch 'feature-17071MonatslisteVorzeitigAbschickenEndeDV' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 08:45:48 +02:00
ma0068 ae42051f15 Merge branch 'bug-24113/ZeiterfassungBerücksichtigungVonAttributProjektZeitaufzeichnung' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 08:44:35 +02:00
ma0068 32493c1b9d Merge branch 'bug-19038/AnzeigeOffenerMonatslistenBeiNichtZeitaufzeichnungspflichtig' into feature-25177/ZeiterfassungMergedBrancheDeploy1 2022-10-07 08:40:43 +02:00
Andreas Österreicher 22613af9fe Merge branch 'feature-25002/Sonstiges-Sprint-192' 2022-10-06 15:12:33 +02:00
KarpAlex 03d6955ec4 issueDataset.js: code formatting 2022-10-06 10:34:32 +02:00
KarpAlex 21d3d40171 issueDatase.js: added comment for changeIssueStatus method 2022-10-06 10:30:55 +02:00
ma0068 9b3b571bd9 Erweiterung Phrasen 2022-10-06 08:55:11 +02:00
Andreas Österreicher 02445ceff4 Zeitaufzeichnung - Zeit verlängert für die Anzeigen von "allen"
Zeitaufzeichnungen auf 360 Tage
2022-10-06 06:51:14 +02:00
KarpAlex 8fe346f6be plausichceks: changed phrasing of check AusbildungssemPrestudentUngleichAusbildungssemStatus 2022-10-06 03:47:28 +02:00
KarpAlex fb70ba3da5 issueDataset.js: enabled sending many issue ids for status change by splitting up 2022-10-06 03:25:57 +02:00
KarpAlex 6d457fd573 added codex/Mobilitaet_model for bis.tbl_mobilitaet 2022-10-06 00:32:53 +02:00
Manfred 5f8a530857 Merge branch 'master' into benutzerberechtigungGUIneu 2022-10-05 17:51:27 +02:00
Manfred 7fb8c02cd6 Merge remote-tracking branch 'origin/master' 2022-10-05 17:43:57 +02:00
Manfred dfc19f56cb Spalten LAS, ALVS und Anzahl Studierende ergänzt 2022-10-05 17:43:50 +02:00
Manfred d82426cd91 Autocomplete für Kostenstelle 2022-10-05 17:42:45 +02:00
Manfred b293673ee9 Updateamum nur bei geänderten Datensätzen
Kostenstelle Autocomplete
Counter für Anzahl Zeilen
Anmerkungsfeld verbreitert
2022-10-05 17:42:24 +02:00
Cris c27534c93c Corrected: Mail wird nun an alle STGL versendet, wenn mehrere vorhanden sind
Bei der Abgabe von Anrechnungsempfehlungen wurde bisher nur dem ersten STGL
aus potentiell mehreren STGLeitungen ein mail zugeschickt. Nun werden alle addressiert.
2022-10-05 16:27:17 +02:00
Cris c1180c0879 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-10-05 16:19:03 +02:00
KarpAlex edd310351b plausichecks fehlertext: check number of parameters before calling vsprintf 2022-10-05 14:07:29 +02:00
KarpAlex c31ab4874d moved "plausicheck start" button in GUI to the right 2022-10-05 14:04:59 +02:00
KarpAlex 2a060ace25 -added issue resolvers for plausichecks - renamed fehler PrestudentStgUngleichStgStudienplan to StgPrestudentUngleichStgStudienplan -fixed some parameters passed for resolving -plausicheck getDatumStudiensemesterFalscheReiheinfolge: performed directly in SQL for speedup -plausicheck GUI: fixed comment, minor text changes 2022-10-04 19:17:03 +02:00
KarpAlex 5670f931ef Plausichecks: beautified GUI output 2022-10-04 03:17:41 +02:00
KarpAlex b28e780aa6 plausichecks issues fehlerupdate.php: added brackets to OrgformStgUngleichOrgformPrestudent 2022-10-04 03:11:59 +02:00
KarpAlex aee25c5252 moved issue resolvers to #own resolvers folder, created first resolver CORE_INOUT_0007 for plausichecks 2022-10-03 19:25:32 +02:00
Andreas Österreicher fded192a98 Merge branch 'feature-21609/LVVerwaltungDefaultwertFuerNeueLvs' 2022-10-03 16:47:54 +02:00
Andreas Österreicher 7cfc6369b6 Optionalen Eintrag beibehalten bei der Anlage von LVs da sonst alte
Einträge ohne Lehrmodus falsch dargestellt werden
2022-10-03 16:46:49 +02:00
Andreas Österreicher 7b6314dc96 Merge branch 'master' into feature-21609/LVVerwaltungDefaultwertFuerNeueLvs 2022-10-03 16:32:33 +02:00
Andreas Österreicher 3bc1654b76 Merge branch 'feature-25001/warning_beim_zuweisen_von_variablen_zu_personen' 2022-10-03 16:12:47 +02:00
Andreas Österreicher 49124f3100 Added JQueryUI css 2022-10-03 15:22:32 +02:00
KarpAlex ae26c4d1ee plausichecks.js: reformatted file, display error as message 2022-10-03 13:40:33 +02:00
KarpAlex f8d3337481 added Plausicheck gui to start plausichecks manually 2022-10-03 02:32:28 +02:00
KarpAlex 5b46722913 -PlausicheckLib: melderelevant and bismelden fields are checked only if applicable, speed up by including conditions in SQL instead of PHP functions -added more info to some fehler texts by params 2022-10-03 02:28:48 +02:00
KarpAlex 854e0a422f Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen 2022-09-30 18:16:46 +02:00
KarpAlex c00b9006b5 Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen 2022-09-30 18:14:33 +02:00
Andreas Österreicher 9d3d84e7ea Pfad zu Bootstrap angepasst 2022-09-30 15:11:01 +02:00
Andreas Österreicher ae4bf1feb1 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-09-30 14:54:07 +02:00
Andreas Österreicher f7b3a3ccaf Merge branch 'feature-19556/Templates_Detailansicht' 2022-09-30 13:50:12 +02:00
ma0048 3967494775 - typo gefixed 2022-09-30 12:52:47 +02:00
ma0048 b4d86744f2 - fas zgv statt kurzbz auf bezeichnung 2022-09-30 12:50:33 +02:00
ma0068 889f8370e1 bugfix checkIfArbeitspakektZuWaehlen 2022-09-30 12:04:59 +02:00
Andreas Österreicher b9b7af0e1d Merge branch 'origin/feature-24110/weiterentwicklung_internationalisierungsmassnahmen' 2022-09-30 09:07:34 +02:00
KarpAlex 0d605158a5 changed text of AktiverStudentOhneStatus plausicheck 2022-09-29 19:43:40 +02:00
KarpAlex eee43fe921 AktiverStudentOhneStatus check: check for status already in SQL instead of getLastStatus function, future status with 4 months buffer 2022-09-29 19:41:30 +02:00
Andreas Österreicher 9e32330a6c Paragraph für Plagiatscheck angepasst bei Beurteilungsformularen 2022-09-29 10:35:21 +02:00
KarpAlex 7c02f21582 added plausichecks to PlausicheckProducerLib, bugfixes in PlausicheckLib and plausicheck libraries and fehlerupdate, mainly concerning passed parameters 2022-09-29 03:16:05 +02:00
KarpAlex 23ec0d6344 Plausicheck AbschlusstatusFehlt: existence of status in previous Semester is checked as well when passing a Studiensemester 2022-09-28 17:26:36 +02:00
ma0068 8533454ad7 Defaulteintrag in Dropdown Lehrmodus gemäß Configeintrag bei Anlegen neuer LV 2022-09-28 12:13:13 +02:00
KarpAlex 1241a05ed3 -Plausichecks: added correct fehlertext and resolution params -replaced Plausichecker Interface with abstract class, which gets ci instance and loads plausicheck lib -write issue info only if issue really newly inserted 2022-09-27 18:32:15 +02:00
Andreas Österreicher 17ad37ac8e Merge branch 'feature-24767/infocenter_zgv_pruefungen_und_lehre_error' 2022-09-26 16:45:06 +02:00
Andreas Österreicher 4f044fb724 Merge branch 'feature-20696/pausenfehler_wird_nicht_angezeigt' 2022-09-26 16:28:22 +02:00
KarpAlex a238a9f550 studentenmeldung.php: previous first Unterbrechungsdatum is used when there are multiple Unterbrecher status after each other 2022-09-26 11:45:48 +02:00
ma0048 2ab548fc87 - absagegrund wird nun mitgespeichert
- neue filter
- studiengangsleitung kann bestaetigung nur noch ablehnen und nicht loeschen
- neue cronjobs
- neue formatierung
- neue phrasen
2022-09-26 09:46:16 +02:00
KarpAlex 9bae6bb0a4 added params to plausicheck libraries, added PlausicheckProducerLib to enable execution of plausichecks for GUI as well, removed old IssueProducer_Controller 2022-09-26 00:41:48 +02:00
KarpAlex 2c475f8bde fehlerupdate: renamed NationNichtOesterreichAberGemeinde Plausicheck, PlausicheckLib: added comments 2022-09-22 19:54:18 +02:00
ma0068 cb5c11a6ab Zeiterfassung config DEFAULT_ALLIN_DIENSTVERTRAG für Anzeige Saldo AllIn 2022-09-22 13:50:43 +02:00
Harald Bamberger e4590909e2 use alias if available instead of uid for email address 2022-09-22 13:20:12 +02:00
ma0068 f9e33a1779 Zeiterfassung: Config ECHTER_DIENSTVERTRAG 2022-09-22 11:32:49 +02:00
ma0068 c1df686edc Zeiterfassung: Projektvalidierung in Klassen refactored 2022-09-22 10:30:15 +02:00
Harald Bamberger 921b1d337d fix typo 2022-09-22 10:21:24 +02:00
Harald Bamberger bf216e6505 search also in stdkst and oe unit 2022-09-22 10:00:23 +02:00
Harald Bamberger 225b3b7c6e only show current stdkst in searchresult 2022-09-22 09:39:05 +02:00
KarpAlex edb69498e5 added PlausicheckLib for checking plausi issues 2022-09-21 19:55:37 +02:00
KarpAlex 5d1e99a222 Plausichecks: enabled passing of params to plausi issue checkers, created first checker StgPrestudentUngleichStgStudent 2022-09-21 19:54:20 +02:00
KarpAlex 0643b99e86 added Plausicheck fehler (for issues) to database 2022-09-21 19:50:30 +02:00
Harald Bamberger 85338b8477 add PersonalFilters to sideMenu, refresh sideMenu in the session after a custom filter was saved 2022-09-21 15:56:42 +02:00
Harald Bamberger de667990a3 add Standard-Kostenstelle to search result for employees 2022-09-21 15:23:45 +02:00
ma0068 3570b2c04d BT: Adaptierung Prüfung auf Abbrecher auf aktuellen Prestudentstatus 2022-09-21 12:54:41 +02:00
Paolo aa217a42d4 Fixed handlerApplyFilterFields of the components/filter/Filter 2022-09-21 12:47:07 +02:00
Manfred a27ad33e0e Merge branch 'master' into benutzerberechtigungGUIneu 2022-09-21 11:09:27 +02:00
Nikolaus Krondraf ec07c4154d Problem behoben wodurch die Anrechnungen im FAS nicht angezeigt werden wenn diese ohne Anrechnungstool im FAS erfasst werden 2022-09-20 14:31:51 +02:00
ma0068 4d44bbb79c Anzeige Aktueller Urlaubssaldo in Sanchomail 2022-09-20 12:39:20 +02:00
Paolo 07a1d7ecb2 - Added CSS for the navigation component and the filter component
- Changed layout of the filter component
2022-09-19 16:31:55 +02:00
Andreas Österreicher 0c9d535941 Merge branch 'feature-20221/PHP_7.1_Kompatibilitäte_Excel_Lib' 2022-09-19 16:26:51 +02:00
Andreas Österreicher 4976804f8d Merge branch 'feature-18874/CISMoodleGradeImportMitUID' 2022-09-19 16:02:17 +02:00
Andreas Österreicher 253b1352f9 Merge branch 'bug-20124/FilterWidget_query_executed_before_changes_are_applied_bug' 2022-09-19 15:55:51 +02:00
Andreas Österreicher 4f35d6bf0a Merge branch 'feature-19547/CoodleZeitsperrenAnzeigen' 2022-09-19 15:44:40 +02:00
Andreas Österreicher 0f6836385f Added Column Wahlname to campus.vw_mitarbeiter 2022-09-19 15:31:31 +02:00
Andreas Österreicher 66b9576e15 Merge branch 'bug-24165/Message_reply_token_allow_to_write_to_anybody' 2022-09-19 15:11:51 +02:00
Andreas Österreicher cac01a50ec Added Column Wahlname to campus.vw_student and campus.vw_benutzer 2022-09-19 15:08:50 +02:00
Andreas Österreicher 6ae6751aa4 Merge branch 'feature-19171/Wahlname' 2022-09-19 14:48:05 +02:00
Manfred 79fbb4b7b2 Merge remote-tracking branch 'origin/master' 2022-09-19 14:05:19 +02:00
Manfred 1e85aeb8da Studiensemester save empty string as null 2022-09-19 14:05:12 +02:00
Andreas Österreicher 2a43793982 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' 2022-09-19 10:26:44 +02:00
KarpAlex 926180f5da system/checkStudenten: corrected typo in Studierenden Orgform Plausicheck text output 2022-09-18 23:11:43 +02:00
KarpAlex 40d8edebef Plausichecks: added run method to IssueProducer_Controller for producing plausicheck issues 2022-09-18 23:02:55 +02:00
Manfred 83ef4be673 Bugfix Limit 10 entfernt 2022-09-16 14:54:11 +02:00
Manfred ec87bd0c80 UID in Dropdown anzeigen und inaktive Mitarbeiter kennzeichnen 2022-09-16 14:47:59 +02:00
Manfred f65ae01dd0 Suche nach LV-Kurzbz, Bugfix Checksubmit 2022-09-16 14:47:06 +02:00
KarpAlex d5eff7d615 issue plausichecks: added issue producer files, code formatting 2022-09-15 18:56:18 +02:00
KarpAlex e34d9afefe BIS Lehrgangsmeldung: correctly placed Orgformcode Tag, indent formatting 2022-09-15 17:22:33 +02:00
KarpAlex 9fb077afdc studentenmeldung bis: renamed Studienkennunguni, master ZGV elements, correct placement of duales studium, correct checkof duales studium 2022-09-15 14:59:04 +02:00
Cris d366c672b9 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze 2022-09-15 10:18:11 +02:00
Cris 3690984682 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-09-15 10:17:33 +02:00
Cris 941bbaaa79 Fixed falschen ECTS Höchstgrenze Hinweis in STGL Detailansicht
Es wird nun bei der Berechnung der ECTS Höchstgrenze auch auf den
Anrechnungsgrund geschaut.
2022-09-15 10:17:02 +02:00
Manfred 00ac201596 Text-Inputs in eckigen Klammern werden als Array interpretiert 2022-09-14 15:56:01 +02:00
Manfred 450b0b6433 Initial commit 2022-09-14 15:55:07 +02:00
Manfred c2024ada3a Merge remote-tracking branch 'origin/master' 2022-09-14 15:50:35 +02:00
ma0048 f0cec85d8f style anpassungen und funktionen geloescht 2022-09-14 11:57:23 +02:00
Andreas Österreicher 91f867c0d6 Merge branch 'master' into feature-19171/Wahlname 2022-09-14 11:55:02 +02:00
Andreas Österreicher 4e68989c06 Merge branch 'feature-24817/infocenter_doc_loeschen_error' 2022-09-14 10:36:45 +02:00
ma0048 4cae13d2ee zgv und nation dropdowns gefixed 2022-09-14 08:55:54 +02:00
KarpAlex 0d03689f57 added IIssueExistsChecker and Issue<producer_Controller for detection of issues 2022-09-14 02:48:43 +02:00
ma0048 f7fa97499c error von loeschen der doc gefixed 2022-09-13 18:01:09 +02:00
Andreas Österreicher 85a6fa5600 Merge branch 'feature-19538/Gruppenadministratoren' 2022-09-12 18:08:17 +02:00
Andreas Österreicher 1d93652b0c Merge branch 'master' into feature-19538/Gruppenadministratoren 2022-09-12 18:07:13 +02:00
Andreas Österreicher c4fbaaaa9d Logging for Students implemented 2022-09-12 17:53:51 +02:00
Andreas Österreicher b526f4ee3a Merge branch 'bug-15317/BTAusbildungsvertragNichtAkzeptierenBeiAbgewiesenen' 2022-09-12 16:29:23 +02:00
Andreas Österreicher dd671bf583 Merge branch 'feature-24767/infocenter_zgv_pruefungen_und_lehre_error' 2022-09-12 14:43:48 +02:00
ma0048 030f1c9c4e zgvpruefung fehler behoben und studienartberechtigung 2022-09-12 14:30:12 +02:00
Andreas Österreicher d6a35603e1 Merge branch 'feature-23977/ZGVNeueKodextabellen' 2022-09-12 13:06:07 +02:00
Andreas Österreicher 9afd03d630 Merge branch 'feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen' 2022-09-12 12:50:43 +02:00
Andreas Österreicher 22088b82ba Merge branch 'feature-19487/infocenter_letzter_bearbeiter_wenn_student' 2022-09-12 12:43:17 +02:00
Andreas Österreicher 75e8c35dcc Merge branch 'feature-19484/infocenter_reihungstest_freigegeben_liste_zeigt_immer_nur_einen_an' 2022-09-12 12:41:41 +02:00
Andreas Österreicher 6855e6ff2e Merge branch 'feature-18940/infocenter_loeschen_von_dokumenten' 2022-09-12 12:36:19 +02:00
ma0048 9c85c7cd97 Merge remote-tracking branch 'origin/master' into feature-19487/infocenter_letzter_bearbeiter_wenn_student 2022-09-12 10:17:52 +02:00
ma0048 f571fef11b Merge remote-tracking branch 'origin/master' into feature-19484/infocenter_reihungstest_freigegeben_liste_zeigt_immer_nur_einen_an 2022-09-12 10:17:15 +02:00
ma0048 33b35286d3 Merge remote-tracking branch 'origin/master' into feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen 2022-09-12 10:15:50 +02:00
ma0048 98cf234f6f Merge remote-tracking branch 'origin/master' into feature-18940/infocenter_loeschen_von_dokumenten 2022-09-12 09:52:19 +02:00
ma0068 7252bc1e6f add config.file 2022-09-09 13:20:50 +02:00
KarpAlex 26236bc989 issues fix: error text is correctly passed when invalid issues status passed from GUI 2022-09-08 15:14:09 +02:00
Andreas Österreicher 1867807cdd Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' 2022-09-08 14:29:44 +02:00
Cris 3a595dda58 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
# Conflicts:
#	application/controllers/lehre/anrechnung/RequestAnrechnung.php
2022-09-08 14:15:49 +02:00
Cris 617dcc0646 Changed application dates for testing reason 2022-09-08 14:09:37 +02:00
Cris 15121ced6d Fixed missing disabled formular and wrong status-test when student emits Anrechnung with Begruendung Hochschule 2022-09-08 14:08:46 +02:00
Cris d13cc789ad Fix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
2022-09-08 12:53:44 +02:00
ma0068 604592cdd1 Bewerbungstool: neue Funktion isPastAbbrecher() 2022-09-07 15:27:47 +02:00
ma0068 625b3c74c4 Bewerbungstool: keine ZGV bei Abbrechern, Berücksichtigung studentstatus für Dokumenthandling 2022-09-07 09:22:06 +02:00
Cris 7ea9b6a741 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-09-07 09:06:03 +02:00
Andreas Österreicher 393eaea91d Removed Dashboard Testfiles 2022-09-07 09:00:00 +02:00
Andreas Österreicher 00f1eb38d1 Added missing index files 2022-09-07 08:27:31 +02:00
Paolo fd649c49c8 Fixed PHP 8.1 compatibilities problems for include/Excel/* 2022-09-06 15:38:42 +02:00
Cris 522e341d3d Dashboard Test V1 2022-09-06 15:29:42 +02:00
Cris c88061463f Hotfix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
2022-09-06 14:21:54 +02:00
Andreas Österreicher 7f64f5c29f Merge branch 'feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen' 2022-09-06 12:38:21 +02:00
Cris 262b5b869a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-09-06 12:15:46 +02:00
Manfred 14c5bdcf3d BugFix Personen zusammenlegen 2022-09-06 11:47:35 +02:00
Manfred 729aec00b3 Admins sehen PreStudent ID und Person ID zum rauskopieren 2022-09-06 11:41:28 +02:00
ma0068 bb4bf02aa8 Merge branch 'master' into feature-20696/pausenfehler_wird_nicht_angezeigt 2022-09-06 09:20:57 +02:00
ma0068 4f7dd73535 Merge branch 'master' into feature-19484/infocenter_reihungstest_freigegeben_liste_zeigt_immer_nur_einen_an 2022-09-06 09:18:58 +02:00
ma0068 52fe5a78e1 Merge branch 'master' into feature-18940/infocenter_loeschen_von_dokumenten 2022-09-06 09:17:39 +02:00
Andreas Österreicher 259dbe9bdc Fixed Error on File Download from Student View 2022-09-05 18:46:13 +02:00
ma0068 985a430888 Merge branch 'master' into feature-19547/CoodleZeitsperrenAnzeigen 2022-09-05 15:23:03 +02:00
ma0068 259f9d29d5 Merge branch 'master' into feature-19041/ZeitausgleichSanchoMail 2022-09-05 15:20:44 +02:00
ma0068 b53f3a1170 Merge branch 'master' into feature-17071MonatslisteVorzeitigAbschickenEndeDV 2022-09-05 13:54:44 +02:00
ma0068 b8d1c61b83 Merge branch 'master' into feature-16658/NeueVertragsartAllIn 2022-09-05 13:53:59 +02:00
ma0068 619924eff8 Merge branch 'master' into feature-16655/StundensaldoAllin 2022-09-05 13:52:59 +02:00
ma0068 477a7dd588 Merge branch 'master' into feature-15943/VilesciLoeschenVonUrlaubenBeiAbgeschicktenMonatslistenVerhindern 2022-09-05 13:51:45 +02:00
ma0068 6bdbe91dd9 Merge branch 'master' into bug-19038/AnzeigeOffenerMonatslistenBeiNichtZeitaufzeichnungspflichtig 2022-09-05 13:36:10 +02:00
ma0068 8670ab18f8 Zeitaufzeichnung: Berücksichtigung von Attribut Zeitaufzeichnung bei Projekt und Projektphase 2022-09-05 11:27:33 +02:00
Andreas Österreicher d109747cfc Merge branch 'master' into feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen 2022-09-01 15:34:12 +02:00
KarpAlex cc33502ab3 adapted "resend token for Begutachter" mail to Projektarbeitsbeurteilung controller split 2022-09-01 02:23:32 +02:00
Paolo 537ce0940c Code quality check improvements 2022-08-31 15:48:35 +02:00
KarpAlex 824a148b92 adapted core to Projektarbeitsbeurteilung Zweitbegutachter/Erstbegutacher Controller split 2022-08-31 13:38:38 +02:00
Andreas Österreicher 1ddd5b7f14 Merge branch 'feature-20226/erfassung_internationalisierungsmassnahmen_bekanntgabe' 2022-08-31 13:36:18 +02:00
ma0048 74331d5e6c dms kategoerie hinzugefuegt 2022-08-31 11:56:19 +02:00
Andreas Österreicher c215b2cb5f Merge branch 'feature-24103/kartenverlaengerung_gueltig_bis_zu_gueltig_fuer' 2022-08-31 11:42:34 +02:00
Andreas Österreicher 162858721c Merge branch 'feature-24184/infocenter_messages_bei_statuswechsel' 2022-08-31 11:34:38 +02:00
ma0048 90a13e445c fix damit messages wieder geschickt werden 2022-08-31 11:33:29 +02:00
Paolo 8e0734ca8c Added check in CL/Messages_model->sendReply to check that $receiver_id, $relationmessage_id and $token match in the database to avoid to be able to write to anyone using a token 2022-08-30 17:31:04 +02:00
Andreas Österreicher ed9f6e0c9b Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-30 14:44:13 +02:00
Andreas Österreicher a2bacae6d7 Merge branch 'feature-19001/VUE_ROUTER' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-30 14:43:10 +02:00
ma0048 03535b7589 text aenderung und holen alle studienbeitraege 2022-08-30 14:08:00 +02:00
ma0068 d1bb1b9666 Infocenter: Adaptierungen ZGV-Master und ZGVmasternation Dropdown 2022-08-30 13:10:47 +02:00
ma0068 67f1c9a707 Infocenter: Umbau von disabled auf Zusatz bei Dropdowns ZGV und ZGVNation 2022-08-30 11:28:16 +02:00
ma0068 8fd69ccd26 Infocenter: Anzeige gesperrte Nationen als disabled im Dropdown ZGVNation 2022-08-30 09:41:45 +02:00
Andreas Österreicher 81a33654a4 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' 2022-08-30 09:10:40 +02:00
Andreas Österreicher 68d6e3c549 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze 2022-08-29 16:23:20 +02:00
ma0068 54a1c486c5 Infocenter: Anzeige inaktive ZGVs als disabled im Dropdown ZGV 2022-08-29 15:12:06 +02:00
cgfhtw 49647c8ded Textänderungen "KVP" entfernen 2022-08-29 14:05:15 +02:00
KarpAlex 079137f497 renamed "dual" checkbox to "duales Studium" 2022-08-29 13:28:26 +02:00
cgfhtw ca9281dbf9 Textänderung KVP 2022-08-29 09:08:27 +02:00
KarpAlex 8dd7f72e37 added Studienkennung Uni to table in gsprogramm vilesci gui 2022-08-27 01:44:37 +02:00
KarpAlex 92762c5dc2 Projektarbeitsbeurteilung:
- getZweitbegutachterWithToken: returns Zweitbegutachter (Senatspruefer) 
from Senatspruefungen as well
- added phrase
2022-08-27 01:34:03 +02:00
Andreas Österreicher da85c69f36 Problem behoben wodurch die Anrechnungen im FAS nicht angezeigt werden
wenn diese ohne Anrechnungstool im FAS erfasst werden
2022-08-25 14:34:40 +02:00
Andreas Österreicher 962ec56b3f Merge branch 'feature-20665/kartenautomat_anpassungen' 2022-08-25 12:48:47 +02:00
ma0048 a13c010cd5 textaenderungen und getzutrittskarte by uid 2022-08-25 10:43:26 +02:00
ma0048 566f2f6399 prueft beim loeschen des dok noch auf person_id 2022-08-25 09:54:33 +02:00
KarpAlex 2ff067193d added Senatsvorsitz to betreuerart kurzbz in pdfExport 2022-08-24 19:39:59 +02:00
KarpAlex 1d408b9d65 added comment to getZweitbegutachterWithToken method in projektbetreuer class 2022-08-24 19:39:31 +02:00
KarpAlex 60d675f22b added parbeitDownload phrases for Projektarbeitsbeurteilung 2022-08-24 18:09:53 +02:00
KarpAlex 2125fdc219 sending of zweitbetreuer mail with token: correct subject depending on projekttyp 2022-08-24 18:09:30 +02:00
KarpAlex 1d5d5e4a84 added getEndabgabe method to Paabgabe model 2022-08-24 18:07:34 +02:00
KarpAlex a1622d8b74 made betreuert SenatsprueferIn gender neutral 2022-08-24 17:05:30 +02:00
Andreas Österreicher df3f7565e7 Merge branch 'feature-20665/kartenautomat_anpassungen' 2022-08-24 13:39:01 +02:00
ma0068 8292e00aaf neues Feld aktiv in den ZGV-Tabellen, Ansicht als durchgestrichen der inaktiven ZGV-Einträge in FAS 2022-08-24 12:52:49 +02:00
KarpAlex 82d7891f3c Projektarbeitsbeurteilung possible for Prüfungssenat. Mails are sent to Senat members, Senat members are displayed with correct labels, external Prüfer can get login token 2022-08-23 17:45:12 +02:00
Andreas Österreicher c234843bfd Satzungsteil Paragrahen korrigiert 2022-08-23 16:20:19 +02:00
KarpAlex 282b46d54e Added betreuerart Senatsvorsitz and Senatsprüfer 2022-08-23 15:26:13 +02:00
ma0048 f2fcdf2cbf app per dbupdate hinzufuegen 2022-08-22 14:40:39 +02:00
ma0048 06e62cac11 phrasen angepasst 2022-08-22 14:35:05 +02:00
Harald Bamberger 238810b5a8 workaround issue with resizable columns 2022-08-19 12:38:29 +02:00
Paolo b0ffbea9a5 Composer changes 2022-08-19 12:21:04 +02:00
Werner Masik 5af4f7a405 Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER 2022-08-18 21:31:54 +02:00
Harald Bamberger 3138ac3e25 add columns Aktiv and StdKst to MA Uebersicht Filterx 2022-08-18 16:38:28 +02:00
Harald Bamberger 582cb20b72 rename Handler functions to do not have a data and methods property error 2022-08-18 15:27:02 +02:00
Paolo c9eb60aade Removed tabulator property from Filter component 2022-08-18 14:52:50 +02:00
Paolo a0e2d7e37d Filter component: changed columns handling for the tabulator 2022-08-18 11:53:54 +02:00
Werner Masik 7b95ca4b92 Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER 2022-08-17 22:13:29 +02:00
Werner Masik a3c9d75617 added model for adressentyp 2022-08-16 13:10:20 +02:00
Paolo 7dd48b2350 Fixed meta includes 2022-08-16 10:57:32 +02:00
Paolo 492014db3a Changed variable names for includes 2022-08-16 10:28:13 +02:00
Harald Bamberger dd38765237 Merge branch 'feature-19538/Gruppenadministratoren' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-16 10:25:46 +02:00
Harald Bamberger dd6383c57b Merge branch 'master' into feature-19538/Gruppenadministratoren 2022-08-16 07:54:43 +02:00
Werner Masik 5ea46ece47 added VueRouter to composer; integrate router.php from extensions 2022-08-15 20:25:42 +02:00
Harald Bamberger 2e00f30e71 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 16:07:39 +02:00
Harald Bamberger 083c360338 remove duplicate body tags 2022-08-11 16:05:15 +02:00
Cris 73c516cbed Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 14:59:39 +02:00
Cris 08b1047b09 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of https://github.com/FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 14:59:06 +02:00
Paolo 1103bb7aa1 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 14:47:31 +02:00
Paolo d95cbb39e3 Reverted bootstrap and jquery include order 2022-08-11 14:46:28 +02:00
ma0048 d7fb91371e added missing includes for infocenter 2022-08-11 14:34:32 +02:00
ma0048 979f8d96bc ermoeglicht das sperren der zutrittskarten 2022-08-11 14:29:56 +02:00
ma0048 f19e13ffd8 ermoeglicht das planen, akzeptieren und erstellen der massnahmen 2022-08-11 14:11:59 +02:00
Cris 6f1ca8e374 Removed unnecessary HTML body tags and added FHC_Footer
Body tags are set in FHC_Header and FHC_Footer.
2022-08-11 14:00:20 +02:00
Cris f85dd2fd2e Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-10 18:21:01 +02:00
Cris a5f6ffa237 Changed content in Student view as requested by QM
. changed tooltip text and help text regarding Maximale ECTS and Berufliche Praxis.
2022-08-10 18:19:50 +02:00
Cris c6aa3c7d9b Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-10 16:28:08 +02:00
Cris 4f435fbc20 Removed date limitation for testing 2022-08-10 16:26:36 +02:00
Cris fabdb70d72 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-10 16:08:54 +02:00
Cris bfa9c2c8a7 Merge remote-tracking branch 'origin/feature-18224/Anrechnungen_ECTS-Grenze' into feature-18224/Anrechnungen_ECTS-Grenze 2022-08-10 16:01:42 +02:00
Cris 1d728336a2 Hided colums 'ECTS Schule bisher'/'ECTS Beruf bisher'
Hide by default colums 'ECTS Schule bisher'/'ECTS Beruf bisher',
as dynamic ECTS column is providing those informations.
2022-08-10 15:59:11 +02:00
Cris debfbf7827 Created AnrechnungJob sendMailRemindRecommendation
...to remind lecturers to provide their recommendation if not done until
one week after request.
2022-08-10 15:58:13 +02:00
Paolo e39bb1ea8a Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-09 18:43:06 +02:00
Harald Bamberger 7499a7f90a navigation component add option to pass css classes for left menu, verticalsplit add isCollapsed function, searchbar remove search button and prevent page reload on pressing enter 2022-08-09 17:12:47 +02:00
Cris c0ce8997ba Optimized Usability: Column 'Details' now on very left side of table
User needs to open details link very often, but needed to scroll until end of table to open link.
Now the link is set as first column to provide direct access.
2022-08-09 16:52:23 +02:00
Cris e56237038d Optimized 'Ablehnen'-/'Nicht empfehlen'-panels for better usability
- Copy-icons are now right aligned and bigger
- Less in-between-text, instead short explanation text into textarea placeholder
2022-08-09 16:40:43 +02:00
Cris 844bfe9150 Fixed wrong 'Bisher angerechnete ECTS' calculation when approving and withdrawing in one go 2022-08-09 11:10:16 +02:00
Harald Bamberger e63d34132c merged current master 2022-08-08 13:29:44 +02:00
Paolo 6d81e36e68 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-08 12:11:08 +02:00
Paolo b912ca9a06 Navigation and Filter components code improvements 2022-08-08 10:31:30 +02:00
Manfred 602bd375c4 BugFix PHP 7.4 Milak 2022-08-04 17:32:03 +02:00
Manfred 7b0de6b3e1 BugFix PHP 4 Milak 2022-08-04 14:41:34 +02:00
ma0048 6fd50d3c8d letzter bearbeiter online satt studentenname 2022-08-04 13:26:15 +02:00
Cris fc94ea4b49 Fixed: Maximale Dokument Uploadgröße 2022-08-03 16:43:34 +02:00
Cris fac257a2b1 Corrected: Falsche ECTS Summenberechnung, wenn Genehmigung zurückgenommen wurde, korrigiert.
Zurückgenommene Anrechnungen haben noch einen Eintrag "angerechnet" in der Zeugnisnotentabelle, weshalb
sie in der ECTS Summenberechnung mitgerechnet wurden. Das ist nun behoben.
2022-08-03 16:40:58 +02:00
Cris bb8a2a97a5 Fixed: Unclickable URLs after approving Anrechnung are clickable now 2022-08-02 15:25:06 +02:00
Manfred e9c2bcd690 Merge remote-tracking branch 'origin/master' 2022-08-01 14:09:10 +02:00
Manfred 62700194dd Bugfix aktuelles Studiensemester 2022-08-01 14:09:00 +02:00
ma0048 1a6b645693 pausefehlt bei 6.5 stunden hinzugefuegt 2022-08-01 10:49:17 +02:00
KarpAlex 80e15b9448 studentenmeldung.php: added field "dualesstudium" 2022-07-27 18:51:59 +02:00
Cris bf3ed6e48e Corrected ECTS Summen Display in Detail View when Withdrawing
If STGL withdraws a former rejection, there is no need to substract the ECTS in "Bisher angerechnete ECTS".
This is needed only if STGL withdraws a former approvement.
2022-07-27 16:22:17 +02:00
Cris 952d5e51b2 Refactoring der Dynamischen Max-ECTS-Berechnungsspalte, Berechnungen stimmen nun auch nach einem Genehmigungs-Update 2022-07-27 16:03:24 +02:00
KarpAlex aafdc41af2 core BPKWartung: corrected comments, removed uid property 2022-07-27 14:26:26 +02:00
ma0048 937236933e zeigt alle RTs an 2022-07-27 10:52:46 +02:00
KarpAlex 0055243a64 DmsLib: replaced _writeFile function with _copyFile to copy all file in one go (php copy method) instead of reading blocks and writing them 2022-07-27 01:52:08 +02:00
Cris 94644b4403 Adapted: Hochschulqualifikation werden bei Berechnung der max ECTS Überschreitung ausgenommen
Anrechnung aufgrund von Hochschulqualifikationen sind ungeschränkt möglich.
2022-07-26 18:22:51 +02:00
Cris 7b9fd39bbc Added: Hochschul-Qualifikation + ECTS Anzeige in Student View
Checkbox zur Angabe von Hochschulqualifikation
Anzeige, wenn ECTS Grenzen überschritten werden.
2022-07-26 18:18:08 +02:00
Cris 6a43928322 Added: Display (Qualifikations-)Begruendung in STGL Anrechnungen Detail View 2022-07-26 18:14:23 +02:00
KarpAlex 8da4bbd14b studentenmeldung.php: removed TODO comment 2022-07-22 18:40:55 +02:00
ma0048 1ee0e8eeb9 verhindert das starten von fremden gebieten 2022-07-22 12:33:47 +02:00
KarpAlex 1b457bda83 check that getting last status of previous semester is successfull before setting Wiedereintrittsdatum and Unterbrechungsdatum 2022-07-20 18:47:31 +02:00
Cris 86d7f8a35e Code refactoring of Dynamic ECTS Summen
. now build with tabulators column formatter.
. rows are reinitialized instead of using the updateData.
. format of cell background-color has moved out from row formatter to cell formatter
2022-07-20 11:25:35 +02:00
KarpAlex 503fbd5bde bis studentenmeldung: Unterbrechungsdatum und Wiedereintrittsdatum gesetzt 2022-07-20 01:01:58 +02:00
Cris 760e5758ce Optimized performance of all 'Alle auswählen'-buttons defined via tableWidgetHook
...by passing an array of rows to be selected, instead of selecting each row one by one.
Further triggered functions, e.g. rowSelectionChanged, are now called once only, not for each row.
2022-07-19 17:50:37 +02:00
Cris 4ba1f2cef5 Changed: Dynamic ECTS Summen (LV ECTS Sum by Prestudent + former ECTS) now build with tabulators mutator and rowFormatter 2022-07-18 17:38:20 +02:00
Cris 1544653fa3 Added Begründungstext 'Max ECTS überschritten' als Ablehnungsgrund 2022-07-18 17:33:50 +02:00
Cris 3b1d0f3aaa Merged DB Model Int/Float conversion
+ query type cast adaptation
2022-07-18 17:33:20 +02:00
ma0068 53a3417c8e Erweiterung lehreinheiten_vorrueckung.php um Config DEFAULT_ECHTER_DIENSTVERTRAG 2022-07-18 16:22:30 +02:00
ma0068 d81b205c05 Adaptierung checkbisverwendung.php und lehrveranstaltungDBDML.php um Config DEFAULT_ECHTER_DIENSTVERTRAG 2022-07-18 14:03:07 +02:00
KarpAlex 1c457f7ab7 studentenmeldung:
- added fields MeldeStatus
- added field HerkunftslandCode for IO Container
- splitted Ausstellungsstaat in ZugangAusstellungsstaat and 
ZugangMaAusstellungsstaat
2022-07-18 00:39:37 +02:00
KarpAlex 055f52a0bd lehrgangsmeldung:
- added field orgform_kurzbz, meldestatus and GS-Block
- splitted Ausstellungsstaat into ZugangAusstellungsstaat and 
ZugangMaAusstellungsstaat
2022-07-18 00:37:27 +02:00
KarpAlex 043f444bb6 added tbl_bisio.herkunftsland_code in db and made it editable as IO data in FAS 2022-07-14 19:50:50 +02:00
Harald Bamberger a463fc0dbf Merge branch 'feature-18236/Standardisierung_Extension_OP-KVP' 2022-07-14 15:58:58 +02:00
Paolo 6b4b3bad6a Fixed application/libraries/FilterCmptLib->applyFilterFields, from arrays to objects 2022-07-14 11:47:28 +02:00
Paolo 267f5b2972 - Added new directory public/js/apps/LogsViewer/
- Moved public/js/apps/LogsViewer.js to public/js/apps/LogsViewer/
- Added new JS file public/js/apps/LogsViewer/TabulatorSetup.js to setup the tabulator in the LogsViewer app
- Added new property tabulatorEvents to the FilterCmpt to subscribe events for the tabulator
2022-07-14 11:28:06 +02:00
Manfred 9fa2f56c89 Grant SELECT to bis.tbl_gsprogramm for web-user 2022-07-14 10:37:25 +02:00
Manfred d569384e66 Merge remote-tracking branch 'origin/master' 2022-07-14 10:34:51 +02:00
Manfred c851cf9da2 Testkorrektur HR Services 2022-07-14 10:34:24 +02:00
Paolo de07d1f340 Switched FilterCmpt to tabulator 2022-07-13 18:57:55 +02:00
Paolo e433affcc3 - Fixed disappearing side menu when additional menu entries are provided by another component
- Fixed wrong parameter for removeFilterField call
2022-07-13 15:44:00 +02:00
KarpAlex 8a813e0a2c added "StudienkennungUni" to BIS XML studentenmeldung 2022-07-13 11:27:10 +02:00
ma0068 141986ca67 Zeitsperren als fixe Termine 2022-07-13 11:11:22 +02:00
Paolo 4dab69cb15 Reverted changes in application/models/person/Benutzer_model.php, pk => array 2022-07-13 09:45:58 +02:00
ma0068 12bff57e0b Erweiterung Coodle und Freebusy um Zeitsperren 2022-07-13 09:24:37 +02:00
KarpAlex f72c165fe6 added codex/Gsprogramm_model 2022-07-12 19:41:08 +02:00
KarpAlex 013def84e3 bis.tbl_gsprogramm: studienkennung_uni can be added and edited in vilesci 2022-07-12 18:16:09 +02:00
KarpAlex 17493a6e40 dbupdate: added bis.tbl_gsprogramm studienkennung_uni to check array 2022-07-12 16:37:18 +02:00
Paolo 8b8515ee03 Fixed typo in system/filtersupdate.php 2022-07-12 14:51:39 +02:00
Paolo 137af3ef71 Fixed typo 2022-07-12 14:10:47 +02:00
Paolo ae70dbcb64 Fixed includes of filter type in FilterCmptLib when it is declared in an extension 2022-07-12 14:09:17 +02:00
Paolo f7e057d7db Fixed identation public/js/components/filter/Filter.js 2022-07-12 13:02:16 +02:00
Paolo c400641754 Includes fixes twbs/bootstrap to twbs/bootstrap3 2022-07-12 12:46:19 +02:00
Paolo 6ce7068ead Includes fixes tinymce/tinymce to tinymce/tinymce4 2022-07-12 12:39:48 +02:00
Paolo 790f2bb130 Includes fixes jsoneditor to josdejong/jsoneditor 2022-07-12 12:34:30 +02:00
Paolo 3f07aa172c Includes fixes json-forms to brutusin/json-forms 2022-07-12 12:29:11 +02:00
Paolo 76db7bd53a Includes fixes jquery/jqueryV2 to jquery/jquery2 2022-07-12 12:18:35 +02:00
Paolo a780338367 Includes fixes components/font-awesome to fortawesome/font-awesome4 2022-07-12 12:16:48 +02:00
Paolo 946ccc33d5 Include fixes alvaro-prieto/colResizable to alvaro-prieto/colresizable 2022-07-12 12:11:09 +02:00
Paolo eb2b738133 Includes fixes: jquery/jqueryV1 to jquery/jquery1 2022-07-12 11:59:52 +02:00
Paolo abcb575ef0 Added swith to turn on/off the top menu of the navigation component 2022-07-12 11:02:56 +02:00
Werner Masik 8c8623ce4f change primary key to string instead of array
because it is not a composite key and the load method gets confused otherwise
2022-07-11 17:31:37 +02:00
Harald Bamberger 17322283f5 use searchresult property photo_url 2022-07-11 16:15:48 +02:00
Paolo 5896a75a44 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-07-11 16:11:53 +02:00
Harald Bamberger 26eb77f030 change orgunit renderer to expect array of of objects for leaders 2022-07-11 16:10:28 +02:00
Paolo b53add9e67 libraries/SearchBarLib->_organisationunit removes from the leaders array those elements with uid and name == null 2022-07-11 16:10:24 +02:00
Paolo 198c6baf3d - Added new protected method getPostJSON to FHC_Controller to get POSTed JSON
- application/controllers/components/Filter.php now makes use of getPostJSON from the FHC_Controller
- RESTClient now POST a JSON request
- public/js/components/filter/Filter.js improvements
2022-07-11 14:54:14 +02:00
Cris 91447d7218 Adapted Query getEctsSummeSchulisch: exclude Anrechnung aufgrund universitärer Qualifikation.
Anrechnungen mit universiäterer Qualifikation sind unbegrenzt möglich.
2022-07-11 11:29:42 +02:00
Cris a8f329e501 Added new Anrechnungbegruendung: Hochschulzeugnis 2022-07-11 10:46:53 +02:00
Paolo cfe7c6b9a4 Fixed typo in application/libraries/FilterCmptLib.php, renamed __getDatasetQueryCondition to _getDatasetQueryCondition 2022-07-11 10:27:49 +02:00
Paolo aac21c9fda Updated composer.lock 2022-07-08 12:33:11 +02:00
Harald Bamberger 9d6d759fd0 current composer.lock for axios zip from github 2022-07-08 12:17:52 +02:00
Andreas Österreicher b2eb035613 Merge branch 'feature-20265/infocenter_check_duplicate_user' 2022-07-08 11:24:10 +02:00
Andreas Österreicher 21650a8782 Merge branch 'feature-19486/infocenter_nationengruppe_anzeigen' 2022-07-08 11:20:59 +02:00
Paolo b3caa4c0ac Bugfix: FilterWidget: query executed before changes are applied 2022-07-08 11:15:52 +02:00
KarpAlex cd7fed2b43 Added studienkennung_uni field to bis.tbl_gsprogramm 2022-07-08 00:33:44 +02:00
Paolo 8ab83a0baa Added directory "components" to the extension installation 2022-07-07 17:26:49 +02:00
Paolo 4e201f1002 Added slot in the header of the navigation component 2022-07-07 17:24:18 +02:00
Paolo 2f1d5f157f - Added new constant PHOTO_IMG_URL to application/libraries/SearchBarLib.php
- phone and photo_url are now return from SearchBarLib->_mitarbeiter
- SearchBarLib->_organisationunit fixed correct number of employees per organisation unit
- SearchBarLib->_organisationunit now returns the mailgroup
- SearchBarLib->_organisationunit returns an array of leaders, each element of this array is an object having the properties uid and name
2022-07-07 16:56:43 +02:00
ma0048 1434deeca1 zeigt die nation gruppe an 2022-07-07 11:29:38 +02:00
ma0048 377cb8ab7f ermoeglicht das loeschen der dokumente ueber das infocenter 2022-07-07 11:25:54 +02:00
Cris b2715bb408 Fixed: Added missing Summe ECTS Schulisch to AntragData. 2022-07-07 10:27:50 +02:00
Cris ade55c9d1f Added ECTS Summen to Anrechnung Detail View 2022-07-07 10:26:56 +02:00
Cris b40db6abbd Added ECTS Summen columns to Anrechnung Übersichtstable 2022-07-07 10:26:13 +02:00
Cris 4d05f54b54 Added ECTS Summen top AnrechnungData in the AnrechnungLib 2022-07-07 10:25:19 +02:00
Cris 2fb4118e69 Added to DB Update: Create functions to get total ECTS Summe by berufliche and schulische Qualifikation 2022-07-07 10:23:33 +02:00
Cris 1dc49ec494 Added methods to sum total ECTS, to be displayed on Anrechnung Details and Uebersicht 2022-07-07 10:21:23 +02:00
Cris 9d7589ddc4 Added DB methods to get ECTS Summen by schulische/berufliche Qualifikation 2022-07-07 10:18:40 +02:00
Werner Masik 647b2a9f45 added rudimentary filter for employee search 2022-07-06 18:02:31 +02:00
Werner Masik 39520d32fd added selectRecord event to filter component 2022-07-06 18:02:10 +02:00
Werner Masik f5df010884 added application/components/extensions/ to .gitignore 2022-07-06 17:52:13 +02:00
Werner Masik f7c394547e * fixed missing $primevue3 var in FHC-Common.php 2022-07-06 17:52:13 +02:00
Werner Masik 19273003ee * changed composer.json
* primvue is now included with help of https://asset-packagist.org/
* https://asset-packagist.org/ makes including npm packages with composer easy
2022-07-06 17:52:13 +02:00
Werner Masik 6c618c9a20 * changed some { to [ for PHP 7.4 compatibility
* added some PrimeVUE 3 components to composer (currently used in organization chart of PV21 extension)
2022-07-06 17:52:13 +02:00
Paolo 74b0fc5662 - Added new directory public/js/components/filter/
- Moved component public/js/components/Filter.js to public/js/components/filter/
- Moved API calls from public/js/components/filter/Filter.js to public/js/components/filter/API.js
- public/js/components/filter/Filter.js now imports public/js/components/filter/API.js
2022-07-06 16:59:33 +02:00
ma0068 fe6a6c5da3 neue Funktion getVorgesetzteMonatTimesheet() 2022-07-06 15:24:28 +02:00
Cris 44a3231d55 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
2022-07-06 12:00:09 +02:00
Cris 72428d0587 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-07-06 11:54:48 +02:00
ma0048 acffebf515 check doppelte benutzer auch mit unterschiedlicher groß und kleinschreibung 2022-07-06 10:56:24 +02:00
Paolo ce9aa4c388 - Removed inlcudes of RESTClient from PHP (FHC-Common, FHC-Footer and views/system/logs/logsViewer)
- Changed RESTClient to be a JS module
- Now RESTClient is included via JS in the app LogsViewer and in component Navigation
- Added new directory public/js/components/navigation
- Moved component Navigation to public/js/components/navigation
- Moved API calls of the Navigation component to public/js/components/navigation/API.js
- Navigation component now imports public/js/components/navigation/API.js
2022-07-06 09:48:15 +02:00
Manfred 759a2b4c8a Merge remote-tracking branch 'origin/master' 2022-07-05 15:33:22 +02:00
Manfred e7587a9f00 Rechtecheck im Skript studienplan_vorrueckung auf lehre/studienplan 2022-07-05 15:33:17 +02:00
Manfred afb9bec9ba Zugangscode ausblenden, wenn Bewerbungstool-Addon nicht aktiv 2022-07-05 15:32:29 +02:00
Paolo 2927682dae Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-07-04 19:30:18 +02:00
Paolo 60b3be3d64 - Added new JS public/js/RESTClient.js as axios wrapper
- composer.json: added axios from github
- Added new directory application/components/extensions/
- Added new utility function findResource to application/helpers/hlp_common_helper.php
- Now the library libraries/FilterCmptLib loads the component definition php files from the extensions
- views/system/logs/logsViewer now includes axios and restclient, removed the includes for ajaxlib and jQueryUI
- Added includes for the RESTClient and axios to views/templates/FHC-Common and views/templates/FHC-Footer
- Improved component js/components/Fetch
- Components public/js/components/Filter.js and public/js/components/Navigation.js now they are making use of the Fetch component or/and the RESTClient
2022-07-04 19:25:16 +02:00
Andreas Österreicher 1d980274fe Merge branch 'feature-19651/OEH_Beitragsliste' 2022-07-04 16:27:26 +02:00
Harald Bamberger 5c94e33f24 render array properties correct, resize result on window resize, hide result on loosing focus 2022-07-02 13:26:18 +02:00
Andreas Österreicher ac231722f1 Problem behoben wodruch Fehlermeldungen nicht korrekt angezeigt wurden
in der Zeitaufzeichnung
2022-07-01 14:31:39 +02:00
Andreas Österreicher 1641a879af PHP Version Compatibility fixed 2022-07-01 09:04:52 +02:00
KarpAlex 6341246550 Gruppenmanagement vilesci:
- changed description of manager input field
- error messsages are displayed in red color
2022-06-30 15:48:32 +02:00
ma0068 2e4085c8de Validierung bei Löschen zeitaufzeichnungsrelevanter Zeitsperren und bereits abgeschickter Monatsliste 2022-06-30 14:22:29 +02:00
KarpAlex 9262dc6197 added Gruppenmanagement navigation menu entry to Persons category 2022-06-30 14:22:12 +02:00
Andreas Österreicher dd66e9d119 Merge branch 'feature-19766/Issues_Studiengang_der_Person_anzeigen' 2022-06-30 12:35:22 +02:00
ma0068 35426251cb Delete Testausgabe 2022-06-30 11:42:14 +02:00
KarpAlex f74e036ec8 moved Berechtigung "extension/dvuh_gui_ekz_anfordern" to DVUH extension SQL 2022-06-30 11:27:24 +02:00
ma0068 cf7ad022a7 Sancho Mail im Urlaubstool, neue Funktion checkActiveAddon 2022-06-30 10:51:02 +02:00
KarpAlex 1c3acc6366 issue overview: added column "Zugehörigkeit"(Belonging) to show study programs of concerning person and wether it is an employee 2022-06-29 17:59:57 +02:00
ma0068 60cbb8bd8c Einfügen Spalte Status Monatsliste, Verhindern bei Löschen von ZA wenn Monatsliste abgeschickt 2022-06-29 15:01:16 +02:00
Harald Bamberger 32daed2ad2 first draft data fetch component 2022-06-29 13:17:57 +02:00
Paolo f85225cc4e Addex axios to the views/templates/ includes 2022-06-29 10:58:33 +02:00
Paolo 091307680b - Sorted composer packages in composer.json
- New composer.lock generated
- Added new package axios
2022-06-29 10:57:08 +02:00
Paolo 796c09999f Changed FilterCmptLib public methods to private where they were not used outside the library itself 2022-06-29 10:55:30 +02:00
ma0068 ad30cc862e Neue Spalte Status Monatsliste 2022-06-29 10:53:45 +02:00
ma0068 797cabccb9 neue Mailvorlagen Sancho fuer Zeitausgleich und Urlaub 2022-06-29 08:46:01 +02:00
KarpAlex 500bbec2c1 added "hasSequence" = false to crm/Dokumentprestudent_model to avoid "lastval not found" error 2022-06-28 19:07:09 +02:00
Andreas Österreicher eeba5c7bd5 Merge branch 'feature-18887/Datenverbund_Clearing_und_Community_Changes' 2022-06-28 14:28:04 +02:00
Paolo bcaa560a46 Bugfix: query executed before changes are applied 2022-06-28 10:29:44 +02:00
Paolo 2a298dc6d1 - Added JSON post parameter check in controllers/components/SearchBar->search
- Expanded search capabilities for organization units and employees
2022-06-27 16:22:40 +02:00
Andreas Österreicher 2692accbdf Merge branch 'master' into feature-18887/Datenverbund_Clearing_und_Community_Changes 2022-06-27 14:48:11 +02:00
Harald Bamberger 47f7c03075 virtualsplit and searchbar vue component, TestSearch Controller and View for Demonstration, minor change to SearchBar Controller to work with posted json 2022-06-24 19:26:37 +02:00
Paolo 147ab92bae - Added new library libraries/SearchBarLib
- Added new controller components/SearchBar
- Removed not anymore used view application/views/system/logs/logsViewerData.php
2022-06-24 17:59:01 +02:00
Paolo 24b78454d3 - Added new function generateJSModulesInclude to application/helpers/hlp_header_helper.php
- Added entry "customJSModules" to the application/views/templates/FHC-Footer.php to be passed to the generateJSModulesInclude function to generate JS modules tags
- The new VUE components are making use of the JS import and export functionalities
2022-06-24 15:07:50 +02:00
Paolo 9e48ba09d8 - Moved GUI options from application/components/filters/LogsViewer.php to application/views/system/logs/logsViewer.php
- Changed controller components/Filter to work with the new FilterComponent
- Removed unused code from library libraries/FilterCmptLib
- Changed library libraries/FilterCmptLib to work with the new changes in the controller components/Filter
- Added new CSSs for the new FilterComponent and NavigationComponent
2022-06-24 14:55:04 +02:00
Manfred f0df99c46a Merge remote-tracking branch 'origin/master' 2022-06-24 14:29:35 +02:00
Manfred fcf829d03b Button "Liste ausräumen" ergänzt
Löscht leere (unbenutzte) Prüflinge
2022-06-24 14:29:08 +02:00
ma0068 c87aee0ddf Zeitsperre Umbau Mail auf Sanchomail, Anzeige Zeitsaldo in Sanchomail, Adpatierungen Urlaub 2022-06-24 08:10:51 +02:00
Cris 5f5031e8d1 Added ECTS Summe to Anrechnung Detail View. 2022-06-22 10:54:17 +02:00
Cris 7bba155bb5 Adapted function getPreviousFrom to return more than 1 previous semester if needed 2022-06-22 10:52:51 +02:00
Cris b52a3c9397 Added DB queries to calculate ECTS Summe in Lehrveranstaltung_model.php 2022-06-22 10:51:39 +02:00
Cris 12c9afbd3d Added function getFirstStatus to Prestudentstatus_model.php
Funktion liefert den Ersten Status eines Prestudenten mit der übergebenen Statuskurzbezeichnung.
2022-06-22 10:48:48 +02:00
Cris 42fb7a4fc8 Added ECTS Summe functions to AnrechnungLib
Added functions to calculate total ECTS Summe of
. angerechnete Studiensemester of Quereinsteiger
. bisher angerechnete schulische Kenntnisse
. bisher angerechente berufliche Kenntisse
2022-06-22 10:47:29 +02:00
cgfhtw 65ba946321 Rework Studienplan->getStudienplanLehrveranstaltung for Templates & use it in Vilesci "Lehrveranstaltung" 2022-06-22 09:39:53 +02:00
KarpAlex ca667feb0d Added document type "Grant Agreement" for syncing of documents with Mobility Online 2022-06-20 18:55:29 +02:00
KarpAlex 40efdf4acf Merge branch 'feature-19538/Gruppenadministratoren' of github.com:FH-Complete/FHC-Core into feature-19538/Gruppenadministratoren 2022-06-20 18:42:35 +02:00
KarpAlex accef23cb8 Gruppenmanagent: correct table cell size when adding/deleting managers and when there are no managers 2022-06-20 18:38:49 +02:00
Andreas Österreicher cfea30162c Merge branch 'feature-19839/rt_freigegeben_liste_uhrzeit_des_rts_anzeigen' 2022-06-20 12:32:41 +02:00
KarpAlex 95f1d87878 melde_studienang_kz can be edited in vilesci 2022-06-15 23:15:23 +02:00
KarpAlex f631cda7a5 Gruppenmanagement: added uid as insertvon when adding Gruppe 2022-06-15 22:53:37 +02:00
KarpAlex dc45427143 gruppenmanagement: renamed variable gruppemanager_class into gruppemanager_hlp 2022-06-15 22:52:37 +02:00
KarpAlex c771cbc644 Gruppenmanagement: added phrases 2022-06-14 18:24:10 +02:00
KarpAlex de08bfd0fc Gruppenmanagement:
- renamed gruppenadministration to gruppenmanagement
- added additional columns to gruppenmanagement filterwidget
- improved comments
- write public.tbl_log every time user is added or deleted from a group
2022-06-14 17:30:07 +02:00
Harald Bamberger 5c65b78a62 Merge branch 'bug-19556/Wrong_LV_Id_on_Template_copy' 2022-06-14 16:27:05 +02:00
KarpAlex 1066dff8e0 Gruppenmanager:
- set on update cascade for gruppe_kurzbz foreign key
- Notice + disabling add of group managers when group is "generiert"
2022-06-14 14:08:27 +02:00
ma0048 5731a98127 uhrzeit bei der rt freigegeben uebersicht hinzugefuegt 2022-06-14 10:29:20 +02:00
cgfhtw e83b1a6ee9 Bugfix: Wrong LV Id on Template copy 2022-06-14 09:11:04 +02:00
KarpAlex 2e728462ca Gruppenmanager:
- Berechtigung "lehre/gruppemanager" needed for managing groups
- added column "aktiv" to benutzeroverview
- group manager are deleted together with their group
- check: generated groups cannot have manager
2022-06-13 19:59:30 +02:00
Harald Bamberger aa8452682d fix error undefined variable 2022-06-13 15:31:40 +02:00
Harald Bamberger 2a95aa3abd Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-06-13 15:08:56 +02:00
Manfred 8304808127 Beim Zusammenlegen von Personen wird in der Anmerkung "von" ergänzt 2022-06-13 14:18:20 +02:00
Manfred 0f236b1da8 Merge remote-tracking branch 'origin/master' 2022-06-13 12:50:37 +02:00
Manfred 42275f2af1 Bugfix LV-Teile kopieren. Vertrag_id wird nicht mehr kopiert 2022-06-13 12:50:32 +02:00
KarpAlex f57123e100 Gruppenadministration Benutzergruppen:
- changed phrases
- show error dialog when json error returned
- zebra table
- hide filter header for non-filtered columns
- empty input field after adding Benutzer
2022-06-13 12:01:00 +02:00
Harald Bamberger c90fd7d120 Merge branch 'feature-18233-18234/Standardisierung' 2022-06-13 10:27:12 +02:00
Harald Bamberger 47843423d0 add column lehrveranstaltung_template_id to gegenpruefung 2022-06-13 10:19:26 +02:00
Harald Bamberger ec19d2e045 Merge master 2022-06-13 09:57:51 +02:00
KarpAlex 5bc57767d1 Gruppenadministration: - added delete functionality - Benutzer per group are retrieved via javascript and refreshed when group added/delted - moved gruppenadministration files to person folder from organisation - handle error when benutzer was already assigned to a group 2022-06-10 22:01:48 +02:00
KarpAlex 83351e7329 Manager Gruppenadministration:
first version of adding Benutzer to Gruppe
2022-06-09 20:05:46 +02:00
KarpAlex d2fea1ac6f Merge branch 'master' into feature-19538/Gruppenadministratoren 2022-06-09 17:27:07 +02:00
Andreas Österreicher a21ad7bbc7 Merge branch 'feature-19020/Checks_bei_Statusaenderungen' 2022-06-09 14:56:27 +02:00
Andreas Österreicher 2faa649cf3 Löschen von Statuseinträgen auch mit Berechtigung
student/keine_studstatuspruefung ermöglicht
2022-06-09 14:55:15 +02:00
KarpAlex 457ab9dc3e Gruppenadministration: first version of list with Gruppen of a manager. 2022-06-08 19:49:30 +02:00
Andreas Österreicher 9d769bbc16 Merge branch 'feature-18473/UrlaubstoolKeinEintragBeiVorhandenerZeitaufzeichnung' 2022-06-08 14:51:17 +02:00
Andreas Österreicher 25ee7f76cb Merge branch 'feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten' 2022-06-08 14:10:28 +02:00
Andreas Österreicher 90e760a9ff Merge branch 'feature-19351/infocenter_vorhandene_benutzer' 2022-06-08 14:03:45 +02:00
Andreas Österreicher ab408958b7 Merge branch 'Sprint-186/Sonstiges' 2022-06-08 13:34:20 +02:00
Nikolaus Krondraf c7df848d9d consider OE when generating document 2022-06-08 13:16:46 +02:00
Andreas Österreicher 9a1d4bf54d Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-06-08 13:10:30 +02:00
Andreas Österreicher 71fa8cb355 Merge branch 'bug-19149/Reihungstest_Sprache_Prio' 2022-06-08 13:09:38 +02:00
Nikolaus Krondraf 734fa31111 consider OE when generating document 2022-06-08 13:08:20 +02:00
cgfhtw 2c932f3d86 Bugfix 2022-06-08 10:30:07 +02:00
Andreas Österreicher 0ee1f3723b Räume mit Raumtyp Gesperrt werden am Infoterminal als besetzt/gesperrt
angezeigt
2022-06-08 08:39:53 +02:00
Andreas Österreicher e89a55b73f Removed unused WYSIWYG Editor 2022-06-08 07:09:04 +02:00
KarpAlex c547fd86a7 replaced Berechtigung dvuh_gui_begrenz with dvuh_gui_ekz_anfordern for requesting ekz only 2022-06-07 18:31:43 +02:00
KarpAlex 549396148d Gruppenmanager can be added and deleted in vilesci gui 2022-06-07 17:54:05 +02:00
Paolo 618a62425b Adapted composer.json and includes to be compatible to composer version 2 2022-06-07 14:56:33 +02:00
ma0068 e2b3dbda7b Suche Cis: Wahlname vor Vorname, kein Hinweis auf Wahlname 2022-06-02 14:07:58 +02:00
Manfred 37af8ea331 Gesamtzeilenanzahl wird im FAS immer angezeigt X/Y 2022-06-02 12:55:25 +02:00
Manfred f2defe2c22 BugFix FAS-Filter Anzahl Reihungstest nicht angemedet
Ergänzung um Studiensemester
2022-06-02 12:31:23 +02:00
Paolo f3fe3aa099 New changes for the Navigation and Filter components 2022-06-02 10:34:45 +02:00
Paolo 29002124cc - Added new controller components/Filter.php
- Added new library FilterCmptLib
- Fixed includes paths in FHC-Footer and FHC-Header
- Moved the LogsViewer tool to VUE+BS5
2022-06-02 10:32:26 +02:00
Manfred 3803c72a97 Merge remote-tracking branch 'origin/master' 2022-05-31 18:03:16 +02:00
Manfred 20c71e1788 Logo statt Fehlermeldung am Informationsbildschirm 2022-05-31 18:03:12 +02:00
Manfred ed08dde5a6 Projektarbeit ID anzeigen um leichter rauskopieren zu können 2022-05-31 18:02:29 +02:00
Manfred 1019d42c73 SQL-Korrektur 2022-05-31 17:54:42 +02:00
Manfred bde469f4b8 Abfrage Brandschutzbeauftragte geändert. FHTW Übergangslösung entfernt 2022-05-31 17:54:23 +02:00
KarpAlex 0cb303c242 added table public.tbl_gruppe_manager for adding managers to groups 2022-05-31 14:59:05 +02:00
ma0068 956e3804bc Merge branch 'feature-19171/Wahlname' of github.com:FH-Complete/FHC-Core into feature-19171/Wahlname 2022-05-31 09:31:57 +02:00
ma0068 3f17c51834 Wahlname bei Suche in Spalte Vorname 2022-05-31 09:31:29 +02:00
Andreas Österreicher f4988f8211 Zeitwuensche Update Mail wird temporär nicht an Studiengänge geschickt 2022-05-30 17:09:11 +02:00
Andreas Österreicher 84ff29ffd2 Merge branch 'feature-16370/AkteLib_create_new_CI_library_to_handle_akte' 2022-05-30 16:08:54 +02:00
KarpAlex 6aa4d4d719 added extension/dvuh_gui_begrenzt Berechtigung for limited functionality access in DVUH GUI 2022-05-30 11:37:59 +02:00
Andreas Österreicher 974791e19b Ausbildungssemester Limitiert damit bei Wiederholern die anzeige
funktioniert
2022-05-27 14:23:24 +02:00
Andreas Österreicher ac91d8ccbc Merge branch 'master' into feature-16370/AkteLib_create_new_CI_library_to_handle_akte 2022-05-27 14:18:30 +02:00
Andreas Österreicher df321c4047 Merge branch 'master' into feature-19171/Wahlname 2022-05-27 13:30:19 +02:00
Andreas Österreicher 0c33ad4a7a Warning bei Fotoliste behoben wenn kein Lektor zugeteilt ist 2022-05-27 13:20:56 +02:00
Andreas Österreicher 95d43753c2 Merge branch 'feature-18486/reihungstest_stoppen_fuer_einzelne_personen' 2022-05-27 11:33:13 +02:00
Andreas Österreicher 99db3ab9f6 Merge branch 'master' into feature-18486/reihungstest_stoppen_fuer_einzelne_personen 2022-05-27 11:01:30 +02:00
KarpAlex dc47a2ffc9 added permission student/keine_studstatuspruefung to enable non-admins to bypass studstatus checks 2022-05-24 18:38:44 +02:00
ma0048 3d3f4d5453 erste version infocenter lehrgaenge 2022-05-24 13:51:39 +02:00
Paolo 8880e07bf2 include/dokument_export.class.php now checks the new signature server response structure 2022-05-24 12:22:30 +02:00
Paolo 7f2025c414 Added signature config entries to config/cis.config-default.inc.php 2022-05-24 11:27:24 +02:00
Paolo c354c69e21 Fixed Zwischenabgabe file upload 2022-05-24 11:23:48 +02:00
Paolo 061780a0d2 - Added new VUE based JS public/js/components/Filter.js, public/js/components/Navigation.js and public/js/apps/LogsViewer.js
- Fixed bootstrap includes in FHC-Footer and FHC-Header
- Moved Job Logs Viewer to VUE
2022-05-24 09:45:31 +02:00
KarpAlex d7708e2f6c Statusänderungen check studentDBDML.php: improved way of checking status by saving status in array first 2022-05-23 18:53:16 +02:00
Paolo a603081544 - Changed composer.json and updated composer.lock
- Added new PostgreSQL types in application/core/DB_Model.php
- Updated the includes in application/views/*
- Added new view template application/views/templates/FHC-Common.php
- Moved JS includes in application/views/templates/FHC-Footer.php
- Updated JS and CSS includes in application/views/templates/FHC-Footer.php and application/views/templates/FHC-Header.php
- Updated public/js/bootstrapper.js
- Changed global variable names in application/views/templates/FHC-Common.php to include the version of the included source
2022-05-23 18:45:29 +02:00
Andreas Österreicher a73d2a06e8 Merge branch 'bug-19281/Bewerbungen01011970' 2022-05-23 17:54:15 +02:00
Andreas Österreicher 69c30ab39d Merge branch 'bug-19529/Projektarbeituebersicht' 2022-05-23 17:17:03 +02:00
Andreas Österreicher 0a8c7aa032 Problem behoben wodurch die Prüfung auf doppelte Zahlungen bei Personen
nicht funktionierte die noch keine Studierenden sind
2022-05-23 17:01:15 +02:00
Paolo 94a1534c14 - Warning Wrap on small Screens in Leturer side
- Perform Signatur Check only on Files from Type Endupload
2022-05-23 14:42:59 +02:00
Andreas Österreicher 3b1aba63b0 Neue Berechtigung für Verwaltung eigener Variablen hinzugefügt, Filter
für Projektabgabeuebersicht angepasst
2022-05-21 12:10:42 +02:00
Cris 9a57b263d1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-05-17 16:33:07 +02:00
Paolo 3d0bdcf95a Changed composer.json and updated composer.lock 2022-05-17 16:05:02 +02:00
ma0068 ba8543716c Erweiterung Gesamtnotenimport um student_uid 2022-05-17 13:24:49 +02:00
Paolo 2d23836396 Translated german phrase 2022-05-16 16:23:15 +02:00
Paolo 22bba685ff Added new style to the warning 2022-05-16 16:15:48 +02:00
ma0068 8b061eab74 Adaptierungen FAS für Ergänzung Wahlname + Hinzufügen Zeitstempel kontakt.xul.php für Mitarbeiter 2022-05-16 09:17:31 +02:00
Paolo d4042228d9 - Better code and comments in application/libraries/SignatureLib->list
- cis/private/lehre/abgabe_lektor_details.php and cis/private/lehre/abgabe_student_details.php check if the uploaded document contains digital signares and display a phrase
- Added new phrase to locale/de-AT/abgabetool.php and locale/en-US/abgabetool.php
2022-05-13 20:11:31 +02:00
Paolo 2a8b61c07f - Added new library application/libraries/SignatureLib.php
- Changed configs for the signature server in config/vilesci.config-default.inc.php
- Changed include/dokument_export.class.php to make use of the new configs
2022-05-11 18:29:10 +02:00
Manfred 71848c5bfc Merge remote-tracking branch 'origin/master' 2022-05-11 16:41:34 +02:00
Manfred 4b3163b67d Anpassung der Breite der Inputfelder 2022-05-11 16:41:31 +02:00
Manfred a9ca16dddc Beim Zusammenlegen von Personen werden beide Anmerkungen erhalten
Außerdem wird eine Info über das Zusammenlegen in der Anmerkung ergänzt
2022-05-11 16:41:14 +02:00
ma0048 fdce499f37 prueft auf doppelte benutzer 2022-05-11 11:31:52 +02:00
ma0068 84bc73f948 Anzeige Wahlname statt Vorname in Noten-,Anwesenheits und Fotoliste, Berücksichtigung in Cis-Suche 2022-05-11 11:18:01 +02:00
Paolo 704b32c76c Fixed constant values in application/libraries/DocsboxLib.php 2022-05-11 11:06:53 +02:00
KarpAlex f2e337b179 FAS prestudent status: added checks when adding or modifiying status, including status and status date checks 2022-05-11 04:36:23 +02:00
Cris a654cbe583 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-05-10 10:34:07 +02:00
Cris 90c5ec53bf Lehrauftragsmail an KF-Leitung: Bei Berechtigungsabfrage wird nun auch Lese-/Schreibrecht berücksichtigt 2022-05-10 10:33:00 +02:00
Andreas Österreicher 8111031dea Merge branch 'feature-18779/FASUidGenerierungslogikAnpassen' 2022-05-10 10:28:33 +02:00
Cris 455dd4b8ff Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-05-09 10:38:54 +02:00
ma0068 d2e0f34d9e Reset Defaulstundensatz bei Neuanlage Projektbetreuer 2022-05-07 12:02:51 +02:00
Paolo 58d252b5b7 Added 3rd parameter to Docsbox::convert call were missing 2022-05-06 09:57:55 +02:00
Andreas Österreicher 315d1d2171 Merge branch 'feature-19223/projektarbeitsbeurteilung_uebersichtsseite_bachelor' 2022-05-06 09:43:04 +02:00
Paolo 9496cba137 Fixed composer.lock 2022-05-04 10:53:22 +02:00
Paolo d7e4d7ebde Moved config entries from application/config/docsbox.php to config/cis.config-default.inc.php and config/vilesci.config-default.inc.php 2022-05-03 10:58:46 +02:00
Andreas Österreicher 491f025364 Merge branch 'feature-15970/kartenterminal' 2022-05-03 10:18:40 +02:00
KarpAlex 707c8a3a6a dbupdate_3.3.php: field melde_studiengang_kz in tbl_studiengang is prefilled correctly 2022-05-02 18:12:29 +02:00
Manfred 5901b4b49c Anzeige OE-Typ in FAS 2022-05-02 12:43:54 +02:00
ma0068 bdee476a74 Adaptierungen Stundensatz: Aktualisierung Anzeige Defaultstundensatz, Zuordnung externe Betreuer 2022-05-02 11:53:14 +02:00
ma0048 826d479761 limit hinzugefuegt 2022-05-02 11:33:33 +02:00
ma0048 f14496ef5a checkstudienbeitrag hinzugefuegt 2022-05-02 11:31:23 +02:00
Andreas Österreicher fddc0068e4 Fixed wrong RegEx on Date Check 2022-04-29 12:49:16 +02:00
Harald Bamberger d89fba33e8 Merge branch 'feature-18234/Standardisierung_Studiengangsverwaltungstool_Template_verwenden' into feature-18233-18234/Standardisierung 2022-04-29 11:06:54 +02:00
Harald Bamberger a493ddd68e merge feature 18233 2022-04-29 11:04:32 +02:00
Andreas Österreicher a055a695e3 Merge branch 'master' into feature-18473/UrlaubstoolKeinEintragBeiVorhandenerZeitaufzeichnung 2022-04-29 10:58:06 +02:00
Andreas Österreicher b7b6cd5399 Merge branch 'master' into feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten 2022-04-28 18:26:18 +02:00
Manfred 05c9500b3b Merge branch 'feature-683/UmbenennungLehreinheit' 2022-04-28 17:01:49 +02:00
Manfred 325821f2a3 Merge branch 'master' into feature-683/UmbenennungLehreinheit 2022-04-28 16:53:38 +02:00
Manfred 6df0982514 Anpassung DMS-Links 2022-04-28 16:48:48 +02:00
Manfred a38e53198f Merge branch 'feature-245/LvTeilKopieren' 2022-04-28 16:16:51 +02:00
Manfred 09ae63baa7 Merge branch 'master' into feature-245/LvTeilKopieren 2022-04-28 16:13:31 +02:00
Manfred 658ef8a2a9 Merge remote-tracking branch 'origin/master' 2022-04-28 16:13:13 +02:00
Manfred 07e4e489d3 Studentenmeldung Fehlendes Sponsionsdatum nicht BIS-Relevant 2022-04-28 16:13:09 +02:00
Manfred 6e16f7cb0e Merge branch 'master' into feature-245/LvTeilKopieren 2022-04-28 16:04:01 +02:00
Manfred 562e0f29e9 Datumsbereich Studiensemester im Tooltip 2022-04-28 16:03:30 +02:00
Andreas Österreicher 968fcecc7c Merge branch 'feature-19208/infocenter_accesscodesent_personaldata_saved_filter' 2022-04-28 15:06:03 +02:00
Andreas Österreicher 7d9c43fe30 Merge branch 'bug-19132/zgv_ueberpruefung_notizen_nicht_sichtbar' 2022-04-28 15:01:59 +02:00
Andreas Österreicher 2f54a436ac Merge branch 'bug-18938/PersonenZusammenlegenAnzeigeproblemAdressen' 2022-04-28 14:59:40 +02:00
ma0068 b6cc084799 Adaptierung Funktion getLastBisZAPflicht() 2022-04-28 11:46:45 +02:00
ma0068 9e094f38d5 Erweiterung der Validierung um ganztägige Zeitsperren 2022-04-28 11:08:39 +02:00
cgfhtw 63142f58d5 admin templates - & error phrases 2022-04-28 08:56:38 +02:00
ma0068 9bf20dd7a4 neue Funktion: getLastVerwendungZapflicht 2022-04-28 07:54:43 +02:00
ma0048 886d84e8af ermoeglicht nun auch bachelor projektbeurteilungen herunterzuladen 2022-04-27 14:26:45 +02:00
ma0048 398c04d0ac sperrt alle prestudents von der person 2022-04-27 08:13:56 +02:00
ma0068 9dbf59d1a1 Adaptierungen Codesniffer 2022-04-26 12:27:58 +02:00
ma0068 a4378b4592 Add Default Stundensatz 2022-04-26 09:48:22 +02:00
ma0048 3544acc60a filter angepasst 2022-04-26 08:38:51 +02:00
Andreas Österreicher 7ff1a25abb Merge branch 'feature-16214/beaurteilungsformulare_ba_ma_arbeit' 2022-04-25 15:46:08 +02:00
Andreas Österreicher 96a739f261 Merge branch 'master' into feature-16214/beaurteilungsformulare_ba_ma_arbeit 2022-04-25 15:15:15 +02:00
ma0068 17a4ce1234 Aufruf kontakt.xul mit Timestamp 2022-04-22 08:34:23 +02:00
cgfhtw 899e2e18df 18775 - Admin GUI f. Tabelle extension.tbl_opkvp_organisationseinheit_opprj 2022-04-21 15:29:16 +02:00
Andreas Österreicher ad0aac398b Merge branch 'FHBGLD-FHBGLD---BIS_lehrgangsmeldung' 2022-04-21 08:17:06 +02:00
FHBGLD b474043c9f Update lehrgangsmeldung.php 2022-04-20 15:53:35 +02:00
FHBGLD cd8b13df1e Update vilesci.config-default.inc.php 2022-04-20 15:53:30 +02:00
ma0048 ebb87d6296 berechtigungen angepasst 2022-04-20 11:21:49 +02:00
Manfred 349ad451f8 lehreinheiten_vorrueckung: Langbezeichnung in DropDown 2022-04-19 19:33:44 +02:00
Manfred c6b851eff2 Merge branch 'master' into feature-683/UmbenennungLehreinheit 2022-04-19 19:08:38 +02:00
Manfred 900866ee24 Button für "Aktuelles Studiensemester" in Statusleiste 2022-04-19 19:03:59 +02:00
Manfred 2bc3083fa9 Merge branch 'master' into feature-245/LvTeilKopieren 2022-04-19 18:50:23 +02:00
Manfred 322d1b6db7 Merge remote-tracking branch 'origin/master' 2022-04-19 18:47:23 +02:00
Manfred 1a2287c47f Bugfix Ausbildungsvertrag Name vom Studiengang 2022-04-19 18:45:58 +02:00
Harald Bamberger 10aa88e262 Merge branch 'feature-15391/Positive_Zeitsperre' 2022-04-19 13:46:38 +02:00
KarpAlex 5522d97afe issuesZustaendigkeiten.js: fixed comments 2022-04-15 23:47:16 +02:00
KarpAlex 3f40622af3 bugfixes issues Zuständigkeiten GUI:
- all needed oe kurzbz are shown at any time for assignment
- funktion can only be entered after oe
2022-04-15 21:15:19 +02:00
KarpAlex 087006a7a5 bugfixes issues Zuständigkeiten GUI:
- all needed oe kurzbz are shown at any time for assignment
- only functions not already assigned are shown
- funktion can only be entered after oe
2022-04-15 21:14:42 +02:00
Manfred a4759ed5a7 Sortierung der Studiensemester geändert auf absteigend 2022-04-15 17:51:41 +02:00
Manfred 9b6b7c6c7f LV-Teile kopieren 2022-04-15 17:50:15 +02:00
Manfred 9ca6c99746 Umbenennung "Lehreinheit" auf "LV-Teil" 2022-04-15 17:46:13 +02:00
Manfred cdb403c38a Korrektur Nachname<->Vorname für Studentenmeldung 2022-04-15 17:42:20 +02:00
Manfred bd35bce49a Select für Lehrgänge 2022-04-15 17:41:49 +02:00
cgfhtw 48333f62f0 autocomplete redesign & template field placement 2022-04-14 15:07:44 +02:00
Paolo 5a00ae5a5e Removed not use constant DEFAULT_USER from libraries/AkteLib.php 2022-04-14 10:21:17 +02:00
KarpAlex 4fe562cbe2 Fehlerzuständigkeiten and issues GUI improvements:
- menu link opens in new tab
- controller id set for easier refresh
- added person and oe Zuständigkeiten to issues list
-
2022-04-13 20:08:08 +02:00
Paolo d1b487e91a - Removed authentication functions from AkteLib and DmsLib
- Added new optional parameter who to write in the database who added the new document
- PHPMD optimizations
2022-04-13 13:22:16 +02:00
Andreas Österreicher 6a51e841ab Merge branch 'feature-15887/BTMessagesBeiMasterAnInfocenter' 2022-04-13 12:17:50 +02:00
Andreas Österreicher eb61991c0b Merge branch 'feature-15886/ZahlungenSichtbarNurBeiErreichtemBuchungsdatum' 2022-04-13 12:01:33 +02:00
Andreas Österreicher 745692911f Merge branch 'feature-18875/AnzeigeTageBeiDienstverhinderungen' 2022-04-13 11:55:42 +02:00
Andreas Österreicher d820079f0c Merge branch 'feature-17785/infocenter_kurzbezeichnung_des_studiengangs_von_studienordnung_holen' 2022-04-13 11:49:32 +02:00
ma0048 7c6adaabeb rt stoppen fuer einzelene personen 2022-04-13 11:43:25 +02:00
Andreas Österreicher 13b77d5300 Merge branch 'feature-18063/NotenlisteInternAngerechnet' 2022-04-13 11:35:39 +02:00
Andreas Österreicher 29c0fc54e5 Nicht Überschreibbare Noten werden generisch auf der Notenliste
angedruckt statt hartcodiert
2022-04-13 11:35:02 +02:00
Andreas Österreicher c26fed90e2 Merge branch 'feature-18472/KurzzeitmobilitaetenNichtAnzeigen' 2022-04-13 11:01:05 +02:00
Andreas Österreicher b8861043b4 Neuer Config für Spezialzeugnisnoten die nicht aufs Zeugnis/DS kommen 2022-04-13 09:19:01 +02:00
Andreas Österreicher 4ff4c88fdf Merge branch 'feature-17908/intern_angerechnet_nicht_am_zeugnis' 2022-04-13 09:15:56 +02:00
Andreas Österreicher 59df862b3f Merge branch 'bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument' 2022-04-13 08:55:06 +02:00
Andreas Österreicher 2b32f534f5 Merge branch 'bug-18663/fas_filter_zgv_erfuellt_zeigt_keine_daten_an' 2022-04-13 08:51:48 +02:00
Andreas Österreicher d8ab58c8d6 Merge branch 'feature-12166/check_im_fas_ob_anzahlung_schon_gebucht_wurde' 2022-04-13 08:44:41 +02:00
Andreas Österreicher 5686ef612b Neuer Config Eintrag für Check auf doppelte Buchungen 2022-04-13 08:44:09 +02:00
Andreas Österreicher fe65627f71 Merge branch 'feature-18939/formal_geprueft_caching_problem_beim_aendern_der_eintraege' 2022-04-13 08:28:15 +02:00
KarpAlex 3804cce361 studentenmeldung.php: export for all Studiengänge: ausserordentliche Studierende are also included if their Studiengang is melderelevant 2022-04-12 18:34:06 +02:00
Paolo 8159f563ba Updated composer.lock 2022-04-12 17:21:06 +02:00
Paolo 8bad536818 Merge branch 'feature-17671/Automated_checks_project_quality' 2022-04-12 17:16:00 +02:00
Paolo 45124fac01 Merge branch 'master' into feature-17671/Automated_checks_project_quality 2022-04-12 17:15:09 +02:00
ma0068 d5225da80c Kein Eintrag Urlaubstool bei vorhandener Zeitaufzeichnung 2022-04-12 16:48:22 +02:00
ma0068 c8b23dbe12 Generierung UID in Addon FHTW ausgelagert 2022-04-12 12:15:17 +02:00
KarpAlex 1f13c352a6 Issues.php: moved variable declaration out of if clause (phpcs issue) 2022-04-12 12:04:13 +02:00
Paolo d3c30af9f7 Merge branch 'master' into feature-15029/Docsbox 2022-04-11 20:14:26 +02:00
Andreas Österreicher 68e81d1eb6 Merge branch 'master' into bug-18663/fas_filter_zgv_erfuellt_zeigt_keine_daten_an 2022-04-11 18:40:32 +02:00
Andreas Österreicher 1ae4ceb4ee Merge branch 'master' into bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument 2022-04-11 16:58:43 +02:00
Andreas Österreicher 9000cf0943 Merge branch 'bug-17359/BewerbungstoolAdpatierungAbfrageZGVInhouse' 2022-04-11 16:47:16 +02:00
Andreas Österreicher e526f4fa2c Merge branch 'master' into bug-17359/BewerbungstoolAdpatierungAbfrageZGVInhouse 2022-04-11 16:34:04 +02:00
Andreas Österreicher 40e3a3d901 Merge branch 'bug-17990/personendetails_homeoffice_adresse' 2022-04-11 16:27:56 +02:00
Andreas Österreicher fe29fd0149 Merge branch 'master' into bug-17990/personendetails_homeoffice_adresse 2022-04-11 16:09:32 +02:00
KarpAlex 0344904631 AkteLib.php, DmsLib.php coding style fixes:
- splitted too long parameter lines
- method call closing parenthesis on new line
2022-04-11 10:57:08 +02:00
KarpAlex 9e8e8c98c8 checksystem: added column melde_studiengang_kz for tbl_studiengang 2022-04-11 10:23:45 +02:00
ma0068 6a403a7fc3 Logik Generierung MA-Nummer im Fas geändert 2022-04-11 08:40:57 +02:00
KarpAlex b6d61c510d checksystem: added columns insertamum and insertvon to system.tbl_fehler_zustaendigkeiten check array 2022-04-09 19:11:42 +02:00
KarpAlex f2ec48682b Fehler Zuständigkeiten assignment page improvements:
- added the page to navigation
- added organisationseinheiten type to oe dropdown
- correct order of oe and funktion dropdown entries
- bugfix: delete button was not shown when german language
- mitarbeiter autocomplete search also works for "vorname nachname" form
2022-04-09 18:32:47 +02:00
Andreas Österreicher 268bf474df Infomail bei Zeitwunschänderungen - Inaktive Abteilungsleitungen werden nicht informiert, Ermittlung der geänderten
Zeitwünsche angepasst
2022-04-08 16:29:47 +02:00
Andreas Österreicher a788459d54 Zeitverfügbarkeiten werden nur aus dem aktuellen und kommenden Semester
angezeigt, vergangene Einträge werden ausgeblendet
2022-04-08 14:46:59 +02:00
Andreas Österreicher 9785cc62a4 Zeitwunsch prüft das VON Datum anstatt das Insert Datum beim Erstellen
neuer Gültigkeiten
2022-04-08 14:44:49 +02:00
Andreas Österreicher c1335e3628 Merge branch 'feature-15390/Zeitwuensche_pro_Semester' into feature-15391/Positive_Zeitsperre 2022-04-08 14:00:37 +02:00
Andreas Österreicher 860bed4bda Merge branch 'master' into feature-15391/Positive_Zeitsperre 2022-04-08 12:31:09 +02:00
Andreas Österreicher e51b79c33d Merge branch 'feature-18887/Datenverbund_Clearing_und_Community_Changes' 2022-04-07 15:19:11 +02:00
KarpAlex df3cab593c fehlerzustaendigkeit phrase "zuweisen" was incorrectly defined 2022-04-07 12:40:46 +02:00
ma0048 79bfba2da5 anezeige fehler beim formal geprueft gefixt 2022-04-06 10:32:55 +02:00
ma0048 02330db5ec zgv erfuellt wird nur abgefragt wenn die config gesetzt ist 2022-04-05 14:02:53 +02:00
KarpAlex 1733f314f7 added last_status and bismelden columns to Datenverbund Storno Übersicht Filter 2022-04-04 18:27:40 +02:00
ma0068 c7ac4954ed Anzeige Anzahl Tage bei Dienstverhinderung 2022-04-04 14:15:36 +02:00
Andreas Österreicher 5e64204354 Merge branch 'FHBGLD-FHBGLD-BIS_studentenmeldung' 2022-04-04 11:14:12 +02:00
Andreas Österreicher 753b679a84 Merge branch 'FHBGLD-BIS_studentenmeldung' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-BIS_studentenmeldung 2022-04-04 11:05:45 +02:00
Andreas Österreicher 9d9a47ee0a Merge branch 'Monika70-lvnoten_verband' 2022-04-04 11:01:40 +02:00
Andreas Österreicher d3615dfe69 Merge branch 'lvnoten_verband' of https://github.com/Monika70/FHC-Core into Monika70-lvnoten_verband 2022-04-04 10:59:59 +02:00
ma0068 f94e9a3a15 Update Löschen alter Primary Key pk_tbl_entwicklungsteam_mitarbeiter_uid, studiengang_kz 2022-04-04 09:37:50 +02:00
Andreas Österreicher c324386e47 Betreuerstunden bei Projektbetreuungen werden nicht mehr nach der
1. Nachkommastelle abgeschnitten sondern können bis zu 4
   Nachkommastellen haben
2022-04-01 17:21:41 +02:00
KarpAlex dcf00b04ce Fehler Zuständigkeiten GUI: removed double row for fehlertyp in fehler info modal 2022-03-31 17:47:20 +02:00
Manfred 77bde75b6e Merge remote-tracking branch 'origin/master' 2022-03-31 16:41:47 +02:00
Manfred 31335b4ee4 Namenssuche mit Sonderzeichen CIS und FAS 2022-03-31 16:41:43 +02:00
ma0068 4676a0a7c1 Fix Bug: Übernahme Werte ins Detailfeld 2022-03-31 15:03:35 +02:00
ma0068 f0c40bf449 Adaptierungen Entwicklungsteam UID für FAS 2022-03-31 12:44:45 +02:00
KarpAlex 427a75b74b added GUI for managing Issues Zuständigkeiten 2022-03-31 12:41:18 +02:00
Harald Bamberger 3d2c8dd1f9 Merge branch 'feature-18823/Covid_Zutrittskontrolle_deaktivieren' 2022-03-31 10:41:01 +02:00
Harald Bamberger 3342a9018c add config to deaktivate covid status 2022-03-31 10:27:10 +02:00
Cris ad77c233e4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-03-31 10:00:18 +02:00
Manfred bc4f352229 Merge remote-tracking branch 'origin/master' 2022-03-30 19:08:11 +02:00
Manfred f471d38e35 Logging von Statistiken über Vilesci 2022-03-30 19:08:07 +02:00
Manfred 86f09c5bce BigFix Load Studienplan Class 2022-03-30 19:07:09 +02:00
Cris 0dc508cf1f Corrected code order 2022-03-30 17:13:26 +02:00
Andreas Österreicher 2897598aa3 Merge branch 'feature-2936/leistungsstipendien' 2022-03-30 16:08:35 +02:00
ma0048 9f8b6056a4 leistungsstipendium filter hinzugefuegt 2022-03-30 15:59:42 +02:00
Cris 814ce1c78b Added: Löschen von Zeitverfügbarkeiten mitloggen
Das Löschen von Zeitverfügbarkeiten wird nun in der Log-Tabelle
festgehalten.
2022-03-30 10:42:10 +02:00
Cris c3f9fda0cd Adapted: Negative Zeitsperre overrult positive Zeitsperre 'ZVerfueg'
Wenn zur gleichen Zeit eine negative und eine positive Zeitsperre besteht
dann wird die Zeit in der LV Planung als negativ (rot) markiert.
(Bsp: LektorIn hatte verfuegbare Zeit eingetragen [pos Zsp], ist wegen eines Krankenstands
dann doch nicht verfuegbar [neg Zsp] --> wird als nicht verfuegbar angezeigt)
2022-03-29 15:03:26 +02:00
ma0068 6d1c926ec0 Anzeige AllinSaldo in Zeitaufzeichnung 2022-03-29 13:56:00 +02:00
cgfhtw 1445876955 Copy Template on save 'tbl_studienplan_lehrveranstaltung' 2022-03-28 16:32:52 +02:00
FHBGLD 3698837937 Update studentenmeldung.php 2022-03-28 13:03:45 +02:00
FHBGLD bb44bd05b6 Merge branch 'FH-Complete:master' into FHBGLD-BIS_studentenmeldung 2022-03-28 13:00:55 +02:00
Harald Bamberger fce72b1f91 fix merge conflicts after merging master 2022-03-28 11:59:26 +02:00
Cris fe52b7e352 Merge branch 'master' into feature-15391/Positive_Zeitsperre 2022-03-28 11:58:00 +02:00
Harald Bamberger d84ed369b1 fix merge conflicts after merging master 2022-03-28 11:36:47 +02:00
cgfhtw 56079a3674 phrasesupdate 2022-03-28 11:32:32 +02:00
Cris a8008d6233 Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
# Conflicts:
#	system/dbupdate_3.3.php
2022-03-28 09:50:02 +02:00
Cris 25a3bbbb85 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-03-28 09:33:43 +02:00
ma0068 74ff9d7c8e Kein Andruck von Kurzzeitmobilitäten auf Fotoliste 2022-03-25 10:27:07 +01:00
ma0068 cf2587827b nur Aufenthalte >= 30 Tage werden als Outgoings in listen angezeigt 2022-03-25 09:56:43 +01:00
Cris 56d3d33cd6 Verbesserte Abfrage beim Erstellen/Adaptieren von Tabellen tbl_zeitwunsch_gueltigkeit und tbl_zeitwunsch 2022-03-24 14:40:54 +01:00
Cris 4decfaa848 Added: Zeitverfuegbarkeit-Notizfeld ist nun verpflichtend in Assistenzsicht 2022-03-24 11:04:03 +01:00
Manfred 86e15f2435 Added vorlagestudiengang_id to function getAktuelleVorlage 2022-03-23 17:39:55 +01:00
Manfred 8db3aeb10f Add index beschreibung to system.tbl_webservicelog 2022-03-23 17:34:04 +01:00
Manfred e0425b3288 Merge remote-tracking branch 'origin/master' 2022-03-23 17:33:19 +01:00
Manfred c54f261e16 Logging von Suchanfragen zur Verbesserung der UX 2022-03-23 17:33:01 +01:00
Manfred 061c7b238e Login für Admin mittels uid als GET-Param 2022-03-23 17:31:57 +01:00
Manfred 70a2db3648 Login für Admin mittels uid als GET-Param 2022-03-23 17:31:34 +01:00
ma0068 f87671ac4f fix typo 2022-03-23 16:34:25 +01:00
Cris 37f6a0caaa Merge branch 'master' into feature-15391/Positive_Zeitsperre
# Conflicts:
#	system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
cgfhtw d5d6432f14 modified model added db entry for lehrtyp added db col for template modified vilesci and added webservicerights for autocomplete 2022-03-23 15:54:44 +01:00
Cris 11373480bb Fixed: Erneute Sperre beim Kopieren von ZW aufgehoben
Problem beim Kopieren von ZW behoben, wo nach Aufhebung einer Sperre die Sperre wieder aktiviert war.
2022-03-23 15:36:44 +01:00
Cris fec8361897 Query zum Einholen der ZWGs vereinfacht 2022-03-23 15:33:11 +01:00
Cris 52f2241b4d Initiales Anlegen der Zeitwunschgueltigkeit vereinfacht
Statt der doppelten Anlage von ZWG wird nur mehr einmal angelegt (Aktuelles Semester, Ende offen)
2022-03-23 15:32:06 +01:00
Cris d37a773ec2 Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
# Conflicts:
#	system/dbupdate_3.3.php
2022-03-22 15:57:19 +01:00
Cris 29f7363343 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-03-22 15:52:55 +01:00
ma0068 37c29455ef intern angerechnet für Notenliste hinzugefügt 2022-03-21 10:52:19 +01:00
ma0068 f29d838b7c Adaptierungen für checksystem entwicklungteam_id 2022-03-18 13:45:33 +01:00
Andreas Österreicher 40392d3cb9 Planner: Laden der Projektphasen optimiert, Personentage werden in der
Übersicht angezeigt
2022-03-18 12:59:03 +01:00
Andreas Österreicher 64f8df780d Merge branch 'feature-12053/pruefungsaktivitaeten_loeschen' 2022-03-17 17:00:24 +01:00
cgfhtw 1197f051a2 kvp phrases 2022-03-17 16:20:54 +01:00
ma0068 681385946a Adaptierungen Tabelle bis.tbl_entwicklungsteam aufgrund Erweiterung um entwicklungsteam_id 2022-03-17 12:24:18 +01:00
Paolo 693832c1cd Changed chriskacerguis/codeigniter-restserver to be used only with version 3.0.3 2022-03-17 11:57:44 +01:00
Harald Bamberger ccc8bf8279 Merge branch 'task-18508/Zeitaufzeichnung_-_Pausenfehler' 2022-03-17 10:14:08 +01:00
Harald Bamberger 04ecd3aa3a fix calculation of pausesumme to sum up all pausen 2022-03-17 10:12:23 +01:00
Andreas Österreicher 253fdf1414 Planner - Anzeigeproblem bei Projektressourcen für Firmen und Studenten
behoben
2022-03-17 09:23:46 +01:00
Christian Paminger 8def68ad4f Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-03-16 18:29:01 +01:00
Christian Paminger d83e0cf52c BugFix ressource.rdf.php 2022-03-16 18:28:31 +01:00
KarpAlex b758275b58 added Projektarbeitsbeurteilung phrases 2022-03-16 17:12:55 +01:00
Manfred a08c8d7a76 Filter für Lehrende in FAS und Tempus 2022-03-16 16:13:47 +01:00
Manfred 334460a230 Spalte "Anzahl Dokumente" bei BPK-Übersicht 2022-03-16 16:04:58 +01:00
Andreas Österreicher a70dd49654 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-03-16 13:42:03 +01:00
ma0068 67c9c79113 Änderung Klasse Entwicklungsteam auf neuen Key entwicklungsteam_id 2022-03-16 13:02:52 +01:00
Christian Paminger 6fb0fd3828 Icon fuer Services im Planner 2022-03-16 12:04:10 +01:00
Christian Paminger 04b896ac13 Update projektphasedetail.overlay.xul.php
Services Added
2022-03-16 09:38:38 +01:00
FHBGLD 28fa931f2c Update studentenmeldung.php 2022-03-16 08:10:10 +01:00
Andreas Österreicher 33d296512f Merge branch 'feature-18115/unr_problem' 2022-03-15 13:02:35 +01:00
ma0068 9c1b6bcd44 Entwicklungsteam: Adpatierungen für Sorierung und Anzeige Mitarbeiter Grid 2022-03-15 09:43:46 +01:00
Andreas Österreicher e4be931704 Merge branch 'feature-17517/AdaptierungenZeiterfassungenSprint177' 2022-03-14 16:03:07 +01:00
Andreas Österreicher e0a2f0490b Laden der Untergebenen optimiert bei vielen Einträgen 2022-03-14 15:58:13 +01:00
ma0048 e756ec4211 interne angerechnet und nicht zugelassen wird nicht angezeigt 2022-03-14 08:20:18 +01:00
KarpAlex a8e36f2f3e added studiengangskennzahl phrase 2022-03-11 02:12:20 +01:00
KarpAlex afd03e414f Datenverbund filter: added new filter for bpk overview in extension and added storno uebersicht filter to dvuh app, and remaned dataset 2022-03-10 13:39:53 +01:00
ma0068 2b2b211470 Änderung Abfrage 2022-03-10 11:45:05 +01:00
Paolo 2adfa8a09c Fixed check in hlp_header_helper->printRefreshMeta function 2022-03-08 14:52:44 +01:00
Paolo 78a5f65025 - Added new parameter refresh to the view /views/templates/FHC-Header.php
- /views/templates/FHC-Header.php calls the helper function printRefreshMeta
- Added new function printRefreshMeta to application/helpers/hlp_header_helper.php
2022-03-08 14:46:38 +01:00
ma0048 9460fd19d8 kurzbz in absage dropdown und abgewiesene uebersicht angepasst 2022-03-08 11:43:34 +01:00
ma0048 b3dff60ba6 views angepasst, kurzbz von studienordnung statt studienplan 2022-03-08 11:28:41 +01:00
Andreas Österreicher 4bd98fd10a Merge branch 'feature_17252/sammelzeugnis_waff' 2022-03-08 08:18:22 +01:00
KarpAlex 0b679bc9e4 Projektarbeitsbeurteilung: added english phrases, renamed kommissionsmitglieder to Prüfungssenatmitglieder 2022-03-08 03:12:03 +01:00
Paolo 7aaeccdd42 Excluded application/phrases/ from been checked for line length with PHPCS 2022-03-07 12:34:11 +01:00
ma0048 db694b9989 nach dem Speichern werden die Felder disabled 2022-03-07 10:30:41 +01:00
ma0068 5838e1caa5 neue Funktion getAll für Entwicklungsteam STGV 2022-03-05 12:51:06 +01:00
Paolo e50cc27a89 Fixed exec second parameter value 2022-03-04 20:13:03 +01:00
Paolo 9f28db36b8 - Added new sniffs for codesniffer to be compliant with the FHComplete coding style
- Commented tests/codesniffer/FHComplete/ruleset.xml
- Removed redundant PHPCS checks already performed by PHPMD
- Added/removed checks from PHPCS to be compliant with the FHComplete coding style
- PHPMD: Removed the ElseExpression rule from the rulesets/cleancode.xml
2022-03-04 19:59:57 +01:00
Paolo db49f2b1e7 - libraries/DocsboxLib:
- Added new constant DEFAULT_FORMAT
	- ERROR and SUCCESS constant values are the same of EXIT_ERROR
	  and EXIT_SUCCESS
	- public method convert parameter format does not have a default
	  value anymore
	- Added use import of ZipArchive
- libraries/DocumentLib: removed unused variables
2022-03-04 19:47:32 +01:00
Andreas Österreicher ea98fd7e18 Merge branch 'feature-12053/pruefungsaktivitaeten_loeschen' 2022-03-04 15:10:51 +01:00
Andreas Österreicher 418f2aee7b Merge branch 'master' into feature-17517/AdaptierungenZeiterfassungenSprint177 2022-03-04 15:03:03 +01:00
Andreas Österreicher 6e6ed893e4 Zeitaufzeichnung Problem behoben wodurch nach dem Löschen in den edit Modus gewechselt
wird statt in den neu Modus
2022-03-04 14:50:42 +01:00
Andreas Österreicher fd209efe55 CSV Import Error Handling
- Leerzeilen ignorieren
 - Prüfung der Pflichtfelder
Zeitsperre
 - Nicht Zeitaufzeichnungsrelevante Zeitsperren parallell zu
   Zeitaufzeichnungen möglich
2022-03-04 14:45:44 +01:00
Andreas Österreicher acf32ffc39 Removed Legacy File 2022-03-04 11:23:08 +01:00
Andreas Österreicher 4619bb56f2 Removed Legacy File 2022-03-04 11:21:09 +01:00
cgfhtw 091fd3487f refactoring: zeitaufzeichnung_import & zeitaufzeichnung_import_csv & zeitaufzeichnung_import_post 2022-03-03 15:59:16 +01:00
Andreas Österreicher 5a34835a20 Mitarbeiteranlage erlaubt jetzt Vornamen und Nachnamen mit nur 2 Zeichen 2022-03-03 13:58:55 +01:00
cgfhtw c3b2533ae9 Comment & Warnings 2022-03-03 08:37:42 +01:00
cgfhtw 4066a7a228 zeitaufzeichnung_csv_import.class 2022-03-02 16:38:23 +01:00
KarpAlex 85107afb63 education/Zeugnisnote_model: Noten can be filtered by zeugnis flag 2022-03-02 12:19:37 +01:00
Harald Bamberger d53f14eeea blockierende Zeitsperren auch serverseitig prüfen, clientseitige Prüfung geringfügig angepasst 2022-02-28 14:02:16 +01:00
Andreas Österreicher 4f8834a8b2 Merge branch 'feature-16190/Issues_automatisches_Beheben' 2022-02-28 13:23:09 +01:00
Andreas Österreicher d7ad3d80f3 Merge branch 'master' into feature-16190/Issues_automatisches_Beheben 2022-02-28 13:07:06 +01:00
KarpAlex 8471d3c8cd added public access modifier to interface (yes, this is actually necessary because mess detector is complaining...) 2022-02-28 12:57:10 +01:00
KarpAlex 1cf216b5ee added DVUH storno filter 2022-02-28 12:55:47 +01:00
Andreas Österreicher 38f34763b1 Merge branch 'feature-12647/reihungstest_anmeldeproblem_bei_zwei_reihungtests' 2022-02-28 11:45:02 +01:00
Andreas Österreicher fed29449e8 Merge branch 'feature-15313/reihungstest_danke_popup_beim_logout' 2022-02-28 11:41:45 +01:00
Andreas Österreicher d84562e830 Merge branch 'feature-17001/infocenter_bewerber_vorhanden' 2022-02-28 11:25:49 +01:00
Andreas Österreicher 766950cc16 Merge branch 'feature-17783/infocenter_zgv_pruefung_sancho_mail_sollte_namen_enthalten' 2022-02-28 11:13:21 +01:00
Andreas Österreicher 2b4ecf3a3d Merge branch 'feature-16922/infocenter_detailansicht_name_statt_uid' 2022-02-28 11:07:38 +01:00
Andreas Österreicher 0168d78207 Merge branch 'feature-17782/infocenter_identitätsdokument_bei_reihungstest_freigegeben' 2022-02-28 11:03:06 +01:00
Andreas Österreicher 934631f4e3 Berechtigungsprüfung auf Untergebene erweitert beim Laden der
Projektphasen
2022-02-25 15:23:48 +01:00
Andreas Österreicher bbc8c0e052 CheckPausenError aus Funktion verwendet 2022-02-25 14:26:40 +01:00
Andreas Österreicher 3c74ff5780 Merge branch 'feature-17728/featureCheckPausenfehlerBeiVorzeitigemAbschicken' into feature-17517/AdaptierungenZeiterfassungenSprint177 2022-02-25 13:44:01 +01:00
Andreas Österreicher 35bf7b4c32 Merge branch 'master' into feature-17517/AdaptierungenZeiterfassungenSprint177 2022-02-25 13:11:43 +01:00
Andreas Österreicher 1cd5a943c4 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-02-25 12:23:25 +01:00
Andreas Österreicher 8ee2dbbe66 Merge branch 'feature-17644/Anrechnung_Ansicht-fuer-Assistenz' 2022-02-25 12:11:00 +01:00
Andreas Österreicher 18731ede47 Laden von Studiengangsleitungen angepasst, Error Handling bei fehenden
Studiengangsleitungen
2022-02-25 11:59:38 +01:00
Cris 68971c7146 Merge remote-tracking branch 'origin/bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument' into bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument
# Conflicts:
#	public/js/lehre/anrechnung/requestAnrechnung.js
2022-02-24 14:12:37 +01:00
Cris c8f93cae07 Adapted system feedback when uploading too large documents
. Added clientside check to avoid uploads > max upload size on serverside
. Adapted message returned by server, when max upload size is exceeded
2022-02-24 14:11:11 +01:00
Manfred 4a509fa9d0 Aktueller Status wird aus den übergebenen Studiensemester ermittelt 2022-02-23 16:29:46 +01:00
Manfred e402c8cdf9 Filter Widget in Tablesorter und Row-Count 2022-02-23 16:22:30 +01:00
Manfred f47f952b0a Get-Param norefresh für Informationsbildschirm unterdrückt refresh 2022-02-23 16:20:29 +01:00
ma0048 c3cef1c5f1 adressentyp class hinzugefuegt
dynamische anzeige der adressentypen
2022-02-23 16:17:29 +01:00
Manfred b3d9c00d3c Merge remote-tracking branch 'origin/master' 2022-02-23 16:17:27 +01:00
Manfred 95c7f083d4 CSV-Export aus dem Reporting mit Komma statt Punkt 2022-02-23 16:17:13 +01:00
ma0048 a4c80b7969 reihenfolge der spalten angepasst 2022-02-23 15:00:14 +01:00
Cris 2d683390ae Adapted system feedback when uploading too large documents
. Added clientside check to avoid uploads > 8MB size
. Adapted message returned by server, when max upload size is exceeded
2022-02-23 12:57:58 +01:00
Cris 09954c479c Changed: Now checking by permission and not by benutzerfunktion
Before, permission for page access and download was checked by benutzerfunktion.
This did not allow access by user with corresponding permissions, like admins.
Therfore changed to check by permission only.
2022-02-23 09:45:45 +01:00
Cris 339f82291c Disabled edit elements / create Anrechnung in GUI if user has readonly access / no permission to create Anrechnung 2022-02-22 16:36:11 +01:00
ma0048 22b0e9f941 name in die mails hinzugefuegt 2022-02-22 12:25:39 +01:00
ma0048 841247aa06 download von identitaetsnachweis hinzugefuegt
onholddate als default spalte hinzugefuegt
2022-02-22 12:23:12 +01:00
Cris 9abc018e08 Removed db->escape when using getLeitung/getAssistance method
...it throws an error since query was adapted to accept array and anyway, is
not necessary anymore.
2022-02-21 17:19:02 +01:00
Cris b1f171aee2 Changed permission function to allow stgl assistance download on Uebersicht- and Detailseite 2022-02-21 16:53:30 +01:00
Cris d2055f759e Added method getAssistance in Studiengang Model 2022-02-21 16:52:13 +01:00
Cris d57a62dbe3 Adapted method getLeitung in Studiengang Model to accept studiengang array 2022-02-21 16:51:17 +01:00
Cris a2a307aade Changed permission to allow stgl assistance reading Uebersicht- and Detailseite 2022-02-21 16:45:01 +01:00
Cris 35c351f045 Added phrases to View 2022-02-21 12:02:18 +01:00
Cris 78d863a383 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-02-21 11:42:37 +01:00
Cris 6ebb298233 Added required fields check on client side 2022-02-21 11:20:17 +01:00
Cris d5dc4484d5 Fixed display of double datepicker
HTML input "date" format was used to avoid displaying text list when using
the optional input "text" format. Problem was then: display of two datepickers
- HTML and jquery ui datepicker. This is fixed now by using prevent default
on HTMl datepicker.
2022-02-21 11:19:43 +01:00
KarpAlex 273ff6a3df Merge branch 'master' into feature-16190/Issues_automatisches_Beheben
# Conflicts:
#	system/dbupdate_3.3.php
2022-02-19 02:45:49 +01:00
ma0048 af9ab29c5c variablename in dbupdate eingetragen 2022-02-18 14:05:44 +01:00
KarpAlex 45f789ebf9 IssueResolver_Controller.php: job does not stop after error or no issues found. 2022-02-18 11:01:45 +01:00
ma0048 ae15c922b8 buchung kann nun trotz vorhandener buchung gebucht werden 2022-02-18 10:30:40 +01:00
Monika70 142c4ca37d Verband als Detailinfo
Verband als Detailinfo bei den Lehrveranstaltungsnoten einblenden
2022-02-18 09:22:02 +01:00
Cris 944cf9c0b3 Merge remote-tracking branch 'origin/feature-15391/Positive_Zeitsperre' into feature-15391/Positive_Zeitsperre 2022-02-17 16:55:37 +01:00
Cris df4d2df9f2 Added tooltip to delete button 2022-02-17 16:54:47 +01:00
ma0048 b8cfa58446 waff zeugnis angepasst 2022-02-17 15:06:22 +01:00
Cris d17c221867 Fixed: Lektor-Dropdown not disabled anymore after Deleting Zeitverfuegung 2022-02-17 15:04:17 +01:00
Cris 61d7b68a79 Added validation checks on post data
Checking date restrictions and other mandatory post params.
Deleted client side validations, now they are performed
only on server side.
2022-02-17 14:48:19 +01:00
Cris 558ad7beee Fixed wrong column name 'ZeitsperreID' to correct name 'UID' 2022-02-17 12:57:35 +01:00
Cris b8b3b1b07d Embedded menu item Zeitverfuegbarkeit to FH Complete Menu 2022-02-17 12:36:31 +01:00
Cris e06301a2de Added phrase 'Geloescht' / 'Deleted' 2022-02-17 12:34:44 +01:00
Cris ca51fef7f8 Added method to get actual Studiensemester to Studiensemester Model 2022-02-17 12:33:38 +01:00
Cris 5c82a4d821 Added insert/update/delete methods to Zeitsperre Model 2022-02-17 12:33:01 +01:00
Cris 9872ab9be3 Added JS file to administrate Zeitverfuegbarkeiten 2022-02-17 12:31:33 +01:00
Cris 2d44675d90 Added permission to administrate Zeitverfuegbarkeiten
Permission: lehre/zeitverfuegbarkeit
2022-02-17 12:30:54 +01:00
Cris 0d0351d265 Added Views to administrate Zeitverfuegbarkeiten 2022-02-17 12:29:40 +01:00
Cris d9c66d95d0 Added Controller to administrate Zeitverfuegbarkeiten 2022-02-17 12:23:48 +01:00
Andreas Österreicher 23e10d8fbf Merge branch 'feature-17391/Kostenstellennummer_6_Zeichen_BFI' 2022-02-16 18:39:08 +01:00
Andreas Österreicher f2ebf9e0fa Infotext bei DB-Update korrigiert 2022-02-16 18:38:38 +01:00
Andreas Österreicher ebf683aac2 Merge branch 'feature-17780/fix_sql_query_for_personalmeldung' 2022-02-16 18:27:05 +01:00
Nikolaus Krondraf 2b974b7729 Bugfix for Personalmeldung 2022-02-16 14:55:17 +01:00
Andreas Österreicher dd97818ebe Merge branch 'hotfix-17758/SAPByD_payments_fix_KontoModel_setPaid' 2022-02-15 16:53:54 +01:00
Paolo f6de822ea0 Fixed Konto_model->setPaid method 2022-02-15 16:49:46 +01:00
Paolo d4d1320503 Removed test files for PHPMD 2022-02-15 12:56:19 +01:00
ma0048 071b361959 verhinderte buchungen, die bereits vorhanden sind
+ neue configeintrag
2022-02-15 12:47:42 +01:00
Paolo 5427a5aff3 Checking test for PHPMD 2022-02-15 12:43:50 +01:00
Paolo cc6f59662a Added test file to check PHPMD 2022-02-15 12:35:25 +01:00
Paolo 282972f441 Added new PHPMD ruleset rulesets-dev-only.xml 2022-02-15 12:28:33 +01:00
Paolo 8037067b44 Changed the size of wawi.tbl_kostenstelle.kostenstelle_nr from character varying(4) to character varying(6) 2022-02-15 09:23:45 +01:00
ma0048 9eb3659d03 archivieren beim waff sammelzeugnis hinzugefuegt 2022-02-15 09:23:30 +01:00
ma0068 51b1f2cfa9 Funktion checkPausenErrors() in zeitaufzeichnung.class.php 2022-02-14 16:26:13 +01:00
Andreas Österreicher 67700a47d8 Merge branch 'feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate' 2022-02-14 11:02:19 +01:00
Andreas Österreicher 7fc9fcfedd Merge branch 'master' into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate 2022-02-14 10:57:23 +01:00
Paolo 6e9ecb23b2 Removed lint test file 2022-02-11 12:55:30 +01:00
Paolo 598575a194 Added excludes to PHPMD and PHPCS rule sets 2022-02-11 11:01:44 +01:00
Andreas Österreicher 37fe8a9968 Merge branch 'Monika70-lvgesamtnoteverwalten' 2022-02-11 09:46:51 +01:00
Andreas Österreicher 5db2ebb260 Merge branch 'lvgesamtnoteverwalten' of https://github.com/Monika70/FHC-Core into Monika70-lvgesamtnoteverwalten 2022-02-11 08:48:35 +01:00
Andreas Österreicher 5cea93d284 Unterstützung für das erstellen von signierten Zertifikaten und LVZeugnissen im
Lehrveranstaltungskarteireiter für mehrere Personen auf einmal
hinzugefügt
2022-02-10 19:01:32 +01:00
Andreas Österreicher 6b163ef786 Merge branch 'master' into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate 2022-02-10 17:43:29 +01:00
Andreas Österreicher a2f9276bcb Fehler behoben wodurch Noten beim Bearbeiten in der
Lehrveranstaltungssicht nicht geladen wurden
2022-02-10 17:40:30 +01:00
ma0048 92b2e7a64b lv zeugnisse und zertifikate mit signatur unter lehrveranstaltungen hinzugefuegt, selfservice auf true geaendert und vorlagen angepasst 2022-02-10 16:35:05 +01:00
KarpAlex 3b8da2d7d0 moved check if projektarbeit is current to projektarbeit.class.php to projektarbeitIsCurrent method 2022-02-10 15:42:19 +01:00
ma0068 c8e31dffa8 Adaptierung Phrasen und Authentifizierung 2022-02-10 15:02:43 +01:00
Paolo 6066da470e - Added excluded directories to PHPMD and PHPCS rule sets
- Added testing file for Lint
2022-02-10 15:00:00 +01:00
Andreas Österreicher f5ae4f8679 Defaultwert für Homeoffice gesetzt 2022-02-10 14:52:35 +01:00
Paolo c84dcd900b - Added new composer dev packages: squizlabs/php_codesniffer phpmd/phpmd phpmetrics/phpmetrics sebastian/phpcpd
- Updated composer.json and composer.lock
2022-02-10 11:54:18 +01:00
Paolo d9aa24cced - Removed phpci.yml file
- Removed tests/codeception/ directory
- Changed tests/codesniffer/FHComplete/ruleset.xml
- Removed tests/codesniffer/FHComplete/Sniffs
- Removed tests/codesniffer/FHComplete/tests
- Added tests/phpmd/rulesets.xml
2022-02-10 11:42:39 +01:00
ma0068 297172113d neue Funktion getAll() für Anzeige Entwicklungsteams 2022-02-10 11:04:31 +01:00
Cris 642ba32e0b Merge branch 'master' into feature-15391/Positive_Zeitsperre 2022-02-10 10:51:08 +01:00
Cris d0e683a514 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-02-10 10:50:11 +01:00
Manfred 5641d10cc1 Link zum Schlagwortdienst korrigiert 2022-02-09 14:33:25 +01:00
ma0048 6b5df6d6ca fixed login for testtool 2022-02-09 13:48:54 +01:00
ma0048 5d2adedd37 Kommission in der uebersicht hinzugefuegt 2022-02-09 10:35:39 +01:00
Cris b0212627ce Changed: Zeitverfuegbarkeit bei Zeitsperren im CIS nicht lösch-/editierbar machen 2022-02-09 09:56:19 +01:00
Cris 6d62019447 Changed: Zeitverfuegbarkeit bei Zeitsperren im CIS nicht anzeigen 2022-02-09 09:55:39 +01:00
KarpAlex a6771df4dd issues auto-resolve: added checks if library forissue exists and has method for resolving 2022-02-08 21:47:33 +01:00
Cris 8a848f7169 Added: Anzeige in Tempus über Zeitverfuegbarkeit
Wenn ein Lektor eine positive Zeitsperre hinterlegt hat, wird diese
im Tempus nun angezeigt.
2022-02-08 17:53:22 +01:00
Cris 0f871dc89f Added: Methode getVonBis() in Zeitsperre Class
Liefert die Zeitsperren eines Users innerhalb einer bestimmten Zeitspanne.
Einschränkung nach Zeitsperrentyp möglich.
2022-02-08 17:51:58 +01:00
Harald Bamberger a715a78858 phrase maxtagebeschreibung for eucovidqr added 2022-02-08 16:54:55 +01:00
ma0068 fc47391392 Fix Bug Fehlermeldung, Ergänzung Zeittypen Covid, Ergänzung Dropdown um OE-Auswahl Leitung 2022-02-07 17:09:05 +01:00
ma0068 615a55eccc Adaptierungen Zeiterfassungen von Sprint177 2022-02-03 14:49:29 +01:00
Cris 08c35c6500 Fixed Error 'Class 'Studiensemester' not found' in MA Zeitwuensche (VILESCI) 2022-02-03 09:16:56 +01:00
ma0048 cd982f9ece Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate 2022-02-03 08:59:40 +01:00
ma0048 d8fd0400cb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15887/BTMessagesBeiMasterAnInfocenter 2022-02-03 08:57:25 +01:00
ma0048 13c720e230 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-16922/infocenter_detailansicht_name_statt_uid 2022-02-03 08:56:50 +01:00
ma0048 53ab1073ec Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-17001/infocenter_bewerber_vorhanden 2022-02-03 08:56:11 +01:00
ma0048 5897057581 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15313/reihungstest_danke_popup_beim_logout 2022-02-03 08:54:38 +01:00
ma0048 2bb04cac50 Merge remote-tracking branch 'origin/master' into feature-12647/reihungstest_anmeldeproblem_bei_zwei_reihungtests 2022-02-03 08:53:50 +01:00
Cris 4ae4be7eed Fixed Error 'Class 'Studiensemester' not found' in MA Zeitwuensche (VILESCI) 2022-02-02 16:13:41 +01:00
Cris 130c8e271f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-02-02 13:41:29 +01:00
Paolo 18d06c6e0c Added commento to an echo in the application/core/FHC_Controller.php
because it is not possible to replace the echo
2022-02-02 11:52:08 +01:00
Monika70 8de4625b50 Update lvgesamtnoteverwalten.php
Definition der Variable $ueberschreibbar außerhalb des If Statement, da auf die Variable in weiteren Stellen außerhalb des If Statement geprüft wird.
2022-02-02 11:01:15 +01:00
Monika70 f1fc9b467d Update lvgesamtnoteverwalten.php
Definition der Variable $ueberschreibbar außerhalb des If Statement, da auf die Variable in weiteren Stellen geprüft wird.
2022-02-02 10:02:13 +01:00
Monika70 7b17c9c265 Update lvgesamtnoteverwalten.php
Die Definition der Variable $ueberschreibbar außerhalb des If Statement.
2022-02-02 08:44:55 +01:00
KarpAlex 67a86d0705 online assessment or projektarbeit only after SS2022: also added check when sending mails to Begutachter 2022-02-01 22:56:20 +01:00
KarpAlex 1e56743187 added projektarbeitsbeurteilung phrases 2022-02-01 22:44:58 +01:00
Andreas Österreicher 6d806a52d9 Merge branch 'feature-17457/notenliste' 2022-02-01 17:25:54 +01:00
Andreas Österreicher 8d1f8875e8 Merge branch 'feature-17433/cis_profil_adressen' 2022-02-01 17:17:34 +01:00
Andreas Österreicher 4ccc659dd9 Anzeige für Hauptberuf korrigiert 2022-02-01 17:13:16 +01:00
ma0048 37cd868a44 uebersichtseite angepasst und mail beim updaten entfernt 2022-02-01 09:15:22 +01:00
Andreas Österreicher 06408ba66e Variable entfernt 2022-01-28 15:52:06 +01:00
Andreas Österreicher 6809dbdb1f Debug Output entfernt 2022-01-28 15:23:04 +01:00
Andreas Österreicher 1468c875d5 Merge branch 'master' into features-Zeiterfassung/Sprint177 2022-01-28 15:17:06 +01:00
ma0048 d9c056e7c2 bfi aenderungen notenlsite 2022-01-27 11:02:56 +01:00
ma0048 3136cf354a alle eingetragenen adressen nur beim mitarbeiter anzeigen 2022-01-27 11:00:26 +01:00
ma0048 f8d01b0866 rt login fixed bei zwei rts 2022-01-27 10:41:41 +01:00
Manfred 1b71f59dcd Merge remote-tracking branch 'origin/master' 2022-01-25 15:06:41 +01:00
Manfred 9ca053ccb2 Anpassung Studienblatt für AbsolventInnen 2022-01-25 15:06:00 +01:00
KarpAlex 1a8b267a89 Projektbetreuer_model.php: getBetreuerOfProjektarbeit returns only one row for each person 2022-01-25 14:55:01 +01:00
KarpAlex ce38127618 - FAS hide Projektarbeit Punkte 2022-01-25 12:55:29 +01:00
KarpAlex f9b93f55e4 - Projektbetreuer model getBetreuerOfProjektarbeit: added full name and projekttyp_kurzbz are also
returned
 - abgabe_lektor_details.php: grading only possible after end upload of thesis, and only beginning with SS2022
 - added projektbeurteilung phrases to core locale and phrasesupdate.php
2022-01-25 12:40:41 +01:00
ma0068 bda323ba05 Adaptierung Abfrage für ZGV Master 2022-01-21 10:26:31 +01:00
KarpAlex cf7cfd7cd2 sorted results of geBetreuerOfProjektarbeit method of Projektbetreuer_model.php and added mitarbeiter data to the result 2022-01-21 05:15:36 +01:00
KarpAlex 37c19aafc2 Added Betreuerart "Kommission" to lehre.tbl_betreuerart 2022-01-21 02:50:39 +01:00
KarpAlex 094f75ef61 - Projektbetreuer_model.php: method getBetreuerOfProjektarbeit for getting Betreuer by betreuerart
- phrasesupdate.php: added Projektarbeitsbeurteilung phrases
2022-01-21 00:41:13 +01:00
KarpAlex b145e341b8 IssueResolver.php: added comment 2022-01-20 15:11:46 +01:00
KarpAlex 4981b681e0 bufix: issue resolver does not stop after finding error 2022-01-20 12:58:32 +01:00
KarpAlex 291ea166db removed comment 2022-01-20 12:57:11 +01:00
Cris 76783b0826 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-01-20 11:23:58 +01:00
ma0048 f5fd5c3838 dokument_kurzbz auf varchar 32 geandert 2022-01-19 18:40:36 +01:00
ma0048 b8ac076bdb projektbeurteilungs uebersicht hinzugefuegt 2022-01-19 17:56:30 +01:00
Andreas Österreicher e687471a37 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-01-19 14:52:50 +01:00
Andreas Österreicher 9480e79ec0 Zeitsperren für Zeitaufzeichnung ergänzt 2022-01-19 14:52:30 +01:00
Manfred 81b74a7b7c Merge remote-tracking branch 'origin/master' 2022-01-18 20:18:57 +01:00
Manfred b6131283d9 Ampelsystem: Attribut Buttonbeschriftung berücksichtigen 2022-01-18 20:18:53 +01:00
Andreas Österreicher 08322920bc Problem behoben beim Abfragen von Zeitwünschen mit NULL Gültigkeit
Anzeige korrigiert wenn Zweitwünsche unter der Woche korrigiert werden
2022-01-18 18:06:22 +01:00
Andreas Österreicher cf27a0d782 Fehler beim Laden der Lehrveranstaltungen im Prüfungskarteireiter
behoben
2022-01-18 17:10:17 +01:00
KarpAlex 29b19af432 automatic issue resolving: added info text when starting and ending job 2022-01-17 21:53:54 +01:00
KarpAlex de60770e74 automatic issue resolving:
- removed comments
- automatically added issue_id to params, output the id in error messages
2022-01-17 21:46:19 +01:00
Andreas Österreicher f85e72d91d Merge branch 'master' into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate 2022-01-17 17:43:09 +01:00
Andreas Österreicher 25bbe25e48 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2022-01-17 16:05:09 +01:00
Manfred c5efb76014 Merge remote-tracking branch 'origin/master' 2022-01-17 16:04:13 +01:00
Manfred e83e9eed96 Phrasenkorrektur Testtool 2022-01-17 16:04:03 +01:00
Andreas Österreicher 88f8a2130e Merge branch 'feature-279/FAS_AliasgenerierungMitSonderzeichen' 2022-01-17 16:01:09 +01:00
Andreas Österreicher 75a14ec850 Fehler behoben wodurch keine Personen mit Doppelnamen mit Leerzeichen angelegt werden
können
2022-01-17 16:00:25 +01:00
Andreas Österreicher 6aae50fec9 Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen 2022-01-17 15:51:44 +01:00
Andreas Österreicher cfd61ded23 Merge branch 'feature-17002/lehrveranstaltung_projektarbeiten_anzeigen_von_lvs' 2022-01-17 14:35:15 +01:00
Manfred c38435f176 Phrasenkorrektur Testtool nach Kopie vom Livesystem 2022-01-17 14:24:46 +01:00
Manfred 00f8f5f125 Merge remote-tracking branch 'origin/master' 2022-01-17 14:17:19 +01:00
Manfred 1b753f8070 Phrasenkorrekturen Testtool 2022-01-17 14:17:10 +01:00
Andreas Österreicher 1afcd5d4fe DD Markierung korrigiert 2022-01-17 12:19:45 +01:00
Andreas Österreicher 26010e2347 Warning bei DD behoben 2022-01-17 12:12:09 +01:00
Andreas Österreicher 935a1e35d9 Merge branch 'bug-17069/AnwesenheitslisteAnzeigeDDnurAktuellesSemester' 2022-01-17 12:03:23 +01:00
Andreas Österreicher 62197e9868 Merge branch 'Sonstiges-Sprint-176/Anrechnungen_Bugfixes' 2022-01-17 11:11:23 +01:00
Andreas Österreicher 79972c0f1a Phrase korrigiert 2022-01-17 11:07:00 +01:00
KarpAlex 82dbe27112 removed, added comments 2022-01-17 10:41:29 +01:00
Andreas Österreicher 0d53b72583 Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2022-01-17 10:32:37 +01:00
KarpAlex 4bcea5348d removed old akte lib 2022-01-17 10:09:34 +01:00
KarpAlex 765b26a439 - added issue resolution job and libraries for defining how to resolve issues
- added issue inserts (fehlerupdate.php), included them in checksystem
- added getAufenthaltsdauer method to Bisio_model.php
- Add column parameterFuerBehebung to system.tbl_issue
2022-01-17 10:07:37 +01:00
KarpAlex 09ec853f2d issue filters bugfix: Statuscode was not correctly filtered if used other language than german 2022-01-17 09:56:26 +01:00
Andreas Österreicher 6080750495 Merge branch 'FHBGLD-FHBGLD-betriebmittel_anpassungen' 2022-01-14 13:25:05 +01:00
FHBGLD 7e6d036679 Update betriebsmittel.class.php 2022-01-14 11:57:29 +01:00
FHBGLD 1549c8d112 betriebsmittel-textbox-nummer2
Länge des Feldes betriebsmittel-textbox-nummer2 auf 32 Zeichen
2022-01-14 08:26:58 +01:00
FHBGLD ef43b2c1bc transform_kartennummer
transform_kartennummer mit variabler länge
2022-01-14 08:22:44 +01:00
ma0048 c36d0358a9 check duplicate auch studiengang wird nun beruecksichtigt 2022-01-13 15:16:34 +01:00
ma0068 12034b7637 #16842 Legende in Notenliste um iar ergänzt 2022-01-12 12:22:36 +01:00
ma0068 685ac404fb Anzeige dd nur für das betreffende Studiensemester in Noten-, Anwesenheits- und Gesamtliste umgesetzt 2022-01-12 12:05:36 +01:00
Cris 18827290b3 Merge branch 'master' into feature-15391/Positive_Zeitsperre 2022-01-12 11:10:31 +01:00
Cris 39fb1515a6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-01-12 11:09:23 +01:00
Andreas Österreicher 43f75e772a Problem behoben wodurch Reihungstestanmeldungen nicht gespeichert werden
können wenn das Config FAS_REIHUNGSTEST_EXCLUDE_GEBIETE leer gesetzt
wurde
2022-01-11 19:05:12 +01:00
Cris 841d6f9e89 Merge branch 'master' into feature-15391/Positive_Zeitsperre 2022-01-10 14:28:23 +01:00
Cris f87a3f63b6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-01-10 14:25:08 +01:00
Andreas Österreicher ffd529408a Config Einträge für ZGV Doktor hinzugefügt 2022-01-07 11:52:29 +01:00
Andreas Österreicher d29e33b307 Merge branch 'FHBGLD-ZGV_Doktor_und_zgv_erfuellt' 2022-01-07 11:43:52 +01:00
Andreas Österreicher f9915e2627 ZGV Doktor Nation zeigt Nationsperre an 2022-01-07 11:42:22 +01:00
Andreas Österreicher c5c798111b Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt 2022-01-07 11:27:41 +01:00
Andreas Österreicher 83bdd085b1 Merge branch 'feature-16106/NationensperreImFas' 2022-01-05 15:21:12 +01:00
Andreas Österreicher df9dfa1843 Nationen DropDown Sperre auf Rule geändert 2022-01-05 15:15:56 +01:00
Cris c88b9a8297 Adapted TEMPUS Kollisionencheck for positive Zeitsperre 'Zeitverfuegbarkeit'
Positive Zeitsperre 'Zeitverfuegbarkeit' will not appear as collision.
2022-01-04 17:00:16 +01:00
Cris 8dc178fb00 Adapted Tempus Wochenplan GUI to display positive Zeitsperre 'Zeitverfügbarkeit' 2022-01-04 16:47:10 +01:00
Cris 3202ce877f Added new Zeitsperretyp 'Zeitverfügbarkeit' (Positive Zeitsperre) 2022-01-04 15:48:53 +01:00
ma0068 fe41a3d830 Nationensperre im Dropdown für Staatsbuergerschaft, Geburtsnation, ZGVNation und ZGVMasternation umgesetzt 2022-01-03 15:23:11 +01:00
Andreas Österreicher c64183a7cf Merge branch 'feature-14811/neuer_adresstyp_fuer_homeoffice' 2022-01-03 13:49:41 +01:00
Andreas Österreicher 7753ca8cf2 Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice 2022-01-03 13:45:34 +01:00
ma0048 4c3fe39df7 zeigt nun noch die lvs des studiengangs an 2022-01-03 13:12:01 +01:00
ma0048 4d223145d9 if angepasst 2021-12-22 16:32:00 +01:00
ma0048 2d46d80b5f meldung wird nun auch angezeigt wenn es die selbe person id ist 2021-12-22 16:26:45 +01:00
ma0048 e0bc6198d0 Name statt uid bei der "wird bearbeitet von" Meldung 2021-12-20 13:04:06 +01:00
Cris f73f26c668 Added STG mail receiver to be addressed, when lector changes Zeitwunsch...
...and when lector has already been assigned to a course.

Only addressing Studiengaenge that are concerned by Zeitwunsch change
of lector.
LV must be assigned in the selected Studiensemester, but not in the past
2021-12-20 11:53:03 +01:00
Cris 8ab62e4779 Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester 2021-12-20 10:07:30 +01:00
Cris f73439a184 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-12-20 10:06:35 +01:00
Cris 4a2a30ac5e Added Job mailUpdatedZeitwuensche
Job sends Mail to STGL, Kompetenzfeld and LV Planung about todays updated Zeitwuensche.
2021-12-20 09:55:29 +01:00
Cris c2d9afe3b1 Added return value to sendSanchoMail to be able to handle mail error 2021-12-20 09:51:18 +01:00
Cris a4ffe9104b Fixed query to get Studiensemest correctly when using getByDate method 2021-12-20 09:49:49 +01:00
Cris b2bd8e071b Added getStudenplanData method to Class Studenplandev_model 2021-12-20 09:47:21 +01:00
Cris d2c87d6a98 Added Class Zeitwunsch_gueltigkeit_model 2021-12-20 09:43:37 +01:00
KarpAlex 40493936c3 - AkteLib: added optional params "archiv", "signiert", "stud_selfservice", removed "uid"
- AkteLib and DmsLib: added comments, added fallback default user for insertvon
- FS_Model: added TempFS_model.php for writing temp files, added comments
2021-12-17 18:03:34 +01:00
Andreas Österreicher 7dd0bb1489 Merge branch 'master' into features-Zeiterfassung/Sprint177 2021-12-17 08:46:05 +01:00
ma0048 66ba689656 nicht im neuen tab oeffnen 2021-12-16 13:46:09 +01:00
ma0048 bb29dca846 text angepasst nach dem logout 2021-12-15 15:55:16 +01:00
Andreas Österreicher e12e68c1c2 Merge branch 'feature-16119/personen_zusammenlegen' 2021-12-14 15:10:31 +01:00
KarpAlex 8c2af28595 added AkteLib for adding, updating and deleting akte together with DMS documents 2021-12-14 06:26:20 +01:00
Cris bb7922dd3a Adapted to check only for future verplante LVs
Only if LVs are assigend in the future, the lector should be informed
and initially blocked to change their Zeitwunsch.
For past LVs it is not relevant anymore.
2021-12-13 11:40:32 +01:00
Cris cc770e6324 Added param 'nurBevorstehende' to getStundenplanData method in Lehrstunden Class
If 'nurBevorstehende' true, only future Studenplandata will be queried.
2021-12-13 11:29:11 +01:00
KarpAlex d6fb714b21 - added methods in dmslib for adding and removing files and file versions
- FS_Model: added remove method
2021-12-13 10:04:15 +01:00
Andreas Österreicher df09807bb7 Merge branch 'feature-16425/infocenter_nachname_statt_uid' 2021-12-10 08:56:12 +01:00
Andreas Österreicher 6331ed5396 Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene' 2021-12-10 08:51:42 +01:00
ma0048 c3588b4eb4 studeingang hinzugefuegt bei der uebersicht 2021-12-09 20:27:08 +01:00
Andreas Österreicher 3ef7fbc256 Merge branch 'feature-16111/BPK_Pruefseite' 2021-12-09 11:10:09 +01:00
Andreas Österreicher d033803f47 Sortierung an BIS Vergleich angepasst 2021-12-09 11:09:06 +01:00
Manfred 13782d3ade Merge remote-tracking branch 'origin/master' 2021-12-07 21:00:58 +01:00
Manfred 3301aa87dd Export für alle Bachelor und Masterstudiengänge. BIS-Datum als GET 2021-12-07 21:00:53 +01:00
Manfred 5edc56a8f2 Speichern von Insertamum und Updateamum bei Räumen 2021-12-07 20:59:38 +01:00
Manfred 684363aaea Anpassungen bpk und Gebustsdatum 2021-12-07 20:58:47 +01:00
Cris e501681ff8 Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
# Conflicts:
#	system/dbupdate_3.3.php
2021-12-07 18:36:17 +01:00
Cris 976d8d333e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-12-07 18:31:33 +01:00
Cris 6855686c66 Changed text and removed link mailto LV Planung 2021-12-07 18:25:55 +01:00
Cris e9cc04783e Refactored query to load a single Zeitwunschgueltigkeit
Instead of limiting returning rows by using ende of next Studiensemester,
it is limited by ordering and limiting query now.
2021-12-07 17:24:07 +01:00
Cris 40871c73a0 Added link to Vilesci Zeitwuensche in TEMPUS
Now, when rightclicking on 'Zeitwuensche einsehen' on a lector in Tempus,
the Vilesci Zeitwuensche of that lector is opened.
2021-12-07 17:16:15 +01:00
Cris 9c0da32841 Adapted TEMPUS queries to get correct Zeitwunsch (of given Zeitwunschgueltigkeit)
Now correct Zeitwunsch is displayed for
- Wochenplan and Semesterplan of a lector
- Wochenplan, when a LV is added, to which more lectors are assigned:
Now query checks to get correct Zeitwunsch of each lector
2021-12-06 15:51:45 +01:00
Andreas Österreicher dd8876a375 Automatische Pause für einzelne typen hinzugefügt 2021-12-06 10:16:19 +01:00
Paolo 9b1182405e - core/FHC_Controller->outputFile cleaned
- Adapted controllers/lehre/anrechnung/* to make use of the changed core/FHC_Controller->outputFile
- Changed application/core/FS_Model:
	- It's not abstract anymore
	- Added new constants READ_MODE, READ_WRITE_MODE, READ_APPEND_MODE, BLOCK_SIZE, META_URI
	- Constructor accept a mandatory parameter
	- Does not load the FilesystemLib anymore
	- Renamed all the public methods with the suffix Base64
	- Added new public methods openRead, openReadWrite, openReadAppend, close, readBlock and write
	- Added new private methods _checkPath and _open
- Removed the libraries/FilesystemLib
- Adapted model content/DmsFS_model to make use of the changed core/FS_Model
- Changed libraries/DmsLib:
	- Does not extend the FHC_Controller anymore
	- removed private propery UPLOAD_PATH
	- Cleaned code, make use of the standards
	- Adapted to use the Base64 suffixed methods from core/FS_Model
	- Deprecated old methods
	- Refactored public methods download and getFileInfo
2021-12-03 15:56:39 +01:00
ma0048 376aaadecc bug fixed 2021-12-03 15:21:38 +01:00
ma0048 4923c5fc2d personen zusammenlegen mit udf 2021-12-03 14:31:04 +01:00
Andreas Österreicher 0192835275 Merge branch 'feature-7423/infocenter_udf_schule_job' 2021-12-03 13:46:11 +01:00
Andreas Österreicher 88ad75295d Merge branch 'master' into feature-7423/infocenter_udf_schule_job 2021-12-03 13:41:40 +01:00
Andreas Österreicher 78876fa807 Merge branch 'feature-16624/infocenter_firefox_anzeigefehler_dokumente' 2021-12-03 11:41:13 +01:00
Andreas Österreicher 84500652ef Merge branch 'feature-16191/inofcenter_bachelor_die_megssage_an_die_studiengaenge_deaktivieren' 2021-12-03 11:38:01 +01:00
Andreas Österreicher efa348456a Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene' 2021-12-03 11:27:48 +01:00
Andreas Österreicher 25b890a25a Merge branch 'feature-15888/infocenter_datum_fuer_parken' 2021-12-03 11:25:36 +01:00
Andreas Österreicher b61a5a6f34 Merge branch 'feature-13735/message_ohne_gefundener_sprache' 2021-12-03 11:04:20 +01:00
ma0048 554a27cc01 anzeigefehler fixed dokpruefung 2021-12-02 21:06:56 +01:00
Andreas Österreicher 61c1399f01 Improved Performance of dbupdate 2021-12-02 16:50:08 +01:00
Andreas Österreicher 419988aaf9 DB-Index für campus.tbl_zeitaufzeichnung.uid hinzugefügt 2021-12-02 16:17:24 +01:00
Andreas Österreicher 17dd939044 Moved to Addon 2021-12-02 15:24:27 +01:00
Cris d697e189eb Changed: Now function getByUID of ZWG class retrieves correct amount of ZWG 2021-12-02 09:43:06 +01:00
Cris e3ecfbe782 Corrected constructor of Zeitwunsch_gueltigkeit Class 2021-12-02 09:39:00 +01:00
Andreas Österreicher 1613a9837b Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen 2021-12-02 09:37:41 +01:00
Cris a4cb455e3e Added creating/editing/viewing Zeitwunschgueltigkeiten in VILESCI
Admins can see and work on Zeitwunschgueltigkeiten of lector.
Added logic to save/update/display Zeitwuensche by
Zeitwunschgueltigkeiten.
2021-12-02 09:35:20 +01:00
ma0068 410772b230 Aliasgenerierung: Adaptierung Wording Validierung und Löschen Kommentar 2021-12-02 07:19:51 +01:00
ma0048 b2d46af0d6 wording und datum angepasst 2021-12-01 19:31:31 +01:00
Andreas Österreicher b4eb2d426a Lehrauftragsverwaltung - Anzeige von Nachname und Vorname bei Betreuungen vertauscht 2021-12-01 17:00:28 +01:00
Andreas Österreicher 3ee409f06c Merge branch 'feature-15907/lvs_vom_studierenden_anzeigen_fas' 2021-12-01 15:01:55 +01:00
Andreas Österreicher 8d1886039a Projektarbeiten DropDown angepasst damit nach dem Laden die selben
LVEintträge angezeigt werden wie bei der Neuanlage
2021-12-01 15:00:02 +01:00
Andreas Österreicher 46962d5064 Merge branch 'master' into feature-15907/lvs_vom_studierenden_anzeigen_fas 2021-12-01 14:41:51 +01:00
Andreas Österreicher 525b8a04d3 Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice 2021-12-01 14:31:08 +01:00
Andreas Österreicher d657378cba Merge branch 'Monika70-db_update_tbl_studiengangstyp' 2021-12-01 14:28:47 +01:00
Andreas Österreicher 5c84196f96 Fixed Code Intentation 2021-12-01 14:28:17 +01:00
Monika70 be4beaff95 Update dbupdate_3.3.php
Erweiterung der Studiengangstypen
2021-11-30 13:37:50 +01:00
KarpAlex 5fa605a75f bpk overview filter: added mitarbeiter column to default filter 2021-11-30 04:19:43 +01:00
Cris 76ca170678 Changed: when splitting Zeitwunschgueltigkeit, set ende of last ZWG to 'yesterday'
Before it was set to now(). But new ZWG starts with now, therefore last ZWG
should end with day before.
2021-11-29 19:08:56 +01:00
Cris 93d9108db7 Added functionality to select Zeitwunschgueltigkeiten in VILESCI
. added Dropdown with all Zeitwunschgueltigkeiten
. adpated Table to display selected Zeitwunschgueltigkeit
2021-11-29 17:51:08 +01:00
Cris 70c9489ef3 Corrected to retrieve latest Zeitwunschgueltigkeit correctly in getByUID function
...by changing query order
2021-11-29 17:38:16 +01:00
Cris eb923cab9b Changed: Now using textphrases 2021-11-29 11:31:03 +01:00
ma0068 ea0035613a FAS: Neue MA anlegen: Check auf Sonderzeichen in Vor- und Nachnamen nach Umwandlung Problemchars 2021-11-29 10:14:33 +01:00
ma0048 6800c42b90 nachname statt der uid anzeigen 2021-11-26 14:52:39 +01:00
Cris ef675226e4 Corrected: Now Lehrstunde Class has property 'result'
. Errormessages were thrown without result property. Fixed now.
. Also added errormsg, when getStundenplanData query fails.
2021-11-25 14:36:03 +01:00
Cris 2e9bfc049b Corrected: Now retrieving correct data for 'isVerplant'
. Correction in function isVerplant()
. Also changed var name to isVerplant
2021-11-25 14:33:23 +01:00
Cris aa183a0a08 Added 'Alle Werte auf 1 setzen' and 'Aenderungen zuruecknehmen' 2021-11-25 10:56:50 +01:00
Andreas Österreicher e761211425 Merge branch 'FHBGLD-FHBGLD-vilesci/bis/studentenmeldung' 2021-11-24 18:04:47 +01:00
Andreas Österreicher 02ec36d40c Merge branch 'FHBGLD-vilesci/bis/studentenmeldung' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-vilesci/bis/studentenmeldung 2021-11-24 18:03:50 +01:00
Cris 6db2748163 Added Zeitwunsch Edit lock of if LV had already been assigned
- Message is shown and form buttons for changing / copying Zeitwunsch
are disabled if LV had already been assigned to lector.
- Lector can unlock by clicking on link.
2021-11-24 17:47:01 +01:00
Cris bd71650ac5 Colored Legende for Zeitwunsch-Tabelle 2021-11-24 16:26:22 +01:00
Cris 8d3c54fafc Minor change: Removed default now() for updateamum, Changed code order
...for better maintainance
2021-11-24 11:48:57 +01:00
Cris beb850ebe3 Adapted Zeitwunsch zu geteilte Dienste to Bootstrap Style 2021-11-24 09:33:25 +01:00
Cris 7c65e2ff53 Adapted Zeitwunsch GUI to use Zeitwunschgueltigkeit and save by Studiensemester
Major adaptation in GUI:
- Added Dropdown to select actual / next Studiensemester to edit Zeitwunsch
- Added Radiobuttons to allow changing or copying from earlier Studiensemester
- By selecting an earlier Studiensemester, the earlier Zeitwunsch is displayed in
the table and is ready to edit or just to save.
2021-11-23 15:56:07 +01:00
Cris 976e79447a Added / Adapted methods of Zeitwunsch Class to use Zeitwunschgueltigkeit
Added:
- loadByZWG: Zeitwunsch einer Person zu bestimmter Zeitwunschgueltigkeit laden.
Adapted:
- loadPerson
- save
- exists
2021-11-23 15:48:53 +01:00
Cris e485257458 Created Zeitwunsch_gueltigkeit Class
Methods:
- load: Ladet eine Zeitwunschgueltigkeit.
- save: Speichert eine Zeitwunschgueltigkeit (insert/update)
- getByUID: Ladet Zeitwunschgueltigkeiten einer UID mitsamt
  den zugehoerigen Studiensemestern.
- getByStudiensemester: Ladet Zeitwunschgueltigkeiten einer UID und
  eines bestimmten Semesters
2021-11-23 15:39:52 +01:00
Paolo d996e3ad31 Added new database dump system/FHComplete-3.3.sql 2021-11-23 10:54:17 +01:00
Paolo 46eda3c14d - Removed old database dump system/fhcomplete3.0.sql
- Added new database dump system/FHComplete-3.3.sql
2021-11-23 10:53:28 +01:00
Andreas Österreicher f1bfbf66e8 Merge branch 'feature-16166/lvb_gruppen_sonderzeichen' 2021-11-23 10:44:29 +01:00
Paolo f1bf3bb4be Updated composer.lock 2021-11-23 09:54:56 +01:00
Paolo c8ebcdf5a1 Updated composer.json 2021-11-23 09:53:24 +01:00
Cris 70f3cebd36 Changed DB default entry to NOW() for insertamum / updateaumum in tbl_zeitwunschgueltigkeit 2021-11-22 18:51:28 +01:00
Andreas Österreicher fb8512bcbc Merge branch 'feature-14585/Zeitaufzeichnung_aktivitaeten' 2021-11-22 17:38:52 +01:00
Manfred b669bb1ead Merge remote-tracking branch 'origin/master' 2021-11-19 20:17:17 +01:00
Manfred e1edd515bd Check beim speichern einer Funktion, ob OE inaktiv 2021-11-19 20:17:06 +01:00
Manfred b53fc39a35 Namenssuche optimiert um Leerzeichen besser abzufangen 2021-11-19 20:16:18 +01:00
Manfred bfd6889d19 Check, dass es mindestens 1 Aufenthaltszweck geben muss 2021-11-19 20:14:26 +01:00
Andreas Österreicher f3600a79ec Disabled Output on Connection error 2021-11-18 13:40:27 +01:00
Harald Bamberger ced19ecb2d remove misplaced echo 2021-11-17 12:50:17 +01:00
ma0048 e62b250515 beim editieren von lvb gruppen auf umlaute und sonderzeichen ueberpruefen 2021-11-17 08:51:32 +01:00
Harald Bamberger fbe4862a21 Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree' 2021-11-15 16:40:48 +01:00
Harald Bamberger 20fb38ba8f change labels 2021-11-15 16:34:42 +01:00
ma0048 6f877acd7b Mail an Studiengang nur bei "Freigabe an Studiengang" - Button - Bachelor 2021-11-15 12:40:53 +01:00
Manfred 641fb256e1 Merge remote-tracking branch 'origin/master' 2021-11-12 17:46:27 +01:00
Manfred 49951d788e Check in BIS-Meldung, ob Student Abbrecher VOR der ersten Meldung ist 2021-11-12 17:46:24 +01:00
Manfred ea0174fa57 Increased size of BPK-Textbox 2021-11-12 17:45:51 +01:00
ma0048 cf1b34769c api & anpassungen fuer das kartenterminal 2021-11-12 12:16:35 +01:00
Harald Bamberger 0e54dd397e Merge branch 'feature-16081/CovidMeldeformularMAOhneZuordnung' 2021-11-12 08:52:44 +01:00
Harald Bamberger ab8d1b4863 fix indentation 2021-11-11 17:41:22 +01:00
Harald Bamberger c4da43aa65 do not return errormsg 2021-11-11 17:37:09 +01:00
ma0048 15176e7ce6 eigenen filter fuer abgewiesene studenten hinzugefuegt 2021-11-11 15:52:39 +01:00
ma0048 6596a442ad eine logout seite hinzugefuegt - reihungstest 2021-11-11 12:10:35 +01:00
ma0068 0f40e1b80c Funktion getLastVorgesetzter für Covid-Meldeformular 2021-11-11 09:03:38 +01:00
ma0068 70c24899d0 Verhalten MessageAnOEs für Master angepasst 2021-11-09 09:32:05 +01:00
Harald Bamberger 5107d0ddd5 do not distinguish between unknown and invalid consider both invalid 2021-11-08 11:06:26 +01:00
ma0068 c80b623a04 Update Fehlermeldung, erlaubte Sonderzeichen 2021-11-05 10:35:13 +01:00
Andreas Österreicher 63105951a0 Added Check if BPK Parameter exists 2021-11-04 17:16:39 +01:00
Andreas Österreicher 439d2dd999 Merge branch 'feature-15910/BPK_soll_mit_Berechtigung_im_FAS_sichtbar_editierbar_sein' 2021-11-04 17:09:04 +01:00
Manfred da4d749cb7 Merge remote-tracking branch 'origin/master' 2021-11-04 16:56:05 +01:00
Manfred 8df77c104c BPK in Lehrgangsmeldung einkommentiert.
Lehrgänge aus DropDown in Studentenmeldung.php entfernt
2021-11-04 16:56:01 +01:00
KarpAlex dc95a9b0b0 increased size of BPK field for students in FAS 2021-11-04 16:42:15 +01:00
ma0068 cfaeaef8bd Erweiterung erlaubter Sonderzeichen bei Änderung Alias 2021-11-04 16:21:57 +01:00
Andreas Österreicher a455505be7 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-11-04 16:02:30 +01:00
Manfred 0a9511b0c7 BPK einkommentiert, SVNR <-> Geburtsdatum nur mehr als Hinweis
Wenn die SVNR das Geburtsdatum nicht enthält (was in Ausnahmefällen sein kann) wird nur mehr ein Hinweis angezeigt, die Person aber trotzdem ins XML übernommen.
2021-11-04 15:57:49 +01:00
Andreas Österreicher 6d69d572ee Merge branch 'feature-15795/DVUH_Mehrsprachigkeit' 2021-11-04 15:56:26 +01:00
ma0068 0c6f43f36e Check Alias auf Sonderzeichen bei Änderung Alias 2021-11-04 15:43:05 +01:00
Andreas Österreicher c84c2772be Merge branch 'feature-5056/PHP7_Problems_old_Libraries' 2021-11-04 15:17:46 +01:00
Andreas Österreicher ef7d3aa313 Added Missing Phrase matrikelnummer 2021-11-04 15:10:27 +01:00
Andreas Österreicher 01907c4901 Merge branch 'feature-3774/FilterWidget_change_Filter_settings_GUI' 2021-11-04 14:55:28 +01:00
Andreas Österreicher 46e3f91a6e Zeitaufzeichnungsspalten zu Gegencheck hinzugefügt 2021-11-04 14:42:20 +01:00
Andreas Österreicher 6fd5065431 Merge branch 'feature-12510/Planner_ZeitaufzeichnungsCheckbox' 2021-11-04 14:38:17 +01:00
Andreas Österreicher 38aa578528 Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox 2021-11-04 14:32:59 +01:00
FHBGLD 1844140e6d BIS - studentenmeldung
neuer Standort für FHB und die bpk wurde wieder hinzugefügt
2021-11-04 12:55:45 +01:00
KarpAlex fce92f78d4 Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit 2021-11-04 12:05:32 +01:00
Harald Bamberger d6e063dd0c check empty uids array 2021-11-04 11:14:17 +01:00
ma0068 8cb8c4da64 Erweiterung Funktion checkKontostand() 2021-11-04 10:27:21 +01:00
Cris b4f450b073 Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester 2021-11-03 11:16:13 +01:00
ma0048 2a1a068ee2 datum fuers parken nun auf semesterende + 3 monate 2021-11-03 10:51:40 +01:00
ma0068 6342aa3f14 Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree' of https://github.com/FH-Complete/FHC-Core into feature-14001/KennzeichnungStudentDoubleDegree 2021-11-03 09:27:41 +01:00
ma0068 c0fd4f70b9 Ermittlung Prestudent_id mit load() 2021-11-03 09:26:48 +01:00
Harald Bamberger 8d4a79f9b9 only show messages if covid udf is defined 2021-11-02 18:00:41 +01:00
Harald Bamberger 811b59ef1b styling 2021-11-02 17:56:33 +01:00
Harald Bamberger 4d1994ca63 menulayout, coding styles 2021-11-02 17:50:20 +01:00
ma0068 b549fc1edd Update Funktion getPrestudentIdFromBenutzerId 2021-11-02 15:14:00 +01:00
ma0068 f37161dcc2 Vereinfachung Funktion getPrestudentFromBenutzer 2021-11-02 14:49:13 +01:00
Harald Bamberger 341944d38b Merge branch 'feature-15810/task-15839_Covidstatusliste_pro_LV_LE_depends_on_feature-14001' into feature-14001/KennzeichnungStudentDoubleDegree 2021-11-02 14:19:21 +01:00
KarpAlex a02e470970 displaying and editing BPK field in FAS with permission student/bpk 2021-11-02 11:28:10 +01:00
ma0068 776d448fba Erweiterung Gesamtnotenliste um Double Degree Program 2021-11-02 10:41:41 +01:00
Harald Bamberger 12f7f43e65 fix copy paste error 2021-11-01 15:52:52 +01:00
Harald Bamberger 487da82e33 pass studiengang to lehrelisthelper 2021-11-01 15:51:20 +01:00
Harald Bamberger 8c100ba993 moved db logic to lehrelisthelper class 2021-11-01 15:25:24 +01:00
Harald Bamberger 98ffe525b3 first working version to add covid status to lvlists 2021-11-01 13:12:55 +01:00
KarpAlex d339713d0b Issue Zuständigkeiten bugfix: zuständig = "Ja" if Zuständigkeit defined, even if there are other Zuständigkeiten defined 2021-10-30 09:45:46 +02:00
Manfred 69613d35c7 Filter Widget für Services und Spalte "Content ID" eingeblendet 2021-10-29 17:06:29 +02:00
Paolo 080a7acdee Removed the directories cis/private/lehre/ects and include/safehtml 2021-10-29 16:59:31 +02:00
KarpAlex f5bc354199 ÖH-Beitragsverwaltung: changed phrase Öhbeitragsverwaltung to correct ÖH-Beitragsverwaltung (in menu and GUI) 2021-10-29 16:06:38 +02:00
Andreas Österreicher c243f121f2 Merge branch 'feature-10515/zeiterfassung_automatische_pause_runden' 2021-10-29 15:40:37 +02:00
Andreas Österreicher 95d5e715b2 Merge branch 'feature-15781/zeitaufzeichnung_projektuebersicht_export' 2021-10-29 15:34:46 +02:00
Andreas Österreicher 794b3695c3 Merge branch 'master' into feature-15781/zeitaufzeichnung_projektuebersicht_export 2021-10-29 15:30:15 +02:00
Andreas Österreicher 0d4c041688 Organisationseinheiten im FAS werden nach der Bezeichnung sortiert statt nach
der Kurzbezeichnung
2021-10-29 15:26:45 +02:00
ma0068 38cdcef38e Notenliste und Anwesenheitsliste um Mobilität DegreeProgram erweitert 2021-10-29 10:35:12 +02:00
KarpAlex 8068fb1c7c Issues list: added Hauptzuständig column to filter out issues assigned to other persons/oes than logged in user 2021-10-28 18:10:13 +02:00
Harald Bamberger ef93736891 eucovidqr phrases modified 2021-10-28 12:31:48 +02:00
ma0048 e6a11d0dc2 abfrage ob die tbl vorhanden ist hinzugefuegt 2021-10-28 12:30:10 +02:00
Manfred 139dac67a7 Merge remote-tracking branch 'origin/master' 2021-10-28 12:27:34 +02:00
Manfred 9292570684 Log für Löschen von LV-Plan einträgen 2021-10-28 12:26:30 +02:00
Manfred 36731de919 Anpassung Breite Höhe der Textareas 2021-10-28 12:20:09 +02:00
ma0048 203397b135 fas adressen anzeige nicht mehr hartcodiert 2021-10-28 08:01:04 +02:00
ma0048 a31d33bcf9 in eigenes model 2021-10-27 17:59:52 +02:00
Andreas Österreicher 04f85937ae Merge branch 'feature-15270/zeiterfasung_projextexport_fehler_mit_at' 2021-10-27 17:12:57 +02:00
Andreas Österreicher 7c2bf0e291 Merge branch 'feature-14198/LVLeitungBeiLVInfoAnzeigen' 2021-10-27 17:06:50 +02:00
Andreas Österreicher 530ede77ad Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen 2021-10-27 17:06:14 +02:00
Andreas Österreicher 671cf9e102 Merge branch 'feature-15103/Bismeldung_erweitern_Ectsrundung_Emailbe' 2021-10-27 16:45:48 +02:00
ma0068 2b9d688ff7 Adaptierung ZE:Fix Bug Eingabe größer 24:00 2021-10-27 13:07:21 +02:00
ma0068 6d4e5238fd merge feature-11468/ZeitsperrenBeruecksichtigen into featuresZeiterfassung/Sprint177 2021-10-27 11:19:59 +02:00
ma0068 c3771b9cd0 merge feature-11468/ZeitsperrenBeruecksichtigen into featuresZeiterfassung/Sprint177 2021-10-27 10:47:21 +02:00
ma0068 63949faef6 Phrasenupdate Zeitsperre 2021-10-27 09:29:37 +02:00
KarpAlex 8cc5be2c40 Issues GUI: added phrases 2021-10-25 19:14:59 +02:00
KarpAlex b0b49f7a41 moved errormonitoring menu entry to person category 2021-10-25 16:48:47 +02:00
ma0048 9c193442ae archivieren von lv zeugnissen und zertifikaten 2021-10-25 14:54:45 +02:00
Andreas Österreicher 40ea04364e Aktivität nicht mehr optional 2021-10-25 14:45:45 +02:00
ma0048 d269fd003d added new log to logdataname 2021-10-25 14:03:30 +02:00
ma0048 15ba3602f7 job fixed 2021-10-25 13:22:44 +02:00
Andreas Österreicher 70781d966d Merge branch 'feature/infocenter_anpassungen' 2021-10-25 10:50:09 +02:00
ma0048 54f6d88901 Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen 2021-10-25 10:37:14 +02:00
Andreas Österreicher a111503e04 Merge branch 'feature-15091/personen_zusammenlegen_fehlende_berechtigung' 2021-10-25 10:36:17 +02:00
ma0048 29ae48bc48 udflib fixed fuer den infocenter udf schule uebernehmen job 2021-10-25 09:51:06 +02:00
ma0068 4e9eb12a71 Detailsicht: Parameteruebergabe uid für Projekt- und Projektübersichtexport 2021-10-23 10:40:05 +02:00
Andreas Österreicher 875fc5c632 Maximale laufzeit für Auswertungen erhöht 2021-10-22 16:07:41 +02:00
ma0048 e6ba6f9bea dropdown im fas angepasst 2021-10-22 10:44:54 +02:00
ma0068 4fb4b72b26 Hinweis- und Warnsymbol für Pause fehlt ergänzt 2021-10-22 10:39:48 +02:00
Harald Bamberger 52272932ed another euvocid phrase 2021-10-22 10:31:02 +02:00
ma0048 b74247a7f2 Merge remote-tracking branch 'origin/feature-15314/infocenter_abgewiesen_von_nicht_abgeschickten' into feature/infocenter_anpassungen 2021-10-22 07:13:22 +02:00
ma0048 d7364d08dd Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen 2021-10-22 07:13:06 +02:00
ma0048 3f003f8fc3 Merge remote-tracking branch 'origin/feature-15572/infocenter_zurueckgestellt_nicht_immer_erste_stelle' into feature/infocenter_anpassungen 2021-10-22 07:12:53 +02:00
Harald Bamberger 1b1f6788ab Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-10-21 18:31:59 +02:00
Harald Bamberger 7de012c930 more phrases for eucovidqr 2021-10-21 18:31:48 +02:00
Andreas Österreicher d73dd4769a Stipendien-Schnittstelle berücksichtigt auch Anzahlung und Restzahlung 2021-10-21 17:44:45 +02:00
Manfred bc2ed35aa4 Merge remote-tracking branch 'origin/master' 2021-10-21 17:16:58 +02:00
Manfred a72f6597b3 BugFix 9. und 10. Semester bei Lehrauftragsverwaltung
Manche Studiengänge haben ein 9. oder 10. Semester. Dieses muss auch bei der Lehrauftragsverwaltung aufscheinen.
2021-10-21 17:16:20 +02:00
Cris 8033c12665 Added / Adapted tables for Zeitwunsch Gueltigkeit pro Studiensemester
- Added table campus.tbl_zeitwunsch_gueltigkeit and migrated initial data
- Added column zeitwunsch_id (as new primary key) and zeitwunsch_gueltigkeit_id to campus.tbl_zeitwunsch
- Initially copied all Zeitwunsch entries
-- The basic entries are joined with Zeitwunsch Gueltigkeit for actual Studiensemester
-- The copied entries are joined with Zeitwunsch Gueltigkeit for next Studiensemester
This is necessary because the actual Zeitwunschplan represent for some lectors the plan for the actual semester, and for some - who have already planned forward - for the next semester.
2021-10-21 13:03:16 +02:00
ma0068 e754608a64 Merge branch 'feature-15763/ZeiterfassungPauseBeiAllIn' into features-Zeiterfassung/Sprint177 2021-10-21 12:53:54 +02:00
Harald Bamberger b0571e0a26 additional phrases for eucovidqr 2021-10-21 08:18:04 +02:00
KarpAlex 2a8d91119a Öhbeitrag Management GUI: using phrases 2021-10-21 05:48:18 +02:00
Andreas Österreicher 860ca5df53 Spalte Wunschlektor umbenannt 2021-10-20 18:49:39 +02:00
Harald Bamberger 44c1e65011 getBetriebsmittel add parameter to only retrieve aktive users 2021-10-20 15:48:34 +02:00
ma0048 3aa251dc4b projektexport fixed, wenn es mit at startet 2021-10-20 15:11:00 +02:00
ma0048 a87178a0e7 automatische pausen werden nun gerundet 2021-10-20 15:05:57 +02:00
Paolo c92aff5073 Removed console.log and added few comments 2021-10-20 12:57:43 +02:00
Paolo 6dfabf31fb - When the apply button is click it is checked that the conditions are
not empty, in case the filter is not applied and the empty conditions
  are marked
- Added new type bpchar to the conditions
2021-10-20 12:54:00 +02:00
Paolo 458cd6ae0c - Added new phrase for the filter widget and fixed GUI tranlations
- Fixed error logs in public/js/FilterWidget.js
- Changed the behavior of the Apply and Save buttons for the FilterWidget
- Changed the GUI aesthetic of the FilterWidget settings
- Added new option reloadPage to the AjaxLib, to reload the page after the complete callback
- Added new classes to the public/css/FilterWidget.css
- Changed FilterWidgetLib->loadDefinition: added a new fallback to find a filter in the database for the currend FilterWidget
- Changed FilterWidgetLib->removeCustomFilter: when a custom filter is removed from the database then it is removed even from the session
- Added new private method _dropFromSessionFilterWidgetById to application/libraries/FilterWidgetLib.php
2021-10-19 15:37:44 +02:00
ma0068 3f90efaed2 Hinweis: Pause fehlt bei AllIn eingetragen 2021-10-19 14:54:39 +02:00
Andreas Österreicher 7dcddb9d49 Removed wrong comment 2021-10-19 13:52:00 +02:00
ma0068 6025887bb6 Merge branch 'bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler' into feature-11952/ZeiterfassungDetailsichtFuerVorgesetzte 2021-10-18 11:50:14 +02:00
ma0068 af89f444aa Merge branch 'master' into bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler 2021-10-18 11:45:52 +02:00
ma0068 b6b347ff8b Merge Detailsicht Vorgesetzte 2021-10-18 11:10:13 +02:00
ma0068 55dcd730a5 merge master into 11952/DetailansichtVorgesetzte 2021-10-18 10:49:12 +02:00
Andreas Österreicher 8801b84fd3 Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt 2021-10-15 18:30:28 +02:00
Andreas Österreicher 9dcf948e7e Merge branch 'FHBGLD-set_gemeinde_skript' 2021-10-15 17:21:46 +02:00
Andreas Österreicher 7c81f5a64c Gemeinde Update Infotext ergänzt 2021-10-15 17:21:05 +02:00
Andreas Österreicher 4c62b003df Merge branch 'master' into FHBGLD-set_gemeinde_skript 2021-10-15 17:18:20 +02:00
Andreas Österreicher 048d2764cf Merge branch 'FHBGLD-FHBGLD-studentDBML-generateMatrikelnummer' 2021-10-15 17:11:10 +02:00
Andreas Österreicher 2bcf422d7a Fixed Coding Guidelines 2021-10-15 16:01:52 +02:00
Andreas Österreicher 1c7bd4986a Fehler beim Anlegen von neuen Studiengängen behoben 2021-10-15 15:12:23 +02:00
Andreas Österreicher 38edfbac51 Merge branch 'FHBGLD-studentDBML-generateMatrikelnummer' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-studentDBML-generateMatrikelnummer 2021-10-15 14:12:00 +02:00
Andreas Österreicher ef14336b0b Zusätzliche Aktivitätenfilter für Zeitaufzeichnung hinzugefügt 2021-10-15 14:04:20 +02:00
Andreas Österreicher 7413e20888 Merge branch 'feature-15608/anpassung_excel_export_fas' 2021-10-15 13:01:50 +02:00
ma0048 4101929cd5 stammkostenstelle anzeigen bei fixangestellten / fallback falls keine eingetragen ist 2021-10-15 12:57:18 +02:00
ma0048 7805784214 sap projektnummer im export hinzugefuegt 2021-10-15 12:54:24 +02:00
ma0068 aa3a52f201 Aufnahme PhasenReset für neue Validierung Zeitabgrenzung 00:00:00 2021-10-15 11:36:15 +02:00
ma0068 163caccc88 Merge branch 'bug-14102021/ZeiterfassungZeiteingabeMitternacht' into bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler 2021-10-15 11:25:00 +02:00
ma0068 269f3542d7 Zeiterfassung: keine Bis-Buchungen 00:00:00 bzw. 24:00:00 erlaubt 2021-10-14 15:39:17 +02:00
ma0048 9d08d00676 tbl_adresse typ von char auf varchar geaendert 2021-10-14 15:37:15 +02:00
FHBGLD 19548bf5f9 Update studentDBDML.php 2021-10-14 14:36:58 +02:00
FHBGLD 0e5e686669 Änderungen bezüglich generateMatrikelnummer
Hallo liebes Technikum Team,

wie besprochen die Änderungen bezüglich generateMatrikelnummer.

Als erstes die Erweiterung der Unterscheidung von Lehrgang und Studiengang.
Weiters die Aufteilung von unseren AO Studiengängen zwischen 90010 bis 90019.

Hoffe das dies für alle FH's so passt.

Bitte um check ob dieser Code so übernommen werden kann.

Danke und liebe Grüße
Thomas und Michael
2021-10-14 14:33:55 +02:00
Paolo 6f14b5cec5 - Changed DocsboxLib->convert, not it accepts a new optional parameter called format
- Integrated the DocsboxLib into the application/libraries/DocumentLib.php
2021-10-14 14:25:35 +02:00
Paolo 2fb4be0e55 - Added new config entry DOCSBOX_ENABLED to config/global.config-default.inc.php
- Added new library application/libraries/DocsboxLib.php to manage document conversion using docsbox
- Added new config file application/config/docsbox.php
- Integrated DocsboxLib into include/dokument_export.class.php
2021-10-14 11:34:27 +02:00
Harald Bamberger 2bb357ccbd remove 3G from phrases 2021-10-13 15:14:13 +02:00
Andreas Österreicher e5ecbd9488 Merge branch 'feature-10450/DVUH_requestMatrikelnummer' 2021-10-13 14:18:06 +02:00
Harald Bamberger bd3ed4952b add phrases for eucovidqr errormsgs 2021-10-13 12:26:03 +02:00
ma0048 f82315cfe7 ermoeglicht das einloggen wenn 2 Reihungstests am selben Tag sind 2021-10-13 10:46:05 +02:00
KarpAlex 4777c0414f dbupdate_3.3.php: fixed line break 2021-10-13 09:15:58 +02:00
KarpAlex 901f9ba7fa Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-10-13 09:05:05 +02:00
KarpAlex 45bb288127 error monitoring (issues): renamded variables, improved comments 2021-10-13 08:53:12 +02:00
Manfred Kindl ae2e425b7d Merge remote-tracking branch 'origin/master' 2021-10-12 17:01:18 +02:00
Manfred Kindl 6c98829e4e Mimetype editierbar 2021-10-12 17:00:57 +02:00
Manfred Kindl 7e0223b42a Tablesorter Filter-Widget aktiviert 2021-10-12 17:00:37 +02:00
cris-technikum 902ed7d22d Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2021-10-12 16:18:20 +02:00
Andreas Österreicher e5f9b52c8e Stipendienanfragen angepasst wenn eine Person mehrere Studien besucht
oder nach einem Abbruch das selbe Studium erneut besucht
2021-10-12 14:02:00 +02:00
ma0048 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist 2021-10-12 13:08:17 +02:00
cris-technikum 8677cbf6dc Fixed requesting Anrechnungsantrag although grade is a blocking grade
Blocking grades (eg angerechnet), that should not allow
the student to request for Anrechnung, were not fully blocking.
This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-10-12 12:11:06 +02:00
cris-technikum 35cdac0438 Small Code Enhencement
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-10-12 10:51:10 +02:00
KarpAlex 4f0b34137b replacement of hatschek letters added in hlp_common_helper.php to be the same as in function.inc.php 2021-10-11 18:48:25 +02:00
Harald Bamberger 7f00f506ea add viewport meta tag 2021-10-11 13:06:28 +02:00
Harald Bamberger 4c74176d64 Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition' 2021-10-11 12:55:24 +02:00
Paolo 1ebae59292 - Adapted controllers/widgets/UDF->saveUDFs to call UDFLib->saveUDFs without the udfUniqueId parameter
- UDFLib->saveUDFs changed, the udfUniqueId parameter is retrieved from the session
- UDFLib->saveUDFs changed, the check of the permission is performed by
  the method prepare prepareUDFsWrite called by the DB_Model
- Changed UDFLib->_validateUDFs and public/js/UDFWidget.js to have a
  better error handling and better message errors
2021-10-11 10:08:58 +02:00
Paolo c325046e8e - Renamed public method DB_Model->hasUDF to udfsExistAndDefined
- Adapted controllers/system/FAS_UDF and models/crm/Prestudent_model
- Added new private method _getUDFsNoPerms to DB_Model
- Changed private method DB_model->_prepareUDFsWrite to use _getUDFsNoPerms
2021-10-08 17:30:28 +02:00
Harald Bamberger 4ef7f49bdb add missing phrase 2021-10-08 15:12:06 +02:00
Harald Bamberger 066e2fe936 Merge branch 'feature-15049/COVID-19_Zertifikate_automatisiert_ueberpruefen' 2021-10-08 14:28:38 +02:00
Harald Bamberger 11952fe063 Merge branch 'feature-14635/UDF_move_permissions_to_JSON_definition' 2021-10-08 14:02:17 +02:00
Harald Bamberger 524a3dfd95 phrases for eucovidqr 2021-10-08 11:25:55 +02:00
ma0048 5954237851 update rechte tbl_person_lock fuer benutzer vilesci 2021-10-08 10:51:13 +02:00
ma0048 20f583f7e2 excel report angepasst 2021-10-08 10:44:27 +02:00
ma0048 a8327a20ab excel report angepasst 2021-10-08 10:40:10 +02:00
ma0068 3ff3353aae Aufnahme von hacek-Sonderzeichen in Funktion covertProblemChars 2021-10-08 10:24:46 +02:00
Paolo 45fab928ad - Renamed private method _manageUDFs to _prepareUDFsWrite in application/core/DB_Model.php
- Changed private method _toPhp in application/core/DB_Model.php to check permissions on UDFs
- Adapted code to fit the changes in application/libraries/UDFLib.php
- Renamed public method manageUDFs to prepareUDFsWrite in application/libraries/UDFLib.php
- Added new public method prepareUDFsRead to application/libraries/UDFLib.php
- Fixed bugs, comments & code style
2021-10-07 17:32:49 +02:00
Paolo d7a33df898 When exporting in MS Excel format from FAS it is checked that the logged user
has the permissions to export UDFs.
If the logged user has no permissions on a UDF then the UDF is discarted
and it will not present into the MS Excel file
2021-10-06 10:58:58 +02:00
Paolo ab59c265d4 First commit 2021-10-04 14:05:10 +02:00
ma0048 9c4f8eb0eb bei logdata 'new application' entfernt
org_name hinzugefuegt
order by log_id statt zeitpunkt
2021-10-04 13:26:40 +02:00
KarpAlex 175d75c70d FAS studentdetailoverlay.xul.php bisstandort and foerderrelevant fields:
- added label tags (for hiding also the labels)
- changed column width for better look
2021-10-04 12:57:18 +02:00
ma0048 4a4c95aa08 auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt 2021-10-04 12:37:50 +02:00
ma0068 23f335e6a5 BT: Ausbildungsvertrag wird bei Abgewiesenen bei nicht vorhandener offener Bewerbung nicht mehr angezeigt 2021-10-04 12:00:51 +02:00
ma0048 79d7f91794 deleted ; 2021-10-04 09:57:51 +02:00
ma0048 e939eded65 neuer adresstyp fuer homeoffice und dynmaischen adressentyp im FAS 2021-10-04 09:55:21 +02:00
Manfred Kindl 4c156f7f39 Beginn- und Enddatum bei der Funktion Rektor beruecksichtigen
Wenn bei Studierendensuche kein Ergebnis gefunden wird, Zeile mit "Keine Resultate" ausgeben
2021-10-02 00:18:39 +02:00
Manfred Kindl 8ecb0ece6c Merge remote-tracking branch 'origin/master' 2021-10-01 23:26:57 +02:00
Manfred Kindl 97818781b1 Admins können Maximalstunden überschreiben
Phrasenkorrektur Lektoren auf Lehrende
2021-10-01 23:26:25 +02:00
Andreas Österreicher 226a674e7b Projektzeitenexport ohne Projekte im Zeitraum zeigt nun eine
entsprechende Fehlermeldung statt PHP Error
2021-10-01 15:43:40 +02:00
Andreas Österreicher dfc55a8f95 Time Limit für Statistiken erhöht 2021-10-01 14:20:15 +02:00
Andreas Österreicher 7da74c65d9 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-10-01 09:45:08 +02:00
Andreas Österreicher 1b07cbde72 Fixed generation of Diplomasupplement if Outgoing University includes
Special chars
2021-10-01 09:42:59 +02:00
KarpAlex cb25efceca added NOT NULL constraint to fehlercode field of tbl_fehler_zustaendigkeiten 2021-09-29 21:11:52 +02:00
Manfred 80491e4f55 Export für mehrere Studiengänge möglich 2021-09-29 19:05:10 +02:00
Manfred ae357be538 Minor BugFix variables not defined 2021-09-29 18:56:44 +02:00
Manfred bfa85f9caf Wenn Stg nicht gesetzt, wird der Ablauf ignoriert 2021-09-29 18:55:46 +02:00
Manfred 196f604e05 Merge remote-tracking branch 'origin/master' 2021-09-29 18:36:23 +02:00
Manfred 0ead8b4c3f Button um Personendaten zu laden 2021-09-29 18:36:16 +02:00
Manfred 3b5936239e Projekttiel in Funktion getProjectphaseForMitarbeiter 2021-09-29 18:33:55 +02:00
Manfred 9786247222 Projekttitel statt Projektkurzbz in Projektexport anzeigen 2021-09-29 18:33:10 +02:00
KarpAlex cb3f3723ae issues table dataset:
- made more readable for assistance (added vorname, nachname, removed some fields)
- added default filters (all new, last 7 days...)
- issues displayed for children oes of permitted arrays as well
- query: more exact check for prestudents future status by using studiensemester start date
- typo fixes
2021-09-28 15:57:27 +02:00
KarpAlex 76f3afdda5 Person_model.php getPersonStammdaten method:
- added sorting order for contacts (by insertamum descending)
 - rewrote old ->retval to new isError, hasData etc. functions
2021-09-28 15:52:17 +02:00
Paolo 4274a92854 Merge git://github.com/Monika70/FHC-Core into FHBGLD-ZGV_Doktor_und_zgv_erfuellt 2021-09-28 10:51:21 +02:00
Manfred Kindl 825a440ef3 Merge remote-tracking branch 'origin/master' 2021-09-28 01:15:55 +02:00
Manfred Kindl e1961df70f Attribute ergänzt
Attribute ects_gesamt_studienplan und ects_pro_semester_studienplan ergänzt, da die ects der Studienordnungen nicht mehr relevant sind
2021-09-28 01:14:29 +02:00
ma0068 ddfee4499a correct typo 2021-09-27 13:35:13 +02:00
ma0068 072d1437e6 Bugfix: nun werden nach jedem Fehler die Projektphasen neu geladen 2021-09-27 13:31:01 +02:00
Andreas Österreicher c3c33c1578 Merge branch 'feature-14199/HomeofficeProMitarbeiter' 2021-09-27 10:22:03 +02:00
Andreas Österreicher 7073db5ebe Added Permission check on Loading of Zeitaufzeichnung 2021-09-27 09:40:26 +02:00
Andreas Österreicher 307ba9ce83 Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter 2021-09-27 08:12:00 +02:00
Andreas Österreicher daa78aa190 Mehrfaches zurückziehen der Anrechnungen löscht keine anderen Stati mehr 2021-09-27 08:05:34 +02:00
cris-technikum 4f4f88eca3 Merge remote-tracking branch 'origin/Sonstiges-Sprint-176/Anrechnungen_Bugfixes' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2021-09-23 12:48:16 +02:00
cris-technikum 72868f4207 Fixed: Now downloading documents is possible for ALL STGLs of the concerning STG
Before it was possible only for first in array. Now sending to all.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-23 12:47:05 +02:00
cris-technikum bd90876277 Fixed: Now sending mails to ALL STGLs of the concerning STG
Before it was sending only to first in array. Now sending to all.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-23 12:34:58 +02:00
cris-technikum 38e9031cce Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2021-09-23 11:51:51 +02:00
Nikolaus Krondraf 818567b355 Anmeldungen bei stornierten Prüfungen werden nicht mehr berücksichtigt 2021-09-22 12:02:54 +02:00
Monika70 6cb8987fb4 change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 11:41:03 +02:00
Monika70 9493d6a99b Revert "change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)"
This reverts commit 3acf5ba45e.
2021-09-22 11:35:17 +02:00
Monika70 d704e09e82 Revert "Update dbupdate_3.3.php"
This reverts commit a20d947b37.
2021-09-22 11:29:36 +02:00
Monika70 a20d947b37 Update dbupdate_3.3.php 2021-09-22 11:19:48 +02:00
Monika70 3acf5ba45e change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 11:03:25 +02:00
Monika70 ad95088abd Update dbupdate_3.3.php 2021-09-22 10:53:51 +02:00
Monika70 bfa0f722ae change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 10:46:28 +02:00
Monika70 9d59fcbfbf change of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 10:34:06 +02:00
KarpAlex c563f614bb adapted BISmeldung (studentenmeldung.php, lehrgangsmeldung.php) to new changes:
- added eMailAdresseBE for university adress
- ECTS erworben and angerechnet are rounded (kaufmännisch, .5 up)
- only svnr reported if there is svnr and ekz
2021-09-21 19:08:22 +02:00
Andreas Österreicher 13a040737a Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +02:00
Andreas Österreicher 7358adc069 Merge branch 'feature-12808/LVNeuesAttributLehrmodus' 2021-09-21 07:50:26 +02:00
Andreas Österreicher 61044e9a3d Merge branch 'master' into feature-12808/LVNeuesAttributLehrmodus 2021-09-21 07:39:08 +02:00
KarpAlex 45e4d5576c Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-21 00:59:26 +02:00
KarpAlex 4c21d5364c - added issue management functionality - adding, and displaying issues with filter widget. 2021-09-21 00:58:29 +02:00
Andreas Österreicher d336c8ce10 Merge branch 'feature-15274/infocenter_zgv_ueberperpruefung_rechte' 2021-09-20 09:16:47 +02:00
ma0048 ddfe41de2a fixed rechte, damit die assistenz zugriff drauf hat 2021-09-20 09:12:47 +02:00
Manfred d7a2fda698 Merge remote-tracking branch 'origin/master' 2021-09-17 15:33:52 +02:00
Manfred 13b067e9ca Berücksichtigung der Orgform in LV-Planung XLS-Export 2021-09-17 15:33:47 +02:00
Manfred 81b2a678b6 UID in Mitarbeiterexport XLS 2021-09-17 15:32:52 +02:00
Manfred ddc7e0ef90 Fixed typo in statistik class 2021-09-17 15:32:26 +02:00
Manfred 15045df546 BugFix Datum sortierung, Kopierfunktion für Zeitsperren 2021-09-17 15:31:41 +02:00
Andreas Österreicher c3b02bf741 Als ZGV Studiengangskuerzel wird das 3-Stellige Kuerzel verwendet
anstatt der Kurzbzlang
2021-09-17 10:55:46 +02:00
Andreas Österreicher 01cce41a33 Merge branch 'feature-15231/infocenter_anmerkung_zur_bewerbung_falsches_datum' 2021-09-17 10:40:46 +02:00
Andreas Österreicher 32dc9e1a2d Index für AnrechnungID in tbl_anrechnung_anrechnungstatus hinzugefügt 2021-09-17 10:38:19 +02:00
ma0048 52127ade60 fixed datumanzeige 2021-09-17 10:27:55 +02:00
Andreas Österreicher cdd82fe48b Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes 2021-09-15 18:25:36 +02:00
Andreas Österreicher ab4c7ee194 Limit beim Prüfen der Spaltenverfügbarkeit hinzugefügt 2021-09-15 18:24:42 +02:00
Andreas Österreicher f5f3c38c5f Homeoffice wird nun beim Anlegen von neuen Datensätzen korrekt
gespeichert
2021-09-15 18:20:05 +02:00
Andreas Österreicher bdc61410de Fehlermeldung beim Import von Homeoffice auf Orange geändert da die Daten gespeichert
werden nur ohne Homeoffice Flag
2021-09-15 18:06:44 +02:00
Andreas Österreicher 8075ba3a84 Menueeintrag hinzugefügt für Gemeinde 2021-09-15 15:57:15 +02:00
Andreas Österreicher 99c5544dbe Merge branch 'feature-15157/infocenter_anzeige_nicht_abgeschickt' 2021-09-15 13:50:31 +02:00
Andreas Österreicher 30dc436442 Berechtigung für basis/gemeinde hinzugefügt
Pfade korrigiert
2021-09-15 13:49:20 +02:00
ma0048 8a417e5cb8 fixed uebersicht nicht abgeschickt 2021-09-15 13:45:43 +02:00
Andreas Österreicher 1d37fa28dd Merge branch 'master' into FHBGLD-set_gemeinde_skript 2021-09-15 12:13:15 +02:00
Andreas Österreicher 6927b668e3 Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter 2021-09-15 12:10:59 +02:00
Andreas Österreicher 17c580c184 Removed Legacy Script 2021-09-15 12:06:23 +02:00
Andreas Österreicher a77756a0d6 Merge branch 'hotfix-15106/Logs_Viewer_shows_Filters_from_other_People' 2021-09-15 11:20:32 +02:00
Andreas Österreicher 4fcb799731 Merge branch 'feature-14779/infocenter_getrennte_vorlagen' 2021-09-15 10:51:45 +02:00
Andreas Österreicher e412125dd0 Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864' 2021-09-15 10:34:06 +02:00
Andreas Österreicher fd2485cdb3 Zusätzlicher Eintrag bei Statuswechsel wenn Statusgründe für Studenten
vorhanden sind
2021-09-15 10:31:19 +02:00
Paolo 848cc52cfa - Renamed public method system/Filters_model->getFiltersByAppDatasetName to getFiltersByAppDatasetNamePersonId
- Added new parameter person_id to method getFiltersByAppDatasetNamePersonId
- Changed query inside getFiltersByAppDatasetNamePersonId to get global
  and personal filters
- Adapted FilterWidgetLib to use the new method getFiltersByAppDatasetNamePersonId
2021-09-14 12:44:33 +02:00
ma0068 87ba21cf95 Entfernen von Buttons und Links in der Vorgesetzten- und Adminview 2021-09-09 10:08:41 +02:00
Andreas Österreicher 2159e81888 Bugfix Anrechnung Rejected Mails 2021-09-09 08:34:36 +02:00
Manfred b9c1a10f39 Merge remote-tracking branch 'origin/master' 2021-09-08 19:16:49 +02:00
Manfred 602eb5873a Kopierbutton für Funktionen 2021-09-08 19:16:39 +02:00
ma0068 0cf782601c Dropdown für MA-Ansicht 2021-09-08 15:40:17 +02:00
ma0048 b6ae992c3c getrennte msg bei freigabe qualikurs und einstieg anderes semester 2021-09-08 11:41:45 +02:00
Manfred Kindl c5b017511e Merge remote-tracking branch 'origin/master' 2021-09-08 09:27:38 +02:00
Manfred Kindl 6cd81ac96e Warnung im FAS, wenn inaktive BenutzerInnen gespeichert werden 2021-09-08 09:27:32 +02:00
Manfred Kindl 4e7da23bf5 Option auch Prüfling zu löschen in RT-Administration 2021-09-08 09:24:18 +02:00
Manfred Kindl d4a05c91e3 Vorrückung der Studienpläne auch fürs SS 2021-09-08 09:23:33 +02:00
Manfred ebb7af1e59 Bei Abgewiesenen 0 als Prio anzeigen 2021-09-07 15:11:12 +02:00
Manfred fedc8dbd59 Merge remote-tracking branch 'origin/master' 2021-09-07 15:07:07 +02:00
Manfred 261e4066c8 Beginn- und Enddatum bei der Funktion Rektor beruecksichtigen 2021-09-07 15:05:35 +02:00
Manfred 9f5a8e4eb9 Updateaktiv-Datum ergänzt 2021-09-07 15:01:12 +02:00
cris-technikum 4cfad06f2d Fixed: Added check to only add columns if no already present
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-07 14:37:39 +02:00
cris-technikum 2d755e82b4 Fixed: Added DB-Update Gegenchecks for new tables / columns in DB
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-07 14:36:06 +02:00
Paolo 9c84558f5f - Added requiredPermissions to the application/config/udfmasterschema.json and set them as mandatory
- Removed the private method _isAllowed from application/controllers/widgets/UDF.php
- Removed required permissions from views application/views/system/fas_udf.php and application/views/system/infocenter/zgvpruefungen.php
- Widget views application/views/widgets/checkbox, dropdown, textarea and textfield now they print the attribute disabled
- Added constant DISABLED to application/widgets/html/HTMLWidget.php
- Removed private property _requiredPermissions from application/widgets/udf/UDFWidget.php
- application/widgets/udf/UDFWidget.php does not check permissions anymore and does not store them anymore
- Added constants PERMISSION_TYPE_READ and PERMISSION_TYPE_WRITE to application/libraries/UDFLib.php
- Removed constant PERMISSION_TYPE from application/libraries/UDFLib.php
- Removed public method isAllowed from application/libraries/UDFLib.php
- Added private methods _readAllowed, _writeAllowed, _setRequiredPermissions and _setReadOnly to application/libraries/UDFLib.php
- UDFLib->displayUDFWidget now checks if permissions are declared in the UDF JSON and if the user is allowed to read and write such UDF
- UDFLib->saveUDFs now checks if the user has the permissions to write such UDF
- Now the UDFs are even displayed in read only mode
2021-09-07 12:13:59 +02:00
KarpAlex 493bf0edda Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-06 22:35:40 +02:00
KarpAlex 40d686cb21 Merge branch 'feature-13092/Monitoring_Schnittstellen_Dashboard' into feature-10450/DVUH_requestMatrikelnummer
# Conflicts:
#	system/dbupdate_3.3.php
2021-09-06 22:33:47 +02:00
cris-technikum 4f46476f87 Fixed: Now entitlement checked for all STGL. Also added hasData checks.
Before only the first returning STGL was checked for entitlement.
Also added hasData checks to avoid using getData on NULL values.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-06 12:56:43 +02:00
cris-technikum b7c22ac56f Fixed: Now including correctly config start- and enddate
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-06 12:25:29 +02:00
Andreas Österreicher 89209a0c27 Problem behoben wodurch Messages im FAS nicht korrekt geladen werden
konnten
2021-09-06 09:25:38 +02:00
Manfred 47cb486be3 Merge remote-tracking branch 'origin/master' 2021-09-03 18:03:05 +02:00
Manfred 1759bd75da Bei Upload neuer Version Beschreibung und Suche aktualisieren 2021-09-03 18:02:58 +02:00
Andreas Österreicher 04261e11e4 Wording für Anrechnungen angepasst 2021-09-03 17:38:52 +02:00
Andreas Österreicher c03e476e3b Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-09-03 17:36:19 +02:00
Manfred 3b89561736 Zutrittskarten löschen und status
In kartenruecknahme.php werden nun Statusdetails zum Student oder Mitarbeiter angezeigt und man hat die Möglichkeit, Karten ganz aus dem System zu löschen.
2021-09-03 15:14:54 +02:00
Andreas Österreicher f92307cec0 Merge branch 'feature/Anrechnungen_NEU' 2021-09-03 13:24:35 +02:00
Andreas Österreicher 4b94dfbda7 Merge branch 'master' into feature/Anrechnungen_NEU 2021-09-03 11:08:29 +02:00
Manfred 0099aaadb0 Merge remote-tracking branch 'origin/master' 2021-09-02 14:08:27 +02:00
Manfred 3999098fd6 Anzeige der abgelaufene Coodle-Umfragen verlängert auf 90 Tage 2021-09-02 14:08:21 +02:00
ma0068 30c2705b99 fix syntax error system/dbupdate_3.3.php 2021-09-02 11:43:43 +02:00
ma0068 778b5906f9 Merge Branche Cristina 2021-09-02 11:35:17 +02:00
ma0068 d3158b8ce0 merge dbupdate_3.3.php 2021-09-02 11:31:58 +02:00
ma0068 f0c5c3acb4 14774 Zeiterfassung: Homeoffice im CSV Import 2021-09-02 11:24:38 +02:00
ma0068 62cfa27473 14774 Zeiterfassung: Homeoffice im CSV Import 2021-09-02 09:55:14 +02:00
cris-technikum 58ce5a9132 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-09-01 13:58:48 +02:00
Paolo 286f84825a Merge branch 'master' of git://github.com/Monika70/FHC-Core into FHBGLD-ZGV_Doktor_und_zgv_erfuellt 2021-08-31 22:00:12 +02:00
Paolo 6da8dd6865 Merge branch 'FHBGLD-set_gemeinde_skript' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-set_gemeinde_skript 2021-08-31 21:58:34 +02:00
Andreas Österreicher 6034da43d8 Fixed loading of current Geschaeftsjahr if it is the last day of the
year
2021-08-31 07:56:59 +02:00
Andreas Österreicher 6008d97f36 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-08-30 20:35:31 +02:00
Andreas Österreicher 64555c0ca1 Mahnspanne kann auch leer sein 2021-08-30 20:35:15 +02:00
KarpAlex 25cc8c6d49 matr_aktiv field in dbupdate_3.3.php: only set to true if not NULL 2021-08-30 18:11:08 +02:00
cris-technikum 64eb9eacf4 Added: Automatic Scrolling when Approving/Rejecting multiple Anrechnungen
Also added Scrolling for Recommending/Not Recommending multiple Anrechnungen

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-08-30 15:36:50 +02:00
ma0068 a36909763f Delete comments 2021-08-30 14:28:30 +02:00
Andreas Österreicher b05fbe5978 Fixed PHP Version incompatibility issue 2021-08-27 19:05:00 +02:00
Andreas Österreicher 0a97a028ee Reihungstestübersicht zeigt nun die Reihungstests der letzten 12 Monate
an statt der letzten 5
2021-08-26 20:22:13 +02:00
Andreas Österreicher 6eb6f0b2b8 Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen 2021-08-26 11:57:34 +02:00
Andreas Österreicher 484151bab2 Merge branch 'master' into feature/Anrechnungen_NEU 2021-08-26 11:32:47 +02:00
ma0068 437feb2fdd dynamische Anzeige checkbox homeoffice auch bei Ändern 2021-08-24 18:01:15 +02:00
ma0068 00d7d5c834 neues Ajaxfile zeitaufzeichnung_bisverwendung.php 2021-08-24 11:22:02 +02:00
KarpAlex b9ac73955a Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-08-24 01:19:26 +02:00
Andreas Österreicher 98d485b2ba Merge branch 'feature-13943/SAPByD_purchase_orders_job_queue_worker' 2021-08-23 17:04:09 +02:00
Andreas Österreicher a6b37c452f Merge branch 'feature-6189/SAP_basic_structure_for_data_synchronization' 2021-08-23 16:43:20 +02:00
Andreas Österreicher a22227bc26 Merge branch 'feature-13090/Bis_Bewerbermeldung_einzeln_erstellen' 2021-08-23 16:26:37 +02:00
Andreas Österreicher ccff26d834 Merge branch 'feature-12333/Change_legacy_jobs_database_log' 2021-08-23 16:19:49 +02:00
Andreas Österreicher f552c6a702 Merge branch 'feature-12894/LDAP_changes_on_CI' 2021-08-23 15:43:55 +02:00
Paolo 68b5e49f91 Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization 2021-08-22 21:04:53 +02:00
Paolo ff715a72c8 Merge branch 'master' into feature-13943/SAPByD_purchase_orders_job_queue_worker 2021-08-22 21:04:32 +02:00
Paolo a2fc3fe09b Merge branch 'master' into feature-12894/LDAP_changes_on_CI 2021-08-22 20:59:01 +02:00
Paolo 6960a958f7 Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox 2021-08-22 20:58:38 +02:00
Paolo fb00baae00 Merge branch 'master' into feature-12333/Change_legacy_jobs_database_log 2021-08-22 20:58:09 +02:00
Monika70 a6d83ef321 ZGV Doktor und zgv_erfuellt 2021-08-20 15:39:36 +02:00
Monika70 624b910edd ZGV Doktor und zgv_erfuellt 2021-08-20 15:30:37 +02:00
Monika70 ed43b03e37 ZGV Doktor und zgv_erfuellt 2021-08-20 14:33:03 +02:00
Monika70 8423b3e30a ZGV Doktor und zgv_erfuellt 2021-08-20 14:21:10 +02:00
Monika70 cf0957f8a4 ZGV Doktor und zgv_erfuellt 2021-08-20 14:10:37 +02:00
Monika70 ced3f0f978 ZGV Doktor und zgv_erfuellt 2021-08-20 14:04:43 +02:00
Monika70 713374f4d8 ZGV Doktor und zgv_erfuellt 2021-08-20 13:59:16 +02:00
Monika70 dc5ca70645 Create zgvdoktor.rdf.php
ZGV Doktor und zgv_erfuellt
2021-08-20 13:55:13 +02:00
Andreas Österreicher b00337973a Merge branch 'feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung' 2021-08-20 10:35:32 +02:00
Andreas Österreicher 73ce635188 Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung 2021-08-20 10:34:55 +02:00
Harald Bamberger d091374622 create merged branch with all features on topic Wiederholer - feature 13864 2021-08-19 15:26:20 +02:00
Harald Bamberger a28f187473 create merged branch with all features on topic Wiederholer - feature 12998 2021-08-19 14:58:21 +02:00
Harald Bamberger 1d9ba9c232 create merged branch with all features on topic Wiederholer - feature 12997 2021-08-19 14:58:00 +02:00
Harald Bamberger 99c8423bf6 create merged branch with all features on topic Wiederholer - feature 12995 2021-08-19 14:57:10 +02:00
KarpAlex 24a979f9f1 Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected 2021-08-18 22:16:15 +02:00
manu 4d08dc58db merge master into feature-12808 2021-08-18 15:38:17 +02:00
manu 97590dbb91 Merge branch 'feature-12646/LVVerwaltungOEundFilterAnpassen' into feature-12808/LVNeuesAttributLehrmodus 2021-08-18 14:45:28 +02:00
manu 9cb9e414fb Änderungen Übersichtsliste entfernt 2021-08-18 14:44:56 +02:00
manu ef23c4a89d Anzeige homeoffice nur wenn in Bisverwendung eingetragen 2021-08-18 14:06:57 +02:00
Andreas Oesterreicher 0ba11652e1 Merge branch 'feature-13218/BewerbungstoolMasterDokumente' 2021-08-18 11:42:08 +02:00
Andreas Oesterreicher d8804730ba Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente 2021-08-18 11:18:33 +02:00
Andreas Oesterreicher e9b4116bee Merge branch 'feature-13277/anpassung_infocenter' 2021-08-18 10:45:40 +02:00
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +02:00
cris-technikum c38683edf5 Added "homeoffice" to FAS > BIS-Daten
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-08-10 12:31:39 +02:00
cris-technikum 25ee1032e5 Added "homeoffice" to DB and bisverwendung Class
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-08-10 12:30:10 +02:00
manu a1c4c31332 Update Phrasen und neue Funktion für Anzeige LV-Leitung 2021-08-06 10:46:14 +02:00
KarpAlex 367c266e2e Zeugnisnote_model.php: added method getEctsSumsByPerson 2021-07-29 13:02:24 +02:00
Harald Bamberger de1c532ca9 dead code and console.logs removed 2021-07-29 09:11:31 +02:00
Harald Bamberger 9180930e64 functions for student.rdf urls to add orgform parameter if needed 2021-07-29 09:09:29 +02:00
Andreas Österreicher b6a373b9d4 Merge branch 'feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig' 2021-07-29 07:59:57 +02:00
Andreas Österreicher cb855e7864 Zeitaufzeichnungspflichtig Prüfung auf Zeitraum erweitert 2021-07-28 19:05:48 +02:00
Andreas Österreicher 9eae959b15 Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig 2021-07-28 12:10:28 +02:00
cris-technikum cfa7ce2c08 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-07-27 10:55:11 +02:00
Andreas Österreicher f918d0e188 Merge branch 'feature-12317/UsabilityAnpassungenBenotungstool2' 2021-07-23 15:19:54 +02:00
Andreas Österreicher c8919f2878 Benotungstool zeigt den Namen statt der UID bei der Anlage von Nachprüfungsterminen 2021-07-23 15:17:43 +02:00
Andreas Österreicher 524b954abc Merge branch 'feature-12075/zeitwuensche_lesezugriff' 2021-07-23 14:35:28 +02:00
Andreas Österreicher 8822a589c9 Merge branch 'master' into feature-12075/zeitwuensche_lesezugriff 2021-07-23 14:22:36 +02:00
Andreas Österreicher 78322c22f4 Merge branch 'feature-10762/MailAnMitarbeiterBeiUrlaubsfreigabe' 2021-07-23 14:04:35 +02:00
Andreas Österreicher 6b4a47c9db Merge branch 'master' into feature-10762/MailAnMitarbeiterBeiUrlaubsfreigabe 2021-07-23 13:59:49 +02:00
Andreas Österreicher c8cfc49af9 Mailempfänger bei Urlaubsfreigabemail korrigiert 2021-07-23 13:59:21 +02:00
manu 7bd68775e9 statusgrund_kurzbz in dbupdate ergänzt 2021-07-23 13:44:28 +02:00
manu ccfd038d8a 13938 Vorrückung von bezeichnung_mehrsprachig auf statusgrund_kurzbz umgebaut 2021-07-23 13:32:53 +02:00
Andreas Österreicher d87b667f0a Merge branch 'feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen' 2021-07-23 13:25:38 +02:00
Andreas Österreicher cf82a6d28a Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen 2021-07-23 13:18:54 +02:00
Andreas Österreicher 023994b12c PHP Error behoben wenn Lehraufträge für einzelne Studiengänge erstellt werden 2021-07-23 13:07:23 +02:00
Andreas Österreicher 6267a1bc37 - Hautpberuf wird im CIS Profil angezeigt für den Mitarbeiter
- Fehler behoben wodurch die letzte Verwendung nicht korrekt ermittelt wurde wenn das Ende Datum leer ist
2021-07-23 13:06:15 +02:00
manu 36d0981331 neuer Branch + Korrektur Fehlermeldung bei Änderung Status 2021-07-23 12:57:28 +02:00
Andreas Österreicher c2527e1b13 Updated FHComplete Domain 2021-07-22 15:03:27 +02:00
Andreas Österreicher 3bf03a9869 Merge branch 'sonstiges-sprint174/LehrauftraegeErteilen_DoppelteTabellen' 2021-07-21 15:07:16 +02:00
Andreas Österreicher cdc08b88f8 Merge branch 'hotfix-14064/Messaging_System_GUI_to_send_messages_loads_not_active_templeates' 2021-07-21 14:49:46 +02:00
Paolo e4aa42ad58 models/CL/Messages_model->getVorlage now filters out the _not_ active
templates
2021-07-21 10:39:52 +02:00
KarpAlex ccf4d0e49b studentenmeldung.php: link for file with bewerberdaten only added, instead of previous way of passing a GET parameter for bewerdaten only export 2021-07-20 20:21:50 +02:00
manu 143053b893 Bewerbungstool: alle Masterbewerbungen mit Status Interessent mit ZGV-Ort überschreiben 2021-07-20 13:53:38 +02:00
KarpAlex 18bd6f7aa7 Öhbeitrags GUI:
- possible to edit whole Öhbeitragsrow at once
- added comments
2021-07-19 19:26:53 +02:00
cris-technikum 68a469bce6 Changed text for Anrechnungen Antragsfrist 15.09. -> to 22.09.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-07-19 14:50:12 +02:00
cris-technikum 28d7861fe9 Merge branch 'master' into feature/Anrechnungen_NEU 2021-07-19 12:08:46 +02:00
cris-technikum 50a7bfe927 Minor text changes in Infobox/Nachweisdokumente
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-07-19 12:03:55 +02:00
KarpAlex 113ac6a2c2 bisMeldung studentenmeldung.php: added parameter "nur_bewerber" which lets export only bewerberdata 2021-07-15 22:23:11 +02:00
KarpAlex e145a3854a added system.tbl_issues for issue tracking 2021-07-15 16:13:43 +02:00
manu 05a06de109 alle prestudents im Status Interessent mit leerem zgvmatum überschreiben 2021-07-15 09:10:35 +02:00
cris-technikum e3a7fc2f0c Added CC parameter to sendSanchoMail function
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-07-14 17:52:22 +02:00
Paolo 47326fe9fb - Added new protected method getOldestJobs to core/JQW_Controller
- Changed method JQW_Controller->getOldestJob to be a wrapper for getOldestJobs
- Changed method generateJobs to be a wrapper for static method JobsQueueLib::generateJobs
- Removed method JobsQueueLib->getOldestJob
- Added new public method getOldestJobs to JobsQueueLib
- Added new public static method generateJobs to JobsQueueLib
2021-07-14 13:02:08 +02:00
manu e9705e69e7 ZGV-Felder für alle aktuellen Bewerbungen mit Inhouse-ZGV überschreiben 2021-07-13 14:36:41 +02:00
cris-technikum cba638db9f Changed: Now grades are retrieved more dynamically in Anwesenheitsliste
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-07-12 12:06:49 +02:00
cris-technikum f60e923829 Merge branch 'master' into feature-12997/Neue_Noten 2021-07-12 10:38:07 +02:00
manu bd153921c6 13989 Merge Änderungen Berufstätigkeit master 2021-07-09 11:09:43 +02:00
manu a10cacaf4b Anzeige jüngster Eintrag Berufstätigkeit 2021-07-09 08:28:26 +02:00
Andreas Österreicher 54593512af Added Sort for Loading of Notizen in Bewerbungstool 2021-07-08 18:09:04 +02:00
ma0048 f16ea874db fragt bei den mails auch nun den studiengangtyp ab 2021-07-08 15:47:31 +02:00
cris-technikum 1c0de3ec45 Fixed: Doppelte Tabellenanzeige in SanchoMail korrigiert
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-07-08 15:05:19 +02:00
KarpAlex cee6156646 - added Bisioaufenthaltfoerderung_model.php
- dbupdate_3.3.php: added Buchungstyp "ZuschussIO"
2021-07-07 20:22:53 +02:00
cris-technikum 635974fa22 Merge branch 'master' into feature/Anrechnungen_NEU
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
Andreas Österreicher 0ee6485ece Dependecy Update 2021-07-05 18:18:20 +02:00
Andreas Österreicher 25124e0354 Reduced amount of LDAP Requests when Loading CIS Menu 2021-07-05 18:13:37 +02:00
KarpAlex 3a0066a2b5 - rearranged fas prestudent view row for addtional fields
- renamed label standort to bisstandort
2021-07-02 21:00:02 +02:00
manu 5d48b0aad0 BT: neue zu akzeptierende Dokumente, Studiengang als übergebener zgvma_Ort, Styling nicht verpflichtende Dokumente 2021-07-02 13:14:08 +02:00
KarpAlex c6b4be62c0 FAS: Prestudents replaced foerderrelevant checkbox with dropdown ja/nein/Wie Studiengang 2021-07-02 10:10:43 +02:00
KarpAlex 6984ffa278 added melderelevant field to studiengang vilesci GUI for edit 2021-07-02 00:05:10 +02:00
manu 752a891c6b 13887 Freigabemail bei \"Alle Anzeigen\" 2021-07-01 15:29:19 +02:00
manu 2bef17d65b Update Phrasen Englisch und Codesniffer 2021-07-01 15:23:41 +02:00
Andreas Österreicher b1ce67ebd5 Infocenter fixed STG Typ 2021-07-01 14:59:11 +02:00
Andreas Österreicher 07cb19ccd1 Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine' 2021-07-01 14:44:33 +02:00
Andreas Österreicher 2a51222e36 Merge branch 'feature-13207/lehrauftraege_passwortmanager_problem' 2021-07-01 14:40:10 +02:00
Andreas Österreicher dc45658684 Merge branch 'feature-8210/status_abgewiesen_fuer_mehrere_personen' 2021-07-01 14:07:39 +02:00
Andreas Österreicher a9c5533959 Merge branch 'master' into feature-8210/status_abgewiesen_fuer_mehrere_personen 2021-07-01 14:00:47 +02:00
manu 3dd67b90b2 Update Phrasen 2021-07-01 08:13:17 +02:00
KarpAlex 7fe793bf39 bugfix: added boolean parse for foerderrelevant field in prestudent.class.php 2021-07-01 01:39:30 +02:00
KarpAlex ec5fb791a2 when adding new prestudent in FAS, foerderrelevant is set to false if ausserordentlich 2021-06-30 17:22:03 +02:00
ma0048 6246312ce5 bei ergaenzungspruefungen immer eine mail rausschicken und unterscheiden zw englisch und deutsch 2021-06-30 15:24:25 +02:00
manu 36d162d2d7 13850 Bestätigungsmail an Mitarbeiter 2021-06-30 14:29:58 +02:00
ma0048 745ecf4711 zgv pruefung unterscheiden zwischen bachelor und master 2021-06-30 13:29:09 +02:00
ma0048 36507959ac dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks 2021-06-30 13:09:56 +02:00
ma0048 67aa887981 anzeige des errors 2021-06-29 14:47:57 +02:00
ma0048 d4d84a93ba Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden 2021-06-29 14:43:19 +02:00
KarpAlex 02f52f606c added foerderrelevant and standort dropdown fields in FAS for editing 2021-06-29 10:05:25 +02:00
KarpAlex 340f410fa5 - added foerderrelevant and standort_code to prestudent.class.php and studiengang.class.php to all methods
- foerderrelevant and standort for Studiengang can be edited in vilesci studiengang_details.php
2021-06-29 04:00:40 +02:00
manu b5279cf4c6 13845 Reset Projektphasen nach Fehlermeldung 2021-06-28 15:27:06 +02:00
KarpAlex 6ed2808a17 prestudent.class.php, interessentenimport.php: when incoming is created, foerderrelevant is set to false 2021-06-28 13:41:43 +02:00
manu 3b5a2ee766 13788 Korrektur Anzeige Phasen in Editmode 2021-06-28 09:42:38 +02:00
Harald Bamberger 7295523af5 add filter for any statusgrund not only wiederholer 2021-06-25 19:08:02 +02:00
Harald Bamberger b5fcfb7b09 first guess, TODO check statusgrund_id 2021-06-25 14:26:07 +02:00
KarpAlex 1ce0045f86 - Prestudent_model.php: added getStandortCode and getFoerderrelevant methods
- indent formatting
2021-06-25 13:19:02 +02:00
Andreas Österreicher f4ddbd3084 Added DB-Index for lehre.tbl_pruefung to speed up queries 2021-06-25 11:15:12 +02:00
manu ecd6cd466d Korrektur Anzeige Projektphasen in Editview 2021-06-24 16:03:01 +02:00
manu 84950649c4 Adaptierungen ZGV-Master Funktionen 2021-06-24 12:00:49 +02:00
KarpAlex 9a24d2d7c7 dbupdate_3.3.php: removed inserts for bis.tbl_bisstandort, FHs should insert their data as needed 2021-06-23 17:57:31 +02:00
KarpAlex 72b7e5b1fe dbupdate_3.3.php: foerderrelevant field of tbl_prestudent: prefill with false where possible 2021-06-23 15:55:51 +02:00
Andreas Österreicher 5a42fd8999 Lehrtyp Notice behoben 2021-06-23 15:18:06 +02:00
manu 537ad8ab88 Adaptierungen setZGVMasterFields() 2021-06-23 11:41:38 +02:00
Andreas Österreicher e4d2b67369 Berechtigungsprüfung bei Projektphase korrigiert 2021-06-22 17:26:00 +02:00
ma0048 7314352e79 absagen nun möglich auch bei studenten die den reihungstest absolviert haben 2021-06-22 16:54:45 +02:00
KarpAlex 264ba0e66f dbupdate_3.3.php:
- added bis.tbl_bisstandort
- added LIMIT 1 to melderelevant SELECT
- added columns foerderrelevant and standort to public.tbl_studiengang and public.tbl_prestudent
2021-06-22 16:48:06 +02:00
cris-technikum 1eb3f96200 Added STGL-Notizfeld to Lectors Detail View
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-22 12:46:03 +02:00
manu 35366efdad Bewerbungstool: Korrektur Anzeige vorläufiges Sprachzertifikat 2021-06-22 10:20:56 +02:00
KarpAlex c950047fe7 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-06-21 18:20:03 +02:00
KarpAlex ca80d72734 added Öhbeitragsverwaltung to main menu 2021-06-21 17:42:08 +02:00
cris-technikum b2fe9f7b1b Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-06-21 17:18:46 +02:00
cris-technikum bf3c8a344b Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-21 17:18:07 +02:00
cris-technikum 2d6bd0af34 Adjusted 'createAnrechnung'-button to stay inline in smaller devices
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-21 17:17:10 +02:00
Paolo e1a6a899f6 - Renamed libraries/LDAPLib.php to libraries/AuthLDAPLib.php
- Removed constants LDAP_NO_USER_DN and LDAP_TOO_MANY_USER_DN from config/constants.php
- Added config entry timeout to config/ldap.php
- Changed private method libraries/AuthLib->_checkLDAPAuthentication
to use libraries/AuthLDAPLib->checkUsernamePassword
- Changed AuthLDAPLib to have only one public method called checkUsernamePassword that makes use of the other private methods to check if a username and password are valid on many LDAP servers
2021-06-21 17:03:40 +02:00
cris-technikum 46edad620a Fixed: to NOT send Ablehnungsmail to students multiple times
If STGL was rejecting - withdrawing multiple times and entering different
reasons (notizen), the Ablehnungsmail was sent for each of that reasons.
Now the mail is sent only once for most recent reason.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-21 15:50:27 +02:00
manu 3fca876f8d #13749 MasterZGV Art und Ort setzen 2021-06-21 15:12:33 +02:00
Harald Bamberger e76dead570 add parantheses although not explicitly needed for correct function 2021-06-18 14:45:05 +02:00
Harald Bamberger cea673fa82 adjust indentation, changed filter lastWeek to cover last 7 days and not only a week ago today 2021-06-18 12:45:44 +02:00
manu 9961ba1753 13680 Adminansicht korrigiert: neue Variable uidpass 2021-06-18 11:16:26 +02:00
manu b283125436 13680 Adminansicht korrigiert 2021-06-18 11:03:04 +02:00
Harald Bamberger a0b86b6207 rename in_the_future to upcoming consistently 2021-06-18 09:21:39 +02:00
Harald Bamberger e5a6af7eb3 first guess adding filter for upcoming exams 2021-06-18 09:16:02 +02:00
ma0048 8b3df55719 response bei doktyp änderung 2021-06-17 14:08:49 +02:00
ma0048 ab799cb54f abweisen auch wenn bereits freigegeben 2021-06-17 13:47:21 +02:00
Andreas Österreicher 948a26beac Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox 2021-06-17 09:12:02 +02:00
cris-technikum 45e1bfd5e9 Anwesenheitsliste: Kuerzel 'nicht zugelassen ergaenzt'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-16 16:30:50 +02:00
Andreas Österreicher a3adce8776 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-06-16 15:11:38 +02:00
Andreas Österreicher 6376853734 Planner: Timming Problem beim Speichern von Ressourcen behoben das dazu führte dass die Daten nicht immer gespeichert wurden 2021-06-16 15:10:43 +02:00
manu aa94110791 13623 Anzeige Projekt und Phasen in Editiersicht 2021-06-16 13:34:31 +02:00
cris-technikum 377ad0eeec Merge remote-tracking branch 'origin/feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
# Conflicts:
#	vilesci/stammdaten/personen_wartung.php
2021-06-16 13:16:01 +02:00
ma0048 584a8cf100 abfrage auf null beim objekt hinzugefuegt 2021-06-16 12:48:32 +02:00
ma0048 934248aa0e Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter 2021-06-16 09:26:30 +02:00
ma0048 8fa40a843b Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter
# Conflicts:
#	application/controllers/system/infocenter/InfoCenter.php
#	application/views/system/infocenter/dokpruefung.php
#	application/views/system/infocenter/infocenterData.php
#	application/views/system/infocenter/infocenterFreigegebenData.php
#	application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
2021-06-16 09:26:03 +02:00
ma0048 212261a38e autofill vom username im falschen feld verhindern 2021-06-16 09:18:53 +02:00
ma0048 6a3fb14ea6 zgv ueberpruefung zwischen master und bachelor unterscheiden 2021-06-16 09:16:15 +02:00
ma0048 7aa32dff83 status zum studenten aendern auch mit menupopup 2021-06-16 08:18:49 +02:00
ma0048 b7d5fef30a nachrichten wegschicken auch wenn die Sprache nicht gefunden wurde 2021-06-16 08:03:54 +02:00
KarpAlex 27b0679640 dbupdate_3.3.php: column melderelevant prefill with values, added comment 2021-06-15 19:03:41 +02:00
Harald Bamberger ed9bfcdf2d change infoscreen preview url 2021-06-15 11:18:55 +02:00
KarpAlex 2682026fec add column melderelevant to public.tbl_studiengang 2021-06-14 19:13:38 +02:00
KarpAlex 3d22412321 added parameters aktiv, lehre, offiziell, positiv to getByPerson method of Zeugnisnote_model.php 2021-06-14 18:39:29 +02:00
Andreas Österreicher 2d440585f4 Planner enhancements
- Removed Loading of Mantis Tasks
- Dont Load Ressource Overview on Startup
- Set Projects Tab as Default on Startup
2021-06-14 16:40:27 +02:00
cris-technikum eb709e7257 Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen 2021-06-14 16:10:41 +02:00
ma0048 42ff593cb1 zgvnation spalten umbenannt 2021-06-14 15:44:38 +02:00
Andreas Österreicher c71c5ae126 Merge branch 'feature-12340/StudienblattAnpassungFureAbbrecher' 2021-06-14 15:38:01 +02:00
Andreas Österreicher 6d0613e5c8 Merge branch 'master' into feature-12340/StudienblattAnpassungFureAbbrecher 2021-06-14 15:36:56 +02:00
Andreas Österreicher 6595df95ad Studienblatt - Endedatum bei Abbrechern korrigiert 2021-06-14 15:36:17 +02:00
cris-technikum 31957b813f Anwesenheitsliste: Intern angerechnete als 'Angerechnet' markieren (ar)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-14 15:29:26 +02:00
cris-technikum 5765be1ab8 Added Note 'nicht zugelassen'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-14 14:57:42 +02:00
cris-technikum fd4740e7e0 Added Note 'intern angerechnet'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-14 14:46:14 +02:00
Andreas Österreicher 83a0cbf380 Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen 2021-06-14 13:52:00 +02:00
Andreas Österreicher f0c57c78ae Merge branch 'BUG-13075/Urlaubstool_Markierung_Folgemonat' 2021-06-14 13:46:56 +02:00
Andreas Österreicher 5b80ab2726 Merge branch 'master' into BUG-13075/Urlaubstool_Markierung_Folgemonat 2021-06-14 13:42:17 +02:00
Andreas Österreicher ce07771802 Merge branch 'BUG-12899/Planner_Mitarbeiteransicht_Aufbau' 2021-06-14 13:32:57 +02:00
Andreas Österreicher 60d240258c Merge branch 'master' into BUG-12899/Planner_Mitarbeiteransicht_Aufbau 2021-06-14 13:29:53 +02:00
Andreas Österreicher 31f905bc74 Merge branch 'bug-13098/FasVerbandDatentypPruefen' 2021-06-14 13:24:00 +02:00
Andreas Österreicher 5e21b5cda8 Merge branch 'bug-294/FasMobilitaetsprogrammMitLangbezeichnungAnzeigen' 2021-06-14 13:20:27 +02:00
Andreas Österreicher 043b25c2f7 Merge branch 'BUG-13262/FASUnschoeneFehlerMeldung' 2021-06-14 13:13:44 +02:00
Andreas Österreicher 5aacf9f9b2 Datumsprüfung bei Geburtsdatum korrigiert 2021-06-14 13:13:03 +02:00
Andreas Österreicher 19d16809d4 Merge branch 'bugfixes-Sprint172/Diverse_Bugfixes' 2021-06-14 13:02:27 +02:00
manu 531174dcb5 #13533 Button Homeoffice: Haken beim Editieren 2021-06-11 09:17:26 +02:00
ma0048 c9ec4cb674 ist infocentermitarbeiter spalte nachgezogen 2021-06-10 12:19:42 +02:00
ma0048 3171ec2c42 dokumententypen nach bezeichnung sortiert 2021-06-10 12:01:01 +02:00
ma0048 ccffdf9b7f statusgruende sortiert 2021-06-10 12:00:09 +02:00
ma0048 cdfaf5b90b dokumententypen nach bezeichnung sortiert 2021-06-10 11:56:07 +02:00
ma0048 3ba88b43dd zgvmaster spalte hinzugefuegt 2021-06-10 11:49:48 +02:00
cris-technikum 179299443b Bugfixed: Genehmigungsbuttons now working directly after withdrawing
Before buttons were not working, if genehmigungsbuttons were immidiately
used twice. (e.g. approving - withdrawing - rejecting). This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-10 10:39:18 +02:00
manu 49363e893b 13218 update Eintragen MasterZGV Nation 2021-06-10 10:30:49 +02:00
cris-technikum 5cc98562e3 Added focus on filterbutton, if table starts with stored filter
Because tabulators persistentFilter = true, the table is initialized with
the stored filter. Therfore probably less data was shown, but was not
clear, because the corresponding filterbutton was not focused.
Now the button is focused depending on the filter detected.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-10 09:37:16 +02:00
manu e157945ae9 Auskommentieren Testausgaben 2021-06-09 08:58:17 +02:00
KarpAlex b206c019df Oehbeitrag GUI: correct decimal format conversion before after update 2021-06-09 01:34:47 +02:00
manu 472803dbec 13412 Refactoring Functions Dokumente ZGV Master 2021-06-07 16:55:39 +02:00
cris-technikum b86844197d Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-07 14:39:38 +02:00
ma0048 4a2c90ac60 doktypen in zgv uebersicht nur readonly 2021-06-07 12:28:32 +02:00
ma0048 8a870fb4c8 reihungstest msg unterscheiden zwischen deutsch, englisch & bachelor & master 2021-06-07 12:07:34 +02:00
manu a6b53b8fd7 13412 Refactoring Functions for Master Documents 2021-06-07 11:29:39 +02:00
Paolo e056dcd3c2 LDAPLib hotfix: in case that is not possible to connect to an LDAP
server it is not possible to display a valid error message
2021-06-07 10:36:50 +02:00
KarpAlex 5944938052 Oehbeitraege GUI: correct table sorting and refreshing of tablesorter 2021-06-01 15:18:54 +02:00
ma0048 5330e2b250 beim abweisen das studiensemester hinzugefuegt 2021-06-01 11:13:23 +02:00
manu 9a0df43526 13219 Master Dokumente: Anzeige akzeptierter Dokumente als nicht erforderlich 2021-06-01 09:47:02 +02:00
KarpAlex df8c946bb2 enabled updating of oehbeitrag values 2021-05-31 23:20:56 +02:00
ma0048 6550fb6301 wording angepasst 2021-05-31 13:29:13 +02:00
ma0048 36f52cf3cc dokumententyp kann nun im Infocenter geaendert werden und zgv master wird angezeigt 2021-05-31 13:20:45 +02:00
ma0048 efbdb02b2c beim vorruecken wird pre-wiederholer auf wiederholer gesetzt und wird ein semester zurueckgestuft 2021-05-31 12:59:59 +02:00
KarpAlex fc3921ecad dbupdate_3.3.php: removed "bezeichnung_mehrsprachig" field from bis.tbl_oehbeitrag table check 2021-05-28 02:15:26 +02:00
KarpAlex 4b237cbc7f oehbeitrag versicherung: possible to display and add Oehbeitraege and Versicherungsbeiträge per semester 2021-05-28 02:12:55 +02:00
KarpAlex 3dddc97575 dbupdate_3.3.php: removed "bzeichnung_mehrsprachig" feld from bis.tbl_oehbeitrag table check 2021-05-27 16:29:27 +02:00
manu 39668890f2 neue Funktion ZGVMasterNation setzen 2021-05-27 16:22:47 +02:00
cris-technikum b7939f645e Fixed width exceeding table columns, when containing large text
In some cases table columns were exceeding the table width. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-26 19:57:23 +02:00
cris-technikum 5ac2c1f9a6 Bugfix-13280/Lehrtaetigkeitsbestaetigung: Betreuungen ohne Stundensatz
In der Bestaetigung werden nun auch die Projektarbeitsbetreuungs-Stunden
aufgerechnet, bei denen kein Stundensatz hinterlegt ist.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-26 11:51:27 +02:00
manu 135f82a034 13392 Adaptierungen Lehrmodus: Bezeichnung_mehrsprachig 2021-05-26 11:38:28 +02:00
cris-technikum 1e013e371d Bugfix-12064/Keine LV-Anzeige für WS2020
Beim Prüfen, ob ein Lehrvertrag für die Lehreinheit vorliegt, muss die
UID übergeben werden, denn diese wird entweder über GET param übergeben oder
mit dem aktuellen user gleichgesetzt.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-25 17:10:06 +02:00
OliiverHacker f52d3a455c add date validation 2021-05-25 16:35:41 +02:00
cris-technikum 87a4f9b7c0 Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-25 15:07:25 +02:00
cris-technikum cfcf556a6a Corrected: Status now displaying correct Status (issue when deadline has expired)
Before, if application deadline has expired, the status was showing
'Deadline expired', even if the application was already existing and in
process. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-25 13:24:59 +02:00
Cris 12e531532b Changed checking Application Deadline by checking start-/enddate
Now checking start-/enddate in the config entries.
If not provided, start-/endedate of Studiensemester will be used.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-25 13:19:40 +02:00
manu 763eed60d9 13292 Änderung Lehrmodus_kurzbz auf Beschreibung_mehrsprachig 2021-05-24 20:39:53 +02:00
manu ca748d501f 13291 Erweiterung LVEval um Beschreibung Lehrmodus 2021-05-24 19:24:14 +02:00
Andreas Österreicher c1ff4c2d53 Merge branch '9503/csvExportProjektÜbersicht' 2021-05-21 07:51:46 +02:00
Andreas Österreicher 91f1c2b5e8 Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-05-21 07:06:06 +02:00
cris-technikum 0b7adba115 Adapted dokumentname to be empty since Nachweisdokumente can be deleted now (Datenschutz)
Error was thrown in AnrechnungLib since dms_id can be null and no document
exist after Datenschutz delete. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-20 16:26:02 +02:00
cris-technikum 1c780d5aae Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-05-20 16:09:04 +02:00
cris-technikum 5c5f389a2d Corrected: Anrechnungen were not shown in Overview after 'Löschen von Nachweisdokumenten'
Left Joining table dms_version fixed this issue.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-20 13:31:02 +02:00
cris-technikum 35edf82ca6 Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-20 13:27:28 +02:00
ma0048 f05493d3f3 modal und check hinzugefuegt 2021-05-20 09:33:08 +02:00
cris-technikum 9382b2738f Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-20 08:55:00 +02:00
manu 0285e3fc92 Adaptierungen Bewerbungstool Übersichtsseite 2021-05-20 08:54:14 +02:00
KarpAlex 2e2fd33c16 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-05-20 00:58:44 +02:00
KarpAlex 989a1080b4 added codex/Oehbeitrag_model and method getByStudienesemester 2021-05-20 00:56:10 +02:00
OliiverHacker 1249689813 Speichern bei automatischen Pausen möglich 2021-05-19 19:59:48 +02:00
cris-technikum 8f93ab5927 Bugfixed TabelWidget: Ausgewählte Zeilen now displaying amount correctly
Added 'typeof' to correctly check against 'undefined'. Before it was
checking against string.

Also corrected all other occurences.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-19 17:08:26 +02:00
cris-technikum a822f96e88 Changed Create Anrechnung window to open in new tab
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-19 16:21:55 +02:00
cris-technikum 758b9991d5 Added Antragssperre for Noten, when STGL wants to create Anrechnung
Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-19 16:18:04 +02:00
cris-technikum a783b0085b Splitted Antragsdaten into 2 tables
Split to gain more space to see all functionalities/buttons at a glance.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-19 15:28:06 +02:00
OliiverHacker c8309df171 display homeoffice 2021-05-19 14:45:33 +02:00
OliiverHacker 12a52ee79f csv import 2021-05-19 14:12:25 +02:00
OliiverHacker 9180328ab5 save zeitaufzeichnung with homeoffice 2021-05-19 13:59:44 +02:00
OliiverHacker db1f0f5316 add homeoffice checkbox 2021-05-19 11:57:27 +02:00
OliiverHacker 301c836255 add spalte homeoffice to zeitaufzeichnung 2021-05-19 11:48:29 +02:00
OliiverHacker 847529d5aa nachname vorname tauschen 2021-05-19 09:03:20 +02:00
manu 2d11701151 Bugfix Filtern Lehrveranstaltung STGVW 2021-05-19 08:47:08 +02:00
KarpAlex 8fe1129910 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-05-18 23:40:39 +02:00
KarpAlex d476b8cbd6 created bis.tbl_oehbeitrag for storing oehbeitrag and Versicherung amounts 2021-05-18 22:44:31 +02:00
Andreas Österreicher eba394e170 Merge branch 'bug-12339/GeburtsdatumValidieren' 2021-05-18 17:09:31 +02:00
Andreas Österreicher fc9d1ce24b Merge branch 'feature-12338/Zeitbestätigung' 2021-05-18 16:48:16 +02:00
Andreas Österreicher c220bddadc Kurzbezeichnung der Zeitbestätigung korrigiert 2021-05-18 16:10:13 +02:00
cris-technikum 8fe136a5ae Merge branch 'master' into feature/Anrechnungen_NEU
# Conflicts:
#	cis/private/tools/projektabgabe.php
2021-05-18 13:24:49 +02:00
Cris 7bbd94bb89 Adapted & Enhanced Withdrawing of Approvement
. Added 'genehmigt von'
. Moved out to Model and added db rollback

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-17 12:35:14 +02:00
Cris d016e26e70 Added new AnrechnungJob deleteAnrechnungGrades
This job deletes Zeugnisnoten 'angerechnet', when Anrechnung is rejected
afterwards. E.g., when STGL first accepts, then withdraws and finally
rejects the approvement.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-17 12:30:56 +02:00
Andreas Österreicher ce302750f8 Wording im FAS angepasst: Lehreinheit->LV-Teil, Semesterstunden->Lehrauftragsstunden, Planstunden->LV-Plan Stunden 2021-05-12 15:48:05 +02:00
Andreas Österreicher 45b150f0d4 Abgabtetool: Fixed broken ZIP Download 2021-05-12 15:46:05 +02:00
ma0048 0d4bf432e2 deleted console.log 2021-05-12 14:00:45 +02:00
ma0048 ffa7abdf5a standardtitel hinzugefuegt 2021-05-12 13:52:19 +02:00
ma0048 2c6d8937f6 funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv 2021-05-12 12:48:29 +02:00
manu 475f57d10f Erweiterung um Langbezeichnung 2021-05-12 09:42:24 +02:00
cris-technikum d5a72af39f Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-11 13:48:21 +02:00
Andreas Österreicher 4b8bf41837 Plagiatsprüfung Link aktualisiert 2021-05-11 11:07:31 +02:00
manu f5298ae351 Ergänzung lehrmodus für Gegenprüfung, Entfernen von addon.tbl_lvevaluierung_frage 2021-05-10 15:10:30 +02:00
manu cefe34a68f neue Funktion variableChangeValueIfNumber() 2021-05-10 11:28:08 +02:00
Cris 5b3871e999 Corrected requiredPermission of tabulator to create Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-10 08:36:30 +02:00
ma0048 6f885fb924 fixed typo and put the insert on a other position 2021-05-07 22:23:48 +02:00
KarpAlex 0681049122 ParbeitsbeurteilungEndupload.txt Vorlage: Paabgabetyp "Abgabe" wenn not endupload, corrected comment 2021-05-07 12:44:23 +02:00
KarpAlex da3396e816 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-05-07 12:21:33 +02:00
KarpAlex 4ec3172ccd Projektarbeitsbeurteilung Zweitbetreuer: Abgabetyp is passed to Vorlage also when token is resend 2021-05-07 12:20:48 +02:00
Andreas Österreicher 7a80a1f1cd Tokenversand Link ist jetzt immer Sichtbar 2021-05-07 11:49:56 +02:00
Andreas Österreicher 9121488151 Updated PHPSecLib 2021-05-06 12:57:52 +02:00
Andreas Österreicher d0b76aaac5 Merge branch 'BUG-13075/Urlaubstool_Markierung_Folgemonat' 2021-05-06 12:54:28 +02:00
Andreas Österreicher 4f26a831f4 Merge branch 'feature-12881/Titel_Projektexport' 2021-05-06 12:46:26 +02:00
cris-technikum debd6724b3 Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-05 17:21:56 +02:00
Cris 842651e676 Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen'
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-05 17:03:42 +02:00
KarpAlex 73c2319933 Parbeitsbeurteilung Abgabe:
- Mail after Zwischenabgabe for Erstbegutachter has not Beurteilunglink
- added Paabgabetyp for Mail after Abgabe
- Plagiatsprüfung Button links to newer Plagiatschecksite
2021-05-05 16:14:10 +02:00
Cris 563c0cea58 Fixed wrong column grid / Small GUI adaptations
GUI adaptations:
. Changed 'Antrag anlegen': button instead of link
. Changed success text to: Antrag wurde angelegt

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-05 15:52:25 +02:00
FHBGLD aac4467d8a Update set_gemeinde.php 2021-05-05 11:52:12 +02:00
OliiverHacker d21773bad5 markierung auch im vor und folgemonat 2021-05-05 09:21:32 +02:00
ma0048 062ff74b03 Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt 2021-05-04 22:09:47 +02:00
Cris 69b33a7f92 Bugfix: Now Ampelmail is sending HTML content correctly
...so that the eMail client can parse and display HTML content correctly.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-04 16:23:24 +02:00
FHBGLD b22c975355 Create set_gemeinde.php 2021-05-04 14:19:48 +02:00
manu a8c11d3e13 Update Page LV-Details Vilesci 2021-05-04 09:27:42 +02:00
Cris 7a29d27a79 Adapted Deadline check to use config parameter
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 16:18:32 +02:00
Cris a50a666d11 Added Antragssperre for Noten, that are defined in config array
. Added new config file
. Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
. Adapted GUI to process data via JS only

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 16:17:23 +02:00
manu 30746e1ee7 update Klasse Lehrmodus und Lehrveranstaltung 2021-05-03 15:28:35 +02:00
Cris d23faa6e96 Usability: Avoided manually scrolling when recommending/approving on Detailsite
...for STGL and lectors Detailview.
Before the downsliding panel was sliding above the window screen, so that
user was forced to scroll down the page. Now it scrolls up by itself.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 10:50:52 +02:00
Cris 99b1de542d Improvements to all Detail views for lightweighted look and space at end of pages
. Removed 'wrapping' panel
. Removed unnecessary panels and breaks
. Added breaks at the end of site to avoid buttons 'sticking' at the bottom

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 10:40:37 +02:00
manu e91f3f692e Merge branch 'feature-12808/LVNeuesAttributLehrmodus' of https://github.com/FH-Complete/FHC-Core into feature-12808/LVNeuesAttributLehrmodus 2021-04-30 14:16:48 +02:00
OliiverHacker 44be64dcca add titel also to sheet header 2021-04-30 10:56:16 +02:00
Pable d29d80fc59 Merge pull request #10 from FHBGLD/FHBGLD-patch-include_gemeinde_class
Update gemeinde.class.php
2021-04-30 10:36:16 +02:00
OliiverHacker 3075277ca4 Merge branch 'feature-12881/Titel_Projektexport' of https://github.com/FH-Complete/FHC-Core into feature-12881/Titel_Projektexport 2021-04-29 13:04:40 +02:00
OliiverHacker 27549c1a70 fix umlaute und max length also for excel 2021-04-29 13:03:19 +02:00
ma0048 03feb6bd44 Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung 2021-04-29 11:14:04 +02:00
ma0048 d490eb4323 freigabe nur fuer den bachelor 2021-04-29 11:12:48 +02:00
OliiverHacker c0b07ac1d2 fix bug when deleting ressource from projectphasen 2021-04-29 11:12:32 +02:00
OliiverHacker 898562e742 fix bug when deleting ressource from project 2021-04-29 11:06:51 +02:00
ma0048 5fff866363 Merge branch 'feature-4836/studiengang_der_anmerkung_ergaenzen' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:51 +02:00
ma0048 7c02e0247d Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:35 +02:00
ma0048 0b5ae2df9c Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung 2021-04-29 10:53:00 +02:00
Cris 81bd719e39 Added Empfehlungsnotiz in STGL Detailview + minor GUI change
Now STGL can save and update notes regarding recommendation.

Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-29 09:54:57 +02:00
Andreas Österreicher 935519d1c3 Merge branch 'master' into feature-12881/Titel_Projektexport 2021-04-28 17:38:59 +02:00
Andreas Österreicher 77c06516f5 Merge branch 'feature-9612/Casetime_Zeitwarnungen_differenzieren' 2021-04-28 17:29:04 +02:00
Andreas Österreicher 05a3f787e4 Merge branch 'master' into feature-9612/Casetime_Zeitwarnungen_differenzieren 2021-04-28 17:21:51 +02:00
Andreas Österreicher d5ef17d66a Merge branch 'feature-11250/zeitaufzeichnung_stammkostenstelle' 2021-04-28 17:18:40 +02:00
Andreas Österreicher b5be5be59d Merge branch 'master' into feature-11250/zeitaufzeichnung_stammkostenstelle 2021-04-28 17:17:02 +02:00
ma0048 5c339ce448 zgv ueberpruefung bug fixes 2021-04-28 16:56:50 +02:00
ma0048 c9bd10c3d0 zgv ueberpruefung bug fixes 2021-04-28 16:53:43 +02:00
Andreas Österreicher 4dc0bc3aec Merge branch 'feature-98/Feiertage_in_Urlaubstool' 2021-04-28 16:52:09 +02:00
Andreas Österreicher dda82e32f1 Merge branch 'master' into feature-98/Feiertage_in_Urlaubstool 2021-04-28 16:45:28 +02:00
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:54:54 +02:00
Cris cafd72e51d Removed accaptance of FormData object within AjaxLib controllerParameter check
Also adapted JS files to this change.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:53:17 +02:00
OliiverHacker 35f1b00d7a display correct mitarbeiter ressources 2021-04-28 12:53:57 +02:00
manu 20e6573d68 Spalte lehrmodus_kurzbz zu addon.tbl_lvevaluierung_frage hinzugefügt 2021-04-28 09:34:58 +02:00
Cris 5f7672d9df Adapted Anrechnungen-files to use AjaxLib for uploading files
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-27 17:39:45 +02:00
Cris 5904d7f455 Added FILE UPLOAD functionality to AjaxLib
Files can be uploaded now by passing a FormData object or a FileList.
The extra HTTP request option parameters processData and contentType
(important for fileupload) are added and set to false.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-27 17:26:58 +02:00
FHBGLD e4f6496387 Update gemeinde.class.php 2021-04-27 14:37:32 +02:00
manu 14434e8421 auf Stand feature-12646/LVVerwaltungOEundFilterAnpassen vom 26.4. gebracht: Adaptierungen Berechtigungen 2021-04-26 09:40:47 +02:00
manu 4425cf9712 Adaptierungen Codesniffer 2021-04-26 08:40:28 +02:00
manu 5d25298045 Adaptierungen Übersichtsliste Lehrform, Lehrtyp 2021-04-23 15:02:22 +02:00
Cris 3a9704563f Adapted JOB sendMailToSTGL to send mail only if Anrechnung not already processed
Job gets all yesterdays Anrechnungen, that did not process further than
first status. (If Anrechnung is new, but STGL already
started the process yesterday, he does not need to be informed about
this new Anrechnung anymore)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-22 15:52:46 +02:00
OliiverHacker 6ddc912cb3 uncomment uid 2021-04-22 14:23:10 +02:00
OliiverHacker 197accbb02 Add Titel to Projektexport 2021-04-22 13:47:01 +02:00
manu 12d1dafa9f Klasse lehrmodus.class.php adaptiert 2021-04-22 12:22:25 +02:00
manu d6e8b79ce3 Spalte Lehrmodus zu Übersichttabelle hinzufügen 2021-04-22 12:20:46 +02:00
manu 398418515f neue Tabelle lehre.tbl_lehrmodus, neue Spalte lehrmodus_kurzbz in lehre.tbl_lehrveranstaltung 2021-04-22 09:58:53 +02:00
KarpAlex 5fa856c138 add erhalter kz to getByPerson method from Zeugnisnote_model.php 2021-04-22 01:02:32 +02:00
Cris cf58762a6b Fixed Bestaetigung checkbox in students VIEW to be checked if Anrechnung exists
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 19:05:40 +02:00
Cris 7b485053d9 Adapted DMSLib upload method to be accept field name from Controller
The fieldname represents the HTML uploadfile input name attribute, which
is given by the developer in the VIEW.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 18:46:51 +02:00
Cris 6dcb5e3a65 Adapted DMSLib download method to be more generic
DMSLib now extends FHC Controller to use its new method 'outputFile',
which sets HTTP headers and reads the file.
DMSLib uses now download function to accept params from Controller like
own filename or special disposition.
Loading document and retrieving file info is outsourced into own method
to be reusable.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 17:53:42 +02:00
Andreas Österreicher ada7cdfb58 Merge branch 'BUG-1731/Mitarbeiter_Verwendung_Datum' 2021-04-21 15:04:33 +02:00
Cris 731c5b9461 Added link 'Neuen Antrag anlegen' in STGL Overview Site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 13:37:43 +02:00
Cris 6dca00e4e5 Corrected query to retrieve only prestudentstatus 'students'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 18:45:43 +02:00
Cris dca828650a Adapted Bestaetigung Moodle link to open in new tab
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 16:51:18 +02:00
Cris bb0776a808 Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code
Moved code from Controller to Anrechnungmodel.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 16:41:25 +02:00
Cris 356435dbdd Added JS to create Anrechnungsantrag + Adapted TableWidget.js option
Adapted TableWidgets option 'rowSelectionChanged' to be able to directly
define rowSelectionChanged within particular JS file, if needed.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 16:28:46 +02:00
cris-technikum b7a6cefa36 Added Controller to create Anrechnungsantrag + Model Anrechnungbegruendung_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 16:00:14 +02:00
OliiverHacker a7482425ef fix inserst typos 2021-04-20 15:57:43 +02:00
Cris 5e77e252c7 Added GUI to create Anrechnungsantrag
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 15:54:16 +02:00
Cris f6f31f7efb Added Berechtigung 'lehre/anrechnung_anlegen' to create Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 15:49:08 +02:00
Andreas Österreicher f657ffe59d Liste der ganztägige Zeitsperren ohne Stundenangabe erweitert 2021-04-20 14:19:04 +02:00
Paolo 142ea9a1f4 Merge branch 'FHBGLD-master' 2021-04-20 14:10:22 +02:00
Paolo 9699de8c33 Removed commented code 2021-04-20 14:09:52 +02:00
Paolo 61fbb60492 Merge branch 'master' of https://github.com/FHBGLD/FHC-Core into FHBGLD-master 2021-04-20 14:07:07 +02:00
ma0048 bc7e3c5cc5 zgv ueberpruefung hinzugefuegt 2021-04-20 13:51:41 +02:00
manu 236a2f35d2 Query für lehre/lehrveranstaltung:begrenzt aktualisiert 2021-04-20 08:27:28 +02:00
Andreas Österreicher 3281e832ce Merge branch 'bug-3879/fehler_beim_akzeptieren_von_sonstigen_dokumenten' 2021-04-16 15:34:45 +02:00
Andreas Österreicher f3af4fd783 Merge branch 'feature-12598/Projektabgabe_SortierenNachDatum' 2021-04-16 15:27:43 +02:00
manu cbf3a696e4 Berechtigungen Lehrform und Lehrtyp für Assistenz 2021-04-16 15:01:14 +02:00
Andreas Österreicher abcbb0d81c Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen' 2021-04-16 13:41:27 +02:00
Andreas Österreicher a1f4c90deb Merge branch 'master' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-16 13:15:30 +02:00
Andreas Österreicher 08237bdb7f Changed fhcomplete.org Wiki Links to fhcomplete.info 2021-04-15 11:54:50 +02:00
cris-technikum 8730f28d91 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-15 09:53:15 +02:00
manu 5f511eaa3c codesniffer 2021-04-14 18:30:49 +02:00
manu 5fcb9d2b1e Erweiterte Suchoptionen 2021-04-14 16:11:50 +02:00
Cris 3d574c30b7 Adapted job sendMailtoSTGL: interval '24 hours' instead of '1 day'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-14 11:07:20 +02:00
manu 607f516d75 select und Filter um Organisationseinheit erweitert 2021-04-13 20:44:58 +02:00
Cris ca378ef13b Added header filter to all hidden table columns
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 17:35:55 +02:00
Cris b9955c14a6 Minor code changes for better maintainance
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 16:33:53 +02:00
Cris 7317623fbf Added jobs to send mails to students once per day (info approved/rejected)
. The jobs will send mails to students, whose Anrechnungen were
approved/rejected the last day.

. Removed former sendMailToStudent functions from Controllers.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 16:09:11 +02:00
KarpAlex 72b076c785 added repeat.png image for abgabetool 2021-04-13 13:25:42 +02:00
manu 33cf7580c3 Filter ohne FB und mit OE in ÜS 2021-04-13 12:09:04 +02:00
Cris b92260c1d5 Added Moodle-link to Anrechnungen-Prozessinformation
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 11:47:13 +02:00
Cris cb5037626b Minor change: Now using language phrase for 'maxZeichen'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 09:45:23 +02:00
Cris a70082f0e5 Usability: Added Pflichtfeld "Lesebestaetigung" to students VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-12 17:00:03 +02:00
OliiverHacker 456a4e2057 bugfix for datum validation 2021-04-12 11:52:01 +02:00
KarpAlex 1f02506eaf added phrase for Parbeitaktualität error 2021-04-10 04:09:29 +02:00
KarpAlex b29621354f - abgabetool: added zweitbetreuer mailto Link incl. icons
- Bewertunglink is not sent in Parbeit Enduploadmail if older Semester
- phrasesupdate Projektarbeitsbeurteilung: added female form
2021-04-10 03:55:05 +02:00
manu 07f483f3bf Ergänzung tablesorter 2021-04-08 19:13:19 +02:00
Cris b8768f997c Usability: Gendered StudentIn; Changed first table column to bold text - Students VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 14:44:00 +02:00
Cris 1008f6b8b3 Fixed DB errormessage in STGL Overview (related to added Ausbildungssemester)
The subquery was returning multiple rows. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 14:34:16 +02:00
Cris cbf4cd14e5 Added column 'Status' (last Anrechnungstatus) in FAS Anrechnung tab
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 13:15:11 +02:00
ma0048 88dbd77a95 bug gefixed, akzeptieren von mehreren sonstigen dokumenten nun ohne fehlermeldung moeglich 2021-04-08 09:43:36 +02:00
KarpAlex e254dfba54 Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen' of https://github.com/FH-Complete/FHC-Core into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-07 18:01:30 +02:00
KarpAlex c2f74b1bba - mail to Zweitbegutachter after student upload is only sent when it is the endupload
- removed comments
2021-04-07 18:00:10 +02:00
Cris 094b502862 Usability: Limited chars-length for 'Herkunft der Kenntnisse' / Added chars counter
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 17:17:53 +02:00
Cris 587796e374 Usability: Gendered StudentIn; Changed first table column to bold text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 15:52:06 +02:00
Cris fe4b70ba19 Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 15:50:05 +02:00
Cris bd2727fa02 Fixed: Now trimming text when copying lectors reason to STGLs reason for rejection
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:59:32 +02:00
Cris 343b7a3087 Adapted Controller to use library method getLectors()
...instead of redundant private method.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:59:13 +02:00
Cris b5ba81b26e Added fixed column width to tables
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:49:42 +02:00
manu 96ba02bd69 bst_zeit ins Downloaddokumentenarray übernommen 2021-04-07 09:55:55 +02:00
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +02:00
Andreas Österreicher 45a78b7700 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-04-06 16:56:53 +02:00
Andreas Österreicher f681827e5d Personalmeldung Formatierung von Dezimalwerten korrigiert 2021-04-06 16:56:19 +02:00
Cris 7c875d5f80 Usability: Added 'ZGV' to STGL and lectors Detail site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-06 14:48:08 +02:00
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +02:00
ma0048 acdfdc028b zgv beim master nur updaten wenn es sich um einen master handelt 2021-04-06 12:31:46 +02:00
ma0048 84e7d95e34 changed from select to links 2021-04-06 11:47:14 +02:00
OliiverHacker 48105425fc Edit Studienblatt in Englisch für AbbrecherInnen 2021-04-02 15:35:36 +02:00
Manfred Kindl 5bc0f544f9 Neuer Tablesorter 2021-04-02 14:02:01 +02:00
Manfred Kindl 38919da730 Attribut studienplan_regelstudiendauer ergänzt 2021-04-02 13:55:41 +02:00
Manfred Kindl 642561a67d Merge remote-tracking branch 'origin/master' 2021-04-02 13:47:22 +02:00
OliiverHacker 3644cc690c Put Checks from xml to xsl for Abbrecher 2021-04-01 21:28:27 +02:00
OliiverHacker 131ec0e33c change buchbar to zeitaufzeichnung 2021-04-01 18:29:19 +02:00
OliiverHacker 8a672780b2 Fix Typo in Anzahl MA 2021-04-01 18:13:58 +02:00
OliiverHacker 5cdc7f9542 Revert "impiment different text"
This reverts commit 9bf8d58a
2021-04-01 18:09:46 +02:00
OliiverHacker 3e7f75b43f fix merge conflic at dbupdate_3.3 2021-04-01 14:48:56 +02:00
OliiverHacker a6989fff11 Revert "impiment different text"
This reverts commit 9bf8d58a
2021-04-01 14:44:28 +02:00
Cris 5dafb3447b Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...to STGL and lectors Overview site

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-01 14:25:15 +02:00
Cris fdf53ea3eb Modified: Now user gets back error message if upload failes
...instead of hard program exit

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-01 14:15:02 +02:00
OliiverHacker c54e934db9 Revert "impiment different text"
This reverts commit 9bf8d58a
2021-04-01 13:49:01 +02:00
OliiverHacker d66fc6e493 Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-04-01 13:43:40 +02:00
OliiverHacker eb1dabfc03 Merge branch '9503/csvExportProjektÜbersicht' of https://github.com/FH-Complete/FHC-Core into 9503/csvExportProjektÜbersicht 2021-04-01 13:38:42 +02:00
OliiverHacker 1a75666f01 rollback before merge and keep Überlappend fix in Zeitaufzeichnung 2021-04-01 13:36:02 +02:00
cris-technikum 7fab658954 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-01 13:29:14 +02:00
KarpAlex 2493cc57d4 abgabetool lektorview: decreased header table height 2021-04-01 09:48:49 +02:00
Cris 68a0e45472 Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...to STGL and lectors Overview site

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-01 09:18:55 +02:00
KarpAlex 9120268290 moved down icon with quickinfo for Tokensend 2021-04-01 02:34:13 +02:00
KarpAlex 2850d0e5d8 "beautified" abgabetool page (lektorenansicht)
- moved Zweitbetreuer Text
- added icon with quickinfo for Tokensend instead of button with text
- disabled grading button and quickinfo instead of text for older Projektarbeiten
2021-03-31 23:45:17 +02:00
OliiverHacker c37fb8836d implement functionallity for phase 2021-03-31 19:14:01 +02:00
OliiverHacker 1b38b1adca add functionality of buchbar to project overview 2021-03-31 18:22:56 +02:00
OliiverHacker 09a5072a4a db update 2021-03-31 18:21:12 +02:00
ma0048 7f713670b5 fixed recht 2021-03-31 17:57:35 +02:00
ma0048 6c6a4f6cc2 fixed for student 2021-03-31 17:52:15 +02:00
Andreas Österreicher 803076d7d2 Merge branch 'feature-12337/nationenliste_sortieren' 2021-03-31 15:37:41 +02:00
FHBGLD 047129de67 Update CHANGELOG.md 2021-03-31 15:16:22 +02:00
FHBGLD c169aec155 Update CHANGELOG.md 2021-03-31 15:15:24 +02:00
FHBGLD 376f413d2a Update LDAPLib.php 2021-03-31 14:58:31 +02:00
Cris 132b5097ee Usability: Added column 'ZGV' to STGL and lectors Overview site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-31 13:56:52 +02:00
ma0048 9b57248007 zgv auch bei master uebernehmen 2021-03-31 13:12:20 +02:00
Cris d53d91d7d1 Usability: Added filterbutton 'Alle anzeigen, die auf Empfehlung von LektorIn warten'
The filterbutton was added to the STGLs Overview site.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 17:02:15 +02:00
Cris 9ee473d9bd Usability: Added Link to Anrechnungen in CIS LV Menu (for lectors)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 16:41:02 +02:00
cris-technikum 3366cf224b Merge branch 'master' into feature/Anrechnungen_NEU 2021-03-30 14:04:03 +02:00
Cris 7690a122b8 Refactored: Moved getAnrechnungstatusbezeichnung to AnrechnungLib
This method retrieves the Anrechnungstatusbezeichnung in the users language.
It is used multiple times -> moved to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 13:57:43 +02:00
Andreas Österreicher 96bdafbda8 Merge branch 'bugfix-12144/Bewerberstatistikmail_HTMLError' 2021-03-30 12:20:08 +02:00
OliiverHacker 016a9554b9 add null-check in zeitaufzeichnung.class because otherwise it ignores aktivitaet_kuzbz that is null 2021-03-29 19:00:44 +02:00
KarpAlex 5b369f7020 Zaugnisnote_model: added getByPerson method 2021-03-29 18:49:41 +02:00
Cris d183dda815 Fixed: Anrechnunglib returning values, Adapted error messages
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.

Adapted few error functions to be more generic and bilingual.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 18:48:26 +02:00
OliiverHacker 0bd89067f8 Überlappen Problem gefixed 2021-03-29 18:40:32 +02:00
Cris 287b961697 Fixed: Added serversite check on required form fields
After refactoring code to apply via AJAX call, required fields
have to be direclty validated in JS or on serversite. Now fixed by
checking on serversite.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 17:55:50 +02:00
Cris c455778731 Fixed: Added formatted download-document-link after application was done
After refactoring the code and doing the application via AJAX call, the
document-download-link must be created on ajax success. This was missing
and is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 17:50:19 +02:00
cris-technikum 2c091cd405 Fixed: Recommendation button was not enabled correctly after withdrawing approvement
Now, if approvment is withdrawn, the recommendation button is enabled again
ONLY if no recommendation was submitted until yet.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 13:05:27 +02:00
OliiverHacker b73c4aed03 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-03-29 11:05:49 +02:00
OliiverHacker b7cb8b27ce merge 2021-03-29 10:08:35 +02:00
OliiverHacker e4aca8c7e3 Merge branch 'feature-98/Feiertage_in_Urlaubstool' of https://github.com/FH-Complete/FHC-Core into feature-98/Feiertage_in_Urlaubstool 2021-03-29 10:02:48 +02:00
OliiverHacker 43f55ce52b überlappen fix 2021-03-29 10:00:56 +02:00
OliiverHacker 1599fedfce Merge branch 'master' into feature-98/Feiertage_in_Urlaubstool 2021-03-26 19:35:48 +01:00
OliiverHacker 3221252f70 Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-03-26 19:23:02 +01:00
OliiverHacker d2c4dd79d5 merge 2021-03-26 19:08:45 +01:00
OliiverHacker 0c429984b9 add new function to bisverwendung 2021-03-26 18:43:05 +01:00
Cris 279157b920 Added button to copy Empfehlungstext into reason textarea when rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 17:12:38 +01:00
Cris f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:51:11 +01:00
Cris faf253c159 Adapted to keep individual filters by opening views in new tabs
When Detail Views were opened within the same browser window, individual
filters of the overview site were lost when returning to the overview.
Fixed by opening detail views in new tab.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:41:41 +01:00
ma0048 e791e3267f link zur mail vorlage hinzugefuegt 2021-03-25 15:52:14 +01:00
manu 3359e2e972 Funktion checkDatum() aktualisiert 2021-03-25 15:45:09 +01:00
Cris 3ba4229eed Refactored Students View + Controller
. Now application is done via AJAX call.
. Now messages are returned to user instead of hard exits.
. Now formatting status on client side, not on serverside.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 15:06:47 +01:00
Manfred Kindl d4ef17c183 Merge remote-tracking branch 'origin/master' 2021-03-25 13:27:36 +01:00
Manfred Kindl 0c32ecac11 Umbenennung Inskriptionsbestätigung zu "Studienbestätigung" 2021-03-25 13:27:12 +01:00
KarpAlex 8f2ef521e7 changed Projektarbeitsbeurteilung phrase for thema criteria 2021-03-25 13:22:39 +01:00
Cris 4450f5a473 Removed unnessessary code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 12:14:26 +01:00
ma0048 23e502f02e mail vorlage hinzugefuegt 2021-03-25 10:44:11 +01:00
ma0048 17f085d352 projektbeurteilung download für studenten im cis hinzugefuegt
projektbeurteilungsbutton anzeige nur wenn beurteilung bereits abgeschickt wurde
2021-03-25 10:23:40 +01:00
KarpAlex a68dfc1c6c - Projektarbeitsabgabe: added Link to Projektarbeitsuebersicht to Zweitbegutachtermail
- updated abgabetool phrases
2021-03-24 22:49:34 +01:00
Cris 997f6f406b Fixed: Now application can only be done for actual study semester
Before student could apply for past study semester, which should not be
possible. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 17:16:17 +01:00
Cris 683e9ffdda Modified to request recommendation (+send mails) ONLY if LV has lectors
Modifications done for STGL Overview and Detailview

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 16:22:56 +01:00
KarpAlex 6ae8f00066 - Zweitbegutachter im Abgabetool angezeigt
- Tokenneuversand für zweitbegutachter möglich
2021-03-23 21:32:34 +01:00
manu a00009e49f Erweiterung function checkDatum() um Gültigkeitsprüfung 2021-03-23 16:43:14 +01:00
OliiverHacker 4e0dfbf28a change studienblatt if AbbrecherIn 2021-03-23 13:24:15 +01:00
ma0048 10441baff3 sortierung anhand kurztext 2021-03-23 09:34:49 +01:00
ma0048 287cddf926 added zgv ueberpruefung 2021-03-23 09:25:24 +01:00
Andreas Österreicher 989772402d LVA-Liste prüft die Vertragszuordnung jetzt pro Lehreinheit statt pro LV 2021-03-23 08:38:55 +01:00
Cris 3a0720e4de Changed: If LV has no lectors, show empty field instead of error message
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 17:28:29 +01:00
Andreas Oesterreicher 1113b833bd Zeitsperre Fixed CSS 2021-03-22 15:41:17 +01:00
OliiverHacker 9bf8d58ab2 impiment different text 2021-03-22 14:46:56 +01:00
OliiverHacker 711bac0f6c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into 9503/csvExportProjektÜbersicht 2021-03-22 14:44:52 +01:00
Cris 00656efaef Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname'
Adapted STGL and lectors views to change the filename on download event.
All download functions moved from view to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:12:04 +01:00
Cris 050eef120c Adapted download function in DMSLib to accept params filename and disposition
. Filename: uses given string as filename. Otherwise upload filename is used.
. Disposition: inline (open in new tab), attached (download dialog box)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:08:57 +01:00
KarpAlex fbb7b45b69 - added zweitbegutachterFehltWarnung phrase 2021-03-22 04:55:46 +01:00
Paolo 2c9ca77500 Fixed code indentation, standart output, includes path, removed unused
variables and added a check to mail send where missing
2021-03-18 19:14:56 +01:00
OliiverHacker 4c0c6aa6cd bugfix reload projekt 2021-03-18 12:04:28 +01:00
cris-technikum 983ff1b16e Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-03-18 11:43:42 +01:00
cris-technikum 41e8b4094e Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU 2021-03-18 10:58:57 +01:00
Cris 9b396eea4e Added columns Organisationsform and Ausbildungssemester to STGL Overview table
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-18 10:57:49 +01:00
Cris d345cbb43b Added 'Zurücknehmen'-button for recommendation in STGL Detail View
Requested recommendations can now be withdrawn.
Now a button 'Zurücknehmen' is displayed as long as the Anrechnung
is processed by the lector and only as long the lector has not provided
a recommendation.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-18 10:55:58 +01:00
Cris 7340564d1e Added job to send mail to STGL with yesterdays new Anrechnungen
. added AnrechnungJob sendMailToSTGL()
. removed functions to send mail from CTRL

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-16 17:42:46 +01:00
KarpAlex 95c5a9c475 added UNIQUE constraing to zugangstoken column of lehre.tbl_projektbetreuer 2021-03-15 23:48:00 +01:00
KarpAlex ee7d51d2b3 Pruefung_model.php: method for retrieving Prüfung by person and studiensemester 2021-03-15 23:27:28 +01:00
KarpAlex 2ef2a906c3 - Projektarbeitsbenotung (abgabe_lektor_details.php): benoten button only shown when semester > SS2021
- updated phrases for text showing if older semester
2021-03-12 09:46:27 +01:00
KarpAlex 73525c94ab uid of student instead of logged in user is passed to sancho infomail 2021-03-11 12:42:18 +01:00
ma0048 3db9b9abee added projektbeurteilung pdfexport 2021-03-09 14:13:55 +01:00
Andreas Österreicher e33eb2e9a9 Zeitraumabfragen für Projektphasen korrigiert 2021-03-09 13:23:56 +01:00
ma0048 fb7835de57 added new zeitwuensche permission 2021-03-08 12:53:59 +01:00
KarpAlex 5f187b5293 Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-03-07 21:44:56 +01:00
Andreas Österreicher 5da754c9db Anmerkung bei Lehreinheitmitarbeiter verschoben 2021-03-04 07:59:38 +01:00
KarpAlex 5b546d25a8 - abgabe_student_details.php: added reply to and other header/footer to sancho Endupload mails
- sancho.inc.php: enabled reply-to and passing of footer image
2021-03-04 00:04:47 +01:00
KarpAlex 6bb9c77ca1 abgabe_student_details.php: Mail to Erst- and Zweitbegutachter is a sancho mail 2021-03-03 10:43:37 +01:00
KarpAlex edf657fdb9 abgabe_student_details.php: Mail with link (and possibly token for second assessor) to project assessment is sent with final upload to first and second assessor. 2021-03-03 00:00:51 +01:00
Cris 9ba6f3b538 Fixed HTML code appearing within mail message body
. by breaking lines with \n
. using nowrap to avoid breaking text

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-02 15:44:46 +01:00
Nikolaus Krondraf 9cbcec7231 Fallback-Lösung für LV-Regel wenn im aktuellen Semester kein Status vorhanden ist 2021-03-02 15:26:44 +01:00
KarpAlex 9677a5a4fd - BenutzerModel: added comment for getFromPersonId method
- UPDATE permission for web for tbl_projektbetreuer added
- added phrase for Zweitbegutachter - link
2021-03-01 09:33:14 +01:00
Andreas Österreicher 8bd148f7e5 Hinweistext für Zahlungen angepasst 2021-02-26 15:01:23 +01:00
OliiverHacker 95c2e4bf9c fix true false 2021-02-26 00:25:59 +01:00
Andreas Österreicher 54286a7e6c Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-02-25 15:49:52 +01:00
Andreas Österreicher d9cbea680e Fixed Loading of AZG Relevant Checkbox in FAS
Fixed missing Column Warning in DB Update
2021-02-25 15:25:41 +01:00
Andreas Österreicher 8086501d04 Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig 2021-02-25 14:43:06 +01:00
Andreas Österreicher 6f27fccc09 - Corrected Permissions for Anrechnungen
- Removed Useless Sequence
2021-02-23 17:55:41 +01:00
cris-technikum 616cfaaf41 Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-23 14:21:47 +01:00
Cris 83b1286e08 Added column Antragsdatum to STGL/Lector Overview
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-23 14:21:21 +01:00
Cris 6446e424a9 Fixed: Now all buttons have a type (button / reset)
+ belonging adaptations in JS:
. removed e.preventDefault as no longer needed with button type=button
. removed empty text value settings with button type=reset

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-23 11:27:03 +01:00
Andreas Österreicher 581a4c33a4 Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit' 2021-02-23 08:48:30 +01:00
Andreas Österreicher cb4f22141d Merge branch 'feature-11142/Reihungstest_aufgenommene_bei_Neupriorisierung' 2021-02-23 08:36:53 +01:00
Cris 4ebd5a85bb Avoided click event bubbling for nested buttons
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-22 16:12:15 +01:00
cris-technikum cf5ee6afa3 Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-22 16:05:50 +01:00
Andreas Österreicher 4d041023a8 Problem beim Speichern der Lektorenzuordnung behoben wenn Semesterstunden leer sind 2021-02-22 08:49:52 +01:00
Andreas Österreicher f208fbcd4b Merge branch 'feature-11869/testtool_sprache_und_sprachwahl' 2021-02-19 17:15:00 +01:00
Andreas Österreicher d69083eba2 Fixed Typo in Demo Page 2021-02-19 17:13:53 +01:00
Andreas Österreicher b44853d536 Merge branch 'master' into feature-11869/testtool_sprache_und_sprachwahl 2021-02-19 17:13:25 +01:00
Andreas Österreicher ad9de97a8c Merge branch 'feature-10816/log_download_bescheid' 2021-02-19 16:23:07 +01:00
Cris 9a3addd79d Removed comments on 'if (! defined('BASEPATH')) exit('No direct script access allowed');'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 14:59:11 +01:00
Cris 2723e130f0 Fixed repeating grant privileges on tbl anrechnungstatus to web user
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 14:53:03 +01:00
Cris 4b3cf019c3 Fixed flickering popup massage preventing approving AFTER withdrawing a rejection
This happened because of a conflict between HTML forms native submit behaviour
(automatically refreshing page) and our javascripts submit onclick functions.
Now fixed by setting event.preventDefault() within the js functions.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 13:56:15 +01:00
Cris 6d3407c309 Reset deleted filter button in STGL overview (show recommended)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 09:42:16 +01:00
Cris ce2deb32e1 Deleted testuser
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 09:32:46 +01:00
KarpAlex eb95421ff9 ReihungstestJob.php: formatted sql 2021-02-18 04:26:54 +01:00
KarpAlex 20413b1b03 abgabetool: replaced link in CIS to redirect to new Beurteilungsformular 2021-02-18 01:53:57 +01:00
cris-technikum b5c9567c01 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
# Conflicts:
#	public/js/lehre/anrechnung/approveAnrechnungDetail.js
2021-02-17 19:09:09 +01:00
Cris abcf41f7a3 Added feature to withdraw approvals/rejections for STGL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-17 19:07:13 +01:00
Cris d9d71c42ce Added feature to withdraw approvals/rejections for STGL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-17 18:54:53 +01:00
Andreas Österreicher 577d0f1eb5 Fixed Filename 2021-02-17 15:21:38 +01:00
ma0048 935b370166 added filter for bachelor and master 2021-02-17 15:07:09 +01:00
Andreas Österreicher 0993b94507 Anrechnungen Tooltip korrigiert bei STGL Filter 2021-02-17 11:44:35 +01:00
Andreas Österreicher a02d581d0a Merge branch 'feature/Anrechnungen_NEU' 2021-02-17 08:49:24 +01:00
Paolo 94d335600c - Added new protected method getOldestJob to JQW_Controller
- Added new public method getOldestJob to JobsQueueLib
2021-02-16 21:21:11 +01:00
Cris 734db4a2a8 Granted Web User for tbl_anrechnung_status; Added Sequence Anrechnung Status
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 18:22:00 +01:00
Cris 241fb34b23 Added filter button to STGL Overview (filter: show all progressed by STGL)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 18:04:27 +01:00
Cris 1ca22970a9 Adapted: Show only applications that were requested for recommendation
Change in lectors overview.
Now lectors only get Anrechnungsanträge, where the STGL had requested
a recommendation.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 17:37:14 +01:00
Cris 86a065d0d6 Fixed: Now checking user by prestudent_id to entitle to read DMS document
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 16:31:42 +01:00
Andreas Österreicher fec8fbb6d4 Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts 2021-02-16 09:46:50 +01:00
Andreas Österreicher 3366f091dd Anrechnungen - Fixed Details Page for People with multiple Accounts 2021-02-15 21:12:14 +01:00
Andreas Österreicher 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden 2021-02-15 16:44:34 +01:00
Andreas Österreicher 6522def7a2 Merge branch 'feature/Anrechnungen_NEU' 2021-02-15 11:44:07 +01:00
Cris acec92fa2b Adapted mail message for students (different text for approved/rejected)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-15 11:26:59 +01:00
OliiverHacker bf1686e253 display Holidays in Datepicker 2021-02-15 11:11:54 +01:00
ma0048 38220ab772 Logeintrag beim Downloaden eines Bescheides 2021-02-15 08:11:37 +01:00
KarpAlex da4e913a38 ReihungstestJob.php:
- studiensemester is passed as parameter
- info mail is sent to lower priority when higher priority is cancelled (abgewiesen)
- info mail is sent to master studiengänge as well if higher prio is cancelled/aufgenommen and there are other bachelor prestudenten in same semester
2021-02-13 00:37:33 +01:00
Andreas Österreicher 2973c9e856 Merge branch 'feature/Anrechnungen_NEU' 2021-02-12 16:14:59 +01:00
Andreas Österreicher bff6307a62 Anrechnungen
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
2021-02-12 15:52:26 +01:00
Cris d44c526ba4 Minor changes
. phrases
. GUI

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 16:37:44 +01:00
Cris 6dea79180c Adapted tables' boolean headerfilter to be used with strings
i.e. entering 'yes' will filter all truish entries

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 16:06:20 +01:00
ma0048 ea45ce9934 Sprache und Sprachwahl fixed, wenn kein Studienplan verfügbar ist.
Ablauf_ID wird nun mitgeschickt
2021-02-11 11:57:45 +01:00
Cris c23a3bdac9 Fixed button breaking line in smaller devices; now all buttons inline
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 11:52:57 +01:00
Cris eaf902c528 Adapted tooltips for Students VIEW, minor change of phrase text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 11:36:38 +01:00
cris-technikum 41f8a0e3b3 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
# Conflicts:
#	system/phrasesupdate.php
2021-02-10 18:31:26 +01:00
Cris c0843e9506 Translated STGL and Lectors VIEW to English
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-10 18:25:48 +01:00
Cris 3cbb1b5c95 Translated STGL and Lectors VIEW to English
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-10 17:26:25 +01:00
Cris c82ebaf678 Translated Students VIEW to English
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-09 16:31:32 +01:00
Cris 81151025da Fixed non-existing phrases
. anrechnungNichtEmpfehlenAsk
. empfehlungNegativ

The phrases did not exist anymore, they got new name. Now fixed.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-09 14:54:32 +01:00
Cris d1537df896 Fixed: Now Nachweisdokument- and Detail-Links clickable after table update
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-09 14:36:29 +01:00
cris-technikum 3eecd74b1f Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-09 10:54:28 +01:00
cris-technikum 6e689ce657 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-02-09 10:53:41 +01:00
Andreas Österreicher 8a3096edf1 Merge branch 'feature-11841/studiengang_dropdown' 2021-02-09 08:06:51 +01:00
Andreas Österreicher a39256d21d Merge branch 'feature-11575/anzahl_der_markierten_personen' 2021-02-09 08:03:41 +01:00
KarpAlex 544def7f5a - Organisationseinheit Dropdown in zeitaufzeichnung is limited by funktionen, only dizipl. Zuordnung, standardkostenstelle Zuordnung and funktionale Zuordnungen are shown 2021-02-09 04:41:14 +01:00
Cris c69188dffe Corrected typos in name that caused button not being disabled
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 18:25:27 +01:00
Cris 17ae1b144c Corrected: Now correct text for confirmed positive recommendation
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 18:13:50 +01:00
Cris 2a59d2464b Uncommented tooltips for genehmigung/empfehlung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 18:07:40 +01:00
Cris 77774e8cec Corrected STGL permission check to check against UID
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 18:01:06 +01:00
Cris 00799f2f64 Adapted: Ordered Notizen to retrieve last inserted first
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:35:34 +01:00
Cris 25400d8b5f Removed updateamum/updatevon when updating Anrechnungmodel
They are not needed. Just confusing.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:25:34 +01:00
Cris 494cf1f688 Changed style & flow of approve/reject/recommend/dont recommend
This was done for better clarity in workflow.
Now, when clicking on approve/reject/recommend/dont recommend - button,
this will always lead to second panel. In that one the user may leave
a reason, but in any case the user need to CONFIRM (or break) the action.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:19:58 +01:00
ma0048 8c666ceef2 Studiengang Dropdown angepasst 2021-02-08 17:09:34 +01:00
OliiverHacker d84da96669 display Feiertage and Wochenenden 2021-02-08 09:57:08 +01:00
KarpAlex fd79551f00 - Pruefungsprotokoll bugfix: replaced bitwise and with logical and 2021-02-04 20:37:05 +01:00
Andreas Österreicher 253ffa7e93 Hinweistext bei Zahlungen hinzugefügt 2021-02-04 17:53:57 +01:00
Cris be5ff3f122 Changed CIS menu title and icon for Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 17:11:36 +01:00
Cris c8ceacc972 Added checks if user is entitled to read DMS document / Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 17:05:05 +01:00
Cris 071a6a4ee6 Added tooltips (Upload info, Read Infoboxen-info)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 15:42:26 +01:00
Cris 4a8fa95a3a Changed: Now infobox color is blue and icons are info-icons
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 15:36:12 +01:00
KarpAlex 1f88bfae40 - Projektbetreuer Model: added getBetreuerByToken method
- phrasesupdate: added new Projektarbeitsbeurtielung phrases
2021-02-04 11:21:40 +01:00
Cris cfc3b4f985 Corrected: Added space to be able to disable textarea
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 11:04:20 +01:00
Cris e6da4b2e2d Minor changes
- unfold 'Antrag Voraussetzungen' in Infopanels
- open Detailpage on same page (not on new tab)
- unified sancho mails titles

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:56:03 +01:00
Cris e9664c179a Added Genehmigungs GUI + Begreundungsnotiz for rejected Anrechnungen in STGL VIEWS
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:24:08 +01:00
Cris 52450561fd Added method getApprovedOrRejected() to Anrechnung Model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:20:10 +01:00
ma0048 5abac91058 Anazahl der markierten Personen hinzugefügt 2021-02-04 09:50:05 +01:00
Andreas Österreicher fc8df1b10d Wording korrigiert im CIS Profil 2021-02-04 07:56:18 +01:00
Cris d380e6ac49 Added change of status in lectors Detail GUI
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 16:22:19 +01:00
Cris a3c33ed385 Added change of status when STGL requests for recommendation
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 16:21:15 +01:00
Cris 5a8c779bcd Corrected URI and permissions
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 16:18:06 +01:00
Cris 110f05b91c Corrected empfehlung_datum
Now the query uses the correct status kurzbz 'inProgressDP'.
This is because the date the lector sends the recommendation (=empfehlung_datum),
the status is changed to inProgressDP and the insertamum is set there.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:43:14 +01:00
Cris 5e1bbfe718 Minor change to InfoPanels
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:32:42 +01:00
Cris e780a3e505 Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:30:53 +01:00
Cris 0affbf4e41 Added param to calling function rejectAnrechnung to work properly
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 14:53:40 +01:00
Cris 5109828772 Adapted STGL overview: info/begruendungsangabe when approving/rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 12:59:46 +01:00
Cris 39016b873f Adapted STGL overview: info/begruendungsangabe when approving/rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 12:41:26 +01:00
Cris 1c0c8e9ad4 Hided empfehlung/begruendung panels in lector overview after sending recommendation
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 12:37:48 +01:00
Cris 9790fc650b Adapted lector overview to slide in/out info when recommending
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:13:05 +01:00
Cris ec16354594 Adapted Controller for lector Details to process Empfehlungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:03:58 +01:00
Cris 8b6f0f56af Corrected not collapsing 'Fristen' in Infopanels
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:02:26 +01:00
Cris b13fb0cda8 Added lector Detail GUI to retrieve and process Empfehlungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:01:02 +01:00
Cris 5235915d6a Changed method getNotizByAnrechnung() -> added param titel
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 10:57:27 +01:00
Cris b8046aeccf Added insertvon when saving new Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 10:55:46 +01:00
Cris 297c96c3e5 Changed method getLastAnrechnungstatus() -> added param status_kurzbz
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 10:53:51 +01:00
Cris 8fc338ccb4 Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-02 14:06:49 +01:00
Cris da3720e65d Added lectors detail view CONTROLLER
+ adaptations to AnrechnungLib
+ phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-01 10:11:57 +01:00
Cris a0658a61c3 Added lectors Detail VIEW to review and recommend Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-01 10:10:55 +01:00
Cris a218b36323 Added getUID() by prestudentID - method to Prestudent Model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-01 10:03:18 +01:00
Andreas Österreicher fcf15c410e Merge branch 'master' into feature-9612/Casetime_Zeitwarnungen_differenzieren 2021-01-29 15:32:49 +01:00
Andreas Österreicher c6f6a626d3 Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen 2021-01-29 15:30:58 +01:00
Andreas Österreicher 5b3daa76df Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig 2021-01-29 15:30:22 +01:00
Andreas Österreicher 1ea521e858 Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-01-29 15:28:41 +01:00
Cris 907ecca333 Added coloured status alert in students view
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-29 11:55:27 +01:00
Cris 70d02e25f9 Removed doublecheck of last status
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-29 11:54:52 +01:00
Cris 8ba7744acb HOTFIX: Removed test-UIDS!
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-29 08:23:25 +01:00
cris-technikum f3feb53438 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-01-29 08:04:20 +01:00
cris-technikum 02e4004300 Merge branch 'master' into feature/Anrechnungen_NEU 2021-01-29 08:02:04 +01:00
cris-technikum ea7d0692b9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-01-29 08:01:15 +01:00
Cris 106cbe8194 HOTFIX: Removed test-UIDS!
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-29 07:59:24 +01:00
Cris aff6e2ed8a Changed: Now "Herkunft der Kenntnisse" are required
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 19:38:59 +01:00
Cris ce794d0e54 Added important help text for students view regarding applying correclty
German only. English will follow.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 18:55:02 +01:00
Cris 14d1762c9f Changed email links to correct CIS URL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 16:52:14 +01:00
Cris bd293f3b3a Changed mail text to inform students about approved/rejected Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 16:04:21 +01:00
KarpAlex c3f24f3038 - Projektarbeitsbeurtielung: added app Projektarbeitsbeurteilung and phrases for Projektarbeitsformular 2021-01-28 13:03:18 +01:00
Cris 8d09ee7299 Modified to update Zeugnisnote, if already exists
During approving process the zeugnisnote is set to 6 (angerechnet).
If zeugnisnote already exists, it will be updated now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 11:28:44 +01:00
Cris 6a37c71cfc Added sending Sanchomail to lector asking to recommend Anrechnung
Mails are send to lectors (prio for LV-Leitung, if not present to all
lectors of LV) Anyway, as many there recommendation may be requested
for many lvs at the same time, the receiver array will be unique to ensure
sending only once to one and the same lector. e.g. if lector is lv-leitung
for lv x and lector for lv y, will get only one mail.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 10:21:56 +01:00
Cris 35009097f1 Added sending Sanchomail to student when Anrechnung was approved/rejected
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 14:49:30 +01:00
Cris 697e5057cf Added sending Sanchomail when Anrechnung is (not) recommended by lector
Mail goes to STGL. If not present, it will be sent to STGL assistance.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 11:37:51 +01:00
Cris 3fb2c3d387 Added Sanchomail sent when Anrechnung is applied by student
Mail goes to STGL. If not present, it will be sent to STGL assistance.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 10:33:19 +01:00
Cris 8a75bc9fdd Added method getFullName() to Person_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 18:54:42 +01:00
Cris db10f78505 Added method getLeitung() to Studiengang_model to retrieve STGL by studiengang_kz
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 18:52:28 +01:00
Cris 82780e9626 Added column "Herkunft (der Kenntnisse)" to STGL and lectors VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 15:39:18 +01:00
Cris e06a6768a4 Changed text as required in Students Anrechnung' View
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 15:26:16 +01:00
Cris 3f3d7aa7d7 Changed lektors status text to 'Empfehlung angefordert'
...to make status in process more understandable.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 13:57:57 +01:00
Cris 7d0ff4fcee Added check, when STGL tries to request recommendation for already recommended Antraege
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 13:56:34 +01:00
Cris 5b77a5d08f Restricted to upload only pdf files
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-25 18:23:59 +01:00
Cris aefd0842db Added tooltip for unselectable Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-25 18:18:13 +01:00
Cris 1b00ae78b4 Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-25 17:07:39 +01:00
Cris 0da2c6a74c Changed tabulator requiredPermissions for STGL Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 14:41:46 +01:00
cris-technikum 0bf0c2a152 Merge branch 'master' into feature/Anrechnungen_NEU 2021-01-21 14:07:40 +01:00
cris-technikum 71b8122a20 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-01-21 14:06:58 +01:00
cris-technikum 2359592032 Merge branch 'master' into feature/Anrechnungen_NEU
# Conflicts:
#	application/libraries/AnrechnungLib.php
#	application/views/lehre/anrechnung/requestAnrechnung.php
#	system/dbupdate_3.3.php
#	system/phrasesupdate.php
2021-01-21 14:06:03 +01:00
Cris 0528ae3eb9 Added uebernahmedatum and benotungsdatum to zeugnisnote
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 13:39:31 +01:00
Cris dc98b766c9 Now filtering / formatting correctly the updated data
...by adding status_kurzbz to returning json object

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 12:50:07 +01:00
Cris fd5b68d3b8 Set persistent layout and persistent sorting to STGL Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 12:21:31 +01:00
Cris 8a03ccab5d Visibly greyed rows that are unselectable (at start and on update)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 11:19:11 +01:00
Cris 99db4ec3ce Adapted empfehlung to be human readable
ja/nein/- instead of boolean/null

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 11:08:57 +01:00
Cris 47c8432faf Added filter buttons to STGL Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 10:51:22 +01:00
Cris 9e5b03b2dc Adapted Select-all-button to select only Anrechnungen progressed by STGL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 19:16:17 +01:00
Cris 97d86cc702 Added logic & GUI adaptations for requesting recommendations
. Added request recommendation-methods in Controller and Library

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 19:07:33 +01:00
Cris 3a285c5672 Added status inProgressLektor
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 19:05:56 +01:00
Cris 9a0ea02e0c Minor code enhancement
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 19:03:53 +01:00
Cris a09abfd70c Added Zeugnisnote = 6 (angerechnet) when Anrechnung is approved
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 15:14:31 +01:00
Cris 114ac7a69e Corrected Personenkennzeichen: students matrikelnr instead of person bpk
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 13:40:33 +01:00
Cris 1bd66d0ee2 Corrected: No genehmigt_von and update info when Anrechnung is rejected
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 13:15:28 +01:00
Cris f0ef091c5f Added logic & GUI adaptations for rejecting Anrechnungen
. Added rejecting-methods in Controller and Library

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:48:07 +01:00
Cris 046f807788 Added ECTS to tabledata
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:06:53 +01:00
Cris 4ed786d65a Added promise check (browser compatibility) and redrawing table on resize
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:03:47 +01:00
cris-technikum 964bd40c14 Added logic & GUI adaptations for approving Anrechnungen
. Added approve-methods in Controller and Library
. Added row selection checks to avoid selecting approved and rejected
Antraege

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:02:15 +01:00
OliiverHacker 943961127f implement checkbox 2021-01-19 16:15:03 +01:00
Cris 403304e1a7 Adapted CSS: Red button for rejecting, blue for approving
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:56:34 +01:00
Cris 360aec41ee Restricted tabledata to retrieve only for studies of STGL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:47:31 +01:00
Cris 8d26cc9a86 Added permission lehre/anrechnung_genehmigen to Controller
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:45:04 +01:00
Cris 1a050adea4 Added permission to DB: lehre/anrechnung_genehmigen and lehre/anrechnung_empfehlen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:42:08 +01:00
Cris b5dd85f2a6 Created Anrechnungen STGL: GUI, Controller, Tabledata, Phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 14:43:32 +01:00
OliiverHacker 8441345d7a add azgrelevant to save method in bisverwendungclass 2021-01-19 13:22:47 +01:00
Cris f185c92db7 Created Anrechnungen Students GUI, Controller, DB-tables, library, phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 13:03:26 +01:00
Cris c0952af290 Corrected default value for empfehlung_anrechnung to be nullable
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 08:27:59 +01:00
Cris 4df012798f Changed bpk to Matrikelnummer
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 15:09:01 +01:00
Cris e04e584410 Added Anrechnungsdatum
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 15:08:16 +01:00
Cris 3ffc5c7d3f Deactivated application deadline
Deactivated application deadline by setting checking variable
is_expired to false. This is to keep the logic for a later time when the
application deadline is going to be defined.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 13:59:29 +01:00
Cris 0edccc299c Deleted js-file - not needed by now
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 13:52:26 +01:00
Cris 4e0fd56d99 Corrected empfehlung default value
Now default value is empty instead of false, as there are 3 different
stati to retrieve
1. null = no recommendation at all (default)
1. true = recommended
1. false = not recommended

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 13:45:11 +01:00
Cris de5c67d2f1 Devided methods getAnrechnungData and getAnrechnungDataByLv
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 13:41:46 +01:00
Cris b6f5bc2703 Added phrases for Anrechnung beantragen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 15:27:44 +01:00
Cris 0d546dc0c0 Renamed POST parameter lv_id, studiensemester
...to stay consistent

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 15:24:26 +01:00
Cris 67c130f9c1 Included Anrechnung beantragen into CIS Menu
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 15:22:20 +01:00
Cris aff838d3c3 Fixed typo studiensemester in AnrechnungLib
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:55:42 +01:00
Cris a1dfd3f598 Created new model Anrechnungstatus_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:21:53 +01:00
Cris dc84c91dae Added methods saveAnrechnungstatus() and getLastAnrechnungstatus()
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:21:00 +01:00
Cris 85ec64876d Changed permission to student/anrechnung_beantragen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:18:28 +01:00
Cris 091d921efa Redesigned and adapted GUI
Added download, alerts, new layout and styles that fit better to new
adaptations and to other GUIs.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:16:53 +01:00
Cris b57a3ec90f Added logic to download and open a document
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:13:17 +01:00
Cris 5af134312c Added logic for uploading file and saving anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:12:08 +01:00
Cris 3116d4c7c9 Adapted index method and library(deadline, status, refactored code, lib functions)
- Check if application deadline is expired
- Refactored retrieving Anrechnung data (reusable)
- Adapted status for student view (new, in progress)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:09:33 +01:00
KarpAlex 98deb3d2a0 moved creation of tbl_projektarbeitsbeurteilung to FHC_Core_Abschlusspruefungsbeurteilung extension 2021-01-14 10:32:42 +01:00
Cris 44e8bd57b0 Set default value to NOW() for insertamum in lehre.tbl_anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 10:00:44 +01:00
Cris 78e4edd590 Added permission student/anrechnung_beantragen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 08:36:53 +01:00
KarpAlex 254dad8700 db changes for projektarbeitsbeurteilung
- added lehre.tbl_projektarbeitsbeurteilung
- added columns zugangstoken, zugangstoken_gueltigbis to lehre.tbl_projektbetreuer
2021-01-13 21:15:44 +01:00
Cris 47f66644ef Added Bezeichnung 'berufliche Praxis' to Anrechnungbegruendung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-13 14:55:50 +01:00
Cris 2454104cc3 Changed datum type from timestamp to date in tbl_anrechnung_anrechnungstatus
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-13 14:37:55 +01:00
KarpAlex 57722553ec - new funktion type kstzuordnung for cost center assignment in public.tbl_funktion 2021-01-13 00:05:03 +01:00
Cris 5cd163819d Added upload function to DmsLib
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-11 15:24:12 +01:00
Cris 1fefffcab3 Added / Adapted DB for Anrechnungen
- Added column dms_id, studiensemester_kurzbz, anmerkung_student und
empfehlung_anrechnung in tbl_anrechnung
- Changed genehmigt_von and begruendung_id to be NULLABLE in
tbl_anrechnung
- Added DMS category "anrechnung"
- Added DMS category permissiongroup for DMS category "anrechnung"
- Add table anrechnung_status
- Added table anrechnung_anrechnungstatus
- Für bestehende genehmigte Anrechnungsanträge wird ein Eintrag mit dem
Status 'approved' angelegt

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-11 13:43:57 +01:00
Cris 04174d35f5 Added Anrechnungsdata (student, lv and lectors of lv)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-05 12:19:27 +01:00
Cris fb29dc1e0e Added method getLvByStudent() to Lehrveranstaltung_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-05 12:17:41 +01:00
Cris 8309dfb3ca Created CONTROLLER Anrechnungen for students (CIS)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-12-22 16:00:07 +01:00
Cris e7d9d8859c Created VIEW Anrechnungen for students (CIS)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-12-22 15:43:44 +01:00
cris-technikum 5dbad37416 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>

# Conflicts:
#	locale/de-AT/global.php
#	locale/en-US/global.php
2020-12-21 15:54:18 +01:00
OliiverHacker d62b1bead4 change table 2020-12-21 09:27:23 +01:00
OliiverHacker 30960adf81 fix typo in query 2020-12-21 08:55:33 +01:00
OliiverHacker c3ab40282b add azgrelevant column and alter zeitaufzeichnung column in bis.tbl_bisverwendung 2020-12-16 16:39:43 +01:00
OliiverHacker 74c12372c8 also hide hours on edit 2020-12-15 13:17:23 +01:00
Andreas Österreicher 7fdadc48cf Merge branch 'master' into 9503/csvExportProjektÜbersicht 2020-12-15 09:48:42 +01:00
OliiverHacker 15d15faf8a Zeiteneintragung nicht möglich wenn zuvor Projektübersichtexport angeklickt wird 2020-12-03 11:49:11 +01:00
cris-technikum 3cf6e338d7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2020-12-03 10:33:05 +01:00
OliiverHacker 47d7a4688f Zeiterfassung: Zeitausgleich und Krankenstand nur ganztägig eintragbar 2020-12-02 15:16:07 +01:00
OliiverHacker c33856ee50 Zeitsperren: User bekommt Warnhinweis bei auffällig langem Zeitraum 2020-12-02 12:57:54 +01:00
OliiverHacker a8227e1f91 Zeiterfassung: Tagesübergreifende Einträge verhindern 2020-12-02 11:58:51 +01:00
OliiverHacker 32a174d836 Zeiterfassung: Eintraege in der Zukunft 2020-11-30 11:09:49 +01:00
Cris 442cd67d08 Changed COVID page text, Removed placeholder in COVID textarea
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-11-30 11:01:09 +01:00
alex ace636ef52 workerqueues (JQW_Controller and JobsQueueLib.php): added getJobsByTypeStatus method 2020-11-27 03:03:37 +01:00
alex 3c2fdc1991 added Aufenthaltsfoerderung_model 2020-11-25 16:31:13 +01:00
Cris 34e3756d74 Mitarbeiter zusammenlegen entfernt / Extension-Tabellen auf Vorhandensein pruefen
- Mitarbeiter zusammenlegen entfernt.
- Bevor Personen auch in extenstions zusammengelegt werden: pruefen, ob
die entsprechenden Tabellen existieren. (diese sind nur vorhanden, wenn
extensions FHC-Core-ALMA, FHC-Core-SAP installiert sind)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-11-18 13:14:59 +01:00
cris-technikum 60963c691b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen 2020-11-17 12:20:22 +01:00
Cris 4cbbd662b6 Automatisch Personen in tbl_sap_mitarbeiter zusammenlegen
Wenn doppelt angelegte Personen zusammengeführt werden, wird nun ggf auch
in der Tabelle tbl_sap_mitarbeiter die hinterlegte Person upgedatet.
Ausnahme: wenn in der tbl_sap_mitarbeiter die Person auch schon doppelt
angelegt ist. In diesem Fall gibt es ein exit mit der Aufforderung, dies
direkt (manuell) in der tbl_sap_mitarbeiter zu ändern.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-11-16 17:48:24 +01:00
Cris adb96ed33f Automatisch Personen in tbl_sap_students zusammenlegen
Wenn doppelt angelegte Personen zusammengeführt werden, wird nun ggf auch
in der Tabelle tbl_sap_students die hinterlegte Person upgedatet.
Ausnahme: wenn in der tbl_sap_students die Person auch schon doppelt
angelegt ist. In diesem Fall gibt es ein exit mit der Aufforderung, dies
direkt (manuell) in der tbl_sap_students zu ändern.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-11-16 17:23:05 +01:00
OliiverHacker 56c958319d fix bug in export 2020-11-12 15:49:45 +01:00
alex a86dcbd290 - Added matr_aktiv to person table for indication of not yet active matrikelnummern
- PersonModel getPersonStammdaten: staatsbuergerschafts- and geburtsnationcode are also retrieved
2020-11-11 23:29:18 +01:00
Cris 01032c63d3 Update der Person in ALMA Tabelle, wenn Personen zusammengelegt werden
Falls nur die zu löschende Person in ALMA vorhanden ist, mit der zu
behaltenden Person ersetzen.
Falls bereits die zu ersetzende UND zu löschende Person in ALMA
vorhanden sind, muss erst direkt im ALMA Bibliothekssystem und in der
tbl_alma gelöscht werden.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-11-04 15:29:36 +01:00
Cris 7fe2f3ef39 Adapted span-width of date in each tablerow
Allows nice align of error messages.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-15 11:03:16 +02:00
OliiverHacker f672cd2d53 user can enter project with projectphase even if not assigend to project 2020-09-24 11:14:32 +02:00
OliiverHacker 3d274645ac correct user 2020-09-24 08:52:33 +02:00
OliiverHacker 14fbfc7860 diplay date in error message 2020-09-24 08:48:59 +02:00
OliiverHacker 16fb610b3f impliment checks for ProjektPhase 2020-09-23 14:24:17 +02:00
OliiverHacker 4183e7f4f7 changed errormessage for projects that are already complited 2020-09-23 13:44:46 +02:00
OliiverHacker 49fb4d8afa sort csvExport 2020-09-23 13:16:07 +02:00
OliiverHacker 85c6aa08fc fix bug for empty projekt and projektphasen 2020-09-23 12:45:00 +02:00
Oliiver ad98fed84b additionally export projectphasen without project 2020-09-16 12:34:26 +02:00
Oliiver 82d7f4edd2 fix brackets; remove error_reporting 2020-09-16 09:37:31 +02:00
OliiverHacker a565b66751 display only projektphasen of the user 2020-09-10 13:07:51 +02:00
OliiverHacker 612c339305 only get project phases that user is assigned to in CSV Export 2020-09-10 10:39:33 +02:00
OliiverHacker e933cce0e8 add project ID to csv export 2020-09-10 09:29:39 +02:00
OliiverHacker 2e8ed786f4 impliment export 2020-09-09 13:05:28 +02:00
OliiverHacker 8173328c92 Merge branch '9502/csvImportChecks' of https://github.com/FH-Complete/FHC-Core into 9502/csvImportChecks 2020-09-09 10:51:23 +02:00
OliiverHacker e4f3139205 impliment zeitaufzeichnungs checks 2020-09-09 10:50:42 +02:00
Oliiver 37884b1f7e cleanup code 2020-09-08 09:49:57 +02:00
OliiverHacker 2e44f58df9 check time in project for user input 2020-09-07 16:11:17 +02:00
OliiverHacker 6c857b7c24 cleanup var_dump 2020-09-03 15:25:33 +02:00
OliiverHacker 9250485cb3 check for time in csv import 2020-09-03 15:22:46 +02:00
Paolo 8ec6265bd5 Fixed windows new lines 2020-03-04 11:17:23 +01:00
Paolo 05a2cca130 Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization 2020-03-04 11:14:09 +01:00
Paolo 0239246ab0 - Renamed APIv1_Controller to API_Controller
- Adapted code
- Added functionalities to API_Controller to log into the database
2020-02-07 15:11:00 +01:00
2207 changed files with 186313 additions and 175600 deletions
+1
View File
@@ -24,6 +24,7 @@ application/logs/
application/models/extensions/
application/views/extensions/
application/widgets/extensions/
application/components/extensions/
public/extensions/
+1 -1
View File
@@ -56,7 +56,7 @@
]
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt": "^1.3.0",
"grunt-cli": "~0.1.13",
"grunt-contrib-clean": "^0.7.0",
"grunt-contrib-concat": "^0.5.1",
+1 -1
View File
@@ -1,5 +1,5 @@
# FH-Complete
* [FH-Complete Homepage](https://www.fhcomplete.org)
* [Wiki](https://wiki.fhcomplete.org/)
* [Wiki](https://wiki.fhcomplete.info/)
* [Changelog](CHANGELOG.md)
@@ -0,0 +1,19 @@
<?php
$filterCmptArray = array(
'app' => 'core',
'datasetName' => 'logs',
//'filterKurzbz' => 'jobs48hours', // REMOVE ME
'query' => '
SELECT wsl.webservicelog_id AS "LogId",
wsl.request_id AS "RequestId",
wsl.execute_time AS "ExecutionTime",
wsl.execute_user AS "ExecutedBy",
wsl.beschreibung AS "Description",
wsl.request_data AS "Data",
wsl.webservicetyp_kurzbz AS "WebserviceType"
FROM system.tbl_webservicelog wsl
ORDER BY wsl.execute_time DESC
',
'requiredPermissions' => 'admin'
);
+14
View File
@@ -0,0 +1,14 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
use CI3_Events as Events;
/**
* NOTE(chris): example:
Events::on('stv_conf_student', function (&$res) {
$res['test'] = [
'title' => 'TEST',
'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
];
});
*/
+26
View File
@@ -0,0 +1,26 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
// Deadline for Application given as Time-Interval after Semesterstart.
$config['interval_blocking_application'] = 'P1M';
// Lehrveranstaltungen with these grades will be blocked for application
$config['grades_blocking_application'] = array(
5, // nicht genügend
6, // angerechnet
9, // noch nicht eingetragen
13, // nicht erfolgreich absolviert
14, // nicht bestanden,
15, // nicht teilgenommen
18 // unentschuldigt
);
//Enables Fachbereichsleiter instead of LV Leiter
$config['fbl'] = FALSE;
//Enables Info Mails
$config['send_mail'] = TRUE;
// Display fields to explain equivalence of ECTS and LV-Inhalte
$config['explain_equivalence'] = TRUE;
-8
View File
@@ -57,14 +57,6 @@ define('AUTH_SUCCESS', 0);
define('AUTH_NOT_AUTHENTICATED', 1);
define('AUTH_INVALID_CREDENTIALS', 2);
/*
|--------------------------------------------------------------------------
| LDAP constants
|--------------------------------------------------------------------------
*/
define('LDAP_NO_USER_DN', 10);
define('LDAP_TOO_MANY_USER_DN', 11);
/*
|--------------------------------------------------------------------------
| Language constants
+29
View File
@@ -0,0 +1,29 @@
<?php
/**
* Copyright (C) 2023 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (!defined('BASEPATH')) exit('No direct script access allowed');
// NOTE: if database encryption is _not_ used then leave this array empty!
$config['encryption_passwords'] = array(
// 'password name 1' => 'password 1'
// 'password name 2' => 'password 2'
// 'password name ...' => 'password ...'
// 'password name N' => 'password N'
);
+5
View File
@@ -0,0 +1,5 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
+9 -4
View File
@@ -17,7 +17,8 @@ if (defined('LDAP_SERVER')) // 1st LDAP server
'basedn' => LDAP_BASE_DN,
'username' => LDAP_BIND_USER,
'password' => LDAP_BIND_PASSWORD,
'usf' => LDAP_USER_SEARCH_FILTER
'usf' => LDAP_USER_SEARCH_FILTER,
'timeout' => 1
);
}
@@ -30,7 +31,8 @@ if (defined('LDAP2_SERVER')) // 2nd LDAP server
'basedn' => LDAP2_BASE_DN,
'username' => LDAP2_BIND_USER,
'password' => LDAP2_BIND_PASSWORD,
'usf' => LDAP2_USER_SEARCH_FILTER
'usf' => LDAP2_USER_SEARCH_FILTER,
'timeout' => 1
);
}
@@ -45,7 +47,8 @@ if (defined('LDAP_SERVER')) // 1st LDAP server
'basedn' => LDAP_BASE_DN,
'username' => LDAP_BIND_USER,
'password' => LDAP_BIND_PASSWORD,
'usf' => LDAP_USER_SEARCH_FILTER
'usf' => LDAP_USER_SEARCH_FILTER,
'timeout' => 1
);
}
@@ -58,6 +61,8 @@ if (defined('LDAP2_SERVER')) // 2nd LDAP server
'basedn' => LDAP2_BASE_DN,
'username' => LDAP2_BIND_USER,
'password' => LDAP2_BIND_PASSWORD,
'usf' => LDAP2_USER_SEARCH_FILTER
'usf' => LDAP2_USER_SEARCH_FILTER,
'timeout' => 1
);
}
+36
View File
@@ -0,0 +1,36 @@
<?php
/**
* Copyright (C) 2023 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (!defined('BASEPATH')) exit('No direct script access allowed');
$config['migratecontract_oe_default'] = 'TODO_OE_DEFAULT';
$config['migratecontract_matching_ba1_vertragsart'] = array(
'101'=>'dvbund',
'102'=>'dvanderengk',
'103'=>'echterdv',
'104'=>'studentischehilfskr',
'105'=>'externerlehrender',
'106'=>'dvanderenbet',
'107'=>'werkvertrag',
'108'=>'studentischehilfskr',
'109'=>'ueberlassungsvertrag',
'110'=>'echterfreier',
'111'=>'echterdv' //All-In
);
+102 -7
View File
@@ -15,7 +15,7 @@ $config['navigation_header'] = array(
'description' => 'Organisation',
'sort' => 20,
'requiredPermissions' => 'basis/vilesci:r',
'children'=> array(
'children' => array(
'vilesci' => array(
'link' => base_url('vilesci'),
'icon' => '',
@@ -23,6 +23,22 @@ $config['navigation_header'] = array(
'expand' => true,
'sort' => 10,
'requiredPermissions' => 'basis/vilesci:r'
),
'oehbeitragsverwaltung' => array(
'link' => site_url('codex/Oehbeitrag'),
'icon' => '',
'description' => 'ÖH-Beitragsverwaltung',
'expand' => true,
'sort' => 20,
'requiredPermissions' => 'admin:w'
),
'bismeldestichtagsverwaltung' => array(
'link' => site_url('codex/Bismeldestichtag'),
'icon' => '',
'description' => 'BIS-Meldestichtagsverwaltung',
'expand' => true,
'sort' => 30,
'requiredPermissions' => 'admin:w'
)
)
),
@@ -32,7 +48,7 @@ $config['navigation_header'] = array(
'description' => 'Lehre',
'sort' => 30,
'requiredPermissions' => 'basis/vilesci:r',
'children'=> array(
'children' => array(
'cis' => array(
'link' => CIS_ROOT,
'icon' => '',
@@ -62,6 +78,25 @@ $config['navigation_header'] = array(
'lehre/lehrauftrag_bestellen:r',
'lehre/lehrauftrag_erteilen:r'
)
),
'zverfueg' => array(
'link' => site_url('lehre/lvplanung/AdminZeitverfuegbarkeit'),
'description' => 'Zeitverf&uuml;gbarkeit',
'expand' => true,
'sort' => 45,
'requiredPermissions' => array(
'lehre/zeitverfuegbarkeit:rw',
'lehre/zeitverfuegbarkeit:rw'
)
),
'zgvueberpruefung' => array(
'link' => site_url('system/infocenter/ZGVUeberpruefung'),
'description' => 'ZGV Überprüfung',
'expand' => true,
'sort' => 50,
'requiredPermissions' => array(
'lehre/zgvpruefung:r'
)
)
)
),
@@ -71,7 +106,7 @@ $config['navigation_header'] = array(
'description' => 'Personen',
'sort' => 40,
'requiredPermissions' => 'basis/vilesci:r',
'children'=> array(
'children' => array(
'messages' => array(
'link' => site_url('system/messages/MessageClient/read'),
'icon' => '',
@@ -85,6 +120,27 @@ $config['navigation_header'] = array(
'description' => 'BPK Wartung',
'sort' => 20,
'requiredPermissions' => 'admin:r'
),
'errormonitoring' => array(
'link' => site_url('system/issues/Issues'),
'description' => 'Fehler Monitoring',
'expand' => true,
'sort' => 30,
'requiredPermissions' => 'system/issues_verwalten:r'
),
'plausichecks' => array(
'link' => site_url('system/issues/Plausichecks'),
'description' => 'Plausichecks',
'expand' => true,
'sort' => 40,
'requiredPermissions' => 'system/issues_verwalten:r'
),
'gruppenmanagement' => array(
'link' => site_url('person/Gruppenmanagement'),
'description' => 'Gruppenmanagement',
'expand' => true,
'sort' => 50,
'requiredPermissions' => 'lehre/gruppenmanager:r'
)
)
),
@@ -95,7 +151,7 @@ $config['navigation_header'] = array(
'expand' => false,
'sort' => 50,
'requiredPermissions' => 'admin:r',
'children'=> array(
'children' => array(
'extensions' => array(
'link' => site_url('system/extensions/Manager'),
'description' => 'Extensions Manager',
@@ -116,7 +172,14 @@ $config['navigation_header'] = array(
'expand' => true,
'sort' => 20,
'requiredPermissions' => 'system/developer:r'
)
),
'anrechnungen' => array(
'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
'description' => 'Anrechnungen',
'expand' => true,
'sort' => 30,
'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
)
)
)
)
@@ -136,6 +199,15 @@ $config['navigation_menu']['Vilesci/index'] = array(
)
);
$config['navigation_menu']['Vilesci/index'] = array(
'dashboard' => array(
'link' => '#',
'description' => 'Dashboard',
'icon' => 'dashboard',
'sort' => 1
)
);
$config['navigation_menu']['organisation/Reihungstest/index'] = array(
'reihungstestverwalung' => array(
'link' => base_url('vilesci/stammdaten/reihungstestverwaltung.php'),
@@ -160,7 +232,8 @@ $config['navigation_menu']['lehre/lehrauftrag/Lehrauftrag/*'] = array(
'icon' => 'dashboard',
'sort' => 1,
'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r','lehre/lehrauftrag_erteilen:r')
),'lehrauftragBestellen' => array(
),
'lehrauftragBestellen' => array(
'link' => site_url('lehre/lehrauftrag/Lehrauftrag'),
'description' => 'Lehrauftrag bestellen',
'icon' => '',
@@ -182,6 +255,7 @@ $config['navigation_menu']['lehre/lehrauftrag/Lehrauftrag/*'] = array(
'requiredPermissions' => array('lehre/lehrauftrag_erteilen:r')
)
);
$config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
'lehrauftragDashboard' => array(
'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
@@ -189,7 +263,8 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
'icon' => 'dashboard',
'sort' => 1,
'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r','lehre/lehrauftrag_erteilen:r')
),'lehrauftragBestellen' => array(
),
'lehrauftragBestellen' => array(
'link' => site_url('lehre/lehrauftrag/Lehrauftrag'),
'description' => 'Lehrauftrag bestellen',
'icon' => '',
@@ -211,3 +286,23 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
'requiredPermissions' => array('lehre/lehrauftrag_erteilen:r')
)
);
$config['navigation_menu']['system/issues/Issues/*'] = array(
'fehlerzustaendigkeiten' => array(
'link' => site_url('system/issues/IssuesZustaendigkeiten'),
'description' => 'Fehler Zuständigkeiten',
'icon' => 'users',
'sort' => 100,
'target' => '_blank',
'requiredPermissions' => array('admin:rw')
),
'fehlerkonfiguration' => array(
'link' => site_url('system/issues/IssuesKonfiguration'),
'description' => 'Fehler Konfiguration',
'icon' => 'cogs',
'sort' => 200,
'target' => '_blank',
'requiredPermissions' => array('admin:rw')
),
);
+23
View File
@@ -60,3 +60,26 @@ $route['api/v1/organisation/[G|g]eschaeftsjahr/(:any)'] = 'api/v1/organisation/g
$route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisation/organisationseinheit2/$1';
$route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
$route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
// load routes from extensions
$subdir = 'application/config/extensions';
$dirlist = scandir($subdir);
if ($dirlist)
{
$files = array_diff($dirlist, array('.','..'));
foreach ($files as &$item)
{
if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
{
$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
if (file_exists($routes_file))
{
require($routes_file);
}
}
}
}
+170
View File
@@ -0,0 +1,170 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
$config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
// TODO(chris): review this!
#$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => null];
$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => 'Akte'];
/**
* UPLOAD
*/
/**
* Allowed filetypes for attachment upload in unterbrechung antrag
*
* @var array An array of fileextensions
*/
$config['unterbrechung_dms_filetypes'] = ['jpg', 'pdf'];
/**
* GRADES
*/
/**
* On wiederholung the student must repeat certain lvs.
* This lvs will be graded with this id
*
* @var integer tbl_note.note
*/
$config['wiederholung_note_angerechnet'] = 19;
/**
* On wiederholung the student can not attend certain lvs.
* Those lvs will be graded with this id
*
* @var integer tbl_note.note
*/
$config['wiederholung_note_nicht_zugelassen'] = 20;
/**
* JOBS
*/
/**
* The Job will remind for every Unterbrecher who has a
* wiedereinstieg_datum between the date the Job is run
* and the modified date
* e.g.: If the Job is running on 2023-04-20 and the modifier
* is '+3 days' it will remind of everyone that
* has a wiedereinstiegs_datum between 2023-04-20 and 2023-04-23
*
* @var string A string formated as PHP DateTime modifier
* @see https://www.php.net/manual/de/datetime.modify.php
*/
$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
/**
* The Job will sent a request to everyone who faild the 3rd committee exam
* and respecting the given conditions (not repeated yet, stg not in blacklist)
* to decide if he/she will repeat or not
*
* First request
*
* @var string A string formated as PHP DateTime modifier
* @see https://www.php.net/manual/de/datetime.modify.php
*/
$config['wiederholung_job_request_1_date_modifier'] = '+0 days';
/**
* Second request
*
* @var string A string formated as PHP DateTime modifier
* @see https://www.php.net/manual/de/datetime.modify.php
*/
$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
/**
* Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
*
* @var string A string formated as PHP DateTime modifier
* @see https://www.php.net/manual/de/datetime.modify.php
*/
$config['wiederholung_job_deadline_date_modifier'] = '+1 month';
/**
* before this exam dates for Wiederholer will be ignored
*
* @var string A string formated as Date
*
*/
$config['digitalization_start'] = '2022-07-01';
/**
* Objection period - the student will be abgemeldet if he hasn't objected in this period
*
* @var string A string formated as PHP DateTime modifier
* @see https://www.php.net/manual/de/datetime.modify.php
*/
$config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
/**
* System User - uid of a user that is allowed to set prestudentstatus
*
* @var string
*/
$config['antrag_job_systemuser'] = '';
/**
* WHITELISTS
*/
/**
* List of stati who entitle a prestudent to create an Antrag
*
* @var array Array of tbl_status.status_kurzbz's
*/
$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
$config['antrag_prestudentstatus_whitelist_abmeldung'] = ['Student', 'Diplomand', 'Unterbrecher'];
/**
* BLACKLISTS
*/
/**
* List of Statusgründe that prevent a prestudent from create an Wiederholungsantrag
*
* @var array An array of tbl_status_grund.statusgrund_id's
*/
$config['status_gruende_wiederholer'] = [16, 15];
/**
* Blacklisted for abmeldung anträge
*
* @var array An array of tbl_studiengang.studiengang_kz's
*/
$config['stgkz_blacklist_abmeldung'] = [];
/**
* Blacklisted for unterbrechung anträge
*
* @var array An array of tbl_studiengang.studiengang_kz's
*/
$config['stgkz_blacklist_unterbrechung'] = [];
/**
* Blacklisted for wiederholung anträge
*
* @var array An array of tbl_studiengang.studiengang_kz's
*/
$config['stgkz_blacklist_wiederholung'] = [];
/**
* Blacklisted noten for negative committee exams
* noten with this ids won't be seen as negative
*
* @var array An array of noten ids
*/
$config['note_blacklist_wiederholung'] = [];
+10 -6
View File
@@ -9,6 +9,13 @@
"name": {
"type": "string"
},
"type": {
"type": "string",
"enum": ["checkbox", "textfield", "textarea", "date", "dropdown", "multipledropdown"]
},
"requiredPermissions": {
"type": "array"
},
"description": {
"type": "array",
},
@@ -18,10 +25,6 @@
"title": {
"type": "array",
},
"type": {
"type": "string",
"enum": ["checkbox", "textfield", "textarea", "date", "dropdown", "multipledropdown"]
},
"sort": {
"type": "integer"
},
@@ -67,5 +70,6 @@
}
}
},
"required": ["type", "name"]
}
"required": ["type", "name", "requiredPermissions"]
}
+16
View File
@@ -0,0 +1,16 @@
<?php
if ( !defined("PHPUNIT_TEST") ) {
show_404();
}
class Test extends CI_Controller
{
public function index()
{
// Yep... This is all we need.
ini_set('error_reporting', E_ALL); // or error_reporting(E_ALL);
ini_set('display_errors', '1');
ini_set('display_startup_errors', '1');
}
}
@@ -0,0 +1,163 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (FAS) and the AntragLib (back-end)
* This controller works with calls on the HTTP GET or POST and the output is always RDF
*/
class Wiederholung extends Auth_Controller
{
/**
* Calls the parent's constructor and loads the FilterCmptLib
*/
public function __construct()
{
parent::__construct([
'getLvs' => ['student/studierendenantrag:r', 'student/noten:r'],
'moveLvsToZeugnis' => ['student/studierendenantrag:w', 'student/noten:w']
]);
// Libraries
$this->load->library('AntragLib');
// Load language phrases
$this->loadPhrases([
'global',
'studierendenantrag'
]);
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
public function getLvs($prestudent_id)
{
// header für no cache
$this->output->set_header("Cache-Control: no-cache");
$this->output->set_header("Cache-Control: post-check=0, pre-check=0", false);
$this->output->set_header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
$this->output->set_header("Pragma: no-cache");
$this->output->set_header("Content-type: application/xhtml+xml");
$this->load->library('VariableLib', ['uid' => getAuthUID()]);
$sem_akt = $this->variablelib->getVar('semester_aktuell');
$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
if (isError($result))
return $result;
$lvs = $result->retval;
$rdf_url = 'http://www.technikum-wien.at/antragnote';
$this->load->view('lehre/Antrag/Wiederholung/getLvs.rdf.php', [
'url' => $rdf_url,
'lvs' => $lvs
]);
}
public function moveLvsToZeugnis()
{
$anzahl = $this->input->post('anzahl');
$student_uid = $this->input->post('student_uid');
$this->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
$errormsg = array();
for($i=0; $i<$anzahl; $i++)
{
$id = $this->input->post('studierendenantrag_lehrveranstaltung_id_' . $i);
$result =$this->StudierendenantraglehrveranstaltungModel->load($id);
if(isError($result))
{
$errormsg[] = getError($result);
}
elseif(!hasData($result))
{
$errormsg[] = $this->p->t('studierendenantrag', 'error_no_lv_in_application');
}
else
{
$antragLv = getData($result)[0];
$result= $this->ZeugnisnoteModel->load([
'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
'student_uid'=> $student_uid,
'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
]);
if(isError($result))
{
$errormsg[] = getError($result);
}
else
{
if (hasData($result))
{
$result = $this->ZeugnisnoteModel->update(
[
'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
'student_uid'=> $student_uid,
'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
],
[
'note'=> $antragLv->note,
'uebernahmedatum' => date('c'),
'benotungsdatum' => $antragLv->insertamum,
'updateamum' => date('c'),
'bemerkung'=>$antragLv->anmerkung,
'updatevon'=>getAuthUID()
]
);
}
else
{
$result = $this->ZeugnisnoteModel->insert([
'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
'student_uid'=> $student_uid,
'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz,
'note'=> $antragLv->note,
'uebernahmedatum' => date('c'),
'benotungsdatum' => $antragLv->insertamum,
'insertamum' => date('c'),
'bemerkung'=>$antragLv->anmerkung,
'insertvon'=>getAuthUID()
]);
}
if(isError($result))
{
$errormsg[] = getError($result);
}
}
}
}
if($errormsg)
$return = false;
else
$return = true;
$this->load->view('lehre/Antrag/Wiederholung/moveLvs.rdf.php', [
'return' => $return,
'errormsg' => $errormsg
]);
}
}
@@ -0,0 +1,231 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
* Provides data to the ajax get calls about the filter component
* Listens to ajax post calls to change the filter data
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Filter extends FHCAPI_Controller
{
const FILTER_UNIQUE_ID = 'filterUniqueId'; // Name of the filter cmpt unique id (mandatory)
const FILTER_TYPE = 'filterType'; // The filter type (PHP filter definition) used (mandatory)
const FILTER_ID = 'filterId'; // The id of the used filter (optional)
/**
* Calls the parent's constructor and loads the FilterCmptLib
*/
public function __construct()
{
// NOTE: FilterCmpt has its own permissions checks
parent::__construct([
'getFilter' => self::PERM_LOGGED,
'removeFilterField' => self::PERM_LOGGED,
'addFilterField' => self::PERM_LOGGED,
'applyFilterFields' => self::PERM_LOGGED,
'removeCustomFilter' => self::PERM_LOGGED,
'saveCustomFilter' => self::PERM_LOGGED,
'reloadDataset' => self::PERM_LOGGED
]);
// Loads the FiltersModel
$this->load->model('system/Filters_model', 'FiltersModel');
// Loads the FilterCmptLib with HTTP GET/POST parameters
$this->_startFilterCmptLib();
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
/**
* Retrieves data about the current filter from the session and will be written on the output in JSON format
*/
public function getFilter()
{
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$session = $this->filtercmptlib->getSession();
if (is_object($session)) {
// If stdClass it is an retval object
$session = $this->getDataOrTerminateWithError($session);
}
$this->terminateWithSuccess($session);
}
/**
* Remove an applied filter (SQL where condition) from the current filter
*/
public function removeFilterField()
{
$this->form_validation->set_rules('filterField', 'filterField', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$result = $this->filtercmptlib->removeFilterField($this->input->post('filterField'));
if (!$result)
$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
$this->terminateWithSuccess('Field removed');
}
/**
* Add a filter (SQL where clause) to be applied to the current filter
*/
public function addFilterField()
{
$this->form_validation->set_rules('filterField', 'filterField', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$result = $this->filtercmptlib->addFilterField($this->input->post('filterField'));
if (!$result)
$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
$this->terminateWithSuccess('Field added');
}
/**
* Apply the filter changes
*/
public function applyFilterFields()
{
$this->form_validation->set_rules('filterFields', 'filterFields', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$result = $this->filtercmptlib->applyFilterFields($this->input->post('filterFields'));
if (!$result)
$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
$this->terminateWithSuccess('Applied');
}
/**
* Save the current filter as a custom filter for this user with the given description
*/
public function saveCustomFilter()
{
$this->form_validation->set_rules('customFilterName', 'customFilterName', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$result = $this->filtercmptlib->saveCustomFilter($this->input->post('customFilterName'));
if (!$result)
$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
$this->terminateWithSuccess('Saved');
}
/**
* Remove a custom filter by its filterId
*/
public function removeCustomFilter()
{
$this->form_validation->set_rules('filterId', 'filterId', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$result = $this->filtercmptlib->removeCustomFilter($this->input->post('filterId'));
if (!$result)
$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
$this->terminateWithSuccess('Removed');
}
/**
* Reloads the dataset
*/
public function reloadDataset()
{
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$this->filtercmptlib->reloadDataset();
$this->terminateWithSuccess('Success');
}
//------------------------------------------------------------------------------------------------------------------
// Private methods
/**
* Loads the FilterCmptLib with the FILTER_UNIQUE_ID parameter
* If the parameter FILTER_UNIQUE_ID is not given then the execution of the controller is terminated and
* an error message is printed
*/
private function _startFilterCmptLib()
{
$filterUniqueId = null;
$filterType = null;
$filterId = null;
$validations = [
[
'field' => self::FILTER_UNIQUE_ID,
'label' => self::FILTER_UNIQUE_ID,
'rules' => 'required'
],
[
'field' => self::FILTER_TYPE,
'label' => self::FILTER_TYPE,
'rules' => 'required'
],
];
$this->load->library('form_validation');
if ($this->input->method() == 'get')
$this->form_validation->set_data($this->input->get());
$this->form_validation->set_rules($validations);
if ($this->form_validation->run()) {
$filterUniqueId = $this->input->post_get(self::FILTER_UNIQUE_ID);
$filterType = $this->input->post_get(self::FILTER_TYPE);
$filterId = $this->input->post_get(self::FILTER_ID);
// Loads the FilterCmptLib that contains all the used logic
$this->load->library(
'FilterCmptLib',
array(
'filterUniqueId' => $filterUniqueId,
'filterType' => $filterType,
'filterId' => $filterId
)
);
// Start the component
$this->filtercmptlib->start();
}
}
}
@@ -0,0 +1,101 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (GUI) and the NavigationLib (back-end)
* Provides data to the ajax get calls about the filter
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Navigation extends FHCAPI_Controller
{
const NAVIGATION_PAGE_PARAM = 'navigation_page'; // Navigation page parameter name
/**
* Loads the NavigationLib where the used logic lies
*/
public function __construct()
{
parent::__construct([
'menu' => self::PERM_LOGGED,
'header' => self::PERM_LOGGED
]);
$this->_loadNavigationLib(); // Loads the NavigationLib with parameters
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
/**
* This function creates the left Menu for each Page
* @param NAVIGATION_PAGE_PARAM GET Parameter witch holds the currently called Page
* @return JSON object with the Menu Entries
*/
public function menu()
{
$menuArray = $this->navigationlib->getMenuArray($this->input->get(self::NAVIGATION_PAGE_PARAM));
$this->terminateWithSuccess($menuArray);
}
/**
* This function creates the Top Menu for each Page
* @param NAVIGATION_PAGE_PARAM GET Parameter witch holds the currently called Page
* @return JSON object with the Menu Entries
*/
public function header()
{
$headerArray = $this->navigationlib->getHeaderArray($this->input->get(self::NAVIGATION_PAGE_PARAM));
$this->terminateWithSuccess($headerArray);
}
//------------------------------------------------------------------------------------------------------------------
// Private methods
/**
* Loads the NavigationLib with the NAVIGATION_PAGE_PARAM parameter
* If the parameter NAVIGATION_PAGE_PARAM is not given then the execution of the controller is terminated and
* an error message is printed
*/
private function _loadNavigationLib()
{
// If the parameter NAVIGATION_PAGE_PARAM is present in the HTTP GET or POST
if (isset($_GET[self::NAVIGATION_PAGE_PARAM]) || isset($_POST[self::NAVIGATION_PAGE_PARAM]))
{
// If it is present in the HTTP GET
if (isset($_GET[self::NAVIGATION_PAGE_PARAM]))
{
$navigationPage = $this->input->get(self::NAVIGATION_PAGE_PARAM); // is retrieved from the HTTP GET
}
elseif (isset($_POST[self::NAVIGATION_PAGE_PARAM])) // Else if it is present in the HTTP POST
{
$navigationPage = $this->input->post(self::NAVIGATION_PAGE_PARAM); // is retrieved from the HTTP POST
}
// Loads the NavigationLib that contains all the used logic
$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE_PARAM => $navigationPage));
}
else // Otherwise an error will be written in the output
{
show_error('Parameter "' . self::NAVIGATION_PAGE_PARAM . '" not provided!');
}
}
}
@@ -0,0 +1,46 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (GUI) and the PhrasesLib (back-end)
* Provides data to the ajax get calls about the Phrasen plugin
* This controller works with JSON calls on the HTTP GET and the output is always JSON
*/
class Phrasen extends FHCAPI_Controller
{
public function __construct()
{
parent::__construct([
'loadModule' => self::PERM_ANONYMOUS
]);
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
/**
* @param string $module
*/
public function loadModule($module)
{
$this->load->library('PhrasesLib', [$module], 'pj');
$this->terminateWithSuccess(json_decode($this->pj->getJSON()));
}
}
@@ -0,0 +1,69 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
/**
* This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
* Provides data to the ajax get calls about the searchbar component
* This controller works with JSON calls on the HTTP GET and the output is always JSON
*/
class Searchbar extends FHCAPI_Controller
{
const SEARCHSTR_PARAM = 'searchstr';
const TYPES_PARAM = 'types';
/**
* Object initialization
*/
public function __construct()
{
// NOTE(chris): additional permission checks will be done in SearchBarLib
parent::__construct([
'search' => self::PERM_LOGGED
]);
// Load the library SearchBarLib
$this->load->library('SearchBarLib');
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
/**
* Gets a JSON body via HTTP POST and provides the parameters
*/
public function search()
{
$this->load->library('form_validation');
// Checks if the searchstr and the types parameters are in the POSTed JSON
$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
if (!$this->form_validation->run())
$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
// Convert to json the result from searchbarlib->search
$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
if (property_exists($result, 'error'))
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
$this->terminateWithSuccess($result);
}
}
@@ -0,0 +1,387 @@
<?php
if (!defined('BASEPATH')) exit('No direct script access allowed');
use \DateTime as DateTime;
class BetriebsmittelP extends FHCAPI_Controller
{
private $person_id = null;
public function __construct()
{
parent::__construct([
'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
'addNewBetriebsmittel' => self::PERM_LOGGED,
'updateBetriebsmittel' => self::PERM_LOGGED,
'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
'deleteBetriebsmittel' => self::PERM_LOGGED,
'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
'loadInventarliste' => ['admin:r', 'assistenz:r']
]);
//Load Models
$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
// Additional Permission Checks
if ($this->router->method == 'addNewBetriebsmittel') {
$this->person_id = current(array_slice($this->uri->rsegments, 2));
$this->checkPermissionsForPerson(
$this->person_id,
['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
);
} elseif ($this->router->method == 'updateBetriebsmittel' || $this->router->method == 'deleteBetriebsmittel') {
$betriebsmittelperson_id = current(array_slice($this->uri->rsegments, 2));
$result = $this->BetriebsmittelpersonModel->load($betriebsmittelperson_id);
if (!hasData($result))
show_404();
$this->person_id = current(getData($result))->person_id;
$this->checkPermissionsForPerson(
$this->person_id,
['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
);
}
// Load Libraries
$this->load->library('VariableLib', ['uid' => getAuthUID()]);
$this->load->library('form_validation');
// Load language phrases
$this->loadPhrases([
'ui',
'wawi'
]);
}
public function getAllBetriebsmittel($type_id, $id)
{
$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
if (isError($result)) {
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
$this->terminateWithSuccess((getData($result) ?: []));
}
protected function validateNewOrUpdate()
{
$this->form_validation->set_rules('betriebsmitteltyp', 'Typ', 'required', [
'required' => $this->p->t('ui', 'error_fieldRequired')
]);
$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
]);
$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
'required' => $this->p->t('ui', 'error_fieldRequired')
]);
if ($this->input->post('ausgegebenam') && $this->input->post('retouram')) {
$this->form_validation->set_rules('retouram', 'Retour am', [
'is_valid_date',
['is_not_before_ausgegebenam', function ($value) {
return (new DateTime($value) >= new DateTime($this->input->post('ausgegebenam')));
}]
], [
'is_not_before_ausgegebenam' => $this->p->t('wawi', 'error_retourdatumVorAusgabe')
]);
} else {
$this->form_validation->set_rules('retouram', 'Retour am', 'is_valid_date');
}
$this->form_validation->set_rules('anmerkung', 'Anmerkung', 'max_length[256]');
if ($this->input->post('betriebsmitteltyp') == 'Inventar') {
// Inventar
$this->form_validation->set_rules('betriebsmittel_id', 'Inventarnummer', 'required');
} elseif ($this->input->post('betriebsmitteltyp') == 'Zutrittskarte') {
// Zutrittskarte
if ($this->input->post('nummer') === null && $this->input->post('nummer') === null) {
$this->form_validation->set_rules('nummer', 'Nummer', 'required', [
'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
]);
$this->form_validation->set_rules('nummer2', 'Nummer2', 'required', [
'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
]);
} else {
if ($this->input->post('nummer') === null) {
$result = $this->BetriebsmittelpersonModel->loadViewWhere([
'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
'nummer2' => $this->input->post('nummer2'),
'person_id !=' => $this->person_id,
'retouram IS NULL' => null
]);
if (hasData($result))
$this->form_validation->set_rules('nummer2', 'Nummer2', 'is_array', [
'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
]);
} else {
$result = $this->BetriebsmittelpersonModel->loadViewWhere([
'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
'nummer' => $this->input->post('nummer'),
'person_id !=' => $this->person_id,
'retouram IS NULL' => null
]);
if (hasData($result))
$this->form_validation->set_rules('nummer', 'Nummer', 'is_array', [
'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
]);
}
}
}
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
}
public function addNewBetriebsmittel($person_id)
{
$this->form_validation->set_rules('uid', 'UID', [
['uid_in_person', function ($value) use ($person_id) {
if ($value === null)
return true;
$this->load->model('person/Benutzer_model', 'BenutzerModel');
$result = $this->BenutzerModel->loadWhere([
'uid' => $value,
'person_id' => $person_id
]);
return hasData($result);
}]
], [
'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
]);
$this->validateNewOrUpdate();
$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
$nummer = $this->input->post('nummer');
$nummer2 = $this->input->post('nummer2');
$beschreibung = $this->input->post('beschreibung');
$betriebsmittel_id = $this->input->post('betriebsmittel_id');
$anmerkung = $this->input->post('anmerkung');
$kaution = $this->input->post('kaution');
$ausgegebenam = $this->input->post('ausgegebenam');
$retouram = $this->input->post('retouram');
$uid = $this->input->post('uid');
// NOTE(chris): transform_kartennummer
if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
$this->db->trans_start();
if ($betriebsmitteltyp != 'Inventar') {
$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
$result = $this->BetriebsmittelModel->loadWhere([
'betriebsmitteltyp' => $betriebsmitteltyp,
'nummer2' => $nummer2
]);
} else {
$result = $this->BetriebsmittelModel->loadWhere([
'betriebsmitteltyp' => $betriebsmitteltyp,
'nummer' => $nummer
]);
}
$data = $this->getDataOrTerminateWithError($result);
if ($data) {
$data = current($data);
if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
'nummer' => $nummer,
'nummer2' => $nummer2,
'beschreibung' => $beschreibung,
'updateamum' => date('c'),
'updatevon' => getAuthUID()
]);
$this->getDataOrTerminateWithError($result);
}
$betriebsmittel_id = $data->betriebsmittel_id;
} else {
$result = $this->BetriebsmittelModel->insert([
'betriebsmitteltyp' => $betriebsmitteltyp,
'nummer' => $nummer,
'nummer2' => $nummer2,
'beschreibung' => $beschreibung,
'reservieren' => false,
'ort_kurzbz' => null,
'insertamum' => date('c'),
'insertvon' => getAuthUID(),
]);
$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
}
}
$result = $this->BetriebsmittelpersonModel->insert([
'person_id' => $person_id,
'betriebsmittel_id' => $betriebsmittel_id,
'anmerkung' => $anmerkung,
'kaution' => $kaution,
'ausgegebenam' => $ausgegebenam,
'retouram' => $retouram,
'uid' => $uid,
'insertamum' => date('c'),
'insertvon' => getAuthUID()
]);
$data = $this->getDataOrTerminateWithError($result);
$this->db->trans_complete();
$this->terminateWithSuccess(true);
}
public function updateBetriebsmittel($betriebsmittelperson_id)
{
$this->validateNewOrUpdate();
$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
$nummer = $this->input->post('nummer');
$nummer2 = $this->input->post('nummer2');
$beschreibung = $this->input->post('beschreibung');
$betriebsmittel_id = $this->input->post('betriebsmittel_id');
$anmerkung = $this->input->post('anmerkung');
$kaution = $this->input->post('kaution');
$ausgegebenam = $this->input->post('ausgegebenam');
$retouram = $this->input->post('retouram');
// NOTE(chris): transform_kartennummer
if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
$this->db->trans_start();
if ($betriebsmitteltyp != 'Inventar') {
$found = false;
if ($nummer !== null && $betriebsmittel_id !== null) {
$result = $this->BetriebsmittelModel->load($betriebsmittel_id);
$data = $this->getDataOrTerminateWithError($result);
if ($data && current($data)->nummer == $nummer) {
$found = true;
}
}
if (!$found) {
$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
$result = $this->BetriebsmittelModel->loadWhere([
'betriebsmitteltyp' => $betriebsmitteltyp,
'nummer2' => $nummer2
]);
} else {
$result = $this->BetriebsmittelModel->loadWhere([
'betriebsmitteltyp' => $betriebsmitteltyp,
'nummer' => $nummer
]);
}
$data = $this->getDataOrTerminateWithError($result);
}
if ($data) {
$data = current($data);
if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
'nummer' => $nummer,
'nummer2' => $nummer2,
'beschreibung' => $beschreibung,
'updateamum' => date('c'),
'updatevon' => getAuthUID()
]);
$this->getDataOrTerminateWithError($result);
}
$betriebsmittel_id = $data->betriebsmittel_id;
} else {
$result = $this->BetriebsmittelModel->insert([
'betriebsmitteltyp' => $betriebsmitteltyp,
'nummer' => $nummer,
'nummer2' => $nummer2,
'beschreibung' => $beschreibung,
'reservieren' => false,
'ort_kurzbz' => null,
'insertamum' => date('c'),
'insertvon' => getAuthUID(),
]);
$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
}
}
$result = $this->BetriebsmittelpersonModel->update($betriebsmittelperson_id, [
'betriebsmittel_id' => $betriebsmittel_id,
'anmerkung' => $anmerkung,
'kaution' => $kaution,
'ausgegebenam' => $ausgegebenam,
'retouram' => $retouram,
'updateamum' => date('c'),
'updatevon' => getAuthUID()
]);
$data = $this->getDataOrTerminateWithError($result);
$this->db->trans_complete();
$this->terminateWithSuccess(true);
}
public function loadBetriebsmittel($betriebsmittelperson_id)
{
$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
if (isError($result)) {
$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
if (!hasData($result)) {
$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
}
$this->terminateWithSuccess(current(getData($result)));
}
public function deleteBetriebsmittel($betriebsmittelperson_id)
{
$result = $this->BetriebsmittelpersonModel->delete(
array('betriebsmittelperson_id' => $betriebsmittelperson_id,
)
);
if (isError($result)) {
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
if (!hasData($result)) {
return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
}
return $this->outputJsonSuccess(current(getData($result)));
}
public function getTypenBetriebsmittel()
{
$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
$result = $this->BetriebsmitteltypModel->load(); // load All
if (isError($result)) {
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
return $this->terminateWithSuccess(getData($result) ?: []);
}
public function loadInventarliste($searchString)
{
$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
$data = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($data);
}
}
@@ -0,0 +1,187 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \REST_Controller as REST_Controller;
use \Studierendenantrag_model as Studierendenantrag_model;
/**
* This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Abmeldung extends FHCAPI_Controller
{
/**
* Calls the parent's constructor and loads the AntragLib
*/
public function __construct()
{
parent::__construct([
'getDetailsForNewAntrag' => self::PERM_LOGGED,
'getDetailsForAntrag' => self::PERM_LOGGED,
'createAntrag' => self::PERM_LOGGED,
'cancelAntrag' => self::PERM_LOGGED
]);
// Libraries
$this->load->library('AntragLib');
// Load language phrases
$this->loadPhrases([
'studierendenantrag'
]);
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
/**
* Retrieves data of the current studiengang for the current user
*/
public function getDetailsForNewAntrag($prestudent_id)
{
if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, true))
$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
if (!$result) {
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_no_student'),
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
} elseif ($result == -3) {
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_stg_blacklist'),
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
} elseif ($result == -1) {
$result = $this->antraglib->getDetailsForLastAntrag(
$prestudent_id,
[
Studierendenantrag_model::TYP_ABMELDUNG,
Studierendenantrag_model::TYP_ABMELDUNG_STGL
]
);
$data = $this->getDataOrTerminateWithError($result);
$data->canCancel = (
$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
);
$this->terminateWithSuccess($data);
}
$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
$data = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($data);
}
public function getDetailsForAntrag($studierendenantrag_id)
{
if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))
return show_404();
$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
$data = $this->getDataOrTerminateWithError($result);
if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL && $data->typ !== Studierendenantrag_model::TYP_ABMELDUNG)
return show_404();
$data->canCancel = (
$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
);
$this->terminateWithSuccess($data);
}
public function createAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
$this->form_validation->set_rules('grund', 'Grund', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$grund = $this->input->post('grund');
$studiensemester = $this->input->post('studiensemester');
$prestudent_id = $this->input->post('prestudent_id');
$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
if (!$result)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
elseif ($result == -3)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
elseif ($result < 0)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
$data = $this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getDetailsForAntrag($data);
if (!hasData($result))
return $this->terminateWithSuccess(true);
$data = getData($result);
$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
$this->terminateWithSuccess($data);
}
public function cancelAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$antrag_id = $this->input->post('antrag_id');
if (!$this->antraglib->isEntitledToCancelAntrag($antrag_id))
$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getDetailsForAntrag($antrag_id);
if (!hasData($result))
$this->terminateWithSuccess($antrag_id);
$data = getData($result);
$this->terminateWithSuccess($data);
}
}
@@ -0,0 +1,428 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \stdClass as stdClass;
use \Studierendenantrag_model as Studierendenantrag_model;
/**
* This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Leitung extends FHCAPI_Controller
{
/**
* Calls the parent's constructor and loads the AntragLib
*/
public function __construct()
{
parent::__construct([
'getActiveStgs' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
'getAntraege' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
'getHistory' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
'getPrestudents' => 'student/studierendenantrag:w',
'approveAntrag' => 'student/antragfreigabe:w',
'rejectAntrag' => 'student/antragfreigabe:w',
'reopenAntrag' => 'student/studierendenantrag:w',
'pauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'unpauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'objectAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'approveObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'denyObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w']
]);
// Libraries
$this->load->library('AntragLib');
// Load language phrases
$this->loadPhrases([
'studierendenantrag'
]);
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
public function getActiveStgs()
{
$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
$studiengaenge = array_merge($studiengaenge, $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: []);
$result = $this->StudierendenantragModel->loadStgsWithAntraege($studiengaenge);
$data = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($data);
}
public function getAntraege($studiengang = null, $extra = null)
{
if ($studiengang && $studiengang == 'todo') {
$studiengang = $extra;
$extra = true;
} else {
$extra = false;
}
$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
if(!is_array($studiengaenge))
$studiengaenge = [];
$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
if(!is_array($stgsNeuanlage))
$stgsNeuanlage = [];
$studiengaenge = array_unique(array_merge($studiengaenge, $stgsNeuanlage));
if ($studiengang) {
if (!in_array($studiengang, $studiengaenge))
$this->terminateWithError(
'Forbidden',
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
$studiengaenge = [$studiengang];
}
$antraege = [];
if ($studiengaenge) {
$result = $extra
? $this->StudierendenantragModel->loadActiveForStudiengaenge($studiengaenge)
: $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
$antraege = $this->getDataOrTerminateWithError($result);
}
$this->terminateWithSuccess($antraege ?: []);
}
public function getHistory($studierendenantrag_id)
{
if (!$this->antraglib->isEntitledToSeeHistoryForAntrag($studierendenantrag_id))
$this->terminateWithError(
'Forbidden',
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
$result = $this->antraglib->getAntragHistory($studierendenantrag_id);
$data = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($data ?: []);
}
public function getPrestudents()
{
$query = $this->input->post('query');
$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
$result = $this->antraglib->getAktivePrestudentenInStgs($studiengaenge, $query);
$result = $this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($result ?: []);
}
public function approveAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToApproveAntrag', [$this->antraglib, 'isEntitledToApproveAntrag']],
],
[
'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
]
);
$this->form_validation->set_rules(
'typ',
'Typ',
'required|in_list[' . implode(',', [
Studierendenantrag_model::TYP_ABMELDUNG,
Studierendenantrag_model::TYP_ABMELDUNG_STGL,
Studierendenantrag_model::TYP_UNTERBRECHUNG,
Studierendenantrag_model::TYP_WIEDERHOLUNG
]) . ']'
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
switch ($this->input->post('typ')) {
case Studierendenantrag_model::TYP_ABMELDUNG:
case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
break;
case Studierendenantrag_model::TYP_UNTERBRECHUNG:
$result = $this->antraglib->approveUnterbrechung([$studierendenantrag_id], getAuthUID());
break;
case Studierendenantrag_model::TYP_WIEDERHOLUNG:
$result = $this->antraglib->approveWiederholung($studierendenantrag_id, getAuthUID());
break;
}
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function rejectAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToRejectAntrag', [$this->antraglib, 'isEntitledToRejectAntrag']],
],
[
'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
]
);
$this->form_validation->set_rules('grund', 'Grund', 'required');
$this->form_validation->set_rules(
'typ',
'Typ',
'required|in_list[' . implode(',', [
Studierendenantrag_model::TYP_UNTERBRECHUNG
]) . ']'
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$grund = $this->input->post('grund');
$result = $this->antraglib->rejectUnterbrechung([$studierendenantrag_id], getAuthUID(), $grund);
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function reopenAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToReopenAntrag', [$this->antraglib, 'isEntitledToReopenAntrag']],
],
[
'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
]
);
$this->form_validation->set_rules(
'typ',
'Typ',
'required|in_list[' . implode(',', [
Studierendenantrag_model::TYP_WIEDERHOLUNG
]) . ']'
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$result = $this->antraglib->reopenWiederholung($studierendenantrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function pauseAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToPauseAntrag', [$this->antraglib, 'isEntitledToPauseAntrag']],
['antragCanBeManualPaused', [$this->antraglib, 'antragCanBeManualPaused']]
],
[
'isEntitledToPauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
'antragCanBeManualPaused' => $this->p->t(
'studierendenantrag',
'error_not_pauseable',
['id' => $this->input->post('studierendenantrag_id')]
)
]
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$result = $this->antraglib->pauseAntrag($studierendenantrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function unpauseAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToUnpauseAntrag', [$this->antraglib, 'isEntitledToUnpauseAntrag']],
['antragCanBeManualUnpaused', [$this->antraglib, 'antragCanBeManualUnpaused']]
],
[
'isEntitledToUnpauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
'antragCanBeManualUnpaused' => $this->p->t(
'studierendenantrag',
'error_not_paused',
['id' => $this->input->post('studierendenantrag_id')]
)
]
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$result = $this->antraglib->unpauseAntrag($studierendenantrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function objectAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
['canBeObjected', function ($a) {
return $this->antraglib->hasType($a, Studierendenantrag_model::TYP_ABMELDUNG_STGL);
}]
],
[
'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
'canBeObjected' => $this->p->t(
'studierendenantrag',
'error_no_objection'
)
]
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$result = $this->antraglib->objectAbmeldung($studierendenantrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function approveObjection()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
['isObjected', function ($a) {
return $this->antraglib->hasStatus($a, Studierendenantragstatus_model::STATUS_OBJECTED);
}]
],
[
'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
'isObjected' => $this->p->t(
'studierendenantrag',
'error_not_objected'
)
]
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$result = $this->antraglib->cancelAntrag($studierendenantrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function denyObjection()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
['isObjected', function ($a) {
return $this->antraglib->hasStatus($a, Studierendenantragstatus_model::STATUS_OBJECTED);
}]
],
[
'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
'isObjected' => $this->p->t(
'studierendenantrag',
'error_not_objected'
)
]
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$grund = $this->input->post('grund');
$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID(), $grund);
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
}
@@ -0,0 +1,226 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \Studierendenantrag_model as Studierendenantrag_model;
use \DateTime as DateTime;
/**
* This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Unterbrechung extends FHCAPI_Controller
{
/**
* Calls the parent's constructor and loads the AntragLib
*/
public function __construct()
{
parent::__construct([
'getDetailsForNewAntrag' => self::PERM_LOGGED,
'getDetailsForAntrag' => self::PERM_LOGGED,
'createAntrag' => self::PERM_LOGGED,
'cancelAntrag' => self::PERM_LOGGED
]);
// Configs
$this->load->config('studierendenantrag');
// Libraries
$this->load->library('AntragLib');
// Load language phrases
$this->loadPhrases([
'studierendenantrag',
'ui'
]);
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
public function getDetailsForNewAntrag($prestudent_id)
{
if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false))
$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
if (!$result) {
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_no_student'),
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
} elseif ($result == -1) {
$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_UNTERBRECHUNG);
$data = $this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($data);
} elseif ($result == -2) {
$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
$data = $this->getDataOrTerminateWithError($result);
return $this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_pending', [
'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
]));
} elseif ($result == -3) {
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_stg_blacklist'),
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
}
$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
$data = $this->getDataOrTerminateWithError($result);
$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($prestudent_id, null);
$this->terminateWithSuccess($data);
}
public function getDetailsForAntrag($studierendenantrag_id)
{
if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))
return show_404();
$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
$data = $this->getDataOrTerminateWithError($result);
if ($data->typ !== Studierendenantrag_model::TYP_UNTERBRECHUNG)
return show_404();
$this->terminateWithSuccess($data);
}
public function createAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
$this->form_validation->set_rules('grund', 'Grund', 'required');
$this->form_validation->set_rules(
'datum_wiedereinstieg',
'Datum Wiedereinstieg',
'required|callback_isValidDate|callback_isDateInFuture',
[
'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
]
);
if (!$this->form_validation->run()) {
$this->terminateWithValidationErrors($this->form_validation->error_array());
}
$grund = $this->input->post('grund');
$studiensemester = $this->input->post('studiensemester');
$prestudent_id = $this->input->post('prestudent_id');
$datum_wiedereinstieg = $this->input->post('datum_wiedereinstieg');
$dms_id = null;
$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester, $datum_wiedereinstieg);
$result = $this->getDataOrTerminateWithError($result);
if (!$result)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
elseif ($result == -3)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
elseif ($result < 0)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
if (isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE)) {
$this->load->library('DmsLib');
$dms = $this->config->item('unterbrechung_dms');
if (!count(array_filter($dms, function ($v) {
return $v !== null;
})))
$dms = ['kategorie_kurzbz' => 'Akte'];
$dms['version'] = 0;
$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);
$data = $this->getDataOrTerminateWithError($result);
$dms_id = $data['dms_id'];
}
$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);
$antragId = $this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getDetailsForAntrag($antragId);
if (!hasData($result))
$this->terminateWithSuccess($antragId);
$this->terminateWithSuccess(getData($result));
}
public function cancelAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
if (!$this->form_validation->run()) {
$this->terminateWithValidationErrors($this->form_validation->error_array());
}
$antrag_id = $this->input->post('antrag_id');
$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getDetailsForAntrag($antrag_id);
if (!hasData($result))
return $this->terminateWithSuccess($antrag_id);
$this->terminateWithSuccess(getData($result));
}
public function isValidDate($date)
{
try {
new DateTime($date);
} catch (Exception $e) {
return false;
}
return true;
}
public function isDateInFuture($date)
{
return new DateTime() < new DateTime($date);
}
}
@@ -0,0 +1,258 @@
<?php
/**
* Copyright (C) 2024 fhcomplete.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
if (! defined('BASEPATH')) exit('No direct script access allowed');
use \REST_Controller as REST_Controller;
use \Studierendenantragstatus_model as Studierendenantragstatus_model;
/**
* This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
* This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
*/
class Wiederholung extends FHCAPI_Controller
{
/**
* Calls the parent's constructor and loads the FilterCmptLib
*/
public function __construct()
{
parent::__construct([
'getDetailsForNewAntrag' => self::PERM_LOGGED,
'createAntrag' => self::PERM_LOGGED,
'cancelAntrag' => self::PERM_LOGGED,
'getLvs' => self::PERM_LOGGED,
'saveLvs' => ['student/studierendenantrag:w']
]);
// Libraries
$this->load->library('AntragLib');
// Load language phrases
$this->loadPhrases([
'global',
'studierendenantrag'
]);
}
//------------------------------------------------------------------------------------------------------------------
// Public methods
/**
* Retrieves data of the current studiengang for the current user
*/
public function getDetailsForNewAntrag($prestudent_id)
{
if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false))
$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
if (!$result) {
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_no_student_no_failed_exam'),
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
} elseif ($result == -1) {
$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_WIEDERHOLUNG);
$data = $this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id, $data->datum, $data->studiensemester_kurzbz);
// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
$pruefungsdata = current(getData($result));
$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
$data->pruefungsdatum = $pruefungsdata->datum;
$this->terminateWithSuccess($data);
} elseif ($result == -2) {
$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_antrag_pending', [
'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
]),
self::ERROR_TYPE_GENERAL,
REST_Controller::HTTP_BAD_REQUEST
);
} elseif ($result == -3) {
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_stg_blacklist'),
self::ERROR_TYPE_GENERAL,
REST_Controller::HTTP_BAD_REQUEST
);
}
$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
$data = $this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
$pruefungsdata = current(getData($result));
$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
$data->pruefungsdatum = $pruefungsdata->datum;
$this->terminateWithSuccess($data);
}
public function createAntrag()
{
$this->createAntragWithStatus(true);
}
public function cancelAntrag()
{
$this->createAntragWithStatus(false);
}
protected function createAntragWithStatus($repeat)
{
$this->load->library('form_validation');
$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$prestudent_id = $this->input->post('prestudent_id');
$studiensemester = $this->input->post('studiensemester');
$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
if (!$result) {
$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
} elseif ($result == -1) {
$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
$result = $this->getDataOrTerminateWithError($result);
if (!$result)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_prestudentstatus', [
'prestudent_id' => $prestudent_id
]), self::ERROR_TYPE_GENERAL);
if (!in_array(current($result)->status_kurzbz, $this->config->item('antrag_prestudentstatus_whitelist')))
$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
} elseif ($result == -2) {
$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
} elseif ($result == -3) {
$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
}
$result = $this->antraglib->createWiederholung($prestudent_id, $studiensemester, getAuthUID(), $repeat);
$antragId = $this->getDataOrTerminateWithError($result);
$result = $this->antraglib->getDetailsForAntrag($antragId);
if (!hasData($result))
$this->terminateWithSuccess(true);
$data = getData($result);
$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
$pruefungsdata = current(getData($result));
$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
$data->pruefungsdatum = $pruefungsdata->datum;
$this->terminateWithSuccess($data);
}
public function getLvs($antrag_id)
{
$result = $this->antraglib->getLvsForAntrag($antrag_id);
if (isError($result)) {
$error = getError($result);
if ($error == 'Forbidden')
$this->terminateWithError(
$error,
self::ERROR_TYPE_AUTH,
REST_Controller::HTTP_FORBIDDEN
);
$this->terminateWithError(
$error,
self::ERROR_TYPE_GENERAL
);
}
$lvs = getData($result);
$this->terminateWithSuccess($lvs);
}
public function saveLvs()
{
$forbiddenLvs = $this->input->post('forbiddenLvs');
$mandatoryLvs = $this->input->post('mandatoryLvs');
$antragsLvs = array_merge($forbiddenLvs, $mandatoryLvs);
if (!$antragsLvs)
$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_lv'), self::ERROR_TYPE_GENERAL);
$insert = array_map(function ($lv) {
return [
'studierendenantrag_id' => $lv['studierendenantrag_id'],
'lehrveranstaltung_id' => $lv['lehrveranstaltung_id'],
'note' => $lv['zugelassen']
? ($lv['zugelassen'] == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet'))
: $this->config->item('wiederholung_note_nicht_zugelassen'),
'anmerkung' => $lv['anmerkung'],
'insertvon' => getAuthUID(),
'studiensemester_kurzbz' => $lv['studiensemester_kurzbz']
];
}, $antragsLvs);
$antrag_ids = array_unique(array_map(function ($lv) {
return $lv['studierendenantrag_id'];
}, $insert));
foreach ($antrag_ids as $antrag_id) {
$result = $this->StudierendenantragModel->loadIdAndStatusWhere([
'studierendenantrag_id' => $antrag_id
]);
$antrag = $this->getDataOrTerminateWithError($result);
if (!$antrag)
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]),
self::ERROR_TYPE_GENERAL
);
$antrag = current($antrag);
if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED
&& $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
$this->terminateWithError(
$this->p->t('studierendenantrag', 'error_antrag_locked'),
self::ERROR_TYPE_GENERAL
);
}
$result = $this->antraglib->saveLvs($insert);
$data = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($data);
}
}
@@ -12,7 +12,7 @@ class CheckUserAuth extends RESTFul_Controller
parent::__construct();
// Loads helper message to manage returning messages
// NOTE: loaded here because it does not extend the APIv1_Controller
// NOTE: loaded here because it does not extend the API_Controller
$this->load->helper('hlp_return_object');
}
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufteilung extends APIv1_Controller
class Aufteilung extends API_Controller
{
/**
* Aufteilung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestelldetail extends APIv1_Controller
class Bestelldetail extends API_Controller
{
/**
* Bestelldetail API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestelldetailtag extends APIv1_Controller
class Bestelldetailtag extends API_Controller
{
/**
* Bestelldetailtag API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestellstatus extends APIv1_Controller
class Bestellstatus extends API_Controller
{
/**
* Bestellstatus API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestellung extends APIv1_Controller
class Bestellung extends API_Controller
{
/**
* Bestellung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestellungtag extends APIv1_Controller
class Bestellungtag extends API_Controller
{
/**
* Bestellungtag API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Buchung extends APIv1_Controller
class Buchung extends API_Controller
{
/**
* Buchung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Buchungstyp extends APIv1_Controller
class Buchungstyp extends API_Controller
{
/**
* Buchungstyp API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Budget extends APIv1_Controller
class Budget extends API_Controller
{
/**
* Budget API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Konto extends APIv1_Controller
class Konto extends API_Controller
{
/**
* Konto API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Kostenstelle extends APIv1_Controller
class Kostenstelle extends API_Controller
{
/**
* Kostenstelle API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Rechnung extends APIv1_Controller
class Rechnung extends API_Controller
{
/**
* Rechnung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Rechnungsbetrag extends APIv1_Controller
class Rechnungsbetrag extends API_Controller
{
/**
* Rechnungsbetrag API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Rechnungstyp extends APIv1_Controller
class Rechnungstyp extends API_Controller
{
/**
* Rechnungstyp API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Vertrag extends APIv1_Controller
class Vertrag extends API_Controller
{
/**
* Vertrag API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Vertragsstatus extends APIv1_Controller
class Vertragsstatus extends API_Controller
{
/**
* Vertragsstatus API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Vertragstyp extends APIv1_Controller
class Vertragstyp extends API_Controller
{
/**
* Vertragstyp API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zahlungstyp extends APIv1_Controller
class Zahlungstyp extends API_Controller
{
/**
* Zahlungstyp API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Akadgrad extends APIv1_Controller
class Akadgrad extends API_Controller
{
/**
* Akadgrad API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Archiv extends APIv1_Controller
class Archiv extends API_Controller
{
/**
* Archiv API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufmerksamdurch extends APIv1_Controller
class Aufmerksamdurch extends API_Controller
{
/**
* Aufmerksamdurch API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Ausbildung extends APIv1_Controller
class Ausbildung extends API_Controller
{
/**
* Ausbildung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Berufstaetigkeit extends APIv1_Controller
class Berufstaetigkeit extends API_Controller
{
/**
* Berufstaetigkeit API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Beschaeftigungsausmass extends APIv1_Controller
class Beschaeftigungsausmass extends API_Controller
{
/**
* Beschaeftigungsausmass API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Besqual extends APIv1_Controller
class Besqual extends API_Controller
{
/**
* Besqual API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisfunktion extends APIv1_Controller
class Bisfunktion extends API_Controller
{
/**
* Bisfunktion API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisio extends APIv1_Controller
class Bisio extends API_Controller
{
/**
* Bisio API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisorgform extends APIv1_Controller
class Bisorgform extends API_Controller
{
/**
* Bisorgform API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisverwendung extends APIv1_Controller
class Bisverwendung extends API_Controller
{
/**
* Bisverwendung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bundesland extends APIv1_Controller
class Bundesland extends API_Controller
{
/**
* Course API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Entwicklungsteam extends APIv1_Controller
class Entwicklungsteam extends API_Controller
{
/**
* Entwicklungsteam API constructor.
@@ -14,7 +14,7 @@
if (!defined("BASEPATH")) exit("No direct script access allowed");
class Gemeinde extends APIv1_Controller
class Gemeinde extends API_Controller
{
/**
* Gemeinde API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Hauptberuf extends APIv1_Controller
class Hauptberuf extends API_Controller
{
/**
* Hauptberuf API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Lehrform extends APIv1_Controller
class Lehrform extends API_Controller
{
/**
* Lehrform API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Lgartcode extends APIv1_Controller
class Lgartcode extends API_Controller
{
/**
* Lgartcode API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Mobilitaetsprogramm extends APIv1_Controller
class Mobilitaetsprogramm extends API_Controller
{
/**
* Mobilitaetsprogramm API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Nation extends APIv1_Controller
class Nation extends API_Controller
{
/**
* Course API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Note extends APIv1_Controller
class Note extends API_Controller
{
/**
* Note API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Orgform extends APIv1_Controller
class Orgform extends API_Controller
{
/**
* Orgform API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Verwendung extends APIv1_Controller
class Verwendung extends API_Controller
{
/**
* Verwendung API constructor.
+1 -1
View File
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgv extends APIv1_Controller
class Zgv extends API_Controller
{
/**
* Zgv API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgvdoktor extends APIv1_Controller
class Zgvdoktor extends API_Controller
{
/**
* Zgvdoktor API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgvgruppe extends APIv1_Controller
class Zgvgruppe extends API_Controller
{
/**
* Zgvgruppe API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgvmaster extends APIv1_Controller
class Zgvmaster extends API_Controller
{
/**
* Zgvmaster API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zweck extends APIv1_Controller
class Zweck extends API_Controller
{
/**
* Zweck API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Ampel extends APIv1_Controller
class Ampel extends API_Controller
{
/**
* Ampel API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Content extends APIv1_Controller
class Content extends API_Controller
{
/**
* Content API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentchild extends APIv1_Controller
class Contentchild extends API_Controller
{
/**
* Contentchild API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentgruppe extends APIv1_Controller
class Contentgruppe extends API_Controller
{
/**
* Contentgruppe API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentlog extends APIv1_Controller
class Contentlog extends API_Controller
{
/**
* Contentlog API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentsprache extends APIv1_Controller
class Contentsprache extends API_Controller
{
/**
* Contentsprache API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Dms extends APIv1_Controller
class Dms extends API_Controller
{
/**
*
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Infoscreen extends APIv1_Controller
class Infoscreen extends API_Controller
{
/**
* Infoscreen API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class News extends APIv1_Controller
class News extends API_Controller
{
/**
* News API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Template extends APIv1_Controller
class Template extends API_Controller
{
/**
* Template API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Veranstaltung extends APIv1_Controller
class Veranstaltung extends API_Controller
{
/**
* Veranstaltung API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Veranstaltungskategorie extends APIv1_Controller
class Veranstaltungskategorie extends API_Controller
{
/**
* Veranstaltungskategorie API constructor.
+1 -1
View File
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Akte extends APIv1_Controller
class Akte extends API_Controller
{
/**
* Akte API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufnahmeschluessel extends APIv1_Controller
class Aufnahmeschluessel extends API_Controller
{
/**
* Aufnahmeschluessel API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufnahmetermin extends APIv1_Controller
class Aufnahmetermin extends API_Controller
{
/**
* Aufnahmetermin API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufnahmetermintyp extends APIv1_Controller
class Aufnahmetermintyp extends API_Controller
{
/**
* Aufnahmetermintyp API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bewerbungstermine extends APIv1_Controller
class Bewerbungstermine extends API_Controller
{
/**
* Bewerbungstermine API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Buchungstyp extends APIv1_Controller
class Buchungstyp extends API_Controller
{
/**
* Buchungstyp API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Dokument extends APIv1_Controller
class Dokument extends API_Controller
{
/**
* Dokument API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Dokumentprestudent extends APIv1_Controller
class Dokumentprestudent extends API_Controller
{
/**
* Dokumentprestudent API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Dokumentstudiengang extends APIv1_Controller
class Dokumentstudiengang extends API_Controller
{
/**
* Dokumentstudiengang API constructor.
+1 -1
View File
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Konto extends APIv1_Controller
class Konto extends API_Controller
{
/**
* Konto API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Preincoming extends APIv1_Controller
class Preincoming extends API_Controller
{
/**
* Preincoming API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Preinteressent extends APIv1_Controller
class Preinteressent extends API_Controller
{
/**
* Person API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Preinteressentstudiengang extends APIv1_Controller
class Preinteressentstudiengang extends API_Controller
{
/**
* Preinteressentstudiengang API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Preoutgoing extends APIv1_Controller
class Preoutgoing extends API_Controller
{
/**
* Preoutgoing API constructor.
@@ -14,7 +14,7 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Prestudent extends APIv1_Controller
class Prestudent extends API_Controller
{
/**
* Prestudent API constructor.

Some files were not shown because too many files have changed in this diff Show More