diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 2721bbd6f..8f09b82aa 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -108,6 +108,10 @@ class Student extends FHCAPI_Controller $this->PrestudentModel->addSelect('p.matr_nr'); $this->PrestudentModel->addSelect('p.anrede'); $this->PrestudentModel->addSelect('p.zugangscode'); + if($this->permissionlib->isBerechtigt('student/bpk')) + { + $this->PrestudentModel->addSelect('p.bpk'); + } if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) { $this->PrestudentModel->addSelect( diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css index 583d5918d..6347f6840 100644 --- a/public/css/Studentenverwaltung.css +++ b/public/css/Studentenverwaltung.css @@ -12,22 +12,22 @@ html { font-size: .875em; } html.fs_xx-small { - font-size: .5em; + font-size: .625em; } html.fs_x-small { - font-size: .625em; + font-size: .6875em; } html.fs_small { font-size: .75em; } html.fs_normal { - font-size: .875em; + font-size: .8125em; } html.fs_big { - font-size: 1em; + font-size: .875em; } html.fs_huge { - font-size: 1.125em; + font-size: 1em; } #appMenu { @@ -200,3 +200,84 @@ html.fs_huge { .tiny-90 div.tox.tox-tinymce { height: 90% !important; } + +/* slim begin */ +.stv .form-label { + margin-bottom: .15rem; + font-weight: bold; +} + +.stv .form-control, +.stv .form-select, +.stv .input-group-text { + padding-top: .15rem; + padding-bottom: .15rem; +} + +:root { + --bs-body-line-height: 1.2; +} + +.stv .tabulator-row .tabulator-cell, +.stv .tabulator-header-filter input { + padding-top: 1px !important; + padding-bottom: 1px !important; +} + +.stv .tabulator-row { + min-height: 18px; +} + +.stv .btn { + --bs-btn-padding-y: 0.25rem; + --bs-btn-line-height: 1.2; +} + +.stv .p-button.p-button-icon-only { + padding-top: 0; + padding-bottom: 0; +} + +.stv .p-tabview .p-tabview-nav li .p-tabview-nav-link { + padding: 0.25rem .5rem; +} + +.stv .p-tabview .p-tabview-panels { + background-color: #e5eff5; +} + +.stv .p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link { + background: #e5eff5; + border-color: #dee2e6 #dee2e6 #e5eff5 #dee2e6; +} + +.stv-details-details-foto img { + max-height: 120px; +} + +.stv .tabulator-row .tabulator-frozen, +.stv .tabulator-row .tabulator-cell { + border-bottom: none; +} + +/* +.stv .p-treetable .p-treetable-thead > tr > th, +.stv .p-treetable .p-treetable-tbody > tr { + background-color: #e5eff5; +} + +.stv .p-treetable .p-treetable-tbody > tr.p-highlight { + background: #007bff; + color: #fff; +} + +.stv .p-treetable.p-treetable-hoverable-rows .p-treetable-tbody > tr:not(.p-highlight):hover { + background: #fff; + color: #212529; +} + +.tabulator-row.tabulator-row-even .tabulator-cell { + background-color: #e5eff5; +} +*/ +/* slim ende */ diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index 5e25708b7..0b846df9c 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -182,7 +182,7 @@ export default { } }, template: ` -
+
Profilbild diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js index ef5247f57..d2101e2cb 100644 --- a/public/js/components/Messages/Details/TableMessages.js +++ b/public/js/components/Messages/Details/TableMessages.js @@ -364,7 +364,7 @@ export default {
-
+
-
-



-
+
+ +
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js index d0fbf7447..3cd314fc1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js @@ -164,17 +164,17 @@ export default { this.updateStudent(this.modelValue); }, template: ` - +
-
+
Person
{{$p.t('ui', 'dropdownLoading')}}...
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 47724e4d7..5f70e4951 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -260,12 +260,12 @@ export default {
-
+
{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}} -
+
-
+
{{nation.kurztext}}
-
+
-
+
{{nation.kurztext}}
- -
-
+ +
+
-
+
-
+
-
+
PrestudentIn -
+
-
+
-
+
-
+
-
+
-
- +
+
- -
-
- + +
+
- + + +
+
- - - - - - +
+
+ + + + + +
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js index 98ac01ddf..3c507a3c0 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js @@ -85,7 +85,7 @@ export default{ }, }, template: ` -
+