10aa88e262
Merge branch 'feature-15391/Positive_Zeitsperre'
2022-04-19 13:46:38 +02:00
6a51e841ab
Merge branch 'feature-15887/BTMessagesBeiMasterAnInfocenter'
2022-04-13 12:17:50 +02:00
268bf474df
Infomail bei Zeitwunschänderungen - Inaktive Abteilungsleitungen werden nicht informiert, Ermittlung der geänderten
...
Zeitwünsche angepasst
2022-04-08 16:29:47 +02:00
37f6a0caaa
Merge branch 'master' into feature-15391/Positive_Zeitsperre
...
# Conflicts:
# system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
9460fd19d8
kurzbz in absage dropdown und abgewiesene uebersicht angepasst
2022-03-08 11:43:34 +01:00
85107afb63
education/Zeugnisnote_model: Noten can be filtered by zeugnis flag
2022-03-02 12:19:37 +01:00
d7ad3d80f3
Merge branch 'master' into feature-16190/Issues_automatisches_Beheben
2022-02-28 13:07:06 +01:00
d84562e830
Merge branch 'feature-17001/infocenter_bewerber_vorhanden'
2022-02-28 11:25:49 +01:00
18731ede47
Laden von Studiengangsleitungen angepasst, Error Handling bei fehenden
...
Studiengangsleitungen
2022-02-25 11:59:38 +01:00
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
d2055f759e
Added method getAssistance in Studiengang Model
2022-02-21 16:52:13 +01:00
d57a62dbe3
Adapted method getLeitung in Studiengang Model to accept studiengang array
2022-02-21 16:51:17 +01:00
273ff6a3df
Merge branch 'master' into feature-16190/Issues_automatisches_Beheben
...
# Conflicts:
# system/dbupdate_3.3.php
2022-02-19 02:45:49 +01:00
ca51fef7f8
Added method to get actual Studiensemester to Studiensemester Model
2022-02-17 12:33:38 +01:00
5c82a4d821
Added insert/update/delete methods to Zeitsperre Model
2022-02-17 12:33:01 +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
765b26a439
- added issue resolution job and libraries for defining how to resolve issues
...
- added issue inserts (fehlerupdate.php), included them in checksystem
- added getAufenthaltsdauer method to Bisio_model.php
- Add column parameterFuerBehebung to system.tbl_issue
2022-01-17 10:07:37 +01:00
c36d0358a9
check duplicate auch studiengang wird nun beruecksichtigt
2022-01-13 15:16:34 +01:00
2d46d80b5f
meldung wird nun auch angezeigt wenn es die selbe person id ist
2021-12-22 16:26:45 +01:00
a4ffe9104b
Fixed query to get Studiensemest correctly when using getByDate method
2021-12-20 09:49:49 +01:00
b2bd8e071b
Added getStudenplanData method to Class Studenplandev_model
2021-12-20 09:47:21 +01:00
d2c87d6a98
Added Class Zeitwunsch_gueltigkeit_model
2021-12-20 09:43:37 +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
d7364d08dd
Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen
2021-10-22 07:13:06 +02:00
44c1e65011
getBetriebsmittel add parameter to only retrieve aktive users
2021-10-20 15:48:34 +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
3e00e4b3a1
infocenter warning falls bewerberIn bereits vorhanden ist
2021-10-12 13:08:17 +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
76f3afdda5
Person_model.php getPersonStammdaten method:
...
- added sorting order for contacts (by insertamum descending)
- rewrote old ->retval to new isError, hasData etc. functions
2021-09-28 15:52:17 +02:00
13a040737a
Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
...
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +02:00
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
4c21d5364c
- added issue management functionality - adding, and displaying issues with filter widget.
2021-09-21 00:58:29 +02:00
52127ade60
fixed datumanzeige
2021-09-17 10:27:55 +02:00
a77756a0d6
Merge branch 'hotfix-15106/Logs_Viewer_shows_Filters_from_other_People'
2021-09-15 11:20:32 +02:00
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
848cc52cfa
- Renamed public method system/Filters_model->getFiltersByAppDatasetName to getFiltersByAppDatasetNamePersonId
...
- Added new parameter person_id to method getFiltersByAppDatasetNamePersonId
- Changed query inside getFiltersByAppDatasetNamePersonId to get global
and personal filters
- Adapted FilterWidgetLib to use the new method getFiltersByAppDatasetNamePersonId
2021-09-14 12:44:33 +02:00
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
4b94dfbda7
Merge branch 'master' into feature/Anrechnungen_NEU
2021-09-03 11:08:29 +02:00
6034da43d8
Fixed loading of current Geschaeftsjahr if it is the last day of the
...
year
2021-08-31 07:56:59 +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
73ce635188
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
2021-08-20 10:34:55 +02:00
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
24a979f9f1
Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected
2021-08-18 22:16:15 +02:00
Harald Bamberger