Commit Graph

295 Commits

Author SHA1 Message Date
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
ma0048 06e62cac11 phrasen angepasst 2022-08-22 14:35:05 +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 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 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
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
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
Harald Bamberger a463fc0dbf Merge branch 'feature-18236/Standardisierung_Extension_OP-KVP' 2022-07-14 15:58:58 +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
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
Cris 5f5031e8d1 Added ECTS Summe to Anrechnung Detail View. 2022-06-22 10:54:17 +02:00
KarpAlex c771cbc644 Gruppenmanagement: added phrases 2022-06-14 18:24:10 +02:00
Andreas Österreicher 25ee7f76cb Merge branch 'feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten' 2022-06-08 14:10:28 +02:00
Andreas Österreicher b7b6cd5399 Merge branch 'master' into feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten 2022-04-28 18:26:18 +02:00
cgfhtw 63142f58d5 admin templates - & error phrases 2022-04-28 08:56:38 +02:00
ma0048 886d84e8af ermoeglicht nun auch bachelor projektbeurteilungen herunterzuladen 2022-04-27 14:26:45 +02:00
Andreas Österreicher 96a739f261 Merge branch 'master' into feature-16214/beaurteilungsformulare_ba_ma_arbeit 2022-04-25 15:15:15 +02:00
cgfhtw 899e2e18df 18775 - Admin GUI f. Tabelle extension.tbl_opkvp_organisationseinheit_opprj 2022-04-21 15:29:16 +02:00
Harald Bamberger 10aa88e262 Merge branch 'feature-15391/Positive_Zeitsperre' 2022-04-19 13:46:38 +02:00
KarpAlex 4fe562cbe2 Fehlerzuständigkeiten and issues GUI improvements:
- menu link opens in new tab
- controller id set for easier refresh
- added person and oe Zuständigkeiten to issues list
-
2022-04-13 20:08:08 +02:00
Andreas Österreicher 1ae4ceb4ee Merge branch 'master' into bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument 2022-04-11 16:58:43 +02:00
KarpAlex df3cab593c fehlerzustaendigkeit phrase "zuweisen" was incorrectly defined 2022-04-07 12:40:46 +02:00
KarpAlex 427a75b74b added GUI for managing Issues Zuständigkeiten 2022-03-31 12:41:18 +02:00
Harald Bamberger d84ed369b1 fix merge conflicts after merging master 2022-03-28 11:36:47 +02:00
cgfhtw 56079a3674 phrasesupdate 2022-03-28 11:32:32 +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
cgfhtw 1197f051a2 kvp phrases 2022-03-17 16:20:54 +01:00
KarpAlex b758275b58 added Projektarbeitsbeurteilung phrases 2022-03-16 17:12:55 +01:00
KarpAlex a8e36f2f3e added studiengangskennzahl phrase 2022-03-11 02:12:20 +01:00
KarpAlex 0b679bc9e4 Projektarbeitsbeurteilung: added english phrases, renamed kommissionsmitglieder to Prüfungssenatmitglieder 2022-03-08 03:12:03 +01:00
Andreas Österreicher d84562e830 Merge branch 'feature-17001/infocenter_bewerber_vorhanden' 2022-02-28 11:25:49 +01:00
Cris c8f93cae07 Adapted system feedback when uploading too large documents
. Added clientside check to avoid uploads > max upload size on serverside
. Adapted message returned by server, when max upload size is exceeded
2022-02-24 14:11:11 +01:00
Cris 339f82291c Disabled edit elements / create Anrechnung in GUI if user has readonly access / no permission to create Anrechnung 2022-02-22 16:36:11 +01:00
Cris e06301a2de Added phrase 'Geloescht' / 'Deleted' 2022-02-17 12:34:44 +01:00
Harald Bamberger a715a78858 phrase maxtagebeschreibung for eucovidqr added 2022-02-08 16:54:55 +01:00
ma0048 53ab1073ec Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-17001/infocenter_bewerber_vorhanden 2022-02-03 08:56:11 +01:00
KarpAlex 1e56743187 added projektarbeitsbeurteilung phrases 2022-02-01 22:44:58 +01:00
KarpAlex f9b93f55e4 - Projektbetreuer model getBetreuerOfProjektarbeit: added full name and projekttyp_kurzbz are also
returned
 - abgabe_lektor_details.php: grading only possible after end upload of thesis, and only beginning with SS2022
 - added projektbeurteilung phrases to core locale and phrasesupdate.php
2022-01-25 12:40:41 +01:00
KarpAlex 094f75ef61 - Projektbetreuer_model.php: method getBetreuerOfProjektarbeit for getting Betreuer by betreuerart
- phrasesupdate.php: added Projektarbeitsbeurteilung phrases
2022-01-21 00:41:13 +01:00
ma0048 b8ac076bdb projektbeurteilungs uebersicht hinzugefuegt 2022-01-19 17:56:30 +01:00
Andreas Österreicher 79972c0f1a Phrase korrigiert 2022-01-17 11:07:00 +01:00
ma0048 c36d0358a9 check duplicate auch studiengang wird nun beruecksichtigt 2022-01-13 15:16:34 +01:00
Andreas Österreicher 6d69d572ee Merge branch 'feature-15795/DVUH_Mehrsprachigkeit' 2021-11-04 15:56:26 +01:00
Andreas Österreicher ef7d3aa313 Added Missing Phrase matrikelnummer 2021-11-04 15:10:27 +01:00
Andreas Österreicher 01907c4901 Merge branch 'feature-3774/FilterWidget_change_Filter_settings_GUI' 2021-11-04 14:55:28 +01:00
KarpAlex fce92f78d4 Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit 2021-11-04 12:05:32 +01:00