Commit Graph

52 Commits

Author SHA1 Message Date
KarpAlex 85107afb63 education/Zeugnisnote_model: Noten can be filtered by zeugnis flag 2022-03-02 12:19:37 +01:00
KarpAlex 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
Andreas Österreicher 13a040737a Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +02:00
KarpAlex 493bf0edda Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-06 22:35:40 +02:00
KarpAlex 24a979f9f1 Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected 2021-08-18 22:16:15 +02:00
KarpAlex 367c266e2e Zeugnisnote_model.php: added method getEctsSumsByPerson 2021-07-29 13:02:24 +02:00
KarpAlex 3d22412321 added parameters aktiv, lehre, offiziell, positiv to getByPerson method of Zeugnisnote_model.php 2021-06-14 18:39:29 +02:00
KarpAlex 8fe1129910 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-05-18 23:40:39 +02:00
Cris 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
Cris 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
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:54:54 +02:00
KarpAlex 5fa856c138 add erhalter kz to getByPerson method from Zeugnisnote_model.php 2021-04-22 01:02:32 +02:00
Cris 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
cris-technikum 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
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +02:00
KarpAlex 5b369f7020 Zaugnisnote_model: added getByPerson method 2021-03-29 18:49:41 +02:00
KarpAlex ee7d51d2b3 Pruefung_model.php: method for retrieving Prüfung by person and studiensemester 2021-03-15 23:27:28 +01:00
Cris 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
Andreas Österreicher 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
KarpAlex 1f88bfae40 - Projektbetreuer Model: added getBetreuerByToken method
- phrasesupdate: added new Projektarbeitsbeurtielung phrases
2021-02-04 11:21:40 +01:00
Cris 52450561fd Added method getApprovedOrRejected() to Anrechnung Model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:20:10 +01:00
Cris 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
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
alex 15877dd914 Lehrveranstaltung_model getStudents: possible to get only active students 2020-10-13 18:32:09 +02:00
Cris 649d0e7f5d Fixed: retrieving correct Prüfungsprotokoll data for Incomings
Study type (Bachelor/Master) and -kennzahl and -name are retrieved from
Studienordnung. Studienordnung is not assigned to Incomings, so this data
was missing.
. Now study type is always retrieved from Abschlusspruefung.
. If no Studienordnung is provided, studykennzahl and -name are retrieved
from Student.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-07-14 17:40:47 +02:00
KarpAlex f1a346c545 Prüfungsprotokoll:
- new fields: beginnzeit, endezeit, Prüfungsantritt
- Einverständniserklärung: if not checked no save possible
- can be saved and freigegeben
- added phrases
2020-05-28 11:08:38 +02:00
KarpAlex 28d0563fa5 Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German 2020-05-25 18:21:08 +02:00
Paolo 4e6fc7c607 - Create new function getError in helper hlp_return_object_helper that should just returns retval
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
2019-12-18 18:35:19 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
hainberg 3c98988c1c Added new method hasVertrag()
This method checks if a Projektbetreuer has a corresponding contract.
If vertrag_id is null => is still a new Projektauftrag
If vertrag_id is present => Projektauftrag has been ordered and a
contract has been created.
2019-09-12 13:51:54 +02:00
hainberg 237a906ecf Added new method hasVertrag()
This method checks if a Lehrauftrag has a corresponding contract.
If vertrag_id is null => is still a new Lehrauftrag
If vertrag_id is presendt => Lehrauftrag has been ordered and a contract
has been created.
2019-09-12 13:50:31 +02:00
alex 5255e6166d crm/Prestudent_model, education/Lehrveransaltung_mode, person/Person_model: models are loaded in constructor to avoid multiple load 2019-09-06 15:49:47 +02:00
Andreas Oesterreicher 36942d586d Direkte Gruppen werden Defaultmäßig als Mailgruppen erstellt und als
nicht sichtbar
2019-09-04 12:29:38 +02:00
alex 8f5b32ee94 education/Lehreinheit_model: getLesForLv method: Lehreinheiten ordered by lehreinheit_id by default 2019-07-04 11:21:30 +02:00
alex 4151ae5364 education/Lehreinheit_model:
- prestudent_id also retrieved when getting students of a Lehreinheit
2019-04-30 14:00:01 +02:00
alex d32c764955 - Lehrveranstaltung_model: getLvsWithIncomings method takes studienplan_lehrveranstaltung export field (= studienplanrelevant) into account 2019-04-11 10:11:08 +02:00
alex ecadec9280 Changes in Models:
- education/Lehreinheit_model getLesForLv: studiengang_kz and studiengang_kuerzel of lehreinheitgruppen is also retrieved
- education/Lehrveranstaltung_model getLvsWithIncomingPlaces:
   -- Retrieving not by Studienordnung Gültigkeit, but by tbl_studienplan_semester
   -- retrieving lvs of studiengang ECI Campus International
2019-04-08 17:21:38 +02:00
alex 8bc8679143 - added method getLvsWithIncomings to education/Lehrveranstaltung_model (from mobility online extension) 2019-03-25 16:39:47 +01:00
alex abe64c1bfe education/Lehreinheit_model:
- added info if Lehreinheit directly assigned (direktinskription) in getLesForLv method
- added getStudenten method for getting all students of a lehreinheit
2019-03-21 16:13:05 +01:00
alex c325c98728 direct group deletion, education/Lehreinheitgruppe_model:
- fixed "bug" when checking if users are in group
- added additional checks for existence of group in lehreinheitgruppe and benutzergruppe before group deletion
2019-03-08 10:32:05 +01:00
alex 68dd0f3cb8 - added method getLesForLv to education/Lehreinheit_model
- added methods direktUserAdd, direktuserDelete (for direkt User Zuordnung to le) to education/Lehreinheitgruppe_model
- added method getLvsByStudent to education/Lehrveranstaltung_model
- Added hasSequence = false to Benutzergruppe_model
- fixed typo in lehrveranstaltungDBML
2019-03-06 19:03:02 +01:00
Andreas Österreicher b56fb6deb8 Added Cronjob to automatically add direct groups to schedule 2019-01-31 08:43:24 +01:00
alex 89849d30fb - added hasSequence in models to avoid sequenceerrors
- added getByDate, generateMatrikelnummer methods
2019-01-11 18:39:48 +01:00
alex f907cd7292 - Benutzerfunktionen can be retrieved recursively by oe (oe and all oes below) 2018-09-28 17:03:26 +02:00
alex 1cea25a6f3 load correct Studiensemester Model 2018-09-14 15:53:33 +02:00
alex 0916a27ecb - replaced spaces by hyphens in lv group names
- updated comment for getBenutzerFunktionen
2018-09-13 09:55:06 +02:00
alex a66766a3ab - correct studiengang model loaded
- renamed getNextorAktSemester to getAktOrNextSemester
2018-08-23 18:34:04 +02:00
alex ceb9eb57de removed unnecessary array merge 2018-08-23 10:23:33 +02:00
alex fbb3f1694b - added function for generating unique lv-group strings
- added functions for getting students and lecturers by lv
- added function for getting Studiengaenge By Studiensemester
- added function for getting Ausbildungssemester by Studiensemester and Studiengang
2018-08-22 17:36:53 +02:00
Andreas Oesterreicher 42960ffe20 Moodle-Integration aus FHComplete Core entfernt und in eigenes Addon
ausgelagert.
Support für Moodle 1.9 entfernt
2017-08-02 14:05:31 +02:00