Andreas Österreicher
68d6e3c549
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
2022-08-29 16:23:20 +02:00
cgfhtw
49647c8ded
Textänderungen "KVP" entfernen
2022-08-29 14:05:15 +02:00
cgfhtw
ca9281dbf9
Textänderung KVP
2022-08-29 09:08:27 +02:00
KarpAlex
92762c5dc2
Projektarbeitsbeurteilung:
...
- getZweitbegutachterWithToken: returns Zweitbegutachter (Senatspruefer)
from Senatspruefungen as well
- added phrase
2022-08-27 01:34:03 +02:00
KarpAlex
60d675f22b
added parbeitDownload phrases for Projektarbeitsbeurteilung
2022-08-24 18:09:53 +02:00
KarpAlex
a1622d8b74
made betreuert SenatsprueferIn gender neutral
2022-08-24 17:05:30 +02:00
ma0068
8292e00aaf
neues Feld aktiv in den ZGV-Tabellen, Ansicht als durchgestrichen der inaktiven ZGV-Einträge in FAS
2022-08-24 12:52:49 +02:00
KarpAlex
82d7891f3c
Projektarbeitsbeurteilung possible for Prüfungssenat. Mails are sent to Senat members, Senat members are displayed with correct labels, external Prüfer can get login token
2022-08-23 17:45:12 +02:00
Andreas Österreicher
c234843bfd
Satzungsteil Paragrahen korrigiert
2022-08-23 16:20:19 +02:00
KarpAlex
282b46d54e
Added betreuerart Senatsvorsitz and Senatsprüfer
2022-08-23 15:26:13 +02:00
ma0048
f2fcdf2cbf
app per dbupdate hinzufuegen
2022-08-22 14:40:39 +02:00
ma0048
06e62cac11
phrasen angepasst
2022-08-22 14:35:05 +02:00
Paolo
b0ffbea9a5
Composer changes
2022-08-19 12:21:04 +02:00
Harald Bamberger
3138ac3e25
add columns Aktiv and StdKst to MA Uebersicht Filterx
2022-08-18 16:38:28 +02:00
Harald Bamberger
dd38765237
Merge branch 'feature-19538/Gruppenadministratoren' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-16 10:25:46 +02:00
Harald Bamberger
dd6383c57b
Merge branch 'master' into feature-19538/Gruppenadministratoren
2022-08-16 07:54:43 +02:00
ma0048
f19e13ffd8
ermoeglicht das planen, akzeptieren und erstellen der massnahmen
2022-08-11 14:11:59 +02:00
Cris
f85dd2fd2e
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-10 18:21:01 +02:00
Cris
a5f6ffa237
Changed content in Student view as requested by QM
...
. changed tooltip text and help text regarding Maximale ECTS and Berufliche Praxis.
2022-08-10 18:19:50 +02:00
Cris
fabdb70d72
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-10 16:08:54 +02:00
Cris
bfa9c2c8a7
Merge remote-tracking branch 'origin/feature-18224/Anrechnungen_ECTS-Grenze' into feature-18224/Anrechnungen_ECTS-Grenze
2022-08-10 16:01:42 +02:00
Paolo
e39bb1ea8a
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-09 18:43:06 +02:00
Cris
e56237038d
Optimized 'Ablehnen'-/'Nicht empfehlen'-panels for better usability
...
- Copy-icons are now right aligned and bigger
- Less in-between-text, instead short explanation text into textarea placeholder
2022-08-09 16:40:43 +02:00
Harald Bamberger
e63d34132c
merged current master
2022-08-08 13:29:44 +02:00
Paolo
6d81e36e68
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-08 12:11:08 +02:00
Cris
fac257a2b1
Corrected: Falsche ECTS Summenberechnung, wenn Genehmigung zurückgenommen wurde, korrigiert.
...
Zurückgenommene Anrechnungen haben noch einen Eintrag "angerechnet" in der Zeugnisnotentabelle, weshalb
sie in der ECTS Summenberechnung mitgerechnet wurden. Das ist nun behoben.
2022-08-03 16:40:58 +02:00
Cris
7b9fd39bbc
Added: Hochschul-Qualifikation + ECTS Anzeige in Student View
...
Checkbox zur Angabe von Hochschulqualifikation
Anzeige, wenn ECTS Grenzen überschritten werden.
2022-07-26 18:18:08 +02:00
Cris
1544653fa3
Added Begründungstext 'Max ECTS überschritten' als Ablehnungsgrund
2022-07-18 17:33:50 +02:00
KarpAlex
043f444bb6
added tbl_bisio.herkunftsland_code in db and made it editable as IO data in FAS
2022-07-14 19:50:50 +02:00
Harald Bamberger
a463fc0dbf
Merge branch 'feature-18236/Standardisierung_Extension_OP-KVP'
2022-07-14 15:58:58 +02:00
Manfred
9fa2f56c89
Grant SELECT to bis.tbl_gsprogramm for web-user
2022-07-14 10:37:25 +02:00
KarpAlex
17493a6e40
dbupdate: added bis.tbl_gsprogramm studienkennung_uni to check array
2022-07-12 16:37:18 +02:00
Paolo
8b8515ee03
Fixed typo in system/filtersupdate.php
2022-07-12 14:51:39 +02:00
Paolo
eb2b738133
Includes fixes: jquery/jqueryV1 to jquery/jquery1
2022-07-12 11:59:52 +02:00
Cris
91447d7218
Adapted Query getEctsSummeSchulisch: exclude Anrechnung aufgrund universitärer Qualifikation.
...
Anrechnungen mit universiäterer Qualifikation sind unbegrenzt möglich.
2022-07-11 11:29:42 +02:00
Cris
a8f329e501
Added new Anrechnungbegruendung: Hochschulzeugnis
2022-07-11 10:46:53 +02:00
KarpAlex
cd7fed2b43
Added studienkennung_uni field to bis.tbl_gsprogramm
2022-07-08 00:33:44 +02:00
Cris
2fb4118e69
Added to DB Update: Create functions to get total ECTS Summe by berufliche and schulische Qualifikation
2022-07-07 10:23:33 +02:00
Werner Masik
647b2a9f45
added rudimentary filter for employee search
2022-07-06 18:02:31 +02:00
Cris
44a3231d55
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
2022-07-06 12:00:09 +02:00
Andreas Österreicher
1d980274fe
Merge branch 'feature-19651/OEH_Beitragsliste'
2022-07-04 16:27:26 +02:00
KarpAlex
f74e036ec8
moved Berechtigung "extension/dvuh_gui_ekz_anfordern" to DVUH extension SQL
2022-06-30 11:27:24 +02:00
KarpAlex
1c3acc6366
issue overview: added column "Zugehörigkeit"(Belonging) to show study programs of concerning person and wether it is an employee
2022-06-29 17:59:57 +02:00
Andreas Österreicher
2692accbdf
Merge branch 'master' into feature-18887/Datenverbund_Clearing_und_Community_Changes
2022-06-27 14:48:11 +02:00
Cris
5f5031e8d1
Added ECTS Summe to Anrechnung Detail View.
2022-06-22 10:54:17 +02:00
KarpAlex
ca667feb0d
Added document type "Grant Agreement" for syncing of documents with Mobility Online
2022-06-20 18:55:29 +02:00
KarpAlex
c771cbc644
Gruppenmanagement: added phrases
2022-06-14 18:24:10 +02:00
KarpAlex
de08bfd0fc
Gruppenmanagement:
...
- renamed gruppenadministration to gruppenmanagement
- added additional columns to gruppenmanagement filterwidget
- improved comments
- write public.tbl_log every time user is added or deleted from a group
2022-06-14 17:30:07 +02:00
KarpAlex
1066dff8e0
Gruppenmanager:
...
- set on update cascade for gruppe_kurzbz foreign key
- Notice + disabling add of group managers when group is "generiert"
2022-06-14 14:08:27 +02:00
KarpAlex
2e728462ca
Gruppenmanager:
...
- Berechtigung "lehre/gruppemanager" needed for managing groups
- added column "aktiv" to benutzeroverview
- group manager are deleted together with their group
- check: generated groups cannot have manager
2022-06-13 19:59:30 +02:00