01c3a67762
Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI
2024-02-16 14:11:02 +01:00
f6e7d2858a
Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI
2023-12-18 17:01:25 +01:00
15225d0b03
added Benutzerfunktion CRUD methods
2023-10-09 20:29:54 +02:00
4cc8b555d2
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-10-09 11:38:37 +02:00
31426d3c5e
Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu
2023-09-25 16:50:40 +02:00
9bfcbf3bf1
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-09-19 11:06:32 +02:00
64ce3d1f6a
Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung'
2023-07-04 10:34:14 +02:00
d9eb0f5704
- kennzeichen beim zusammenlegen uebernehmen
2023-06-16 11:30:03 +02:00
f5ee097b72
- doppelte benutzer bug fix
2023-06-02 12:01:31 +02:00
2f07590461
Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten
2023-05-04 14:59:12 +02:00
08de013c23
Fixes: code quality checks
2023-04-25 16:07:42 +02:00
cd6443d9c0
-added scheduler for generating and saving ESI -first version of generateESI job
2023-03-22 17:41:15 +01:00
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
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
0bd7d6f7c6
- editieren von stammdaten im infocentertool
2022-10-18 11:00:57 +02:00
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
a3c9d75617
added model for adressentyp
2022-08-16 13:10:20 +02:00
4dab69cb15
Reverted changes in application/models/person/Benutzer_model.php, pk => array
2022-07-13 09:45:58 +02:00
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
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
acffebf515
check doppelte benutzer auch mit unterschiedlicher groß und kleinschreibung
2022-07-06 10:56:24 +02:00
1641a879af
PHP Version Compatibility fixed
2022-07-01 09:04:52 +02:00
fdce499f37
prueft auf doppelte benutzer
2022-05-11 11:31:52 +02:00
fce72b1f91
fix merge conflicts after merging master
2022-03-28 11:59:26 +02:00
d7ad3d80f3
Merge branch 'master' into feature-16190/Issues_automatisches_Beheben
2022-02-28 13:07:06 +01:00
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
c36d0358a9
check duplicate auch studiengang wird nun beruecksichtigt
2022-01-13 15:16:34 +01:00
2d46d80b5f
meldung wird nun auch angezeigt wenn es die selbe person id ist
2021-12-22 16:26:45 +01:00
cf1b34769c
api & anpassungen fuer das kartenterminal
2021-11-12 12:16:35 +01:00
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
3e00e4b3a1
infocenter warning falls bewerberIn bereits vorhanden ist
2021-10-12 13:08:17 +02:00
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
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
52127ade60
fixed datumanzeige
2021-09-17 10:27:55 +02:00
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
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
8fe1129910
Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer
2021-05-18 23:40:39 +02:00
170b2485d3
Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-06 18:06:30 +02:00
42d2f45561
bei den anmerkungen studiengang hinzugefuegt
2021-04-06 13:51:27 +02:00
5f187b5293
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-03-07 21:44:56 +01:00
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
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
5235915d6a
Changed method getNotizByAnrechnung() -> added param titel
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:57:27 +01:00
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
8a75bc9fdd
Added method getFullName() to Person_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 18:54:42 +01:00
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
119d5d99df
Fixed Query to get User for Messages by PersonID and OrganisationUnit
2020-11-23 16:18:43 +01:00
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
443caa91f2
Messaging sysntem: the internal email account is used only if the user
...
account is older then 24 hours
2020-11-09 10:45:25 +01:00
a7d577baa5
person/Kontakt_model: added getZustellKontakt method for getting latest Zustellkontakt
2020-10-22 00:38:52 +02:00
Andreas Österreicher