Commit Graph

153 Commits

Author SHA1 Message Date
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
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
SimonGschnell b53dec6a31 adds breadcrumb to modal and adjusts controller functions and api calls 2024-01-16 15:44:04 +01:00
SimonGschnell 5b597dbc31 changing the editProfil Modal from an Accordion to a select 2024-01-08 15:19:18 +01:00
Simon Gschnell ee8051915e formats the update timestamps in php, differently tracks which properties and informations where changed by the user 2024-01-04 16:06:47 +01:00
Simon Gschnell bb0656c480 http response returns the timestamp of the change 2023-12-29 12:01:25 +01:00
Simon Gschnell 981e782c57 checks whether the editProfilData was changed by the user and is not in the original state 2023-12-28 10:15:24 +01:00
Simon Gschnell bff4fa5544 Merge branch 'master' into feature-25999/C4_ma0594dev 2023-12-13 14:34:37 +01:00
Harald Bamberger 31426d3c5e Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu 2023-09-25 16:50:40 +02:00
cgfhtw 8901791911 Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4 2023-07-19 14:37:59 +02:00
cgfhtw 72d0517701 Merge branch 'master' into feature-25999/C4 2023-07-19 10:55:35 +02:00
cgfhtw 64ce3d1f6a Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung' 2023-07-04 10:34:14 +02:00
ma0048 f5ee097b72 - doppelte benutzer bug fix 2023-06-02 12:01:31 +02:00
cgfhtw c56b774d1d 3 Versions 2022-12-15 09:42:28 +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 0bd7d6f7c6 - editieren von stammdaten im infocentertool 2022-10-18 11:00:57 +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 4dab69cb15 Reverted changes in application/models/person/Benutzer_model.php, pk => array 2022-07-13 09:45:58 +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
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
ma0048 acffebf515 check doppelte benutzer auch mit unterschiedlicher groß und kleinschreibung 2022-07-06 10:56:24 +02:00
Andreas Österreicher 1641a879af PHP Version Compatibility fixed 2022-07-01 09:04:52 +02:00
ma0048 fdce499f37 prueft auf doppelte benutzer 2022-05-11 11:31:52 +02:00
Harald Bamberger fce72b1f91 fix merge conflicts after merging master 2022-03-28 11:59:26 +02:00
Andreas Österreicher d7ad3d80f3 Merge branch 'master' into feature-16190/Issues_automatisches_Beheben 2022-02-28 13:07:06 +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
ma0048 c36d0358a9 check duplicate auch studiengang wird nun beruecksichtigt 2022-01-13 15:16:34 +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 cf1b34769c api & anpassungen fuer das kartenterminal 2021-11-12 12:16:35 +01: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 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist 2021-10-12 13:08:17 +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
KarpAlex 45e4d5576c Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-21 00:59:26 +02:00
ma0048 52127ade60 fixed datumanzeige 2021-09-17 10:27:55 +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
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
KarpAlex 8fe1129910 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-05-18 23:40:39 +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
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +02:00
KarpAlex 5f187b5293 Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-03-07 21:44:56 +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
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 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 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 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 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
Andreas Österreicher 119d5d99df Fixed Query to get User for Messages by PersonID and OrganisationUnit 2020-11-23 16:18:43 +01:00