a663fa9436
Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 11:30:32 +02:00
48798e8309
Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen
2023-04-24 11:20:53 +02:00
01ca8f6fb9
Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige
2023-04-24 11:18:40 +02:00
8feec18ff7
Changed query to get Leitung of Lehrveranstaltung-Organisationseinheit (instead of 'Fachbereich')
2023-03-27 10:58:59 +02:00
d3f88597d9
Created Model Anrechnungszeitraum_model
...
Inserts / Updates / Deletes Anrechnungszeitraum
2023-03-06 13:19:15 +01:00
10ed780b6c
Added method getFachbereichsleitungByLv to Lehrveranstaltung_model
...
Gets all fachbereichsleiter of a Lehrveranstaltung
2022-12-06 10:50:08 +01:00
911035d5ad
added method getBetreuerart to Projektbetreuer model
2022-12-02 19:48:23 +01:00
763b0bb756
renamed betreuerart of secondary examiner of bachelor thesis with Vorsitz from Senatspruefer to Senatsmitglied
2022-11-16 17:19:13 +01:00
83b38b999d
Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat
2022-11-08 15:35:08 +01:00
cc33502ab3
adapted "resend token for Begutachter" mail to Projektarbeitsbeurteilung controller split
2022-09-01 02:23:32 +02:00
824a148b92
adapted core to Projektarbeitsbeurteilung Zweitbegutachter/Erstbegutacher Controller split
2022-08-31 13:38:38 +02:00
92762c5dc2
Projektarbeitsbeurteilung:
...
- getZweitbegutachterWithToken: returns Zweitbegutachter (Senatspruefer)
from Senatspruefungen as well
- added phrase
2022-08-27 01:34:03 +02:00
1d5d5e4a84
added getEndabgabe method to Paabgabe model
2022-08-24 18:07:34 +02:00
82d7891f3c
Projektarbeitsbeurteilung possible for Prüfungssenat. Mails are sent to Senat members, Senat members are displayed with correct labels, external Prüfer can get login token
2022-08-23 17:45:12 +02:00
9d7589ddc4
Added DB methods to get ECTS Summen by schulische/berufliche Qualifikation
2022-07-07 10:18:40 +02:00
44a3231d55
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
2022-07-06 12:00:09 +02:00
b52a3c9397
Added DB queries to calculate ECTS Summe in Lehrveranstaltung_model.php
2022-06-22 10:51:39 +02:00
a493ddd68e
merge feature 18233
2022-04-29 11:04:32 +02:00
48333f62f0
autocomplete redesign & template field placement
2022-04-14 15:07:44 +02:00
d84ed369b1
fix merge conflicts after merging master
2022-03-28 11:36:47 +02:00
d5d6432f14
modified model added db entry for lehrtyp added db col for template modified vilesci and added webservicerights for autocomplete
2022-03-23 15:54:44 +01:00
85107afb63
education/Zeugnisnote_model: Noten can be filtered by zeugnis flag
2022-03-02 12:19:37 +01:00
1a8b267a89
Projektbetreuer_model.php: getBetreuerOfProjektarbeit returns only one row for each person
2022-01-25 14:55:01 +01:00
f9b93f55e4
- Projektbetreuer model getBetreuerOfProjektarbeit: added full name and projekttyp_kurzbz are also
...
returned
- abgabe_lektor_details.php: grading only possible after end upload of thesis, and only beginning with SS2022
- added projektbeurteilung phrases to core locale and phrasesupdate.php
2022-01-25 12:40:41 +01:00
cf7cfd7cd2
sorted results of geBetreuerOfProjektarbeit method of Projektbetreuer_model.php and added mitarbeiter data to the result
2022-01-21 05:15:36 +01:00
094f75ef61
- Projektbetreuer_model.php: method getBetreuerOfProjektarbeit for getting Betreuer by betreuerart
...
- phrasesupdate.php: added Projektarbeitsbeurteilung phrases
2022-01-21 00:41:13 +01:00
b8ac076bdb
projektbeurteilungs uebersicht hinzugefuegt
2022-01-19 17:56:30 +01:00
901f9ba7fa
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-10-13 09:05:05 +02:00
13a040737a
Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
...
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +02:00
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
24a979f9f1
Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected
2021-08-18 22:16:15 +02:00
367c266e2e
Zeugnisnote_model.php: added method getEctsSumsByPerson
2021-07-29 13:02:24 +02:00
3d22412321
added parameters aktiv, lehre, offiziell, positiv to getByPerson method of Zeugnisnote_model.php
2021-06-14 18:39:29 +02:00
8fe1129910
Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer
2021-05-18 23:40:39 +02:00
7bbd94bb89
Adapted & Enhanced Withdrawing of Approvement
...
. Added 'genehmigt von'
. Moved out to Model and added db rollback
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:35:14 +02:00
842651e676
Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen'
...
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 17:03:42 +02:00
21ce118f0b
Merged master into branch
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:54:54 +02:00
5fa856c138
add erhalter kz to getByPerson method from Zeugnisnote_model.php
2021-04-22 01:02:32 +02:00
bb0776a808
Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code
...
Moved code from Controller to Anrechnungmodel.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:41:25 +02:00
b7a6cefa36
Added Controller to create Anrechnungsantrag + Model Anrechnungbegruendung_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:00:14 +02:00
170b2485d3
Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-06 18:06:30 +02:00
5b369f7020
Zaugnisnote_model: added getByPerson method
2021-03-29 18:49:41 +02:00
ee7d51d2b3
Pruefung_model.php: method for retrieving Prüfung by person and studiensemester
2021-03-15 23:27:28 +01:00
abcf41f7a3
Added feature to withdraw approvals/rejections for STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-17 19:07:13 +01:00
bff6307a62
Anrechnungen
...
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
2021-02-12 15:52:26 +01:00
1f88bfae40
- Projektbetreuer Model: added getBetreuerByToken method
...
- phrasesupdate: added new Projektarbeitsbeurtielung phrases
2021-02-04 11:21:40 +01:00
52450561fd
Added method getApprovedOrRejected() to Anrechnung Model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 10:20:10 +01:00
297c96c3e5
Changed method getLastAnrechnungstatus() -> added param status_kurzbz
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:53:51 +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
15877dd914
Lehrveranstaltung_model getStudents: possible to get only active students
2020-10-13 18:32:09 +02:00
Harald Bamberger