ma0048
33b35286d3
Merge remote-tracking branch 'origin/master' into feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen
2022-09-12 10:15:50 +02:00
Cris
7bba155bb5
Adapted function getPreviousFrom to return more than 1 previous semester if needed
2022-06-22 10:52:51 +02:00
ma0048
3d3f4d5453
erste version infocenter lehrgaenge
2022-05-24 13:51:39 +02:00
Harald Bamberger
10aa88e262
Merge branch 'feature-15391/Positive_Zeitsperre'
2022-04-19 13:46:38 +02:00
Cris
37f6a0caaa
Merge branch 'master' into feature-15391/Positive_Zeitsperre
...
# Conflicts:
# system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
ma0048
9460fd19d8
kurzbz in absage dropdown und abgewiesene uebersicht angepasst
2022-03-08 11:43:34 +01:00
Andreas Österreicher
18731ede47
Laden von Studiengangsleitungen angepasst, Error Handling bei fehenden
...
Studiengangsleitungen
2022-02-25 11:59:38 +01:00
Cris
9abc018e08
Removed db->escape when using getLeitung/getAssistance method
...
...it throws an error since query was adapted to accept array and anyway, is
not necessary anymore.
2022-02-21 17:19:02 +01:00
Cris
d2055f759e
Added method getAssistance in Studiengang Model
2022-02-21 16:52:13 +01:00
Cris
d57a62dbe3
Adapted method getLeitung in Studiengang Model to accept studiengang array
2022-02-21 16:51:17 +01:00
Cris
ca51fef7f8
Added method to get actual Studiensemester to Studiensemester Model
2022-02-17 12:33:38 +01:00
Cris
a4ffe9104b
Fixed query to get Studiensemest correctly when using getByDate method
2021-12-20 09:49:49 +01:00
Andreas Österreicher
4b94dfbda7
Merge branch 'master' into feature/Anrechnungen_NEU
2021-09-03 11:08:29 +02:00
Andreas Österreicher
6034da43d8
Fixed loading of current Geschaeftsjahr if it is the last day of the
...
year
2021-08-31 07:56:59 +02:00
cris-technikum
635974fa22
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
ma0048
7314352e79
absagen nun möglich auch bei studenten die den reihungstest absolviert haben
2021-06-22 16:54:45 +02:00
ma0048
2c6d8937f6
funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv
2021-05-12 12:48:29 +02:00
Cris
7340564d1e
Added job to send mail to STGL with yesterdays new Anrechnungen
...
. added AnrechnungJob sendMailToSTGL()
. removed functions to send mail from CTRL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-16 17:42:46 +01:00
Cris
3fb2c3d387
Added Sanchomail sent when Anrechnung is applied by student
...
Mail goes to STGL. If not present, it will be sent to STGL assistance.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-27 10:33:19 +01:00
Cris
db10f78505
Added method getLeitung() to Studiengang_model to retrieve STGL by studiengang_kz
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 18:52:28 +01:00
Andreas Österreicher
b5510f023e
Fixed Corner Case where wrong actual Studysemester ist retrieved if Start and End Dates are overlapping
2020-12-02 12:18:02 +01:00
Andreas Österreicher
e6a761abd7
Darstellungsfehler in OE-Widget behoben
2020-10-15 13:38:01 +02:00
Andreas Oesterreicher
8a4d2abfd9
Added Start and End Date to getAktOrNextStudiensemester
2020-08-20 20:33:17 +02:00
Paolo
32490dfc2d
organisation/Studiensemester_model->getLastOrAktSemester: changed query to get more data
2020-06-21 21:57:50 +02:00
Paolo
91d78066a4
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-03-31 20:33:01 +02:00
Paolo
88fc901bf7
- Added new config entry ou_function_whitelist in message.php
...
- Added new constant CFG_OU_FUNCTION_WHITELIST in library MessageLib
- MessageLib->getOeKurzbz now filters out organization units based on config entry ou_function_whitelist
- Removed redundant templates in Vorlage_widget
2020-03-06 16:56:27 +01:00
alex
2e30841b0d
- added UDF prestudent dropdown to infocenterDetails
...
- crm/Prestudent_model: improved code, e.g. replaced ->retval
2020-01-28 17:21:47 +01:00
Paolo
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
Manfred Kindl
753225e39e
Studienplan-Sprache für Cronjob correctStudienplan
2019-10-07 18:52:07 +02:00
hainberg
b8ed622f96
Added method getParent()
...
This method gets only one parent of given organisational unit.
This ist to easily retrieve department of a studiengang or
fakultät of department etc.
2019-09-12 13:53:39 +02:00
alex
be91fc93c0
- organisation/Studiensemester_model: added getPreviousFrom method, getNextFrom(): next studiensemester with start = ende is not skipped
2019-09-06 15:36:32 +02:00
Cris
cf5177e5e1
Added method getNext() to Studiensemester_model
...
getNext() returns the upcoming study semester.
2019-08-01 15:25:52 +02:00
Manfred Kindl
e598264f30
New Cronjobs for Reihungstests
...
- runZentraleReihungstestAnmeldefristAssistenzJob
- runZentraleReihungstestNachtraeglichHinzugefuegtJob
- runRemindApplicantsOfPlacementTestJob
- New function getWorkingDays returns business days between two dates
- New function checkReachedRegistrationDate
- New function getApplicantsOfPlacementTestForCronjob
- New function getApplicantAssignedAfterDate
- New function getApplicantsOfPlacementTest
- New function getTestsOnDate
- New function loadStudiengaengeFromTyp
2019-02-25 10:30:34 +01:00
Andreas Österreicher
9c78169c52
Merge branch 'master' into lvgruppen
2019-02-13 16:32:02 +01:00
Andreas Österreicher
7662edd061
Neue Notenübersicht für Studenten
...
- Ansicht aller LVs die der Studierende lt Studienplan besuchen muss
- Lehrveranstaltungen die ausserhalb des Studienplanes besucht wurden
- Notendurchschnitt pro Semester und über alle Semester nur für
Studienplanrelevante LVs
- Neuer Menüpunkt im FAS für Zugriff auf die Notenliste
2019-02-13 15:52:51 +01:00
Paolo
4379121637
- Added hasSequence in models to avoid sequenceerrors
...
- Added getByDate, generateMatrikelnummer methods
2019-02-05 10:40:39 +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
80b6f24f43
- Fixed bug when inactive parents are not retrieved even when includeinactive = true
2018-10-03 17:59:47 +02:00
alex
a66766a3ab
- correct studiengang model loaded
...
- renamed getNextorAktSemester to getAktOrNextSemester
2018-08-23 18:34:04 +02:00
alex
4b6aefa3a1
added getNextOrAktSemester method
2018-08-23 10:55:49 +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
Paolo
81e4f2968e
Merge branch 'master' into permissions
...
- Added new core controller called Auth_Controller that extends FHC_Controller and manage the authentication
- All the controllers that were extending the CI_Controller now they extend the FHC_Controller
- All the controllers that were extending the FHC_Controller now they extend the Auth_Controller
- Added the method isAllowed to the FiltersLib to check if the authenticated user has the required permissions
- FilterWidget and controller Filters are using the method isAllowed from the FiltersLib
2018-06-08 17:53:12 +02:00
alex
6a67183738
added Parking feauture to infocenter
2018-05-16 20:00:19 +02:00
alex
024bb06b0f
improved currgeschaeftsjahrquery
2018-05-16 11:52:37 +02:00
Paolo
4f993b06f4
Merge branch 'master' into permissions
2018-05-14 13:44:03 +02:00
alex
e4cdac1acb
moved infocenter and sb admin js and css from include to public, get inactive parents/children oe is possible
2018-05-03 13:33:08 +02:00
alex
3b33e52df4
added getChild and getParents methods to CI model
2018-04-30 17:32:08 +02:00
Paolo
9d5c9b443e
Merge branch 'master' into permissions
2018-04-18 17:35:33 +02:00
alex
17bacc48c6
kostenstellen are retrieved only for permitted users, easier SQL statement, Geschaeftsjahr nex and current retrievement
2018-04-18 14:49:28 +02:00