diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php index bd8ef7aa9..0c27f3aba 100644 --- a/application/controllers/Studentenverwaltung.php +++ b/application/controllers/Studentenverwaltung.php @@ -26,7 +26,7 @@ class Studentenverwaltung extends FHC_Controller 'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'), 'admin' => $this->permissionlib->isBerechtigt('admin'), 'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'), - 'student/keine_studdatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung') + 'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung') ], 'variables' => [ diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index 3db792c2e..772567106 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -242,10 +242,7 @@ class Status extends FHC_Controller } $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - /* var_dump(isBerechtigtNoStudstatusCheck); - $basis = $this->permissionlib->isBerechtigt('basis/prestudent'); - var_dump($basis);*/ if(!$isBerechtigtNoStudstatusCheck) { //Block STATUSCHECKS @@ -636,7 +633,7 @@ $sqlundo = if (!hasData($result)) { $this->outputJson($result); - var_dump("no data Löschen der Lehrverbandszuordnung"); + //var_dump("no data Löschen der Lehrverbandszuordnung"); } $this->outputJsonSuccess(true); } @@ -996,7 +993,7 @@ $sqlundo = } - if(!isBerechtigtNoStudstatusCheck) + if(!$isBerechtigtNoStudstatusCheck) { //Block STATUSCHECKS @@ -1013,7 +1010,7 @@ $sqlundo = $this->db->trans_begin(); //update status - var_dump($ausbildungssemester, $studiensemester_kurzbz); + //var_dump($ausbildungssemester, $studiensemester_kurzbz); $result = $this->PrestudentstatusModel->update( [ 'prestudent_id' => $key_prestudent_id, diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 5a6e62a38..6279f57b5 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -54,7 +54,7 @@ export default { hasAssistenzPermissionForStgs: this.permissions['assistenz_stgs'], hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'], hasAdminPermission: this.permissions['admin'], - //hasPermissionToSkipStatusCheck: this.permission['student/keine_studdatuspruefung'], + hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'], lists: this.lists, defaultSemester: this.defaultSemester } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 9407355cd..b59a50b55 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -28,6 +28,10 @@ export default { from: 'hasPrestudentPermission', default: false }, +/* hasPermissionToSkipStatusCheck: { + from: 'hasPermissionToSkipStatusCheck', + default: false + },*/ hasAssistenzPermission: { from: 'hasAssistenzPermission', default: false @@ -201,6 +205,7 @@ detectChanges() { mounted(){}, template: `
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index ebf37ea86..b2b3eeda3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -41,7 +41,8 @@ export default{ } }, props: { - prestudent_id: String + prestudent_id: String, + studiengang_kz: String }, data() { return { @@ -81,7 +82,7 @@ export default{ container.className = "d-flex gap-2"; let button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum) + if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) button.className = 'btn btn-outline-secondary btn-action disabled'; else button.className = 'btn btn-outline-secondary btn-action'; @@ -93,7 +94,7 @@ export default{ container.append(button); button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum) + if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) button.className = 'btn btn-outline-secondary btn-action disabled'; else button.className = 'btn btn-outline-secondary btn-action'; @@ -105,7 +106,7 @@ export default{ container.append(button); button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum) + if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) button.className = 'btn btn-outline-secondary btn-action disabled'; else button.className = 'btn btn-outline-secondary btn-action'; @@ -117,7 +118,7 @@ export default{ container.append(button); button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum) + if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) button.className = 'btn btn-outline-secondary btn-action disabled'; else button.className = 'btn btn-outline-secondary btn-action'; @@ -157,13 +158,23 @@ export default{ gruendeLength: {}, dataMeldestichtag: null, stichtag: {}, - isLastStatus: {} + isLastStatus: {}, + hasPermissionThisStg: {} } }, computed: { gruende() { return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz); }, + arrayStg(){ + let stgInteger = this.hasAssistenzPermissionForStgs.map(item => { + return parseInt(item); // Wandelt jeden String in eine ganze Zahl um + }); + return stgInteger; + }, + hasPermissionCurrentStg(){ + return this.arrayStg.includes(this.studiengang_kz); + } }, watch: { data: { @@ -459,25 +470,32 @@ export default{
-

TestData

+ + + Studiengaenge: | + Schreibrecht ASS: {{hasSchreibrechtAss}} || + Basis Prestudent: {{hasPrestudentPermission}} || + Recht für Studiengang {{studiengang_kz}} : {{hasPermissionCurrentStg}}-->
-

{{statusId}}

+ diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Status.js index b7ecc556d..623fcb597 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status.js @@ -11,7 +11,7 @@ export default {
Status - +
`