491f025364
Merge branch 'feature-15970/kartenterminal'
2022-05-03 10:18:40 +02:00
826d479761
limit hinzugefuegt
2022-05-02 11:33:33 +02:00
f14496ef5a
checkstudienbeitrag hinzugefuegt
2022-05-02 11:31:23 +02:00
6a51e841ab
Merge branch 'feature-15887/BTMessagesBeiMasterAnInfocenter'
2022-04-13 12:17:50 +02:00
fce72b1f91
fix merge conflicts after merging master
2022-03-28 11:59:26 +02:00
9460fd19d8
kurzbz in absage dropdown und abgewiesene uebersicht angepasst
2022-03-08 11:43:34 +01:00
f6de822ea0
Fixed Konto_model->setPaid method
2022-02-15 16:49:46 +01:00
d8fd0400cb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15887/BTMessagesBeiMasterAnInfocenter
2022-02-03 08:57:25 +01:00
cf1b34769c
api & anpassungen fuer das kartenterminal
2021-11-12 12:16:35 +01:00
70c24899d0
Verhalten MessageAnOEs für Master angepasst
2021-11-09 09:32:05 +01:00
a31d33bcf9
in eigenes model
2021-10-27 17:59:52 +02:00
15ba3602f7
job fixed
2021-10-25 13:22:44 +02:00
b74247a7f2
Merge remote-tracking branch 'origin/feature-15314/infocenter_abgewiesen_von_nicht_abgeschickten' into feature/infocenter_anpassungen
2021-10-22 07:13:22 +02: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
4c74176d64
Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition'
2021-10-11 12:55:24 +02:00
c325046e8e
- Renamed public method DB_Model->hasUDF to udfsExistAndDefined
...
- Adapted controllers/system/FAS_UDF and models/crm/Prestudent_model
- Added new private method _getUDFsNoPerms to DB_Model
- Changed private method DB_model->_prepareUDFsWrite to use _getUDFsNoPerms
2021-10-08 17:30:28 +02:00
4a4c95aa08
auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt
2021-10-04 12:37:50 +02:00
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +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
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
36d0981331
neuer Branch + Korrektur Fehlermeldung bei Änderung Status
2021-07-23 12:57:28 +02:00
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
1ce0045f86
- Prestudent_model.php: added getStandortCode and getFoerderrelevant methods
...
- indent formatting
2021-06-25 13:19:02 +02:00
ccffdf9b7f
statusgruende sortiert
2021-06-10 12:00:09 +02:00
5330e2b250
beim abweisen das studiensemester hinzugefuegt
2021-06-01 11:13:23 +02:00
2c6d8937f6
funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv
2021-05-12 12:48:29 +02:00
bc7e3c5cc5
zgv ueberpruefung hinzugefuegt
2021-04-20 13:51:41 +02:00
7c875d5f80
Usability: Added 'ZGV' to STGL and lectors Detail site
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-06 14:48:08 +02:00
287cddf926
added zgv ueberpruefung
2021-03-23 09:25:24 +01:00
3366f091dd
Anrechnungen - Fixed Details Page for People with multiple Accounts
2021-02-15 21:12:14 +01:00
a218b36323
Added getUID() by prestudentID - method to Prestudent Model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-01 10:03:18 +01:00
3b33b6bcdb
Formatierung des Betrags bei automatisierten Gegenbuchungen korrigiert
2020-09-18 11:55:52 +02:00
b365ac5611
Funktion zum Zahlungsausgleich hinzugefügt
2020-08-28 09:50:48 +02:00
c0693b3899
Merge branch 'master' into feature-6656/Worker_queue
2020-06-17 09:03:41 +02:00
3199d5e25f
Added Function for Loading Last Student Status of all Prestudents of a Person
2020-05-25 21:43:32 +02:00
784afe0044
crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine
2020-05-14 13:40:34 +02:00
7e1f1acb22
Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland
2020-05-13 16:18:05 +02:00
da621a2154
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-03-12 11:19:17 +01:00
749e9be64d
Messaging system: student writes new message: separate logic for master and bachelor
2020-02-04 17:02:25 +01:00
53ac4d11ba
Do not retrieve the degree program name from studiengang table but directly from the organization unit table
...
in student sent messages page and student write to organisation unit page
2020-02-04 14:42:53 +01:00
2e30841b0d
- added UDF prestudent dropdown to infocenterDetails
...
- crm/Prestudent_model: improved code, e.g. replaced ->retval
2020-01-28 17:21:47 +01:00
47682f37df
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-16 16:36:57 +01:00
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
2a4360862a
- Reply Button in Inbox/outbox Page
...
- Write new message Button with Layer/Popup
- Degree Programs drop down displays longer name (if prestudent bestätigt (alias interessent with bestaetigtam != null ) receiver-> dp, otherwise -> infocenter)
- SQL to get OU recipient doesn't use beginn / End of function
- Always set insertvon in tbl_msg_status
- Add Multilanguage Support for Message Page (not completed yet)
- If in sent mode do not set messages as read
- Error message when there are no Messages available shouldnt be displayed
2019-10-30 18:35:46 +01:00
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
34dc82766a
- Renamed public/js/messaging/messageClient.js to public/js/messaging/read.js
...
- Added new JS public/js/messaging/write.js used in view application/views/system/messages/ajaxWrite.php
- Added new public method write, listReceivedMessages, listSentMessages and sendMessageToOU to controller system/messages/MessageClient.php
- Removed private method _getReceiversByOekurzbz from MessageLib
- Fixed method sendMessageOU of MessageLib
- Added new public method prepareAjaxWrite to model CL/Messages_model
- Fixed method prepareAjaxReadReceived of model CL/Messages_model
- Added new public method prepareAjaxReadSent to model CL/Messages_model
- Changed method CL/Messages_model->_personLog interface
- Added new public method getOrganisationunitsByPersonId to crm/Prestudent_model
- Added new public method getReceivedMessages to model system/Recipient_model
- Changed getReceivedMessages method of model system/Recipient_model
- Changed view system/messages/ajaxRead.php
- Added new view system/messages/ajaxWrite.php
2019-06-28 19:01:25 +02:00
Andreas Österreicher