Commit Graph

  • d54747c4df Merge branch 'cis40_2026-05_ma_rc' into demo-cis40 Harald Bamberger 2026-06-24 15:52:23 +02:00
  • 7e141f73d3 Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc Harald Bamberger 2026-06-24 15:52:01 +02:00
  • d5ee6f9cc2 adapt query for outgoing students ma0068 2026-06-24 15:48:04 +02:00
  • da3b329772 Merge branch 'cis40_2026-05_ma_rc' into demo-cis40 Harald Bamberger 2026-06-24 15:42:16 +02:00
  • 7f9dcc43ad add Compat iframe controller and component Harald Bamberger 2026-06-24 15:41:47 +02:00
  • 274262262a iframe_content: only replace ../ to be able to use index.ci.php in menu entry Harald Bamberger 2026-06-24 15:35:31 +02:00
  • a721c1d14d add default permission assistenz:rw for tag functionality ma0068 2026-06-24 15:22:57 +02:00
  • 98cf6c6531 Merge branch 'master' into feature-76781/Vertragsbestandteil_Kollektivvertrag Harald Bamberger 2026-06-24 12:09:46 +02:00
  • 637cc1d1ae special case ''!=0 Werner Masik 2026-06-24 11:59:49 +02:00
  • 79c0f31ddc lv_id & sem_kurzbz are now optional route params; defer loading of LehreinheitenModule.js; fetch orgform for lva dropdown; added selected|filtered|total count to table; dropdowns have responsive labels now; left aligned columns with text; AuthInfo Api for uid; tableLayout without WidthGrow, fixed rowHeight at 30 for now; selectAll + filter interaction fixed; load studiensemester similar to abgabetool; clearFilter fix on LE deselect; modal formatting & loading toggle; Johann Hoffmann 2026-06-23 18:59:51 +02:00
  • 49d61342c2 lv_id & sem_kurzbz are now optional route params; defer loading of LehreinheitenModule.js; fetch orgform for lva dropdown; added selected|filtered|total count to table; dropdowns have responsive labels now; left aligned columns with text; AuthInfo Api for uid; tableLayout without WidthGrow, fixed rowHeight at 30 for now; selectAll + filter interaction fixed; load studiensemester similar to abgabetool; clearFilter fix on LE deselect; modal formatting & loading toggle; Johann Hoffmann 2026-06-23 18:59:36 +02:00
  • 2630a1190b add update of kalender event location before req refetch Ivymaster 2026-06-23 17:10:08 +02:00
  • 1bb4181974 clean up comment Werner Masik 2026-06-23 15:30:52 +02:00
  • d50590aefb Better check of the MAX LRTs that a user can schedule Paolo 2026-06-23 15:04:54 +02:00
  • c40ee917df Refactored main components Paolo 2026-06-23 14:59:34 +02:00
  • faec23b933 refactor kollektivvertrag db schema Werner Masik 2026-06-23 13:24:45 +02:00
  • c7832e62f7 bugfix: add tablename to query to prevent ambiguous columns feature-76604/Studienzweige_auf_Abschlussdokumenten_BEL chfhtw 2026-06-23 13:14:24 +02:00
  • b662fa5fd3 show date of hochgeladenum in case of nachgereicht bug-77392/StudVW_Dokumente_Nachreichlogik_fehlendeBezeichnung ma0068 2026-06-23 12:55:33 +02:00
  • 8126665acd Improvements and updated documentation Paolo 2026-06-23 12:33:44 +02:00
  • be0943f1ba Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4 Johann Hoffmann 2026-06-22 18:12:29 +02:00
  • 5826bf5b70 Added check if the user is not opening too many tasks Paolo 2026-06-22 16:46:40 +02:00
  • fc5ba954fb Added new filters for the LogsViewer app to get logs from the LRTs Paolo 2026-06-22 16:29:28 +02:00
  • 4e9bf3676d application/controllers/jobs/LongRunTaskExecJob.php now provides a way to kill hanging LRTs Paolo 2026-06-22 16:24:51 +02:00
  • 0be1bb95a5 add minor mods Ivymaster 2026-06-22 16:05:46 +02:00
  • 91a691c5f8 Minor mod Ivymaster 2026-06-22 15:49:16 +02:00
  • 31410f0bb9 Merge branch 'master' into feature-76203/Asynchrone_Tasks Paolo 2026-06-22 15:48:15 +02:00
  • 1136d9dca1 Better output handling Paolo 2026-06-22 15:47:39 +02:00
  • 41d40102f3 Merge branch 'cis40_2026-05_ma_rc' into demo-cis40 Harald Bamberger 2026-06-22 15:26:48 +02:00
  • 95e63f865c add CIS4 Header and Footer to application/views/lehre/pruefungsprotokollUebersicht.php Harald Bamberger 2026-06-22 15:25:51 +02:00
  • 4edec4df00 add changes for calendar flicker on event reload, and calendar scroll mods Ivymaster 2026-06-22 15:06:53 +02:00
  • f5cd0f1a5d BUG: add query for inserting new resources collison global variable Ivymaster 2026-06-22 15:04:53 +02:00
  • 3094772150 also added missing erstbetreuer arten to getProjektbetreuerEmail Johann Hoffmann 2026-06-22 13:56:36 +02:00
  • f0afcdd1c5 getMitarbeiterProjektarbeiten CTE primary_betreuer added missing Betreuerarten "Begutachter" and "Betreuer" aswell as where clause on person_id to avoid selecting every betreuer; import the correct dateFilter Headerfilter so manual input is working as intended; Johann Hoffmann 2026-06-22 13:48:41 +02:00
  • 70368525e0 readded phrasen that went missing in https://github.com/FH-Complete/FHC-Core/commit/22eed92c86925101a9445c1bfbe4bf5037b9a114 Johann Hoffmann 2026-06-22 11:47:38 +02:00
  • 715c9f77b8 added missing config BETREUER_SAMMELMAIL_BUTTON_STUDENT in getConfig Api Call; removed duplicate uid data field resulting from merge; Johann Hoffmann 2026-06-22 11:17:14 +02:00
  • d1ef2e4f74 refactor bhdev_treemenu Harald Bamberger 2026-06-22 09:52:08 +02:00
  • 3401afed94 remove duplicate import of ApiAuthinfo and call to ApiAuthinfo.getAuthUID Harald Bamberger 2026-06-22 09:47:24 +02:00
  • 21886e30a3 refactor query getUnacceptedDocuments ma0068 2026-06-22 08:50:10 +02:00
  • 967f53d73c Merge branch 'master' into feature-76203/Asynchrone_Tasks Paolo 2026-06-19 13:57:49 +02:00
  • 8c24292195 2nd draft Paolo 2026-06-19 13:54:38 +02:00
  • 2ab2176795 use language index in all getting Functions for Tags feature-75959/StudVw_Automatische_Tags ma0068 2026-06-19 13:50:19 +02:00
  • 688f815178 BUG: add resovement for multiple ort import from old tempus per one kalendar item Ivymaster 2026-06-19 12:48:57 +02:00
  • 273b1d3fe4 add resources conflict checker and extend tempus tests with it Ivymaster 2026-06-19 11:41:56 +02:00
  • 464cfb9efc Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning Harald Bamberger 2026-06-19 10:23:17 +02:00
  • e3aa36cae0 Merge branch 'master' into cis40_2026-02_rc Harald Bamberger 2026-06-19 10:22:49 +02:00
  • 0a232828c8 Merge branch 'feature-71619/Notenspiegel_ECTS_Summe' Andreas Österreicher 2026-06-19 08:31:08 +02:00
  • 2fe7db7882 phpspreadsheet 1.7 for smaller & well formatted exports feature-76588/LVEvalRohdatenexport Johann Hoffmann 2026-06-18 15:43:23 +02:00
  • 90b8788c93 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning Harald Bamberger 2026-06-18 14:46:05 +02:00
  • c125130dcb Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning Harald Bamberger 2026-06-18 14:38:42 +02:00
  • 1496045c40 Merge branch 'cis40_2026-05_ma_rc' into demo-cis40 Harald Bamberger 2026-06-18 13:46:21 +02:00
  • e2dadcd208 Merge branch 'studvw_2026_05_rc_tags' into demo-cis40 Harald Bamberger 2026-06-18 13:23:49 +02:00
  • 164c11e10a Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc Harald Bamberger 2026-06-18 13:20:25 +02:00
  • df2f142f37 add toasts if no taken selections for Notenspiegel, LVplanung and Studienverlauf ma0068 2026-06-18 11:45:01 +02:00
  • 0d3874b41a Phrase for studienzweig (fhtw addon) chfhtw 2026-06-18 11:06:57 +02:00
  • 9a561efcc1 Allow translations in UDF dropdown options chfhtw 2026-06-18 11:06:32 +02:00
  • eb9c882fe9 Merge branch 'master' into cis40_2026-02_rc Harald Bamberger 2026-06-18 08:48:52 +02:00
  • f85f9a53c4 prestudent status checks: added student history and student orgform checks, changed date input so text input is correctly sent feature-39602/Fas_Statusbearbeitung_bei_Sperre Alexei Karpenko 2026-06-17 19:13:41 +02:00
  • c7bac03429 concat escaped string correct Harald Bamberger 2026-06-17 17:45:18 +02:00
  • 07d3b32279 fix typo Harald Bamberger 2026-06-17 17:23:05 +02:00
  • 245d0d3369 Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags Harald Bamberger 2026-06-17 17:15:37 +02:00
  • d3d04c5a77 Merge branch 'master' into studvw_2026_05_rc Harald Bamberger 2026-06-17 14:44:25 +02:00
  • f4cc311806 getFormData (which loads lehrveranstaltungen) on editProjektarbeit + always query with student.studiengang_kz to have the same set of options when creating the projektarbeit; should work for incomings aswell. first attempt: lva in studienplan of last studentenstatus; if that yields no options just take the full lv list; feature-75469/LeOptional4Projektarbeit Johann Hoffmann 2026-06-17 10:44:55 +02:00
  • 0687ef72ce Merge branch 'bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert' Harald Bamberger 2026-06-17 09:40:23 +02:00
  • 49260fb997 add oe_kurzbz to kollektivvertrag Werner Masik 2026-06-16 17:27:50 +02:00
  • 2170d3e14a numeric notensort in all tables; changed stv projektarbeit getNoten to only fetch active ones so stv and abgabetool use the same set of grades; Johann Hoffmann 2026-06-16 15:17:40 +02:00
  • 9180b9bd63 Merge branch 'master' into bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert Harald Bamberger 2026-06-16 13:11:40 +02:00
  • 2b06de8ecb Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning Johann Hoffmann 2026-06-16 11:59:53 +02:00
  • df46b8ebdd Merge remote-tracking branch 'origin/master' into feature-75469/LeOptional4Projektarbeit Johann Hoffmann 2026-06-16 10:46:44 +02:00
  • cce1c50495 override permission for all methods not only the overwritten ones Harald Bamberger 2026-06-15 16:46:31 +02:00
  • 263b04e67f reworked assistenz timeline feature; now shows all projektarbeiten of associated student in a more compact form; Johann Hoffmann 2026-06-15 14:37:47 +02:00
  • 070ac1e878 override permission for all methods not only the overwritten ones Harald Bamberger 2026-06-15 14:37:43 +02:00
  • de60d0d09e Conflicts resolved Ivymaster 2026-06-15 12:47:29 +02:00
  • 6565399633 - added room suggestion priority - return erro codes - config for from/to without grid - bug fixes and optimizations ma0048 2026-06-15 11:47:36 +02:00
  • 168fb00023 Merge branch 'feature-40852/MasterLehrgaenge_BeruflicheKompetenzen' Andreas Österreicher 2026-06-15 09:18:17 +02:00
  • 245b724314 Minor rfactor Ivymaster 2026-06-15 01:01:33 +02:00
  • 69ef6d2707 Minor mod feature-76031/unterrichtszeiten-der-studiengänge Ivymaster 2026-06-14 21:53:04 +02:00
  • 10a5aaf9b4 Minor mods Ivymaster 2026-06-12 18:49:15 +02:00
  • 544c6e7319 Added seeders for tempus tests Ivymaster 2026-06-12 16:51:24 +02:00
  • 7c594bc4f9 stv added back the old 'save betreuer' button as it makes sense for finishing a single betreuer form and then continuing with editing the projektarbeit form user will get used to it 100%; updated some gendering phrases from StudentIn -> Student*In because thats apparently the current way to do it; Johann Hoffmann 2026-06-12 12:55:06 +02:00
  • 3f99a2ce81 can send zweitbetreuer token mail on demand from betreuer abgabetool detail buttons, if it is external zweitbetreuer without benutzer Johann Hoffmann 2026-06-12 12:17:00 +02:00
  • f5d81e4a93 move prepareQuery (and addSelectPrioRel) into a library and make joins more flexible & change JOIN to LEFT JOIN for tbl_studentlehrverband (the actual bugfix) & change order of JOIN tbl_benutzergruppe in fetchStudents to speed up query chfhtw 2026-06-12 09:53:59 +02:00
  • b0f3fa0c46 Berufliche Qualifikation umbenannt Andreas Österreicher 2026-06-12 09:41:34 +02:00
  • 6d89e95afa Merge branch 'master' into feature-40852/MasterLehrgaenge_BeruflicheKompetenzen Andreas Österreicher 2026-06-12 08:53:44 +02:00
  • e574998897 fetch both erst & zweitbetreuer in abgabetool betreueransicht; fix ProjektarbeitModel->getProjektbetreuerEmail by explicitely only querying erstbetreuer, which fixes rare cases where endupload crashes when the zweitbetreuer has no contact email as private mail AND randomly gets retrieved as first row by the query; fix race condition on the semester filter default value in assistenz view; block all edit/delete operations in flat table for any termin which already has a file uplaoded (abgabetermin != null) or has a note (due to quality gate), to avoid confusing UI implementations; fix STV Projektarbeit bug where betreuer form options where not loading correctly when editing existing projektarbeiten; Johann Hoffmann 2026-06-11 17:10:33 +02:00
  • 765884b0dc add also insert statement for dashboard.tbl_dashboard_widget feature-77048/CIS4_MA_Widget_Studstatus ma0068 2026-06-11 16:07:49 +02:00
  • fe8cf9bc83 new widget CIS4 MA Widget ma0068 2026-06-11 15:34:45 +02:00
  • d0073fdc6c Merge branch 'feature-13011/installation_on_multiple_servers' into merge-6237-13011 Paolo 2026-06-11 13:03:12 +02:00
  • 2df19fa16a Merge branch 'feature-6237/Phrases_system_MkIII' into merge-6237-13011 Paolo 2026-06-11 13:03:02 +02:00
  • d0922993f0 Merge branch 'master' into feature-6237/Phrases_system_MkIII Paolo 2026-06-11 13:02:29 +02:00
  • 35f3239fc0 Merge branch 'master' into feature-13011/installation_on_multiple_servers Paolo 2026-06-11 12:53:31 +02:00
  • fbc88bf768 Merge branch 'master' into feature-76233/LoginAsUser_Logging Paolo 2026-06-11 12:53:05 +02:00
  • 07bb0ddffd Merge branch 'master' into feature-71619/Notenspiegel_ECTS_Summe Paolo 2026-06-11 12:52:41 +02:00
  • 79dc31e9d9 Merge branch 'master' into feature-71351/Erhalter_Kuerzel_Konfigurierbar Paolo 2026-06-11 12:52:24 +02:00
  • 78709db3be Merge branch 'master' into feature-70806/DMS_Erweiterung_Metadaten Paolo 2026-06-11 12:51:56 +02:00
  • 5b73d42525 Merge branch 'master' into feature-70756/PHP8_Cleanup_Organisationseinheiten Paolo 2026-06-11 12:51:42 +02:00
  • 6bdd0f46df Merge branch 'master' into feature-70755/PHP8_Cleanup_Dokumentenvorlagen Paolo 2026-06-11 12:51:25 +02:00
  • fdbc9de2cd Merge branch 'master' into feature-69542/Composer_Dependencies_Update Paolo 2026-06-11 12:51:08 +02:00
  • 629636d674 Merge branch 'master' into feature-69541/PHP8_Vilesci_Studiengang Paolo 2026-06-11 12:50:54 +02:00
  • 54137cd2bb Merge branch 'master' into feature-69540/PHP8_Vilesci_Lehrveranstaltungen Paolo 2026-06-11 12:50:41 +02:00
  • b1f264c37c Merge branch 'master' into feature-69185/PHP8-Vilesci_Berechtigungen Paolo 2026-06-11 12:50:26 +02:00