Commit Graph

61 Commits

Author SHA1 Message Date
Andreas Österreicher c411b826d9 Merge branch 'feature-25518/bewerbungstool_messages_direkt_an_permesser' 2023-03-06 16:54:43 +01:00
ma0048 e6269b121b - fixed zgv uebernehmen 2023-02-06 13:04:32 +01:00
ma0048 f7bd49b408 - master messages an studiengang, wenn bereits bestaetigt
- lehrgang messages direkt an lehrgang
2022-10-28 10:56:02 +02:00
Manfred 409ccd7640 BugFix DISTINCT in getOrganisationunitsByPersonId 2022-10-24 12:21:40 +02:00
Andreas Österreicher 6a51e841ab Merge branch 'feature-15887/BTMessagesBeiMasterAnInfocenter' 2022-04-13 12:17:50 +02:00
ma0048 9460fd19d8 kurzbz in absage dropdown und abgewiesene uebersicht angepasst 2022-03-08 11:43:34 +01:00
ma0048 d8fd0400cb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15887/BTMessagesBeiMasterAnInfocenter 2022-02-03 08:57:25 +01:00
ma0068 70c24899d0 Verhalten MessageAnOEs für Master angepasst 2021-11-09 09:32:05 +01:00
ma0048 a31d33bcf9 in eigenes model 2021-10-27 17:59:52 +02:00
ma0048 15ba3602f7 job fixed 2021-10-25 13:22:44 +02:00
ma0048 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
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
Harald Bamberger 4c74176d64 Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition' 2021-10-11 12:55:24 +02:00
Paolo 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
ma0048 4a4c95aa08 auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt 2021-10-04 12:37:50 +02:00
KarpAlex 493bf0edda Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-06 22:35:40 +02:00
KarpAlex 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
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
KarpAlex 1ce0045f86 - Prestudent_model.php: added getStandortCode and getFoerderrelevant methods
- indent formatting
2021-06-25 13:19:02 +02:00
ma0048 5330e2b250 beim abweisen das studiensemester hinzugefuegt 2021-06-01 11:13:23 +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 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
Andreas Österreicher 3366f091dd Anrechnungen - Fixed Details Page for People with multiple Accounts 2021-02-15 21:12:14 +01:00
Cris 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
alex 784afe0044 crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine 2020-05-14 13:40:34 +02:00
KarpAlex 7e1f1acb22 Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland 2020-05-13 16:18:05 +02:00
Paolo da621a2154 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-12 11:19:17 +01:00
Paolo 749e9be64d Messaging system: student writes new message: separate logic for master and bachelor 2020-02-04 17:02:25 +01:00
Paolo 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
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 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +01: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 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
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
Paolo 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
alex 05a049edca Infocenter message Quereinsteiger Freigabe
- Orgform bezeichnung shown in german and english
Infocenter Controller changes
- constants for Interessent and Abgewiesener names added
- removed unnecessary parameters in comments
crm/Prestudent_model
- fixed typo
2019-06-03 16:30:44 +02:00
alex a2d0ae6da8 Infocenter:
- FIT Programme Studiengänge 10021,10027 can be freigegeben an Studiengang
 - earlier check for existing prestudentid in prestudentmodel in getPrestudentWithZgv method
 - reduced Sprache attributed to sprache, locale, bezeichnung in prestudentmodel in getPrestudentWithZgv method
2019-02-20 16:50:20 +01:00
alex a28df53718 Infocenter changes
- new button for Freigabe zum Reihungstest, sending message to bewerber when freigabe
- button Freigabe for Studiengang with Statusgrund
- Ausbildungssemester can be saved
- Using Vorlagen for Freigabe Mail to assistance and message to bewerber
- Added Nation of address at details page
- Scroll to top button on details page
- moved messageList js to own file
2018-11-30 16:48:28 +01:00
alex 2959e60df0 - beautified prio up/down arrows in infocenter
- infocenter freigabe/absage works with ajax now
- AjaxLib veil is displayed covering the whole page
- infocenter details studiengang kürzel is retrieved from studienordnung (if possible)
2018-11-02 18:22:57 +01:00
alex e081003e16 if only 1 prestudent with prio null - possible to increase (set) prio to 1 2018-10-30 11:25:14 +01:00
alex 0d8c65b6d3 Studiengang name on infocenter details is now retrieved from Studienordnung not from Studiengang 2018-10-25 14:56:39 +02:00
alex 3423830f60 - priority display and priority change possible on infocenterdetails page
- different sort order of zgvpruefungen (prestudenten)
2018-10-22 15:28:21 +02:00
Paolo 4f993b06f4 Merge branch 'master' into permissions 2018-05-14 13:44:03 +02:00
alex aa278e89f0 Infocenter details changes: popup for ZGV info, show Bewerbungsfriste(n), optimized mobile responsiveness, set dokumente to "akzeptiert" when freigegeben 2018-05-08 14:13:47 +02:00
Paolo d9b80b790d Removed permission system from models 2018-03-29 12:13:08 +02:00
alex 8f6ee06b9d added "zgv uebernehmen" for prefill of zgv with latest edited zgv, optimized sort of zgvs 2018-02-26 16:54:41 +01:00
alex 53fcda3504 added infomail when interessent freigegeben 2018-02-23 10:06:46 +01:00
alex 5a0082ec11 added Studienplan Orgform and alternative Orgform (in "Anmerkung" field), Studienplansprache for display, Statusgrund Bezeichnung for Abgewiesener 2018-01-22 17:43:13 +01:00
alex 8f0b4c3114 infocenter: added confirmation popup when student freigegeben/abgewiesen, non-interessent or prestudenten with interessentenstatus confirmed are view-only (infoonly), added Nation data to Prestudent and akte, bugfixes 2018-01-17 11:45:23 +01:00
alex 2b186d0c45 improved infocenter details, added bootstrap and admin theme (sb admin 2) , added zgv pruefung Status, Studiensemester and Ausbildungssemester, contacts in one table, nachzureichen and nachgereicht am columns 2018-01-08 09:55:13 +01:00