Commit Graph

1217 Commits

Author SHA1 Message Date
ma0068 87384f42f9 Update Logik Lehrverband: as function, with transactions 2024-03-13 13:31:53 +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
Harald Bamberger 7bdf5b832b Merge branch 'master' into feature-36016/Studstatus_QMB 2024-03-12 11:32:25 +01:00
ma0068 a49075bcb7 check Bismeldestichtag, refactor Lehrverband 2024-03-12 07:52:51 +01:00
ma0068 3a9f6a0edd check Meldestichtag, update function getHistoryPrestudent 2024-03-07 14:20:46 +01:00
SimonGschnell 96e0bfa72c changes how the EditProfil Modal passes props to its children 2024-03-07 11:08:43 +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
ma0068 7bec7016c3 merge master into branch FHC4 2024-03-05 16:31:41 +01:00
ma0068 a7f1e43225 Status als eigener Tab 2024-03-04 10:10:35 +01:00
ma0068 77e31f2da6 Delete Prestudent 2024-02-29 10:58:45 +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
ma0068 88df5057fb Update, Vorrücken, Delete, Refactoring Statusvalidations 2024-02-27 16:53:37 +01:00
SimonGschnell 21f7099878 refactor 2024-02-23 14:32:06 +01:00
ma0068 843ddad987 Statuschecks, Berechtigungen, add new Status 2024-02-23 12:28:26 +01:00
SimonGschnell ee7a819094 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-22 12:06:16 +01:00
SimonGschnell 0b84e1b608 finishes documentation on Profil.php controller 2024-02-22 09:00:53 +01:00
cgfhtw c034efb8b0 Unterbrechung bei laufender Unterbrechung 2024-02-21 09:19:56 +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
ma0068 6a5b2db79d Start Actions New, Edit, Delete 2024-02-15 17:02:16 +01:00
SimonGschnell 04f6ee6156 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-15 15:16:07 +01:00
SimonGschnell 6eeeb8b4b7 send email 2024-02-15 15:09:41 +01:00
SimonGschnell fd260a6307 changes the check if a user has permissions to accept or deny a profil update 2024-02-15 09:59:27 +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
ma0068 7ec24bfc7b Component Status: Tabelle 2024-02-13 10:45:00 +01:00
SimonGschnell 4b898bd976 queries full name of user that created profil_update using join in Profil_update_model 2024-02-12 15:58:52 +01:00
ma0068 f4197f090b Component Gesamthistorie 2024-02-12 15:11:00 +01:00
ma0068 824423f3ea Update Fkt getTypenStg() 2024-02-12 11:00:35 +01:00
SimonGschnell b21d3448cb fixes some data handling errors in controller functions 2024-02-12 09:07:51 +01:00
SimonGschnell bbf6616cd9 corrects the display of links to attachments of a profil update request 2024-02-09 14:41:29 +01:00
SimonGschnell 43492add0b changes how files are attached/replaced to a profil update 2024-02-09 13:55:08 +01:00
SimonGschnell cda13ac705 makes the send button in the profil update popup disabled instead of not showing it 2024-02-08 13:47:03 +01:00
SimonGschnell 89bc5a5d9d Assistenten koennen nur Profil Aenderungen von Studenten ansehen deren Organisationseinheit in den Berechtigung des Assistenten vorhanden sind (und kleiner sessionStorage fix der einen String zu Boolean converted) 2024-02-08 11:48:14 +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
SimonGschnell fa1871a059 adopting profil controllers/models/views to db table change 2024-02-07 16:34:00 +01:00
SimonGschnell 9362aea0cf when user does not have permissions to accept/deny a profil update request it is notified via alert modal 2024-02-07 14:21:25 +01:00
SimonGschnell 286c7be83d only displays profil update requests the uid has permissions for (mitarbeiter/stammdaten or student/stammdaten), also fixes bug and adds JSON.parse to get the value in the sessionStorage 2024-02-07 13:25:50 +01:00
ma0068 d56dbdf563 Adaptierung Notizcomponent: teleport datepicker, tinymce mount conditionally, fehlerhandling missing id and type 2024-02-07 09:28:30 +01:00
SimonGschnell a2d0f9e39a funciton that queries the ProfilUpdates now takes a associative array instead of multiple separate parameters 2024-02-05 11:17:07 +01:00
KarpAlex 1c2c12f0a5 Bismeldestichtag Model: added getByStudiensemester method 2024-02-02 18:41:18 +01:00
SimonGschnell 1460e6ed80 modifing uploaded files int the fetchProfilUpdates component works correctly 2024-01-31 15:22:03 +01:00
SimonGschnell 0e69e432da fixes a lot of bugs and adds the inseramum/insertvon/updateamum/updatevon fields to the cis_profil_update db table 2024-01-31 14:26:54 +01:00
SimonGschnell a21a292da6 dokument upload 2024-01-29 16:48:41 +01:00
SimonGschnell 20d6a34506 little style changes and adds name field to the public.tbl_cis_profil_update table 2024-01-24 12:18:21 +01:00
ma0068 b8c885c8a4 Remove html-Tags in tabulator text 2024-01-24 09:04:53 +01:00
SimonGschnell 13f2bb4e85 fixes little bug where status timestamp was converted from null to the current date, with create_date in php 2024-01-23 11:40:02 +01:00
SimonGschnell df74bade9b fixes bug when getting all the profil update requests and makes it possible to add a message when dening or accepting a profil update 2024-01-23 11:00:43 +01:00
SimonGschnell fb9b65b138 changes how to display the hr table with all the user update requests and the update request table in the profil view, also adds some new columns to the cis_profil_update table to store the status, status date and status message 2024-01-22 14:45:32 +01:00