 Alexei Karpenko
|
1c21e8f88d
|
Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten
|
2025-10-06 16:54:41 +02:00 |
|
|
Andreas Österreicher
|
666a6ea42c
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2025-10-02 14:32:00 +02:00 |
|
|
Andreas Österreicher
|
2b91ae87c0
|
Merge branch 'feature-61714/infocenter_hinweis_wenn_die_selbe_person_bereits_einen_aufrechten_status_im_selben_studiengang_hat'
|
2025-09-22 14:07:54 +02:00 |
|
|
Alexei Karpenko
|
473715c25c
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2025-09-18 17:39:31 +02:00 |
|
|
Alexei Karpenko
|
ce9a4e2e09
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-08-23 16:16:41 +02:00 |
|
|
ma0048
|
9ae78f2de6
|
master gemerged
|
2025-08-11 09:23:18 +02:00 |
|
|
ma0048
|
2b7f56622c
|
Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/organisation/Studienplan_model.php
# application/models/person/Notiz_model.php
# application/models/ressource/Mitarbeiter_model.php
# public/js/components/Stv/Studentenverwaltung.js
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-08-07 11:03:05 +02:00 |
|
|
Alexei Karpenko
|
caa70715ad
|
Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-07-15 15:24:30 +02:00 |
|
|
ma0048
|
31f0be35c8
|
selbe person auch wenn nicht abbrecher
|
2025-07-02 12:53:54 +02:00 |
|
|
ma0068
|
074403abf5
|
Tab Notizen: show Name of verfasser and bearbeiter
|
2025-06-11 17:27:33 +02:00 |
|
|
Alexei Karpenko
|
6f5fa9624f
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-06-10 13:58:50 +02:00 |
|
|
ma0048
|
f96bfbe000
|
lehrfächerverteilung v1
|
2025-05-28 07:51:10 +02:00 |
|
|
Alexei Karpenko
|
382006aa8b
|
Projektarbeit Studierendenverwaltung: now possible to save and edit Projektbetreuer
|
2025-05-16 13:37:21 +02:00 |
|
|
ma0068
|
9d4568e15e
|
client side placementtest handling, filtering Dropdowns placementtests, Phrases, show future Placementtests, open Reihungstestverwaltung
|
2025-05-08 09:58:08 +02:00 |
|
|
ma0068
|
bca95bcb66
|
change dateFormat Tab Notizen
|
2025-02-10 11:04:02 +01:00 |
|
|
Alexei Karpenko
|
0a97b39efb
|
added phrases for electronic onboarding verification page
|
2024-12-24 19:14:04 +01:00 |
|
|
cgfhtw
|
469c01c9e6
|
Comments
|
2024-12-20 14:15:28 +01:00 |
|
|
cgfhtw
|
e13e612ad9
|
Merge branch 'master' into feature-53938/StV_Tab_Noten_fertigstellen
|
2024-12-19 16:48:15 +01:00 |
|
|
ma0048
|
70b44c2202
|
Merge branch 'feature-40717/pep_faktor' into pep_deploy
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-12-13 11:50:53 +01:00 |
|
|
ma0048
|
8127091e2e
|
- tags werden im fas nicht angezeigt
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
|
2024-12-11 13:25:38 +01:00 |
|
|
Alexei Karpenko
|
cc99d2b378
|
Gruppenmanagement: added checks so only Gruppenmanager can edit groups
|
2024-12-10 12:03:58 +01:00 |
|
|
Alexei Karpenko
|
4e857c9e4e
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2024-11-20 17:00:26 +01:00 |
|
|
cgfhtw
|
fe7ca2bf69
|
Teacher Proposal
|
2024-11-20 11:06:28 +01:00 |
|
|
Harald Bamberger
|
1691c75a84
|
replace dependencies on legacy code with ci model functions
|
2024-11-07 19:18:08 +01:00 |
|
|
Harald Bamberger
|
e78c2e1bf7
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-10-30 17:19:01 +01:00 |
|
|
Alexei Karpenko
|
b8ff37eb8e
|
added kontakt verifikation table for saving of kontakt verifikation data, added model for the table
|
2024-10-19 17:25:09 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
SimonGschnell
|
e475fe568e
|
adds the dashboard menu punkt and adds greeting to the dashboard view
|
2024-10-17 09:58:28 +02:00 |
|
|
Johann Hoffmann
|
effad6f62d
|
only fetch person_id, vorname, nachname & unruly from tbl_person on checkUnruly()
|
2024-09-20 15:16:20 +02:00 |
|
|
Johann Hoffmann
|
79ea8c4521
|
renamed unrulyPerson api to checkPerson; built in logic into infoCenterDetails to trigger a number of checks about any changed data in the info center (in this case unruly) and update the page accordingly; Also fixed a bug when saving stammdaten without kontakt entries;
|
2024-09-17 14:09:49 +02:00 |
|
|
Johann Hoffmann
|
27c312d7d3
|
filterPerson unrulyPerson api & person model
|
2024-09-12 15:42:21 +02:00 |
|
|
Johann Hoffmann
|
d9f5646ad1
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-09-10 10:17:55 +02:00 |
|
|
Harald Bamberger
|
a8141e5dac
|
Merge branch 'master' into feature-25999/C4
|
2024-09-09 11:45:10 +02:00 |
|
|
cgfhtw
|
ffabd681c8
|
setFirstStudent logic
|
2024-08-08 16:24:23 +02:00 |
|
|
cgfhtw
|
f1a2ef25c7
|
Remove unused functions
|
2024-08-08 12:45:36 +02:00 |
|
|
ma0068
|
a728d20b70
|
codesniff Models
|
2024-08-06 08:42:20 +02:00 |
|
|
ma0068
|
90162ed2c9
|
refactor generate alias, add transaction to addStatus
|
2024-08-02 13:55:46 +02:00 |
|
|
Johann Hoffmann
|
c9471c344d
|
added unruly person boolean column to tbl_person; studStatus/leitung added a checkbox to mark persons as unruly unrelated to studstatus datastate;
|
2024-07-31 14:37:26 +02:00 |
|
|
SimonGschnell
|
a0871657ca
|
adds insertFile to the new ProfilUpdate FhcAPIController and starts a transaction when deleting the foreign key from the profil update and deleting the old file
|
2024-07-22 11:24:47 +02:00 |
|
|
ma0068
|
780dce293d
|
refactor addStudent, bugfix updateList after delete, check organisationsform ersterStudent
|
2024-07-15 11:57:16 +02:00 |
|
|
ma0068
|
a728bec15f
|
BewerberZuStudent: new action turnIntoStudent
|
2024-07-11 10:52:59 +02:00 |
|
|
ma0068
|
fd0fb7c9b4
|
Refactor Notizcomponent: add Endpoint and core NotizController
|
2024-04-22 16:21:54 +02:00 |
|
|
SimonGschnell
|
1447a930d3
|
adds more phrasen to the profil and the profilUpdate views, headers of tables phrasen
|
2024-04-19 14:24:32 +02:00 |
|
|
ma0068
|
69067c1ef9
|
Notizcomponent refactor: fhcapi, validations, phrases, format dates
|
2024-04-12 10:48:40 +02:00 |
|
|
SimonGschnell
|
5b2365a1e2
|
stores the status of profilUpdate with their language in the database and adapts the logic to it
|
2024-04-09 15:02:17 +02:00 |
|
|
SimonGschnell
|
96e0bfa72c
|
changes how the EditProfil Modal passes props to its children
|
2024-03-07 11:08:43 +01:00 |
|
|
ma0068
|
7bec7016c3
|
merge master into branch FHC4
|
2024-03-05 16:31:41 +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 |
|
|
Andreas Österreicher
|
01c3a67762
|
Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI
|
2024-02-16 14:11:02 +01:00 |
|