From 13f71502e64a9b523bd85d2016f1d6c6b0c2373c Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 23 Aug 2023 10:28:55 +0200 Subject: [PATCH 001/464] 1st draft --- .../controllers/Studentenverwaltung.php | 19 ++++ .../components/Studentenverwaltung.php | 60 +++++++++++++ application/views/Studentenverwaltung.php | 53 +++++++++++ public/css/Studentenverwaltung.css | 60 +++++++++++++ public/js/apps/Studentenverwaltung.js | 88 +++++++++++++++++++ .../components/Studienverwaltung/Details.js | 9 ++ .../js/components/Studienverwaltung/List.js | 69 +++++++++++++++ .../components/Studienverwaltung/Verband.js | 68 ++++++++++++++ 8 files changed, 426 insertions(+) create mode 100644 application/controllers/Studentenverwaltung.php create mode 100644 application/controllers/components/Studentenverwaltung.php create mode 100644 application/views/Studentenverwaltung.php create mode 100644 public/css/Studentenverwaltung.css create mode 100644 public/js/apps/Studentenverwaltung.js create mode 100644 public/js/components/Studienverwaltung/Details.js create mode 100644 public/js/components/Studienverwaltung/List.js create mode 100644 public/js/components/Studienverwaltung/Verband.js diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php new file mode 100644 index 000000000..dded0ffdd --- /dev/null +++ b/application/controllers/Studentenverwaltung.php @@ -0,0 +1,19 @@ +load->view('Studentenverwaltung'); + } +} diff --git a/application/controllers/components/Studentenverwaltung.php b/application/controllers/components/Studentenverwaltung.php new file mode 100644 index 000000000..d03c7e350 --- /dev/null +++ b/application/controllers/components/Studentenverwaltung.php @@ -0,0 +1,60 @@ +load->model('organisation/Studiengang_model', 'StudiengangModel'); + $result = $this->StudiengangModel->loadWhere(['aktiv' => true]); + if (isError($result)) + return $this->outputJson($result); + if (!hasData($result)) + return $this->outputJsonSuccess([]); + $list = getData($result); + $list[] = [ + 'name' => 'International', + 'children' => [ + [ + 'name' => 'Incoming', + 'leaf' => true + ], + [ + 'name' => 'Outgoing', + 'leaf' => true + ], + [ + 'name' => 'Gemeinsame Studien', + 'leaf' => true + ] + ] + ]; + $this->outputJsonSuccess($list); + } + + /** + * @param integer $studiengang_kz + * @return void + */ + public function getStudiengang($studiengang_kz) + { + // TODO(chris): load stgSemester + prestudent + $this->outputJson([ + [ + 'key' => 2, + 'name' => 'PreStudent' + ] + ]); + } +} diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php new file mode 100644 index 000000000..20a89f8e8 --- /dev/null +++ b/application/views/Studentenverwaltung.php @@ -0,0 +1,53 @@ + 'Studentenverwaltung', + 'axios027' => true, + 'bootstrap5' => true, + 'fontawesome6' => true, + 'vue3' => true, + 'primevue3' => true, + 'filtercomponent' => true, + 'tabulator5' => true, + 'phrases' => [], + 'customCSSs' => [ + 'public/css/Studentenverwaltung.css' + ], + 'customJSModules' => [ + 'public/js/apps/Studentenverwaltung.js' + ] + ); + + $this->load->view('templates/FHC-Header', $includesArray); +?> + +
+
+ FHC 4.0 + + +
+ +
+
+ +
+ + + + +
+
+
+
+ +load->view('templates/FHC-Footer', $includesArray); ?> + diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css new file mode 100644 index 000000000..ccc5b0694 --- /dev/null +++ b/public/css/Studentenverwaltung.css @@ -0,0 +1,60 @@ +@import './components/searchbar.css'; +@import './components/verticalsplit.css'; + +.searchbar { + margin-right: 0!important; +} +.searchbar > .input-group { + margin-right: 0!important; +} +.searchbar > .input-group > * { + border-radius: 0!important; +} + +#main { + display: flex; + flex-direction: column; + height: 100vh; +} +#main > header { + flex: 0 0 auto; +} +#main > div { + flex: 1 1 auto; +} + +@media (min-width: 768px) { + #sidebarMenu { + visibility: visible!important; + transform: none; + position: inherit; + z-index: 1; + } +} + + +@media (max-width: 769px) { + .stv-verband { + max-height: calc(100% - 3rem); + overflow: auto; + } +} +.stv-verband .p-treetable-tbody > tr > td { + display: flex; + padding-top: .25rem!important; + padding-bottom: .25rem!important; +} +.stv-verband .p-treetable-tbody > tr > td > button { + flex: 0 0 auto; +} +.stv-verband .p-treetable-tbody > tr > td > span { + flex: 1 1 auto; +} + +.stv-list { + display: flex; + flex-direction: column; +} +.stv-list > #filterTableDataset { + flex: 1 1 auto; +} \ No newline at end of file diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js new file mode 100644 index 000000000..bdec5d033 --- /dev/null +++ b/public/js/apps/Studentenverwaltung.js @@ -0,0 +1,88 @@ +/** + * Copyright (C) 2022 fhcomplete.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import FhcSearchbar from "../components/searchbar/searchbar.js"; +import StvVerband from "../components/Studienverwaltung/Verband.js"; +import StvList from "../components/Studienverwaltung/List.js"; +import StvStudent from "../components/Studienverwaltung/Student.js"; +import VerticalSplit from "../components/verticalsplit/verticalsplit.js"; +import fhcapifactory from "./api/fhcapifactory.js"; + +Vue.$fhcapi = fhcapifactory; + +const app = Vue.createApp({ + components: { + FhcSearchbar, + StvVerband, + StvList, + StvStudent, + VerticalSplit + }, + data() { + return { + selected: [], + searchbaroptions: { + types: [ + "person", + "student", + "prestudent" + ], + actions: { + person: { + defaultaction: { + type: "link", + action: function(data) { + return data.profil; + } + }, + childactions: [ + { + "label": "testchildaction1", + "icon": "fas fa-check-circle", + "type": "function", + "action": function(data) { + alert('person testchildaction 01 ' + JSON.stringify(data)); + } + }, + { + "label": "testchildaction2", + "icon": "fas fa-file-csv", + "type": "function", + "action": function(data) { + alert('person testchildaction 02 ' + JSON.stringify(data)); + } + } + ] + } + } + }, + } + }, + computed: { + lastSelected() { + return this.selected[this.selected.length - 1]; + } + }, + methods: { + searchfunction(searchsettings) { + return Vue.$fhcapi.Search.search(searchsettings); + } + } +}); + +app.use(primevue.config.default).mount('#main'); + diff --git a/public/js/components/Studienverwaltung/Details.js b/public/js/components/Studienverwaltung/Details.js new file mode 100644 index 000000000..f119b34e4 --- /dev/null +++ b/public/js/components/Studienverwaltung/Details.js @@ -0,0 +1,9 @@ +export default { + props: { + student: Object + }, + template: ` +
+ {{student}} +
` +}; \ No newline at end of file diff --git a/public/js/components/Studienverwaltung/List.js b/public/js/components/Studienverwaltung/List.js new file mode 100644 index 000000000..9a32914b7 --- /dev/null +++ b/public/js/components/Studienverwaltung/List.js @@ -0,0 +1,69 @@ +import {CoreFilterCmpt} from "../filter/Filter.js"; + +export default { + components: { + CoreFilterCmpt + }, + props: { + selected: Array + }, + emits: [ + 'update:selected' + ], + data() { + return { + tabulatorOptions: { + columns:[ //Define Table Columns + {title:"Name", field:"name", width:150}, + {title:"Age", field:"age", hozAlign:"left", formatter:"progress"}, + {title:"Favourite Color", field:"col"}, + {title:"Date Of Birth", field:"dob", sorter:"date", hozAlign:"center"}, + ], + data: [ + {id:1, name:"Oli Bob", age:"12", col:"red", dob:""}, + {id:2, name:"Mary May", age:"1", col:"blue", dob:"14/05/1982"}, + {id:3, name:"Christine Lobowski", age:"42", col:"green", dob:"22/05/1982"}, + {id:4, name:"Brendon Philips", age:"125", col:"orange", dob:"01/08/1980"}, + {id:5, name:"Margret Marmajuke", age:"16", col:"yellow", dob:"31/01/1999"}, + {id:6, name:"Oli Bob", age:"12", col:"red", dob:""}, + {id:7, name:"Mary May", age:"1", col:"blue", dob:"14/05/1982"}, + {id:8, name:"Christine Lobowski", age:"42", col:"green", dob:"22/05/1982"}, + {id:9, name:"Brendon Philips", age:"125", col:"orange", dob:"01/08/1980"} + ], + + height: 'auto', + selectable: true + }, + tabulatorEvents: [ + { + event: 'rowSelectionChanged', + handler: this.rowSelectionChanged + } + ] + } + }, + methods: { + actionNewPrestudent() { + console.log('actionNewPrestudent'); + }, + rowSelectionChanged(data) { + this.$emit('update:selected', data); + } + }, + mounted() { + }, + template: ` +
+ + +
` +}; \ No newline at end of file diff --git a/public/js/components/Studienverwaltung/Verband.js b/public/js/components/Studienverwaltung/Verband.js new file mode 100644 index 000000000..e7abbbcd4 --- /dev/null +++ b/public/js/components/Studienverwaltung/Verband.js @@ -0,0 +1,68 @@ +import {CoreRESTClient} from '../../RESTClient.js'; + +export default { + components: { + TreeTable: primevue.treetable, + TreeColumn: primevue.column + }, + data() { + return { + loading: true, + nodes: [] + } + }, + methods: { + onExpandTreeNode(node) { + if (!node.children) { + let url = ''; + if (node.data.studiengang_kz) { + url = "getStudiengang/" + node.data.studiengang_kz; + } + + if (url) { + this.loading = true; + CoreRESTClient + .get("components/Studentenverwaltung/" + url) + .then(result => { + const subNodes = result.data.map(this.mapResultToTreeData); + node.children = subNodes; + this.loading = false; + }); + } + } + }, + mapResultToTreeData(el) { + const cp = { + data: el + }; + if (el.studiengang_kz !== undefined) { + // TODO(chris): scrolling doesn't work + cp.key = el.studiengang_kz; + cp.data.name = el.bezeichnung; + cp.leaf = false; + } + if (el.children) + cp.children = el.children.map(this.mapResultToTreeData); + else + cp.leaf = el.leaf || false; + return cp; + } + }, + mounted() { + CoreRESTClient + .get("components/Studentenverwaltung") + .then(result => result.data) + .then(result => { + if(CoreRESTClient.isError(result)) { + console.error(CoreRESTClient.getError(result)); + } else if (CoreRESTClient.hasData(result)) { + this.nodes = CoreRESTClient.getData(result).map(this.mapResultToTreeData); + } + this.loading = false; + }); + }, + template: ` + + + ` +}; \ No newline at end of file From 1009f73109a9280dda22b988d41296599100b6c1 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 31 Aug 2023 08:26:16 +0200 Subject: [PATCH 002/464] improvements --- .../components/Studentenverwaltung.php | 91 ++++++++++++++++++- application/views/Studentenverwaltung.php | 4 +- public/js/apps/Studentenverwaltung.js | 7 +- .../js/components/Studienverwaltung/List.js | 32 +++---- .../components/Studienverwaltung/Verband.js | 13 ++- 5 files changed, 123 insertions(+), 24 deletions(-) diff --git a/application/controllers/components/Studentenverwaltung.php b/application/controllers/components/Studentenverwaltung.php index d03c7e350..63fb7118c 100644 --- a/application/controllers/components/Studentenverwaltung.php +++ b/application/controllers/components/Studentenverwaltung.php @@ -17,7 +17,22 @@ class Studentenverwaltung extends FHC_Controller { // TODO(chris): load stgs (this is just for testing) $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); - $result = $this->StudiengangModel->loadWhere(['aktiv' => true]); + + $this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz'); + + $this->StudiengangModel->addDistinct(); + $this->StudiengangModel->addSelect('v.studiengang_kz'); + $this->StudiengangModel->addSelect('tbl_studiengang.bezeichnung'); + $this->StudiengangModel->addSelect('kurzbzlang'); + $this->StudiengangModel->addSelect('erhalter_kz'); + $this->StudiengangModel->addSelect('typ'); + $this->StudiengangModel->addSelect('kurzbz'); + + $this->StudiengangModel->addOrder('erhalter_kz'); + $this->StudiengangModel->addOrder('typ'); + $this->StudiengangModel->addOrder('kurzbz'); + + $result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]); if (isError($result)) return $this->outputJson($result); if (!hasData($result)) @@ -57,4 +72,78 @@ class Studentenverwaltung extends FHC_Controller ] ]); } + + /** + * @param integer $studiengang_kz + * @return void + */ + public function getStudents($studiengang_kz = null) + { + // TODO(chris): stdSem? + $stdSem='SS2023'; + + // TODO(chris): load students filtered by the params + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id'); + $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id'); + $this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid'); + $this->PrestudentModel->addJoin('public.tbl_studentlehrverband v', 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($stdSem)); + + $this->PrestudentModel->addSelect('p.person_id'); + $this->PrestudentModel->addSelect('s.prestudent_id'); + $this->PrestudentModel->addSelect('b.uid'); + $this->PrestudentModel->addSelect('titelpre'); + $this->PrestudentModel->addSelect('titelpost'); + $this->PrestudentModel->addSelect('vorname'); + $this->PrestudentModel->addSelect('wahlname'); + $this->PrestudentModel->addSelect('vornamen'); + $this->PrestudentModel->addSelect('geschlecht'); + $this->PrestudentModel->addSelect('nachname'); + $this->PrestudentModel->addSelect('gebdatum'); + $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung'); + $this->PrestudentModel->addSelect('ersatzkennzeichen'); + $this->PrestudentModel->addSelect('svnr'); + $this->PrestudentModel->addSelect('s.matrikelnr'); + $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen'); + $this->PrestudentModel->addSelect('v.semester'); + $this->PrestudentModel->addSelect('v.verband'); + $this->PrestudentModel->addSelect('v.gruppe'); + $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz'); + $this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz'); + $this->PrestudentModel->addSelect('mentor'); + $this->PrestudentModel->addSelect('b.aktiv AS bnaktiv'); + $this->PrestudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat", false); + $this->PrestudentModel->addSelect("(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte", false); + $this->PrestudentModel->addSelect('tbl_prestudent.dual'); + $this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id'); + $this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest'); + $this->PrestudentModel->addSelect('p.matr_nr'); + $this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz'); + $this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz'); + $this->PrestudentModel->addSelect('tbl_prestudent.priorisierung'); + $this->PrestudentModel->addSelect('p.zugangscode'); + $this->PrestudentModel->addSelect('p.bpk'); + + $this->PrestudentModel->addOrder('nachname'); + $this->PrestudentModel->addOrder('vorname'); + + // TODO(chris): do we need that? do we want that? + if ($studiengang_kz === null) + $this->PrestudentModel->addLimit(1000); + + if ($studiengang_kz !== null) + $result = $this->PrestudentModel->loadWhere([ + 'tbl_prestudent.studiengang_kz' => $studiengang_kz + ]); + else + $result = $this->PrestudentModel->load(); + + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson(getError($result)); + } else { + $this->outputJson(getData($result)); + } + } } diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php index 20a89f8e8..96cf0974d 100644 --- a/application/views/Studentenverwaltung.php +++ b/application/views/Studentenverwaltung.php @@ -33,12 +33,12 @@
- +
- +
+
+ v-model:anhang="formData.anhang" + > + + + +
+ parent: {{anhang}} | {{formData.anhang.name}} +
` }; \ No newline at end of file From d38ed229bfaf89b973b80e1539d180048417053f Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 21 Dec 2023 14:01:25 +0100 Subject: [PATCH 068/464] Korrekturen Bugs --- public/js/components/Stv/Studentenverwaltung/Details.js | 2 +- public/js/components/Stv/Studentenverwaltung/List/New.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js index 3f723fdab..69182db29 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details.js @@ -24,7 +24,7 @@ export default {
profilbild
-

{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}} +

{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js index d62f92dd3..37f25a823 100644 --- a/public/js/components/Stv/Studentenverwaltung/List/New.js +++ b/public/js/components/Stv/Studentenverwaltung/List/New.js @@ -280,7 +280,7 @@ export default { - + ` +} \ No newline at end of file diff --git a/public/js/components/Form/Upload/SingleFile.js b/public/js/components/Form/Upload/SingleFile.js deleted file mode 100644 index 74c60fcb8..000000000 --- a/public/js/components/Form/Upload/SingleFile.js +++ /dev/null @@ -1,36 +0,0 @@ -export default { - data() { - return { - file: null, - }; - }, - methods: { - handleFileChange(event) { - this.file = event.target.files[0]; - }, - uploadFile() { - if (this.file) { - // You can perform your file upload logic here - console.log('Uploading file:', this.file); - // Reset the file input - this.$refs.fileInput.value = ''; - this.file = null; - } else { - console.error('No file selected'); - } - }, - }, -}; -template: ` -
-

File Upload

-
- - -
-
-

Selected File: {{file.name}}

-
-
-` \ No newline at end of file diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index d61483a0c..64430294f 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -1,11 +1,10 @@ import VueDatePicker from '../vueDatepicker.js.php'; -//import SingleFile from '../Form/Upload/SingleFile.js'; +import File from '../Form/Upload/File.js'; export default { components: { VueDatePicker, - //BsModal - //SingleFile + File }, props: [ 'typeId', @@ -22,6 +21,11 @@ export default { 'showDocument', 'anhang' ], + data(){ + return { + multiupload: true + } + }, computed: { intTitel: { get() { @@ -103,26 +107,45 @@ export default { } },*/ methods: { - handleFileChange(event) { - //single - this.intAnhang = event.target.files[0]; - - //multiple not working - //this.intAnhang = event.target.files; +/* handleFileChange(event) { + this.intAnhang = event.target.files; + },*/ + reset() { + this.$refs.form.reset(); + //this.$emit('update:anhang', dt.files); }, +/* deleteFile(id){ + //console.log("Delete file with id " + id ); + + //console.log(this.intAnhang[id]); + + const dt = new DataTransfer(); + const files = this.$refs.upload.files; + + for (let i = 0; i < files.length; i++) { + const file = files[i]; + if (id !== i) + dt.items.add(file); // here you exclude the file. thus removing it. + } + + this.$refs.upload.files = dt.files; // Assign the updates list + this.$emit('update:anhang', dt.files); + }*/ }, + template: `
- -component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}} -
+
- {{action}} + {{action}} +
+ [{{this.typeId}}] +
-
+
@@ -143,29 +166,30 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}
- - + +
+ +
-
+ -
-

Selected File: {{ intAnhang.name }}

- -
+ + + -
    -
  • - +
  • +
-
+
--> + +
+
@@ -175,7 +199,7 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}
- + {{uid}}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 29efb8078..ee203efc6 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -30,8 +30,8 @@ export default { {title: "Text", field: "text", width: 350}, {title: "VerfasserIn", field: "verfasser_uid"}, {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, - {title: "Start", field: "start"}, - {title: "Ende", field: "ende"}, + {title: "Start", field: "start", visible: false}, + {title: "Ende", field: "ende", visible: false}, /* {title: "Dokumente", field: "dms_id"},*/ {title: "Dokumente", field: "countdoc"}, {title: "Erledigt", field: "erledigt"}, @@ -71,7 +71,7 @@ export default { bearbeiter: null, anhang: [] }, - showErweitert: true, + showErweitert: false, showDocument: true, } @@ -104,7 +104,8 @@ export default { }); }, actionNewNotiz(){ - this.formData.typeId = 'person'; + this.resetFormData(); +/* this.formData.typeId = 'person'; this.formData.titel = ''; this.formData.action = 'Neue Notiz2'; this.formData.text = null; @@ -114,14 +115,24 @@ export default { this.formData.erledigt = false; this.formData.verfasser = null; this.formData.bearbeiter = null; - this.formData.anhang = []; + this.formData.anhang = [];*/ }, addNewNotiz(notizData) { /* console.log("here: anhang noch empty"); console.log(this.formData);*/ + const formData = new FormData(); - Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v)); + //working with single files + // Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v)); + + //multiple files + //console.log(this.formData.anhang); + Object.entries(this.formData).forEach(([k, v]) => { + if(k!= 'anhang') + formData.append(k, v); + }); + Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); /* for( var i = 0; i < this.formData.anhang.length; i++ ){ let file = this.formData.anhang[i]; @@ -129,8 +140,8 @@ export default { formData.append('files[' + i + ']', file); }*/ - console.log("after append"); - console.log(formData); +/* console.log("after append"); + console.log(this.formData);*/ CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } @@ -152,9 +163,6 @@ export default { window.scrollTo(0, 0); }); }, - attachFile(){ - console.log("ATTACH FILE"); - }, deleteNotiz(notiz_id){ CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id) .then(response => { @@ -208,16 +216,21 @@ export default { this.$refs.table.reloadTable(); }, resetFormData(){ - this.formData.titel = null; - this.formData.text = null; - this.formData.von = null; - this.formData.bis = null; - this.formData.document = null; - this.formData.erledigt = false; - this.formData.verfasser = null; - this.formData.bearbeiter = null; - this.formData.anhang = []; - //this.formData.anhang = {}; + this.$refs.form.reset(); + //sicherstellen, dass über props nur leere felder übergeben werden + this.formData = { + typeId: 'person', + titel: null, + action: 'Neue Notiz', + text: null, + von: null, + bis: null, + document: null, + erledigt: false, + verfasser: null, + bearbeiter: null, + anhang: [] + }; }, updateNotiz(notiz_id){ CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, @@ -274,6 +287,7 @@ export default {
- parent: {{formData.anhang}} {{formData.typeId}} | {{formData.anhang.name}} +
` From a3f9e19bd68ff893573c4d4354c54a3bbb606c71 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 9 Jan 2024 13:22:37 +0100 Subject: [PATCH 088/464] =?UTF-8?q?Noten=20manuell=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/components/stv/Noten.php | 127 +++++++++++++++++- .../education/Lehrveranstaltung_model.php | 7 + .../models/organisation/Studienplan_model.php | 13 ++ .../Details/Noten/Zeugnis.js | 17 ++- .../Details/Noten/Zeugnis/Actions.js | 54 ++++++++ 5 files changed, 216 insertions(+), 2 deletions(-) create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js diff --git a/application/controllers/components/stv/Noten.php b/application/controllers/components/stv/Noten.php index 6ba5863c5..dfde2892b 100644 --- a/application/controllers/components/stv/Noten.php +++ b/application/controllers/components/stv/Noten.php @@ -7,13 +7,29 @@ class Noten extends Auth_Controller public function __construct() { parent::__construct([ - 'getZeugnis' => 'student/noten:r' + 'get' => 'student/noten:r', + 'getZeugnis' => 'student/noten:r', + 'update' => ['admin:w', 'assistenz:w'] ]); // Load Libraries $this->load->library('VariableLib', ['uid' => getAuthUID()]); } + public function get() + { + $this->load->model('codex/Note_model', 'NoteModel'); + + $result = $this->NoteModel->addOrder('note'); + + $result = $this->NoteModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + + return $this->outputJson($result); + } + public function getZeugnis($prestudent_id) { $this->load->model('crm/Student_model', 'StudentModel'); @@ -40,4 +56,113 @@ class Noten extends Auth_Controller return $this->outputJson($result); } + + public function update() + { + $this->load->model('crm/Student_model', 'StudentModel'); + $this->load->model('organisation/Studienplan_model', 'StudienplanModel'); + $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel'); + $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel'); + + $this->load->library('form_validation'); + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + if (empty($_POST) || !is_array(current($_POST))) { + $result = $this->hasPermissionUpdate($this->input->post('lehrveranstaltung_id'), $this->input->post('student_uid')); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN); + return $this->outputJson($result); + } + + $this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrverantaltung ID', 'required|numeric'); + $this->form_validation->set_rules('student_uid', 'Student UID', 'required'); + $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester Kurzbezeichnung', 'required'); + $this->form_validation->set_rules('note', 'Note', 'required|numeric'); + $post = [$_POST]; + } else { + foreach ($_POST as $i => $data) { + $lvid = isset($data['lehrveranstaltung_id']) ? $data['lehrveranstaltung_id'] : null; + $uid = isset($data['student_uid']) ? $data['student_uid'] : null; + $result = $this->hasPermissionUpdate($lvid, $uid); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN); + return $this->outputJson($result); + } + + $this->form_validation->set_rules($i . '[lehrveranstaltung_id]', '#' . $i . ' Lehrverantaltung ID', 'required|numeric'); + $this->form_validation->set_rules($i . '[student_uid]', '#' . $i . ' Student UID', 'required'); + $this->form_validation->set_rules($i . '[studiensemester_kurzbz]', '#' . $i . ' Studiensemester Kurzbezeichnung', 'required'); + $this->form_validation->set_rules($i . '[note]', '#' . $i . ' Note', 'required|numeric'); + } + $post = $_POST; + } + if ($this->form_validation->run() == false) { + $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); + return $this->outputJsonError($this->form_validation->error_array()); + } + + $final_result = success(); + $this->ZeugnisnoteModel->db->trans_start(); + + foreach ($post as $i => $data) { + $note = $data['note']; + unset($data['note']); + $result = $this->ZeugnisnoteModel->update($data, [ + 'note' => $note, + 'benotungsdatum' => date('c'), + 'updateamum' => date('c'), + 'updatevon' => getAuthUID() + ]); + if (isError($result)) { + $final_result = $result; + break; + } + } + + $this->ZeugnisnoteModel->db->trans_complete(); + + if (isError($final_result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + + $this->outputJson($final_result); + } + + protected function hasPermissionUpdate($lehrveranstaltung_id, $student_uid) + { + // TODO(chris): error phrases! + if ($lehrveranstaltung_id === null || $student_uid === null) + return success(); + $result = $this->StudentModel->load([$student_uid]); + if (isError($result)) + return $result; + if (!hasData($result)) + return error('Fehler beim Ermitteln des Studenten'); + $student = current(getData($result)); + + if ($this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz)) + return success(); + if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz)) + return success(); + + $result = $this->StudienplanModel->getAllOesForLv($lehrveranstaltung_id); + if (isError($result)) + return $result; + $oes = getData($result) ?: []; + $result = $this->LehrveranstaltungModel->getStg($lehrveranstaltung_id); + if (isError($result)) + return $result; + if (hasData($result)) + $oes[] = current(getData($result)); + + foreach ($oes as $oe) { + if ($this->permissionlib->isBerechtigt('admin', 'suid', $oe->oe_kurzbz)) + return success(); + if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $oe->oe_kurzbz)) + return success(); + } + + return error('Forbidden'); + } } diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php index 1f1b90131..cefd147b9 100644 --- a/application/models/education/Lehrveranstaltung_model.php +++ b/application/models/education/Lehrveranstaltung_model.php @@ -493,4 +493,11 @@ class Lehrveranstaltung_model extends DB_Model return $this->execQuery($qry, array($student_uid)); } + + public function getStg($lehrveranstaltung_id) + { + $this->addSelect('stg.*'); + $this->addJoin('public.tbl_studiengang stg', 'studiengang_kz'); + return $this->load($lehrveranstaltung_id); + } } diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php index 66ec06ba8..b68f74bd8 100644 --- a/application/models/organisation/Studienplan_model.php +++ b/application/models/organisation/Studienplan_model.php @@ -90,4 +90,17 @@ class Studienplan_model extends DB_Model 'tbl_studienplan_lehrveranstaltung.semester' => $semester )); } + + public function getAllOesForLv($lehrveranstaltung_id) + { + $this->addDistinct('oe_kurzbz'); + + $this->addJoin('lehre.tbl_studienplan_lehrveranstaltung lv', 'studienplan_id'); + $this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id'); + $this->addJoin('public.tbl_studiengang', 'studiengang_kz'); + + return $this->loadWhere([ + 'lv.lehrveranstaltung_id' => $lehrveranstaltung_id + ]); + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js index 8dcc52d96..95875f868 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js @@ -1,9 +1,11 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; import {CoreRESTClient} from '../../../../../RESTClient.js'; +import ZeugnisActions from './Zeugnis/Actions.js'; export default { components: { - CoreFilterCmpt + CoreFilterCmpt, + ZeugnisActions }, props: { student: Object @@ -51,10 +53,20 @@ export default { ], layout: 'fitDataStretch', height: '100%', + selectable: true, + selectableRangeMode: 'click', persistence: true }; } }, + methods: { + setGrades(selected) { + CoreRESTClient + .post('components/stv/Noten/update', selected) + .then(this.$refs.table.reloadTable) + .catch(this.$fhcAlert.handleFormValidation); + } + }, template: `
Kein Student
@@ -67,6 +79,9 @@ export default { :side-menu="false" reload > +
` }; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js new file mode 100644 index 000000000..7e8e2cbe5 --- /dev/null +++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js @@ -0,0 +1,54 @@ +import {CoreRESTClient} from '../../../../../../RESTClient.js'; + +export default { + emits: [ + 'setGrades' + ], + props: { + selected: Array + }, + data() { + return { + grades: [] + }; + }, + computed: { + current: { + get() { + if (!this.selected.length) + return ''; + if (this.selected.length == 1) + return this.selected[0].note; + const grades = Object.keys(this.selected.reduce((a,c) => { + a[c.note] = true; + return a; + }, {})); + if (grades.length == 1) + return grades[0]; + return ''; + }, + set(note) { + this.$emit('setGrades', this.selected.map(zeugnis => { + const { lehrveranstaltung_id, uid: student_uid, studiensemester_kurzbz } = zeugnis; + return { lehrveranstaltung_id, student_uid, studiensemester_kurzbz, note }; + })); + } + } + }, + created() { + CoreRESTClient + .get('components/stv/Noten/get') + .then(result => result.data) + .then(result => { + this.grades = result.retval; + }) + .catch(this.$fhcAlert.handleSystemError); + }, + template: ` +
+ +
` +}; \ No newline at end of file From 284351a0242bd7240fc5760ac4094e847cfea043 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 9 Jan 2024 16:39:38 +0100 Subject: [PATCH 089/464] bugfix format date vuedatepicker --- .../controllers/components/stv/Notiz.php | 54 ++----------- public/js/components/Notiz/Notiz.js | 78 +++++++------------ .../Studentenverwaltung/Details/Notizen.js | 49 ++++++++---- 3 files changed, 69 insertions(+), 112 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 73c06ba86..f9145bdcc 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -77,8 +77,6 @@ class Notiz extends FHC_Controller $dms_id = []; foreach ($_FILES as $k => $file) { -/* var_dump($file["name"]); - var_dump($file);*/ $dms = array( 'kategorie_kurzbz' => 'notiz', 'version' => 0, @@ -92,7 +90,6 @@ class Notiz extends FHC_Controller if (isSuccess($result)) { - //TODO(Manu) change to array $dms_id[] = $result->retval['dms_id']; } /* else { @@ -117,49 +114,12 @@ class Notiz extends FHC_Controller $erledigt = $_POST['erledigt']; $type = $_POST['typeId']; - /* $start = isset($_POST['bis']) ? ($_POST['bis'] : null; - $ende = isset($_POST['bis']) ? $_POST['bis'] : null;*/ + //get rid of null value error + $start = $this->input->post(date('von')); + $ende = $this->input->post(date('bis')); - - if(isset($_POST['von'])) - { -/* $date = $_POST['von']; - $date = DateTime::createFromFormat('F-d-Y h:i A',$date); - var_dump($date); - $timestamp = strtotime($_POST['von']); - $start = date('Y-m-d', $timestamp);*/ - -/* $dateString = $_POST['von']; - $myDateTime = DateTime::createFromFormat('Y-m-d', $dateString); - $start= $myDateTime->format('Y-m-d');*/ - - //Todo(manu) check input format datepicker.. auch ohne null!!! - $start = '2023-01-01'; - } - else - $start = null; - - - if(isset($_POST['bis'])) - { - //Todo(manu) check input format datepicker -/* $ende = strtotime($_POST['bis']); - $ende = new DateTime($ende); - $ende = $ende->format('Y-m-d');*/ - - $ende = '2023-01-01'; - } - else - $ende = null; - - - //Todo(manu) multiple files - // mit id_type $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); - //vorher - //$result = $this->NotizModel->addNotizForPersonWithDoc($id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id); - if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -172,7 +132,7 @@ class Notiz extends FHC_Controller { $uid = getAuthUID(); $this->load->library('form_validation'); - $_POST = json_decode($this->input->raw_input_stream, true); + //$_POST = json_decode($this->input->raw_input_stream, true); $this->form_validation->set_rules('titel', 'titel', 'required'); $this->form_validation->set_rules('text', 'Text', 'required'); @@ -195,9 +155,11 @@ class Notiz extends FHC_Controller $text = isset($_POST['text']) ? $_POST['text'] : null; $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; $bearbeiter_uid = $uid; - $start = isset($_POST['von']) ? new DateTime($_POST['von']) : null; - $ende = isset($_POST['bis']) ? new DateTime($_POST['bis']) : null; $erledigt = $_POST['erledigt']; + $start = $this->input->post(date('von')); + $ende = $this->input->post(date('bis')); + + $result = $this->NotizModel->update( [ diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 64430294f..38b1ca22c 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -48,7 +48,8 @@ export default { return this.von; }, set(value) { - this.$emit('update:von', value); + const tempVon = new Date(value).toISOString().split('T')[0]; + this.$emit('update:von', tempVon); } }, intBis: { @@ -56,7 +57,8 @@ export default { return this.bis; }, set(value) { - this.$emit('update:bis', value); + const tempBis = new Date(value).toISOString().split('T')[0]; + this.$emit('update:bis', tempBis); } }, intDocument: { @@ -101,36 +103,11 @@ export default { } } }, -/* mounted(){ - showZuordnung(){ - this.idTyp = 'Person'; - } - },*/ methods: { -/* handleFileChange(event) { - this.intAnhang = event.target.files; - },*/ reset() { this.$refs.form.reset(); //this.$emit('update:anhang', dt.files); }, -/* deleteFile(id){ - //console.log("Delete file with id " + id ); - - //console.log(this.intAnhang[id]); - - const dt = new DataTransfer(); - const files = this.$refs.upload.files; - - for (let i = 0; i < files.length; i++) { - const file = files[i]; - if (id !== i) - dt.items.add(file); // here you exclude the file. thus removing it. - } - - this.$refs.upload.files = dt.files; // Assign the updates list - this.$emit('update:anhang', dt.files); - }*/ }, template: ` @@ -143,9 +120,7 @@ export default { [{{this.typeId}}]
- +
@@ -170,24 +145,7 @@ export default {
- - - +
@@ -196,7 +154,8 @@ export default {
-
+ +
- +
- +
@@ -233,6 +206,7 @@ export default { +
` } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index ee203efc6..b6bb9e3ec 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -28,7 +28,7 @@ export default { columns: [ {title: "Titel", field: "titel"}, {title: "Text", field: "text", width: 350}, - {title: "VerfasserIn", field: "verfasser_uid"}, + {title: "VerfasserIn", field: "verfasser_uid", visible: false}, {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, {title: "Start", field: "start", visible: false}, {title: "Ende", field: "ende", visible: false}, @@ -71,7 +71,7 @@ export default { bearbeiter: null, anhang: [] }, - showErweitert: false, + showErweitert: true, showDocument: true, } @@ -105,7 +105,7 @@ export default { }, actionNewNotiz(){ this.resetFormData(); -/* this.formData.typeId = 'person'; + this.formData.typeId = 'person'; this.formData.titel = ''; this.formData.action = 'Neue Notiz2'; this.formData.text = null; @@ -115,7 +115,7 @@ export default { this.formData.erledigt = false; this.formData.verfasser = null; this.formData.bearbeiter = null; - this.formData.anhang = [];*/ + this.formData.anhang = []; }, addNewNotiz(notizData) { /* console.log("here: anhang noch empty"); @@ -134,14 +134,6 @@ export default { }); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); -/* for( var i = 0; i < this.formData.anhang.length; i++ ){ - let file = this.formData.anhang[i]; - - formData.append('files[' + i + ']', file); - }*/ - -/* console.log("after append"); - console.log(this.formData);*/ CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } @@ -232,7 +224,7 @@ export default { anhang: [] }; }, - updateNotiz(notiz_id){ +/* updateNotiz(notiz_id){ CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, this.formData ).then(response => { @@ -254,6 +246,35 @@ export default { window.scrollTo(0, 0); //this.reload(); }); + },*/ + updateNotiz(notiz_id){ + const formData = new FormData(); + Object.entries(this.formData).forEach(([k, v]) => { + if(k!= 'anhang') + formData.append(k, v); + }); + Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); + + CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, + formData, + { Headers: { "Content-Type": "multipart/form-data" } } + ).then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Update von neuer Notiz erfolgreich'); + this.resetFormData(); + this.reload(); + } else { + const errorData = response.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + }); + } + }).catch(error => { + this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + }); }, }, template: ` @@ -305,7 +326,7 @@ export default { - +
From 751c1fd31ea4c6e1efbe885458b491217d587ebb Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 10 Jan 2024 14:51:28 +0100 Subject: [PATCH 090/464] Profile Image: Slash removed from path --- public/js/components/Stv/Studentenverwaltung/Details.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js index 74e54cfe8..d502adc5e 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details.js @@ -28,7 +28,7 @@ export default {
- profilbild + profilbild

{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}

From db6e1add8a1233283e7c8fe913e3ee1fa13f0671 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 11 Jan 2024 07:37:46 +0100 Subject: [PATCH 091/464] refactoring Fkt addNewNotiz --- .../controllers/components/stv/Notiz.php | 70 +++++++++++++++---- application/models/person/Notiz_model.php | 25 ++----- public/js/components/Form/Upload/File.js | 1 + public/js/components/Notiz/Notiz.js | 7 +- .../Studentenverwaltung/Details/Notizen.js | 11 ++- 5 files changed, 75 insertions(+), 39 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index f9145bdcc..cdb15d9d3 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -61,20 +61,24 @@ class Notiz extends FHC_Controller public function addNewNotiz($id) { - $this->load->library('form_validation'); + $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); + //$this->load->library('form_validation'); //$_POST = json_decode($this->input->raw_input_stream, true); //TODO(Manu) Validation - $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required'); +/* $this->form_validation->set_rules('titel', 'titel', 'required'); + $this->form_validation->set_rules('text', 'Text', 'required');*/ //TODO(Manu) form validation - schon für type hier?, + + //Speichern der Files $this->load->library('DmsLib'); $uid = getAuthUID(); //multiple files - $dms_id = []; + $dms_id_arr = []; + $notiz_id = null; foreach ($_FILES as $k => $file) { $dms = array( @@ -90,7 +94,7 @@ class Notiz extends FHC_Controller if (isSuccess($result)) { - $dms_id[] = $result->retval['dms_id']; + $dms_id_arr[] = $result->retval['dms_id']; } /* else { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -104,27 +108,67 @@ class Notiz extends FHC_Controller } + //Speichern der Notiz mit Notizzuordnung $this->load->model('person/Notiz_model', 'NotizModel'); $uid = getAuthUID(); - $titel = isset($_POST['titel']) ? $_POST['titel'] : null; - $text = isset($_POST['text']) ? $_POST['text'] : null; - $bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null; $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; - $erledigt = $_POST['erledigt']; - $type = $_POST['typeId']; + $titel = $this->input->post('titel'); + $text = $this->input->post('text'); + $bearbeiter_uid = $this->input->post('bearbeiter_uid'); + $erledigt = $this->input->post('erledigt'); + $type = $this->input->post('typeId'); //get rid of null value error $start = $this->input->post(date('von')); $ende = $this->input->post(date('bis')); - $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); - + $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); + return $this->outputJson(getError($result)); } + $notiz_id = $result->retval; + + //Zuordnung speichern +/* $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type=> $id)); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + }*/ + + + //Eintrag in Notizdokument speichern + if($dms_id_arr) + { + // Loads model Notizdokument_model + $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); + //Todo(manu) change for multiple files + foreach($dms_id_arr as $dms_id) + { + $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + } + + } + + + + + //$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); +/* + $result = $this->NotizModel->addNotizForPerson($id, $titel, $text, $erledigt, $verfasser_uid); + if (isError($result)) + { + //$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + }*/ return $this->outputJsonSuccess(true); } diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 3a4888f38..17cf9a140 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -140,7 +140,7 @@ class Notiz_model extends DB_Model * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...) * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz */ - public function addNotizForType($type, $id, $titel, $text, $insertvon, $dms_id=null, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null) + public function addNotizForType($type, $id, $titel, $text, $insertvon, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null) { // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); @@ -153,30 +153,13 @@ class Notiz_model extends DB_Model if (isSuccess($result)) { - //cases für alle types - $notiz_id = $result->retval; - if($dms_id) + if (isSuccess($result)) { - // Loads model Notizdokument_model - $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); - //Todo(manu) change for multiple files - foreach ($dms_id as $file) - { - $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $file)); - } - - //single File - //$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); + $notiz_id = $result->retval; + $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id)); } - - if ($type == 'person') - $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $id)); - elseif ($type == 'prestudent') - $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'prestudent_id' => $id)); - else - $result = error($result->msg, "Type nicht vorhanden"); } // Transaction complete! diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js index 0394afd42..c84996e8d 100644 --- a/public/js/components/Form/Upload/File.js +++ b/public/js/components/Form/Upload/File.js @@ -32,6 +32,7 @@ export default { } }, template: ` + FILES: {{dateien}} diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 38b1ca22c..ccbfaa548 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -98,7 +98,7 @@ export default { return this.anhang; }, set(value) { - console.log(value); + //console.log(value); this.$emit('update:anhang', value); } } @@ -106,12 +106,15 @@ export default { methods: { reset() { this.$refs.form.reset(); - //this.$emit('update:anhang', dt.files); + this.intAnhang = null; + this.$emit('update:anhang', []); }, }, template: `
+{{this.intAnhang}} + {{anhang.name}} {{index}}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index b6bb9e3ec..678e3abe1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -59,7 +59,7 @@ export default { tabulatorEvents: [], notizen: [], formData: { - typeId: 'person', + typeId: 'person_id', titel: null, action: 'Neue Notiz', text: null, @@ -105,7 +105,7 @@ export default { }, actionNewNotiz(){ this.resetFormData(); - this.formData.typeId = 'person'; + this.formData.typeId = 'person_id'; this.formData.titel = ''; this.formData.action = 'Neue Notiz2'; this.formData.text = null; @@ -134,6 +134,9 @@ export default { }); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); + console.log(this.formData); + console.log(formData); + CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } @@ -211,7 +214,7 @@ export default { this.$refs.form.reset(); //sicherstellen, dass über props nur leere felder übergeben werden this.formData = { - typeId: 'person', + typeId: 'person_id', titel: null, action: 'Neue Notiz', text: null, @@ -330,6 +333,8 @@ export default {
+ Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}} + {{anhang.name}} {{index}}
 ref: {{formData.ref}}
From ef6634a38e38af2d719947c0ff05730aba492c2f Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 11 Jan 2024 09:56:59 +0100 Subject: [PATCH 092/464] bugfix FileUpload Component --- public/js/components/Form/Upload/File.js | 8 +--- public/js/components/Notiz/Notiz.js | 48 +++++++++---------- .../Studentenverwaltung/Details/Notizen.js | 4 +- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js index c84996e8d..b62cdd788 100644 --- a/public/js/components/Form/Upload/File.js +++ b/public/js/components/Form/Upload/File.js @@ -32,12 +32,8 @@ export default { } }, template: ` - FILES: {{dateien}} - - - - - + + diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index ccbfaa548..941820405 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -107,37 +107,37 @@ export default { reset() { this.$refs.form.reset(); this.intAnhang = null; - this.$emit('update:anhang', []); + //this.$emit('update:anhang', []); }, }, template: ` -
-{{this.intAnhang}} +
+ {{anhang.name}} {{index}}
 - -
-
- {{action}} -
- [{{this.typeId}}] -
-
- -
- -
- -
-
- -
- -
- + +
+
+ {{action}} +
+ [{{this.typeId}}] +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
-
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 678e3abe1..5d618592b 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -333,8 +333,8 @@ export default {
- Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}} - {{anhang.name}} {{index}}
 ref: {{formData.ref}} +
From 4526c10d304fc134a3ef6408661a57b2f10d47a5 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 11 Jan 2024 12:56:36 +0100 Subject: [PATCH 093/464] temp --- .../controllers/components/stv/Notiz.php | 66 +++++++++++++++++-- application/models/person/Notiz_model.php | 4 ++ .../Studentenverwaltung/Details/Notizen.js | 5 +- 3 files changed, 66 insertions(+), 9 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index cdb15d9d3..28dcb33ef 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -48,7 +48,6 @@ class Notiz extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); $this->outputJson($result); } - elseif (!hasData($result)) { $this->outputJson($result); //success mit Wert null // $this->outputJson(getData($result) ?: []); @@ -158,9 +157,6 @@ class Notiz extends FHC_Controller } - - - //$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); /* $result = $this->NotizModel->addNotizForPerson($id, $titel, $text, $erledigt, $verfasser_uid); @@ -172,7 +168,7 @@ class Notiz extends FHC_Controller return $this->outputJsonSuccess(true); } - public function updateNotiz($notiz_id) + public function updateNotizOldVersion($notiz_id) { $uid = getAuthUID(); $this->load->library('form_validation'); @@ -205,6 +201,63 @@ class Notiz extends FHC_Controller + $result = $this->NotizModel->update( + [ + 'notiz_id' => $notiz_id + ], + [ + 'titel' => $titel, + 'updatevon' => $uid, + 'updateamum' => date('c'), + 'text' => $text, + 'verfasser_uid' => $verfasser_uid, + 'bearbeiter_uid' => $bearbeiter_uid, + 'start' => $start, + 'ende' => $ende, + 'erledigt' => $erledigt + ] + ); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + return $this->outputJsonSuccess(true); + } + + public function updateNotiz($notiz_id) + { + $uid = getAuthUID(); + $this->load->library('form_validation'); + //$_POST = json_decode($this->input->raw_input_stream, true); + /* $this->form_validation->set_rules('titel', 'titel', 'required'); + $this->form_validation->set_rules('text', 'Text', 'required'); + + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + }*/ + + $this->load->model('person/Notiz_model', 'NotizModel'); + + if(!$notiz_id) + { + return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + + $uid = getAuthUID(); + $titel = $this->input->post('titel'); + $text = $this->input->post('text'); + $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; + $bearbeiter_uid = $uid; + $erledigt = $this->input->post('erledigt'); + $type = $this->input->post('typeId'); + $start = $this->input->post(date('von')); + $ende = $this->input->post(date('bis')); + + + $result = $this->NotizModel->update( [ 'notiz_id' => $notiz_id @@ -298,8 +351,7 @@ class Notiz extends FHC_Controller { $this->load->model('person/Notiz_model', 'NotizModel'); - //TODO(manu) check, ob mehr Dateien bzw. -versionen - //warum nur ein Eintrag??? + $this->NotizModel->addSelect('campus.tbl_dms_version.*'); $this->NotizModel->addJoin('public.tbl_notiz_dokument','ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)'); diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 17cf9a140..7e7ffbe32 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -180,6 +180,8 @@ class Notiz_model extends DB_Model return $result; } + + /** * Add a Notiz for a given person with DMS_id */ @@ -244,6 +246,7 @@ class Notiz_model extends DB_Model * @param $person_id */ //Todo(Manu) rewrite in CI-Style + //Todo(Manu) auf andere types erweitern public function getNotizWithDocEntries($id) { $type = 'writeFunction'; @@ -267,6 +270,7 @@ class Notiz_model extends DB_Model notiz_id, z.notizzuordnung_id "; + return $this->execQuery($qry, array($id)); } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 5d618592b..0dd0c9ce0 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -52,7 +52,7 @@ export default { ], layout: 'fitDataFill', layoutColumnsOnNewData: false, - height: '150', + height: '200', selectable: true, index: 'notiz_id' }, @@ -96,6 +96,7 @@ export default { this.formData.erledigt = this.notizen.erledigt; this.formData.verfasser = this.notizen.verfasser_uid; this.formData.bearbeiter = this.notizen.bearbeiter_uid; + this.formData.anhang = this.notizen.anhang; if(this.notizen.dms_id){ console.log("loadEntries"); this.loadDocEntries(this.notizen.notiz_id); @@ -107,7 +108,7 @@ export default { this.resetFormData(); this.formData.typeId = 'person_id'; this.formData.titel = ''; - this.formData.action = 'Neue Notiz2'; + this.formData.action = 'Neue Notiz'; this.formData.text = null; this.formData.von = null; this.formData.bis = null; From 8d8c25bd6e9b2937ff4acda2e5092cea77545658 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 15 Jan 2024 09:39:46 +0100 Subject: [PATCH 094/464] =?UTF-8?q?Autocomplete=20Feld=20Mitarbeiter=20f?= =?UTF-8?q?=C3=BCr=20Bearbeiterlogik?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/components/stv/Notiz.php | 142 ++++++++++-------- .../models/ressource/Mitarbeiter_model.php | 22 +++ public/js/components/Form/Upload/File.js | 2 +- public/js/components/Notiz/Notiz.js | 43 ++++-- .../Studentenverwaltung/Details/Notizen.js | 120 ++++++++------- 5 files changed, 197 insertions(+), 132 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 28dcb33ef..507e9ed07 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -48,6 +48,7 @@ class Notiz extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); $this->outputJson($result); } + elseif (!hasData($result)) { $this->outputJson($result); //success mit Wert null // $this->outputJson(getData($result) ?: []); @@ -60,7 +61,10 @@ class Notiz extends FHC_Controller public function addNewNotiz($id) { - $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); + $this->load->model('person/Notiz_model', 'NotizModel'); + + $this->load->library('DmsLib'); + //$this->load->library('form_validation'); //$_POST = json_decode($this->input->raw_input_stream, true); @@ -69,52 +73,14 @@ class Notiz extends FHC_Controller /* $this->form_validation->set_rules('titel', 'titel', 'required'); $this->form_validation->set_rules('text', 'Text', 'required');*/ - //TODO(Manu) form validation - schon für type hier?, - - //Speichern der Files - $this->load->library('DmsLib'); - $uid = getAuthUID(); - - //multiple files - $dms_id_arr = []; - $notiz_id = null; - foreach ($_FILES as $k => $file) - { - $dms = array( - 'kategorie_kurzbz' => 'notiz', - 'version' => 0, - 'name' => $file["name"], - 'mimetype' => $file["type"], - 'insertamum' => date('c'), - 'insertvon' => $uid - ); - - $result = $this->dmslib->upload($dms, $k, array('pdf')); - - if (isSuccess($result)) - { - $dms_id_arr[] = $result->retval['dms_id']; - } -/* else { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - - //TODO(manu) error handling - //feedback, dass ein File nicht erfolgreich gespeichert werden konnte - //$this->outputJson($result); - //$this->outputJsonError(['filetype nicht erlaubt' => getError($result)]); - }*/ - - - } - - //Speichern der Notiz mit Notizzuordnung - $this->load->model('person/Notiz_model', 'NotizModel'); + //TODO(Manu) form validation - schon für type hier? + //Speichern der Notiz und Notizzuordnung $uid = getAuthUID(); $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; $titel = $this->input->post('titel'); $text = $this->input->post('text'); - $bearbeiter_uid = $this->input->post('bearbeiter_uid'); + $bearbeiter_uid = $this->input->post('bearbeiter'); $erledigt = $this->input->post('erledigt'); $type = $this->input->post('typeId'); @@ -130,21 +96,33 @@ class Notiz extends FHC_Controller } $notiz_id = $result->retval; - //Zuordnung speichern -/* $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type=> $id)); - if (isError($result)) + //Speichern der Files + $dms_id_arr = []; + foreach ($_FILES as $k => $file) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - }*/ + $dms = array( + 'kategorie_kurzbz' => 'notiz', + 'version' => 0, + 'name' => $file["name"], + 'mimetype' => $file["type"], + 'insertamum' => date('c'), + 'insertvon' => $uid + ); + $result = $this->dmslib->upload($dms, $k, array('pdf')); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $dms_id_arr[] = $result->retval['dms_id']; + } //Eintrag in Notizdokument speichern if($dms_id_arr) { // Loads model Notizdokument_model $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); - //Todo(manu) change for multiple files foreach($dms_id_arr as $dms_id) { $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); @@ -154,17 +132,8 @@ class Notiz extends FHC_Controller return $this->outputJson(getError($result)); } } - } - //$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); -/* - $result = $this->NotizModel->addNotizForPerson($id, $titel, $text, $erledigt, $verfasser_uid); - if (isError($result)) - { - //$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - }*/ return $this->outputJsonSuccess(true); } @@ -228,8 +197,15 @@ class Notiz extends FHC_Controller public function updateNotiz($notiz_id) { - $uid = getAuthUID(); + var_dump("in function updateNotiz " . $notiz_id); + //Loads Libraries $this->load->library('form_validation'); + $this->load->library('DmsLib'); + + // Loads models + $this->load->model('person/Notiz_model', 'NotizModel'); + $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); + //$_POST = json_decode($this->input->raw_input_stream, true); /* $this->form_validation->set_rules('titel', 'titel', 'required'); $this->form_validation->set_rules('text', 'Text', 'required'); @@ -239,25 +215,22 @@ class Notiz extends FHC_Controller return $this->outputJsonError($this->form_validation->error_array()); }*/ - $this->load->model('person/Notiz_model', 'NotizModel'); - if(!$notiz_id) { return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } + //update Notiz $uid = getAuthUID(); $titel = $this->input->post('titel'); $text = $this->input->post('text'); $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; - $bearbeiter_uid = $uid; + $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid; $erledigt = $this->input->post('erledigt'); $type = $this->input->post('typeId'); $start = $this->input->post(date('von')); $ende = $this->input->post(date('bis')); - - $result = $this->NotizModel->update( [ 'notiz_id' => $notiz_id @@ -274,12 +247,40 @@ class Notiz extends FHC_Controller 'erledigt' => $erledigt ] ); - if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } + + //neue Files speichern + //Todo(manu) check, welche files neu sind.. + foreach ($_FILES as $k => $file) + { + $dms = array( + 'kategorie_kurzbz' => 'notiz', + 'version' => 0, + 'name' => $file["name"], + 'mimetype' => $file["type"], + 'insertamum' => date('c'), + 'insertvon' => $uid + ); + + $result = $this->dmslib->upload($dms, $k, array('pdf')); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $dms_id = $result->retval['dms_id']; + + $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + } return $this->outputJsonSuccess(true); } @@ -374,4 +375,15 @@ class Notiz extends FHC_Controller } } + public function getMitarbeiter($searchString) + { + $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel'); + + $result = $this->MitarbeiterModel->searchMitarbeiter($searchString); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + } \ No newline at end of file diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php index 90c30927f..1e3fde502 100644 --- a/application/models/ressource/Mitarbeiter_model.php +++ b/application/models/ressource/Mitarbeiter_model.php @@ -202,4 +202,26 @@ class Mitarbeiter_model extends DB_Model } return success($kurzbz); } + + public function searchMitarbeiter($filter) + { + $filter = strtoLower($filter); + $qry = " + SELECT + ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter + FROM + public.tbl_mitarbeiter ma + JOIN + public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid) + JOIN + public.tbl_person p on (p.person_id = b.person_id) + WHERE + lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%' + OR + lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%' + OR + (ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'"; + + return $this->execQuery($qry); + } } diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js index b62cdd788..6881c8e67 100644 --- a/public/js/components/Form/Upload/File.js +++ b/public/js/components/Form/Upload/File.js @@ -39,7 +39,7 @@ export default {
  • - +
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 941820405..660404f7c 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -1,10 +1,13 @@ import VueDatePicker from '../vueDatepicker.js.php'; +import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; import File from '../Form/Upload/File.js'; +import {CoreRESTClient} from "../../RESTClient"; export default { components: { VueDatePicker, - File + File, + PvAutoComplete }, props: [ 'typeId', @@ -12,7 +15,7 @@ export default { 'text', 'von', 'bis', - 'action', + 'statusNew', 'document', 'erledigt', 'verfasser', @@ -23,7 +26,10 @@ export default { ], data(){ return { - multiupload: true + multiupload: true, + mitarbeiter: [], + filteredMitarbeiter: [], + filteredFirmen: [] } }, computed: { @@ -90,7 +96,12 @@ export default { return this.bearbeiter; }, set(value) { - this.$emit('update:bearbeiter', value); + if(value) + { + this.$emit('update:bearbeiter', value.mitarbeiter_uid); + } + else + this.$emit('update:bearbeiter', value); } }, intAnhang: { @@ -109,11 +120,19 @@ export default { this.intAnhang = null; //this.$emit('update:anhang', []); }, + + search(event) { + return CoreRESTClient + .get('components/stv/Notiz/getMitarbeiter/' + event.query) + .then(result => { + //console.log(result); + this.filteredMitarbeiter = CoreRESTClient.getData(result.data); + }); + }, }, template: `
- {{anhang.name}} {{index}}
@@ -156,9 +175,9 @@ export default {
- + -
-
--> - + +
+
@@ -203,7 +224,7 @@ export default {
- +
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 0dd0c9ce0..ba82b2628 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -15,7 +15,7 @@ export default { CoreRESTClient, CoreFilterCmpt, Notiz, - BsModal, + BsModal }, props: { modelValue: Object @@ -32,7 +32,7 @@ export default { {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, {title: "Start", field: "start", visible: false}, {title: "Ende", field: "ende", visible: false}, -/* {title: "Dokumente", field: "dms_id"},*/ + /* {title: "Dokumente", field: "dms_id"},*/ {title: "Dokumente", field: "countdoc"}, {title: "Erledigt", field: "erledigt"}, {title: "Notiz_id", field: "notiz_id", visible: false}, @@ -58,10 +58,11 @@ export default { }, tabulatorEvents: [], notizen: [], + filteredMitarbeiter: [], formData: { typeId: 'person_id', titel: null, - action: 'Neue Notiz', + statusNew: true, text: null, von: null, bis: null, @@ -73,7 +74,6 @@ export default { }, showErweitert: true, showDocument: true, - } }, methods:{ @@ -88,7 +88,7 @@ export default { this.loadNotiz(notiz_id).then(() => { if(this.notizen.notiz_id) { this.formData.titel = this.notizen.titel; - this.formData.action = 'Notiz bearbeiten'; + this.formData.statusNew = false; this.formData.text = this.notizen.text; this.formData.von = this.notizen.start; this.formData.bis = this.notizen.ende; @@ -96,19 +96,22 @@ export default { this.formData.erledigt = this.notizen.erledigt; this.formData.verfasser = this.notizen.verfasser_uid; this.formData.bearbeiter = this.notizen.bearbeiter_uid; - this.formData.anhang = this.notizen.anhang; - if(this.notizen.dms_id){ - console.log("loadEntries"); - this.loadDocEntries(this.notizen.notiz_id); - } } - }); + }) + .then(() => { + if(this.notizen.dms_id){ + console.log("loadEntries with " + this.notizen.notiz_id); + this.loadDocEntries(this.notizen.notiz_id); + //console.log(this.formData.anhang); + } + }) + ; }, actionNewNotiz(){ this.resetFormData(); this.formData.typeId = 'person_id'; this.formData.titel = ''; - this.formData.action = 'Neue Notiz'; + this.formData.statusNew = false; this.formData.text = null; this.formData.von = null; this.formData.bis = null; @@ -119,13 +122,13 @@ export default { this.formData.anhang = []; }, addNewNotiz(notizData) { -/* console.log("here: anhang noch empty"); - console.log(this.formData);*/ + /* console.log("here: anhang noch empty"); + console.log(this.formData);*/ const formData = new FormData(); //working with single files - // Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v)); + // Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v)); //multiple files //console.log(this.formData.anhang); @@ -134,9 +137,9 @@ export default { formData.append(k, v); }); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); - +/* console.log(this.formData); - console.log(formData); + console.log(formData);*/ CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, @@ -179,9 +182,11 @@ export default { return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id) .then( result => { - console.log(result.data); - if(result.data.retval) + //console.log(result.data); + if(result.data.retval) { this.formData.anhang = result.data.retval; + console.log(this.formData.anhang); + } else { this.formData.anhang = {}; @@ -197,7 +202,7 @@ export default { result => { if(result.data.retval) { this.notizen = result.data.retval; - + console.log(this.notizen); } else { @@ -216,55 +221,59 @@ export default { //sicherstellen, dass über props nur leere felder übergeben werden this.formData = { typeId: 'person_id', - titel: null, - action: 'Neue Notiz', - text: null, - von: null, - bis: null, - document: null, - erledigt: false, - verfasser: null, - bearbeiter: null, - anhang: [] + titel: null, + statusNew: true, + text: null, + von: null, + bis: null, + document: null, + erledigt: false, + verfasser: null, + bearbeiter: null, + anhang: [] }; }, -/* updateNotiz(notiz_id){ - CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, - this.formData - ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Update erfolgreich'); - this.resetFormData(); - this.reload(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); + /* updateNotiz(notiz_id){ + CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, + this.formData + ).then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Update erfolgreich'); + this.resetFormData(); + this.reload(); + } else { + const errorData = response.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + }); + } + }).catch(error => { + this.statusMsg = 'Error in Catch'; + this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + //this.reload(); }); - } - }).catch(error => { - this.statusMsg = 'Error in Catch'; - this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten'); - }).finally(() => { - window.scrollTo(0, 0); - //this.reload(); - }); - },*/ + },*/ updateNotiz(notiz_id){ const formData = new FormData(); + + Object.entries(this.formData).forEach(([k, v]) => { if(k!= 'anhang') formData.append(k, v); }); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); + console.log(this.formData); + //warum geht das nicht analog? wie kann titel = null sein? CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } ).then(response => { if (!response.data.error) { - this.$fhcAlert.alertSuccess('Update von neuer Notiz erfolgreich'); + this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich'); this.resetFormData(); this.reload(); } else { @@ -318,7 +327,7 @@ export default { v-model:typeId="formData.typeId" v-model:titel="formData.titel" v-model:text="formData.text" - v-model:action="formData.action" + v-model:statusNew="formData.statusNew" v-model:von="formData.von" v-model:bis="formData.bis" v-model:document="formData.document" @@ -329,11 +338,12 @@ export default { > - +
+ parent: {{formData.bearbeiter}} From 61616fbaefacd0abece97545bc0838eb44659f99 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 15 Jan 2024 13:56:17 +0100 Subject: [PATCH 095/464] Update AppendForm mit JSON.stringify, Update Form, authUid --- .../controllers/components/stv/Notiz.php | 52 ++++++++++-- public/js/components/Notiz/Notiz.js | 40 ++++----- .../Studentenverwaltung/Details/Notizen.js | 82 ++++++------------- 3 files changed, 89 insertions(+), 85 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 507e9ed07..494b1fdbf 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -19,6 +19,24 @@ class Notiz extends FHC_Controller ]); } + public function getUid() + { + // Load Libraries + $this->load->library('AuthLib'); + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + $result = getAuthUid(); + $this->outputJsonError($result); + + // $this->outputJson(getData($result)); + +/* if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson(getError($result)); + } else { + $this->outputJson($result); + }*/ + } + public function getNotizen($person_id) { $this->load->model('person/Notiz_model', 'NotizModel'); @@ -74,19 +92,26 @@ class Notiz extends FHC_Controller $this->form_validation->set_rules('text', 'Text', 'required');*/ //TODO(Manu) form validation - schon für type hier? - //Speichern der Notiz und Notizzuordnung $uid = getAuthUID(); - $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; + + if (isset($_POST['data'])) + { + $data = json_decode($_POST['data']); + unset($_POST['data']); + foreach ($data as $k => $v) { + $_POST[$k] = $v; + } + } + $titel = $this->input->post('titel'); $text = $this->input->post('text'); - $bearbeiter_uid = $this->input->post('bearbeiter'); $erledigt = $this->input->post('erledigt'); + $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; + $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null; $type = $this->input->post('typeId'); - - //get rid of null value error - $start = $this->input->post(date('von')); - $ende = $this->input->post(date('bis')); + $start = $this->input->post('von'); + $ende = $this->input->post('bis'); $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); if (isError($result)) @@ -215,6 +240,15 @@ class Notiz extends FHC_Controller return $this->outputJsonError($this->form_validation->error_array()); }*/ + if (isset($_POST['data'])) + { + $data = json_decode($_POST['data']); + unset($_POST['data']); + foreach ($data as $k => $v) { + $_POST[$k] = $v; + } + } + if(!$notiz_id) { return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -228,8 +262,8 @@ class Notiz extends FHC_Controller $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid; $erledigt = $this->input->post('erledigt'); $type = $this->input->post('typeId'); - $start = $this->input->post(date('von')); - $ende = $this->input->post(date('bis')); + $start = $this->input->post('von'); + $ende = $this->input->post('bis'); $result = $this->NotizModel->update( [ diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 660404f7c..46b6a6992 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -88,7 +88,8 @@ export default { return this.verfasser; }, set(value) { - this.$emit('update:verfasser', value); + //this.$emit('update:verfasser', value); + this.$emit('update:verfasser', value.mitarbeiter_uid); } }, intBearbeiter: { @@ -179,24 +180,12 @@ export default {
-
- - {{uid}} -
-
- -
- -
- - +
+
-
- -
- -
+ +
+
+
+ +
+ +
+
- + -
+
+ +
+ +
- +
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index ba82b2628..f88ce0627 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -7,7 +7,7 @@ var editIcon = function (cell, formatterParams) { return ""; }; var deleteIcon = function (cell, formatterParams){ - return ""; + return ""; }; export default { @@ -28,13 +28,13 @@ export default { columns: [ {title: "Titel", field: "titel"}, {title: "Text", field: "text", width: 350}, - {title: "VerfasserIn", field: "verfasser_uid", visible: false}, + {title: "VerfasserIn", field: "verfasser_uid"}, {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, {title: "Start", field: "start", visible: false}, {title: "Ende", field: "ende", visible: false}, /* {title: "Dokumente", field: "dms_id"},*/ {title: "Dokumente", field: "countdoc"}, - {title: "Erledigt", field: "erledigt"}, + {title: "Erledigt", field: "erledigt", visible: false}, {title: "Notiz_id", field: "notiz_id", visible: false}, {title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false}, { @@ -58,6 +58,8 @@ export default { }, tabulatorEvents: [], notizen: [], + uid: '', + intVerfasser: '', filteredMitarbeiter: [], formData: { typeId: 'person_id', @@ -68,12 +70,13 @@ export default { bis: null, document: null, erledigt: false, - verfasser: null, + verfasser: this.uid, bearbeiter: null, anhang: [] }, showErweitert: true, - showDocument: true, + showDocument: true + } }, methods:{ @@ -111,35 +114,22 @@ export default { this.resetFormData(); this.formData.typeId = 'person_id'; this.formData.titel = ''; - this.formData.statusNew = false; + this.formData.statusNew = true; this.formData.text = null; this.formData.von = null; this.formData.bis = null; this.formData.document = null; this.formData.erledigt = false; - this.formData.verfasser = null; + this.formData.verfasser = this.uid; this.formData.bearbeiter = null; this.formData.anhang = []; }, addNewNotiz(notizData) { - /* console.log("here: anhang noch empty"); - console.log(this.formData);*/ const formData = new FormData(); - //working with single files - // Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v)); - - //multiple files - //console.log(this.formData.anhang); - Object.entries(this.formData).forEach(([k, v]) => { - if(k!= 'anhang') - formData.append(k, v); - }); + formData.append('data', JSON.stringify(this.formData)); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); -/* - console.log(this.formData); - console.log(formData);*/ CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, @@ -228,46 +218,18 @@ export default { bis: null, document: null, erledigt: false, - verfasser: null, + verfasser: this.uid, bearbeiter: null, anhang: [] }; }, - /* updateNotiz(notiz_id){ - CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, - this.formData - ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Update erfolgreich'); - this.resetFormData(); - this.reload(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - this.statusMsg = 'Error in Catch'; - this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten'); - }).finally(() => { - window.scrollTo(0, 0); - //this.reload(); - }); - },*/ updateNotiz(notiz_id){ const formData = new FormData(); - - Object.entries(this.formData).forEach(([k, v]) => { - if(k!= 'anhang') - formData.append(k, v); - }); + formData.append('data', JSON.stringify(this.formData)); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); - console.log(this.formData); + //console.log(this.formData); - //warum geht das nicht analog? wie kann titel = null sein? CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } @@ -290,6 +252,17 @@ export default { }); }, }, + created(){ + CoreRESTClient + .get('components/stv/Notiz/getUid') + .then(result => { + if(result.data.retval) { + this.formData.verfasser = result.data.retval; + } + }) + .catch(this.$fhcAlert.handleSystemError); + }, + computed: { }, template: `
@@ -343,10 +316,7 @@ export default {
- parent: {{formData.bearbeiter}} - - +
` From 20edb299a76ecadd6daa12dda7c0227a94d7e72e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 15 Jan 2024 14:05:34 +0100 Subject: [PATCH 096/464] Form validation --- .../controllers/components/stv/Notiz.php | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 494b1fdbf..197ec06d3 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -82,17 +82,8 @@ class Notiz extends FHC_Controller $this->load->model('person/Notiz_model', 'NotizModel'); $this->load->library('DmsLib'); + $this->load->library('form_validation'); - //$this->load->library('form_validation'); - //$_POST = json_decode($this->input->raw_input_stream, true); - - //TODO(Manu) Validation - -/* $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required');*/ - - //TODO(Manu) form validation - schon für type hier? - //Speichern der Notiz und Notizzuordnung $uid = getAuthUID(); if (isset($_POST['data'])) @@ -104,6 +95,15 @@ class Notiz extends FHC_Controller } } + //Form Validation + $this->form_validation->set_rules('titel', 'titel', 'required'); + $this->form_validation->set_rules('text', 'Text', 'required'); + + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + } + $titel = $this->input->post('titel'); $text = $this->input->post('text'); $erledigt = $this->input->post('erledigt'); @@ -113,6 +113,7 @@ class Notiz extends FHC_Controller $start = $this->input->post('von'); $ende = $this->input->post('bis'); + //Speichern der Notiz und Notizzuordnung $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); if (isError($result)) { @@ -222,23 +223,11 @@ class Notiz extends FHC_Controller public function updateNotiz($notiz_id) { - var_dump("in function updateNotiz " . $notiz_id); - //Loads Libraries - $this->load->library('form_validation'); - $this->load->library('DmsLib'); - - // Loads models $this->load->model('person/Notiz_model', 'NotizModel'); $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); - //$_POST = json_decode($this->input->raw_input_stream, true); - /* $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required'); - - if ($this->form_validation->run() == false) - { - return $this->outputJsonError($this->form_validation->error_array()); - }*/ + $this->load->library('form_validation'); + $this->load->library('DmsLib'); if (isset($_POST['data'])) { @@ -254,6 +243,15 @@ class Notiz extends FHC_Controller return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } + //Form Validation + $this->form_validation->set_rules('titel', 'titel', 'required'); + $this->form_validation->set_rules('text', 'Text', 'required'); + + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + } + //update Notiz $uid = getAuthUID(); $titel = $this->input->post('titel'); @@ -288,7 +286,6 @@ class Notiz extends FHC_Controller } //neue Files speichern - //Todo(manu) check, welche files neu sind.. foreach ($_FILES as $k => $file) { $dms = array( From 70d7496ed9982c54f48af051f25babc2d4b8626a Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 15 Jan 2024 14:54:24 +0100 Subject: [PATCH 097/464] =?UTF-8?q?bei=20L=C3=B6schen=20von=20Notiz=20Entf?= =?UTF-8?q?ernen=20aller=20DMS-=20und=20Eintr=C3=A4ge=20in=20Notizdokument?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/components/stv/Notiz.php | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 197ec06d3..2356f8bf1 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -318,7 +318,7 @@ class Notiz extends FHC_Controller public function deleteNotiz ($notiz_id) { //dms_id auslesen aus notizdokument wenn vorhanden - $dms_id = null; + $dms_id_arr = []; $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); $result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id)); @@ -326,35 +326,36 @@ class Notiz extends FHC_Controller if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); + $this->outputJson(getError($result)); } elseif (!hasData($result)) { $this->outputJson($result); - $dms_id = null; + //$dms_id_arr = []; } else { - //Todo(manu( umbau auf array) - $result = current(getData($result)); - $dms_id = $result->dms_id; + $result = getData($result); + foreach($result as $doc) { + $dms_id_arr[] = $doc->dms_id; + } } - if($dms_id) + if($dms_id_arr) { $this->load->library('DmsLib'); - $result = $this->dmslib->removeAll($dms_id); - - if (isError($result)) + foreach($dms_id_arr as $dms_id) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); + $result = $this->dmslib->removeAll($dms_id); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + else + $this->outputJson($result); } - else - $this->outputJson($result); - - //return $this->outputJsonSuccess(current(getData($result))); - } From 09c02b0906d4f9c5b5a949f52c2868aeeabaf156 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 15 Jan 2024 15:29:04 +0100 Subject: [PATCH 098/464] refactoring controllers, codesniffer --- .../controllers/components/stv/Kontakt.php | 117 ++++++------------ .../controllers/components/stv/Notiz.php | 78 +----------- 2 files changed, 46 insertions(+), 149 deletions(-) diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php index 5ed9bc9ef..d8ed352f6 100644 --- a/application/controllers/components/stv/Kontakt.php +++ b/application/controllers/components/stv/Kontakt.php @@ -42,7 +42,6 @@ class Kontakt extends FHC_Controller } } - //old version public function addNewAddress($person_id) { $this->load->library('form_validation'); @@ -58,6 +57,16 @@ class Kontakt extends FHC_Controller $this->load->model('person/Adresse_model', 'AdresseModel'); $uid = getAuthUID(); +/* $person_id = $this->input->post('$person_id'); + $co_name = $this->input->post('co_name'); + $strasse = $this->input->post('strasse'); + $ort = $this->input->post('ort'); + $gemeinde = $this->input->post('gemeinde'); + $nation = $this->input->post('nation'); + $name = $this->input->post('name'); + $typ = $this->input->post('typ'); + $anmerkung = $this->input->post('anmerkung');*/ + $co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null; $strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null; $ort = isset($_POST['ort']) ? $_POST['ort'] : null; @@ -98,68 +107,11 @@ class Kontakt extends FHC_Controller if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); + return $this->outputJson(getError($result)); } return $this->outputJsonSuccess(true); } - //Version mit input->post() TODO(Manu) check mit Chris, not working -/* public function addNewAddress($person_id) - { - $this->load->library('form_validation'); - //$_POST = json_decode($this->input->raw_input_stream, true); - - - $this->load->model('person/Adresse_model', 'AdresseModel'); - - $uid = getAuthUID(); - - $data = [ - 'insertvon' => $uid, - 'insertamum' => date('c'), - 'plz' => $this->input->post('plz'), - 'heimatadresse' => $this->input->post('heimatadresse'), - 'zustelladresse' => $this->input->post('zustelladresse'), - 'rechnungsadresse' => $this->input->post('rechnungsadresse') - ]; - - - $this->form_validation->set_rules('plz', 'PLZ', 'required|numeric'); - - if ($this->form_validation->run() == false) - { - return $this->outputJsonError($this->form_validation->error_array()); - } - - - if ($this->input->post('co_name')) - $data['co_name'] = $this->input->post('co_name'); - if ($this->input->post('strasse')) - $data['strasse'] = $this->input->post('strasse'); - if ($this->input->post('ort')) - $data['ort'] = $this->input->post('ort'); - if ($this->input->post('gemeinde')) - $data['gemeinde'] = $this->input->post('gemeinde'); - if ($this->input->post('nation')) - $data['nation'] = $this->input->post('nation'); - if ($this->input->post('name')) - $data['name'] = $this->input->post('name'); - if ($this->input->post('typ')) - $data['typ'] = $this->input->post('typ'); - if ($this->input->post('anmerkung')) - $data['anmerkung'] = $this->input->post('anmerkung'); - if ($this->input->post('firma')) - $data['firma_id'] = $this->input->post('firma_id'); - - $result = $this->AdresseModel->insert($data); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - return $this->outputJsonSuccess(true); - }*/ - public function updateAddress($address_id) { $uid = getAuthUID(); @@ -187,6 +139,8 @@ class Kontakt extends FHC_Controller else $firma_id = null; + + $person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null; $co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null; $strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null; @@ -197,6 +151,16 @@ class Kontakt extends FHC_Controller $typ = isset($_POST['typ']) ? $_POST['typ'] : null; $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null; +/* $person_id = $this->input->post('$person_id'); + $co_name = $this->input->post('co_name'); + $strasse = $this->input->post('strasse'); + $ort = $this->input->post('ort'); + $gemeinde = $this->input->post('gemeinde'); + $nation = $this->input->post('nation'); + $name = $this->input->post('name'); + $typ = $this->input->post('typ'); + $anmerkung = $this->input->post('anmerkung');*/ + $result = $this->AdresseModel->update( [ 'adresse_id' => $address_id @@ -407,10 +371,11 @@ class Kontakt extends FHC_Controller $standort_id = null; $uid = getAuthUID(); - $kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null; - $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null; - $kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null; - $ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null; + + $kontakttyp = $this->input->post('kontakttyp'); + $anmerkung = $this->input->post('anmerkung'); + $kontakt = $this->input->post('kontakt'); + $ext_id = $this->input->post('ext_id'); $result = $this->KontaktModel->insert( [ @@ -453,11 +418,11 @@ class Kontakt extends FHC_Controller $standort_id = null; $uid = getAuthUID(); - $kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null; - $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null; - $kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null; - $ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null; - $person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null; + $kontakttyp = $this->input->post('kontakttyp'); + $anmerkung = $this->input->post('anmerkung'); + $kontakt = $this->input->post('kontakt'); + $ext_id = $this->input->post('ext_id'); + $person_id = $this->input->post('person_id'); $result = $this->KontaktModel->update( [ @@ -536,14 +501,14 @@ class Kontakt extends FHC_Controller $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); - $ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null; - $oe_kurzbz = isset($_POST['oe_kurzbz']) ? $_POST['oe_kurzbz'] : null; - $orgform_kurzbz = isset($_POST['orgform_kurzbz']) ? $_POST['orgform_kurzbz'] : null; - $name = isset($_POST['name']) ? $_POST['name'] : null; - $anschrift = isset($_POST['anschrift']) ? $_POST['anschrift'] : null; - $bic = isset($_POST['bic']) ? $_POST['bic'] : null; - $blz = isset($_POST['blz']) ? $_POST['blz'] : null; - $kontonr = isset($_POST['kontonr']) ? $_POST['kontonr'] : null; + $ext_id = $this->input->post('ext_id'); + $oe_kurzbz = $this->input->post('oe_kurzbz'); + $orgform_kurzbz = $this->input->post('orgform_kurzbz'); + $name = $this->input->post('name'); + $anschrift = $this->input->post('anschrift'); + $bic = $this->input->post('bic'); + $blz = $this->input->post('blz '); + $kontonr = $this->input->post('kontonr'); $result = $this->BankverbindungModel->insert( [ diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 2356f8bf1..36504d77d 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -25,16 +25,8 @@ class Notiz extends FHC_Controller $this->load->library('AuthLib'); $this->load->library('VariableLib', ['uid' => getAuthUID()]); $result = getAuthUid(); + $this->outputJsonError($result); - - // $this->outputJson(getData($result)); - -/* if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } else { - $this->outputJson($result); - }*/ } public function getNotizen($person_id) @@ -163,64 +155,6 @@ class Notiz extends FHC_Controller return $this->outputJsonSuccess(true); } - public function updateNotizOldVersion($notiz_id) - { - $uid = getAuthUID(); - $this->load->library('form_validation'); - //$_POST = json_decode($this->input->raw_input_stream, true); - - $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required'); - - if ($this->form_validation->run() == false) - { - return $this->outputJsonError($this->form_validation->error_array()); - } - - $this->load->model('person/Notiz_model', 'NotizModel'); - - if(!$notiz_id) - { - return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - - // $person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null; - $uid = getAuthUID(); - $titel = isset($_POST['titel']) ? $_POST['titel'] : null; - $text = isset($_POST['text']) ? $_POST['text'] : null; - $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; - $bearbeiter_uid = $uid; - $erledigt = $_POST['erledigt']; - $start = $this->input->post(date('von')); - $ende = $this->input->post(date('bis')); - - - - $result = $this->NotizModel->update( - [ - 'notiz_id' => $notiz_id - ], - [ - 'titel' => $titel, - 'updatevon' => $uid, - 'updateamum' => date('c'), - 'text' => $text, - 'verfasser_uid' => $verfasser_uid, - 'bearbeiter_uid' => $bearbeiter_uid, - 'start' => $start, - 'ende' => $ende, - 'erledigt' => $erledigt - ] - ); - - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - return $this->outputJsonSuccess(true); - } - public function updateNotiz($notiz_id) { $this->load->model('person/Notiz_model', 'NotizModel'); @@ -315,7 +249,7 @@ class Notiz extends FHC_Controller return $this->outputJsonSuccess(true); } - public function deleteNotiz ($notiz_id) + public function deleteNotiz($notiz_id) { //dms_id auslesen aus notizdokument wenn vorhanden $dms_id_arr = []; @@ -331,7 +265,6 @@ class Notiz extends FHC_Controller elseif (!hasData($result)) { $this->outputJson($result); - //$dms_id_arr = []; } else { @@ -387,8 +320,8 @@ class Notiz extends FHC_Controller $this->NotizModel->addSelect('campus.tbl_dms_version.*'); - $this->NotizModel->addJoin('public.tbl_notiz_dokument','ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)'); - $this->NotizModel->addJoin('campus.tbl_dms_version','ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)'); + $this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)'); + $this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)'); $result = $this->NotizModel->loadWhere( array('public.tbl_notiz.notiz_id' => $notiz_id) @@ -417,5 +350,4 @@ class Notiz extends FHC_Controller } $this->outputJson($result); } - -} \ No newline at end of file +} From 28fe3ef839820f6859b022962eccb9d3da930e98 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 16 Jan 2024 14:34:13 +0100 Subject: [PATCH 099/464] Funktionserweiterungen um idType --- .../controllers/components/stv/Notiz.php | 51 +++++++++---- application/models/person/Notiz_model.php | 48 +++++++----- .../models/person/Notizzuordnung_model.php | 31 ++++++++ public/js/components/Notiz/Notiz.js | 71 ++++++++---------- .../Studentenverwaltung/Details/Notizen.js | 73 +++++++++---------- 5 files changed, 163 insertions(+), 111 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 36504d77d..1850a5609 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -29,18 +29,30 @@ class Notiz extends FHC_Controller $this->outputJsonError($result); } - public function getNotizen($person_id) + public function getNotizen($id, $type) { $this->load->model('person/Notiz_model', 'NotizModel'); - $type = 'person'; + $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); - $result = $this->NotizModel->getNotizWithDocEntries($person_id); + //check if valid type + $isValidType = $this->NotizzuordnungModel->isValidType($type); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + if($isValidType) + { + $result = $this->NotizModel->getNotizWithDocEntries($id, $type); + + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson(getError($result)); + } else { + $this->outputJson(getData($result) ?: []); + } + } + else + { + //Todo manu (correct return to ajax) + $result = "datatype not yet implemented for notes"; $this->outputJson(getError($result)); - } else { - $this->outputJson(getData($result) ?: []); } } @@ -60,8 +72,7 @@ class Notiz extends FHC_Controller } elseif (!hasData($result)) { - $this->outputJson($result); //success mit Wert null - // $this->outputJson(getData($result) ?: []); + $this->outputJson($result); } else { @@ -69,7 +80,7 @@ class Notiz extends FHC_Controller } } - public function addNewNotiz($id) + public function addNewNotiz($id, $paramTyp = null) { $this->load->model('person/Notiz_model', 'NotizModel'); @@ -87,6 +98,18 @@ class Notiz extends FHC_Controller } } + //Überprüfung ob type übergeben wurde (entweder Funktions- oder Postparameter) + if ($paramTyp) + $type = $paramTyp; + if(isset($_POST['typeId'])) + $type = $this->input->post('typeId'); + + if(!$type) + { + //Todo(manu) return error + var_dump("ERROR no type"); + } + //Form Validation $this->form_validation->set_rules('titel', 'titel', 'required'); $this->form_validation->set_rules('text', 'Text', 'required'); @@ -101,11 +124,11 @@ class Notiz extends FHC_Controller $erledigt = $this->input->post('erledigt'); $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null; - $type = $this->input->post('typeId'); + //$type = $this->input->post('typeId'); $start = $this->input->post('von'); $ende = $this->input->post('bis'); - //Speichern der Notiz und Notizzuordnung + //Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); if (isError($result)) { @@ -219,7 +242,10 @@ class Notiz extends FHC_Controller return $this->outputJson(getError($result)); } + //Todo(manu) update von Notizzuordnung?? typeId? + //neue Files speichern + //Todo(manu) update files foreach ($_FILES as $k => $file) { $dms = array( @@ -291,7 +317,6 @@ class Notiz extends FHC_Controller } } - //Todo(manu) rollback? //delete Notiz und Notizzuordnung $this->load->model('person/Notiz_model', 'NotizModel'); diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 7e7ffbe32..21c91884b 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -140,11 +140,31 @@ class Notiz_model extends DB_Model * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...) * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz */ - public function addNotizForType($type, $id, $titel, $text, $insertvon, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null) - { + public function addNotizForType( + $type, + $id, + $titel, + $text, + $insertvon, + $start = null, + $ende = null, + $erledigt = false, + $verfasser_uid = null, + $bearbeiter_uid = null + ) { // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); + //check if valid type + $isValidType = $this->NotizzuordnungModel->isValidType($type); + + if(!$isValidType) + { + //Todo manu (correct return to controller) + $msg = "datatype " . $type . " not implemented for notes"; + return error($msg, EXIT_ERROR); + } + // Start DB transaction $this->db->trans_start(false); @@ -180,13 +200,10 @@ class Notiz_model extends DB_Model return $result; } - - /** * Add a Notiz for a given person with DMS_id */ - //TODO(manu) add type for Notizzuordnung - public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id=null) + public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id = null) { // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); @@ -243,16 +260,12 @@ class Notiz_model extends DB_Model /** * gets all Notizen with Documententries for a certain type and type_id - * @param $person_id + * @param String type of id eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id, + * bestellung_id, lehreinheit_id, anrechnung_id, uid) + * @param $id the corresponding id, part of public.tbl_notizzuordnung */ - //Todo(Manu) rewrite in CI-Style - //Todo(Manu) auf andere types erweitern - public function getNotizWithDocEntries($id) + public function getNotizWithDocEntries($id, $type) { - $type = 'writeFunction'; - //$type_id = 'z.person_id'; - - $qry = " SELECT n.*, count(dms_id) as countDoc, z.notizzuordnung_id @@ -265,16 +278,15 @@ class Notiz_model extends DB_Model LEFT JOIN campus.tbl_dms_version USING (dms_id) WHERE - z.person_id = ? + z.$type = ? GROUP BY notiz_id, z.notizzuordnung_id "; - return $this->execQuery($qry, array($id)); - } + /** * gets all Notizen for a person with a specific title * @param $person_id @@ -361,6 +373,4 @@ class Notiz_model extends DB_Model return $this->loadWhere(array('anrechnung_id' => $anrechnung_id)); } - // ------------------------------------------------------------------------------------------------------ - } diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php index 187a8399b..542c68e6f 100644 --- a/application/models/person/Notizzuordnung_model.php +++ b/application/models/person/Notizzuordnung_model.php @@ -11,4 +11,35 @@ class Notizzuordnung_model extends DB_Model $this->dbTable = 'public.tbl_notizzuordnung'; $this->pk = 'notizzuordnung_id'; } + + public function isValidType($type) + { + //var_dump($type); + $validTypes = []; + + $qry = " + SELECT column_name + FROM information_schema.columns + WHERE table_schema = 'public' + AND table_name = 'tbl_notizzuordnung' + "; + + $type_arr = $this->execQuery($qry); + $type_arr = $type_arr->retval; + + foreach ($type_arr as $t) { + $validTypes[] = $t->column_name; + } + + if (in_array($type, $validTypes)) + { + // var_dump($type . " is IN ARRAY"); + return true; + } + else + { + //var_dump($type . " is NOT IN ARRAY"); + return false; + } + } } diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 46b6a6992..be472de6d 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -29,7 +29,7 @@ export default { multiupload: true, mitarbeiter: [], filteredMitarbeiter: [], - filteredFirmen: [] +/* filteredFirmen: []*/ } }, computed: { @@ -138,17 +138,16 @@ export default {
- {{action}}
[{{this.typeId}}] -
+
-
+
@@ -159,25 +158,21 @@ export default {
-
- + +
- -
+ +
-
- - - -
- -
- - +
+ + +
+
@@ -186,15 +181,15 @@ export default {
- -
+
@@ -205,32 +200,28 @@ export default {
-
- -
- +
+
- - -
- - - - -
` +
+ + + +
` } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index f88ce0627..8e9917287 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -6,7 +6,7 @@ import BsModal from "../../../Bootstrap/Modal"; var editIcon = function (cell, formatterParams) { return ""; }; -var deleteIcon = function (cell, formatterParams){ +var deleteIcon = function (cell, formatterParams) { return ""; }; @@ -20,11 +20,11 @@ export default { props: { modelValue: Object }, - data() { + data(){ return { tabulatorOptions: { - ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id), - // + this.modelValue.person_id, 'person'), + ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'), + //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.typeId), columns: [ {title: "Titel", field: "titel"}, {title: "Text", field: "text", width: 350}, @@ -52,7 +52,7 @@ export default { ], layout: 'fitDataFill', layoutColumnsOnNewData: false, - height: '200', + height: '150', selectable: true, index: 'notiz_id' }, @@ -74,10 +74,10 @@ export default { bearbeiter: null, anhang: [] }, - showErweitert: true, - showDocument: true + showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt + showDocument: true //show upload documents - } + }; }, methods:{ actionDeleteNotiz(notiz_id){ @@ -107,8 +107,7 @@ export default { this.loadDocEntries(this.notizen.notiz_id); //console.log(this.formData.anhang); } - }) - ; + }); }, actionNewNotiz(){ this.resetFormData(); @@ -125,13 +124,13 @@ export default { this.formData.anhang = []; }, addNewNotiz(notizData) { - const formData = new FormData(); formData.append('data', JSON.stringify(this.formData)); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); - CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, + CoreRESTClient.post( + 'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } ).then(response => { @@ -163,16 +162,15 @@ export default { this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); } }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); - }).finally(()=> { - window.scrollTo(0, 0); - }); + this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); + }).finally(()=> { + window.scrollTo(0, 0); + }); }, loadDocEntries(notiz_id){ return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id) .then( result => { - //console.log(result.data); if(result.data.retval) { this.formData.anhang = result.data.retval; console.log(this.formData.anhang); @@ -187,15 +185,15 @@ export default { ); }, loadNotiz(notiz_id){ - return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id) + return CoreRESTClient.get( + 'components/stv/Notiz/loadNotiz/' + notiz_id) .then( result => { if(result.data.retval) { this.notizen = result.data.retval; - console.log(this.notizen); + //console.log(this.notizen); } - else - { + else { this.notizen = {}; this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); } @@ -230,7 +228,8 @@ export default { Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); //console.log(this.formData); - CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, + CoreRESTClient.post( + 'components/stv/Notiz/updateNotiz/' + notiz_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } ).then(response => { @@ -256,9 +255,9 @@ export default { CoreRESTClient .get('components/stv/Notiz/getUid') .then(result => { - if(result.data.retval) { - this.formData.verfasser = result.data.retval; - } + if(result.data.retval) { + this.formData.verfasser = result.data.retval; + } }) .catch(this.$fhcAlert.handleSystemError); }, @@ -277,7 +276,7 @@ export default { - + -
+
- Neu anlegen - -
- -
-` -}; \ No newline at end of file + ` +}; From dc5368f346fc86656050cc6a913694920ea7bce0 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 17 Jan 2024 13:23:52 +0100 Subject: [PATCH 100/464] =?UTF-8?q?Letzte=20=C3=84nderung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/components/stv/Notiz.php | 2 ++ application/models/person/Notiz_model.php | 21 ++++++++++++- public/js/components/Notiz/Notiz.js | 31 +++++++++++++++++-- .../Studentenverwaltung/Details/Notizen.js | 8 ++++- 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 1850a5609..82d494a16 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -61,6 +61,8 @@ class Notiz extends FHC_Controller $this->load->model('person/Notiz_model', 'NotizModel'); $this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT'); $this->NotizModel->addSelect('*'); + $this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum + THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate"); $this->NotizModel->addLimit(1); $result = $this->NotizModel->loadWhere( diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 21c91884b..aac679915 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -266,9 +266,27 @@ class Notiz_model extends DB_Model */ public function getNotizWithDocEntries($id, $type) { + // ci query builder returns null +/* $this->db->select('n.*, count(dms_id) as countDoc, z.notizzuordnung_id'); + $this->db->select('(CASE WHEN n.updateamum >= n.insertamum THEN n.updateamum ELSE n.insertamum END) AS lastUpdate'); + $this->db->from('public.tbl_notiz n'); + $this->db->join('public.tbl_notizzuordnung z', 'n.notiz_id = z.notiz_id'); + $this->db->join('public.tbl_notiz_dokument dok', 'n.notiz_id = dok.notiz_id', 'left'); + $this->db->join('campus.tbl_dms_version', 'dok.notiz_id = campus.tbl_dms_version.dms_id', 'left'); + $this->db->where("z.$type", $id); + $this->db->group_by('n.notiz_id, z.notizzuordnung_id'); + + $query = $this->db->get(); + return $query->result();*/ + + $qry = " SELECT - n.*, count(dms_id) as countDoc, z.notizzuordnung_id + n.*, count(dms_id) as countDoc, z.notizzuordnung_id, + TO_CHAR (CASE + WHEN n.updateamum >= n.insertamum THEN n.updateamum + ELSE n.insertamum + END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate FROM public.tbl_notiz n JOIN @@ -284,6 +302,7 @@ class Notiz_model extends DB_Model "; return $this->execQuery($qry, array($id)); + } diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index be472de6d..3c1bbab27 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -13,6 +13,7 @@ export default { 'typeId', 'titel', 'text', + 'lastChange', 'von', 'bis', 'statusNew', @@ -49,6 +50,14 @@ export default { this.$emit('update:text', value); } }, +/* intLastChange: { + get() { + return this.lastChange; + }, + set(value) { + this.$emit('update:lastChange', value); + } + },*/ intVon: { get() { return this.von; @@ -142,6 +151,13 @@ export default { [{{this.typeId}}]
+ +
+
+

Neue Notiz

+

Notiz bearbeiten

+
+
@@ -156,6 +172,7 @@ export default {
+
@@ -179,7 +196,7 @@ export default {
- +
- +
- + +
+ +
+ +

{{this.lastChange}}

+
+
+
` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 8e9917287..bbe03d785 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -37,6 +37,7 @@ export default { {title: "Erledigt", field: "erledigt", visible: false}, {title: "Notiz_id", field: "notiz_id", visible: false}, {title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false}, + {title: "letzte Änderung", field: "lastupdate", visible: false}, { formatter: editIcon, cellClick: (e, cell) => { this.actionEditNotiz(cell.getData().notiz_id); @@ -66,6 +67,7 @@ export default { titel: null, statusNew: true, text: null, + lastChange: null, von: null, bis: null, document: null, @@ -93,6 +95,7 @@ export default { this.formData.titel = this.notizen.titel; this.formData.statusNew = false; this.formData.text = this.notizen.text; + this.formData.lastChange = this.notizen.lastupdate; this.formData.von = this.notizen.start; this.formData.bis = this.notizen.ende; this.formData.document = this.notizen.dms_id; @@ -115,6 +118,7 @@ export default { this.formData.titel = ''; this.formData.statusNew = true; this.formData.text = null; + this.formData.lastChange = null; this.formData.von = null; this.formData.bis = null; this.formData.document = null; @@ -212,6 +216,7 @@ export default { titel: null, statusNew: true, text: null, + lastChange: null, von: null, bis: null, document: null, @@ -299,6 +304,7 @@ export default { v-model:typeId="formData.typeId" v-model:titel="formData.titel" v-model:text="formData.text" + :lastChange="formData.lastChange" v-model:statusNew="formData.statusNew" v-model:von="formData.von" v-model:bis="formData.bis" @@ -312,7 +318,7 @@ export default { - +
` }; From 22f6e3fe3bdf7a20ae2cef3ac73c5091a2f3cb38 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 17 Jan 2024 15:18:38 +0100 Subject: [PATCH 101/464] Upload Dms Component --- public/js/components/Form/Upload/Dms.js | 85 +++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 public/js/components/Form/Upload/Dms.js diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js new file mode 100644 index 000000000..1c2f476e8 --- /dev/null +++ b/public/js/components/Form/Upload/Dms.js @@ -0,0 +1,85 @@ +export default { + emits: [ + 'update:modelValue' + ], + props: { + modelValue: { + type: [ FileList, Array ], + required: true + }, + multiple: Boolean, + id: String, + name: String + }, + methods: { + stringifyFile(file) { + return JSON.stringify({ + lastModified: file.lastModified, + lastModifiedDate: file.lastModifiedDate, + name: file.name, + size: file.size, + type: file.type + }); + }, + addFiles(event) { + if (!this.multiple) + return this.$emit('update:modelValue', event.target.files); + + const dt = new DataTransfer(); + const doubles = []; + for (var file of this.modelValue) { + dt.items.add(file); + doubles.push(this.stringifyFile(file)); + } + for (var file of event.target.files) { + // NOTE(chris): deep check (with FileReader) would require an async function so we only check the basic attributes + if (doubles.indexOf(this.stringifyFile(file)) < 0) + dt.items.add(file); + } + this.$emit('update:modelValue', dt.files); + }, + removeFile(id) { + const fileToRemove = Array.from(this.modelValue)[id]; + + const dt = new DataTransfer(); + for (var file of this.modelValue) { + if (file !== fileToRemove) + dt.items.add(file); + } + this.$emit('update:modelValue', dt.files); + } + }, + watch: { + modelValue(n) { + if (n instanceof FileList) + return this.$refs.upload.files = n; + + const dt = new DataTransfer(); + const dms = []; + for (var file of n) { + if (file instanceof File) { + dt.items.add(file); + } else { + const dmsFile = new File([JSON.stringify(file)], file.name, { + type: 'application/x.fhc-dms+json' + }); + dt.items.add(dmsFile); + } + } + this.$emit('update:modelValue', dt.files); + } + }, + template: ` +
+ +
    +
  • + + {{ file.name }} + +
    • +
+
` +} \ No newline at end of file From abb9885b3b9a19cccbafecc718419ec765ab4064 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 17 Jan 2024 15:23:00 +0100 Subject: [PATCH 102/464] Fhc.css --- public/css/Fhc.css | 80 ++---------------------------- public/css/Studentenverwaltung.css | 1 + 2 files changed, 5 insertions(+), 76 deletions(-) diff --git a/public/css/Fhc.css b/public/css/Fhc.css index 23c2379ea..1376a251f 100644 --- a/public/css/Fhc.css +++ b/public/css/Fhc.css @@ -2,82 +2,10 @@ white-space: pre-line; } -.accordion-button-primary { - background-color: #e7f1ff; - color: #0c63e4; -} -.accordion-button-primary:not(.collapsed) { - background-color: #cfe2ff; - color: #0a58ca; +.btn-p-0 { + padding: 0 .375rem; } -.accordion-button-secondary { - background-color: #f0f1f2; - color: #616971; +.z-1 { + z-index: 1; } -.accordion-button-secondary:not(.collapsed) { - background-color: #e2e3e5; - color: #565e64; -} - -.accordion-button-success { - background-color: #e8f3ee; - color: #177a4c; -} -.accordion-button-success:not(.collapsed) { - background-color: #d1e7dd; - color: #146c43; -} - -.accordion-button-info { - background-color: #e7fafe; - color: #0cb6d8; -} -.accordion-button-info:not(.collapsed) { - background-color: #cff4fc; - color: #0aa2c0; -} - -.accordion-button-warning { - background-color: #fff9e6; - color: #e6ae06; -} -.accordion-button-warning:not(.collapsed) { - background-color: #fff3cd; - color: #cc9a06; -} - -.accordion-button-danger { - background-color: #fcebec; - color: #c6303e; -} -.accordion-button-danger:not(.collapsed) { - background-color: #f8d7da; - color: #b02a37; -} - -.accordion-button-light { - background-color: #fefeff; - color: #dfe0e1; -} -.accordion-button-light:not(.collapsed) { - background-color: #fefefe; - color: #c6c7c8; -} - -.accordion-button-dark { - background-color: #e9e9ea; - color: #1e2125; -} -.accordion-button-dark:not(.collapsed) { - background-color: #d3d3d4; - color: #1a1e21; -} - -.tabulator-edit-list .tabulator-edit-list-item { - background-color: white; -} -.tabulator-edit-list .tabulator-edit-list-item:hover, -.tabulator-edit-list .tabulator-edit-list-item.active { - color: white; -} \ No newline at end of file diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css index f845adc43..3f12660ff 100644 --- a/public/css/Studentenverwaltung.css +++ b/public/css/Studentenverwaltung.css @@ -1,3 +1,4 @@ +@import './Fhc.css'; @import './components/searchbar.css'; @import './components/verticalsplit.css'; @import './components/FilterComponent.css'; From 8762e87658523265fe469b2943fa0845f502d375 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 17 Jan 2024 15:24:44 +0100 Subject: [PATCH 103/464] Noten: Switch all/current semester --- .../controllers/components/stv/Noten.php | 4 +- .../Details/Noten/Zeugnis.js | 54 +++++++++++++------ 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/application/controllers/components/stv/Noten.php b/application/controllers/components/stv/Noten.php index dfde2892b..fb61de065 100644 --- a/application/controllers/components/stv/Noten.php +++ b/application/controllers/components/stv/Noten.php @@ -30,7 +30,7 @@ class Noten extends Auth_Controller return $this->outputJson($result); } - public function getZeugnis($prestudent_id) + public function getZeugnis($prestudent_id, $all = null) { $this->load->model('crm/Student_model', 'StudentModel'); $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel'); @@ -47,7 +47,7 @@ class Noten extends Auth_Controller $student_uid = current(getData($result))->student_uid; - $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell'); + $studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null; $result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz); if (isError($result)) { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js index 95875f868..0f5bcc62e 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js @@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; import {CoreRESTClient} from '../../../../../RESTClient.js'; import ZeugnisActions from './Zeugnis/Actions.js'; +const LOCAL_STORAGE_ID = 'stv_details_noten_zeugnis_2024-01-11_stdsem_all'; + export default { components: { CoreFilterCmpt, @@ -13,12 +15,13 @@ export default { data() { return { validStudent: true, - tabulatorEvents: [] + tabulatorEvents: [], + stdsem: '' }; }, computed: { ajaxURL() { - return CoreRESTClient._generateRouterURI('components/stv/Noten/getZeugnis/' + this.student.prestudent_id); + return CoreRESTClient._generateRouterURI('components/stv/Noten/getZeugnis/' + this.student.prestudent_id + this.stdsem); }, tabulatorOptions() { return { @@ -59,29 +62,50 @@ export default { }; } }, + watch: { + ajaxURL(n) { + if (this.$refs.table) + this.$refs.table.tabulator.setData(n); + } + }, methods: { setGrades(selected) { CoreRESTClient .post('components/stv/Noten/update', selected) .then(this.$refs.table.reloadTable) .catch(this.$fhcAlert.handleFormValidation); + }, + saveStdsem(event) { + window.localStorage.setItem(LOCAL_STORAGE_ID, event.target.value ? 'true' : ''); } }, + created() { + const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID); + this.stdsem = savedPath ? '/all' : ''; + }, + // TODO(chris): phrasen template: `
Kein Student
- - - +
` }; \ No newline at end of file From 5c9e1b3fd36ac56238b352964e6d6e571d2c4a2c Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 17 Jan 2024 15:28:39 +0100 Subject: [PATCH 104/464] Use new Form Components in Details --- .../controllers/components/stv/Student.php | 7 +- public/js/components/Form/Input.js | 20 +- public/js/components/Form/Upload/Image.js | 18 +- .../Studentenverwaltung/Details/Details.js | 512 ++++++++++-------- 4 files changed, 329 insertions(+), 228 deletions(-) diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php index 88627ca03..ddfd95aed 100644 --- a/application/controllers/components/stv/Student.php +++ b/application/controllers/components/stv/Student.php @@ -77,6 +77,7 @@ class Student extends FHC_Controller $this->form_validation->set_rules('semester', 'Semester', 'integer'); if ($this->form_validation->run() == false) { + $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); return $this->outputJsonError($this->form_validation->error_array()); } @@ -202,7 +203,11 @@ class Student extends FHC_Controller } } - $this->outputJsonSuccess(true); + $this->outputJson(success(array_fill_keys(array_merge( + array_keys($update_lehrverband), + array_keys($update_person), + array_keys($update_student) + ), ''), 1)); } public function check() diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js index 46ddbd3c5..8bdff639b 100644 --- a/public/js/components/Form/Input.js +++ b/public/js/components/Form/Input.js @@ -14,7 +14,8 @@ export default { bsFeedback: Boolean, noAutoClass: Boolean, type: String, - name: String + name: String, + containerClass: [String, Array, Object] }, data() { return { @@ -23,6 +24,13 @@ export default { } }, computed: { + hasContainer() { + if (!this.bsFeedback) + return true; + if (this.containerClass) + return true; + return false; + }, lcType() { if (!this.type) return 'text'; @@ -37,6 +45,8 @@ export default { return 'VueDatePicker'; case 'autocomplete': return 'PvAutocomplete'; + case 'uploadimage': + return 'UploadImage'; default: return 'input'; } @@ -133,7 +143,9 @@ export default { if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) { this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php")); } else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) { - this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));; + this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js")); + } else if (this.tag == 'UploadImage' && !this._.components.UploadImage) { + this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js")); } } }, @@ -149,7 +161,7 @@ export default { // TODO(chris): wrap check in div? }, template: ` - + @@ -197,7 +209,7 @@ export default { > -
+
- +
` } \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js index ebbd68dd2..0c988179f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js @@ -1,16 +1,14 @@ -import VueDatePicker from '../../../vueDatepicker.js.php'; -import FormUploadImage from '../../../Form/Upload/Image.js'; import {CoreRESTClient} from '../../../../RESTClient.js'; - - -import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js"; +import FormForm from '../../../Form/Form.js'; +import FormInput from '../../../Form/Input.js'; +import FormUploadImage from '../../../Form/Upload/Image.js'; export default { components: { - VueDatePicker, - FormUploadImage, - PvToast + FormForm, + FormInput, + FormUploadImage }, inject: { showBpk: { @@ -62,6 +60,9 @@ export default { }, changedLength() { return Object.keys(this.changed).length; + }, + noImageSrc() { + return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/profilbild_dummy.jpg'; } }, watch: { @@ -69,6 +70,7 @@ export default { this.updateStudent(n); }, data: { + // TODO(chris): use @input instead? handler(n) { let res = {}; for (var k in this.original) { @@ -82,7 +84,6 @@ export default { } } this.changed = res; - this.resetErrors(); }, deep: true } @@ -98,213 +99,264 @@ export default { this.data.familienstand = ''; this.original = {...this.data}; }) - .catch(err => { - console.error(err.response.data || err.message); - }); + .catch(this.$fhcAlert.handleSystemError); }, save() { - CoreRESTClient - .post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed) - .then(result => result.data) + this.$refs.form + .send(CoreRESTClient.post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed)) .then(result => { - this.resetErrors(); - if (CoreRESTClient.isError(result)) { - let errors = CoreRESTClient.getError(result); - - if (errors === "Generic error") - console.error(errors, result); - else { - for (var k in errors) - this.addError(k, errors[k]); - } - } else { - for (var node of document.querySelectorAll(Object.keys(this.changed).map(el => '#stv-details-' + el).join(','))) - node.classList.add('is-valid'); - if (this.changed.gebdatum !== undefined) - this.gebDatumIsValid = true; - - // TODO(chris): phrase - this.$fhcAlert.alertSuccess('Gespeichert'); - //this.addToast('Gespeichert', '', 'success'); - - this.original = {...this.data}; - this.changed = {}; - } + this.original = {...this.data}; + this.changed = {}; }) - .catch(this.$fhcAlert.handleSystemError/*err => { - // TODO(chris): phrase - this.addToast('Error', err?.response?.data || err?.message, 'error'); - }*/); - }, - resetErrors() { - Array.from(this.$refs.form.getElementsByClassName('is-valid')).forEach(el => el.classList.remove('is-valid')); - Array.from(this.$refs.form.getElementsByClassName('is-invalid')).forEach(el => el.classList.remove('is-invalid')); - Array.from(this.$refs.form.getElementsByClassName('invalid-feedback')).forEach(el => el.remove()); - this.gebDatumIsValid = false; - this.gebDatumIsInvalid = false; - }, - addError(field, msg) { - let id = 'stv-details-' + field; - - let input = document.getElementById(id); - if (field === 'gebdatum') { - this.gebDatumIsInvalid = true; - input = document.getElementById('dp-input-' + id).parentNode; - } - - input.classList.add('is-invalid'); - - let feedback = document.createElement('div'); - feedback.classList.add('invalid-feedback'); - feedback.innerHTML = msg; - input.after(feedback); - /*}, - addToast(header, msg, severity) { - this.$refs.responseToast.add({ - severity: severity, - summary: header, - detail: msg, - life: 3000 - })*/ + .catch(this.$fhcAlert.handleSystemError); } }, created() { this.updateStudent(this.modelValue); }, + //TODO(chris): Phrasen //TODO(chris): Geburtszeit? Anzahl der Kinder? template: ` -
-
+ +
Person
@@ -315,47 +367,79 @@ export default { StudentIn
Loading...
- - ` + ` }; \ No newline at end of file From f17591327dc882a61b24ac5e0707a52aecf79fc9 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 17 Jan 2024 16:00:56 +0100 Subject: [PATCH 105/464] Quickfix missing "!" --- public/js/components/Form/Input.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js index 8bdff639b..8107c1a19 100644 --- a/public/js/components/Form/Input.js +++ b/public/js/components/Form/Input.js @@ -161,7 +161,7 @@ export default { // TODO(chris): wrap check in div? }, template: ` - + From 0c0d5294789a9087031ec2dfb4e43e43c3f54c10 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 17 Jan 2024 16:03:24 +0100 Subject: [PATCH 106/464] Tabs: vertical usage & reactive configUrl & configUrl accepts object --- public/js/components/Tabs.js | 99 +++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 42 deletions(-) diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js index 7d2cf0500..1e77fa996 100644 --- a/public/js/components/Tabs.js +++ b/public/js/components/Tabs.js @@ -11,9 +11,14 @@ export default { 'changed' ], props: { - configUrl: String, + // TODO(chris): rename to config? + configUrl: { + type: [String, Object], + required: true + }, default: String, - modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol] + modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol], + vertical: Boolean }, data() { return { @@ -37,60 +42,70 @@ export default { } } }, + watch: { + configUrl(n) { + this.initConfig(n); + } + }, methods: { change(key) { this.$emit("change", key) this.current = key; this.$nextTick(() => this.$emit("changed", key)); - } - }, - created() { - CoreRESTClient - .get(this.configUrl) - .then(result => CoreRESTClient.getData(result.data)) - .then(result => { - if (!result) - return; + }, + initConfig(config) { + if (!config) + return; + if (typeof config === 'string' || config instanceof String) + return CoreRESTClient.get(config) + .then(result => CoreRESTClient.getData(result.data)) + .then(this.initConfig) + .catch(this.$fhcAlert.handleSystemError); - const tabs = {}; + console.log(config); + const tabs = {}; - if (Array.isArray(result)) { - result.forEach((config, key) => { - if (!config.component) - return console.error('Component missing for ' + key); + if (Array.isArray(config)) { + config.forEach((item, key) => { + if (!item.component) + return console.error('Component missing for ' + key); - tabs[key] = { - component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))), - title: config.title || key, - config: config.config, - key - } - }); + tabs[key] = { + component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))), + title: item.title || key, + config: item.config, + key + } + }); + } else { + Object.entries(config).forEach(([key, item]) => { + if (!item.component) + return console.error('Component missing for ' + key); - } else { - Object.entries(result).forEach(([key, config]) => { - if (!config.component) - return console.error('Component missing for ' + key); + tabs[key] = { + component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))), + title: item.title || key, + config: item.config, + key + } + }); + } - tabs[key] = { - component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))), - title: config.title || key, - config: config.config, - key - } - }); - } + if (this.current === null || !tabs[this.current]) { if (tabs[this.default]) this.current = this.default; else this.current = Object.keys(tabs)[0]; - this.tabs = tabs; - }) - .catch(this.$fhcAlert.handleSystemError); + } + this.tabs = tabs; + } + }, + created() { + this.initConfig(this.configUrl); }, template: ` -
-
+
+
{{tab.title}}
-
+
From bd4bbe0b7a1f8e976cecef6cfbde37650d9cb2f0 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 18 Jan 2024 07:45:08 +0100 Subject: [PATCH 107/464] Update response/error handling --- application/controllers/components/stv/Notiz.php | 11 +++++++---- application/models/person/Notiz_model.php | 11 +++++++++-- application/models/person/Notizzuordnung_model.php | 12 ++++++------ public/js/components/Notiz/Notiz.js | 14 ++------------ .../Stv/Studentenverwaltung/Details/Notizen.js | 5 +++-- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 82d494a16..d5307f7c2 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -100,7 +100,8 @@ class Notiz extends FHC_Controller } } - //Überprüfung ob type übergeben wurde (entweder Funktions- oder Postparameter) + //Überprüfung ob type übergeben wurde (via Funktions- oder Postparameter) + $type = null; if ($paramTyp) $type = $paramTyp; if(isset($_POST['typeId'])) @@ -108,8 +109,10 @@ class Notiz extends FHC_Controller if(!$type) { - //Todo(manu) return error - var_dump("ERROR no type"); + $result = error('kein Type für ID vorhanden', EXIT_ERROR); + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + + return $this->outputJson(getError($result)); } //Form Validation @@ -126,7 +129,7 @@ class Notiz extends FHC_Controller $erledigt = $this->input->post('erledigt'); $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null; - //$type = $this->input->post('typeId'); + $type = $this->input->post('typeId'); $start = $this->input->post('von'); $ende = $this->input->post('bis'); diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index aac679915..5684bf3ed 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -156,14 +156,21 @@ class Notiz_model extends DB_Model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); //check if valid type - $isValidType = $this->NotizzuordnungModel->isValidType($type); + $result = $this->NotizzuordnungModel->isValidType($type); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $result = error($result->retval, EXIT_ERROR); + return $result; + } +/* if(!$isValidType) { //Todo manu (correct return to controller) $msg = "datatype " . $type . " not implemented for notes"; return error($msg, EXIT_ERROR); - } + }*/ // Start DB transaction $this->db->trans_start(false); diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php index 542c68e6f..8a6672424 100644 --- a/application/models/person/Notizzuordnung_model.php +++ b/application/models/person/Notizzuordnung_model.php @@ -14,7 +14,6 @@ class Notizzuordnung_model extends DB_Model public function isValidType($type) { - //var_dump($type); $validTypes = []; $qry = " @@ -22,24 +21,25 @@ class Notizzuordnung_model extends DB_Model FROM information_schema.columns WHERE table_schema = 'public' AND table_name = 'tbl_notizzuordnung' + AND column_name not in ('notizzuordnung_id', 'notiz_id') "; $type_arr = $this->execQuery($qry); $type_arr = $type_arr->retval; - foreach ($type_arr as $t) { + foreach ($type_arr as $t) + { $validTypes[] = $t->column_name; } if (in_array($type, $validTypes)) { - // var_dump($type . " is IN ARRAY"); - return true; + $result = success('Type of Id is valid'); } else { - //var_dump($type . " is NOT IN ARRAY"); - return false; + $result = error('Type of Id is not valid'); } + return $result; } } diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 3c1bbab27..6850feff8 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -30,7 +30,6 @@ export default { multiupload: true, mitarbeiter: [], filteredMitarbeiter: [], -/* filteredFirmen: []*/ } }, computed: { @@ -50,14 +49,6 @@ export default { this.$emit('update:text', value); } }, -/* intLastChange: { - get() { - return this.lastChange; - }, - set(value) { - this.$emit('update:lastChange', value); - } - },*/ intVon: { get() { return this.von; @@ -128,7 +119,6 @@ export default { reset() { this.$refs.form.reset(); this.intAnhang = null; - //this.$emit('update:anhang', []); }, search(event) { @@ -143,7 +133,8 @@ export default { template: `
- {{anhang.name}} {{index}}
 +
@@ -240,7 +231,6 @@ export default {
-

{{this.lastChange}}

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index bbe03d785..f31cf745a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -150,7 +150,9 @@ export default { }); } }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten'); + if (error.response) { + this.$fhcAlert.alertError(error.response.data); + } }).finally(() => { window.scrollTo(0, 0); }); @@ -210,7 +212,6 @@ export default { }, resetFormData(){ this.$refs.form.reset(); - //sicherstellen, dass über props nur leere felder übergeben werden this.formData = { typeId: 'person_id', titel: null, From b9329aa41774491becc54dd11795c3830214b615 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 18 Jan 2024 09:46:31 +0100 Subject: [PATCH 108/464] temp --- public/js/components/Notiz/Notiz.js | 44 +++++++++++++++++++++++++++-- public/js/components/tinymce.js.php | 22 +++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 public/js/components/tinymce.js.php diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 6850feff8..0882b41b5 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -1,4 +1,5 @@ import VueDatePicker from '../vueDatepicker.js.php'; +import tinymce from '../tinymce.js.php'; import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; import File from '../Form/Upload/File.js'; import {CoreRESTClient} from "../../RESTClient"; @@ -7,7 +8,8 @@ export default { components: { VueDatePicker, File, - PvAutoComplete + PvAutoComplete, + tinymce }, props: [ 'typeId', @@ -129,6 +131,26 @@ export default { this.filteredMitarbeiter = CoreRESTClient.getData(result.data); }); }, + methods: { + initTinyMCE() { + //console.log(" before initfile"); + tinymce.init({ + selector: '#editor', // Use the ID of your textarea or div + plugins: ['autoresize', 'lists'], + toolbar: 'undo redo | styleselect | bold italic | bullist numlist', + autoresize_bottom_margin: 16, + setup: (editor) => { + // for additional setup or customization here + }, + }); + }, + }, + }, + mounted() { + this.initTinyMCE(); + }, + beforeDestroy() { + tinymce.get('editor').destroy(); }, template: ` @@ -150,13 +172,31 @@ export default {
-
+
+
+ + +
+ + + + +
+
+
diff --git a/public/js/components/tinymce.js.php b/public/js/components/tinymce.js.php new file mode 100644 index 000000000..101306442 --- /dev/null +++ b/public/js/components/tinymce.js.php @@ -0,0 +1,22 @@ + Date: Thu, 18 Jan 2024 14:38:23 +0100 Subject: [PATCH 109/464] Tiny MCE: neue Notiz erstellen --- application/views/Studentenverwaltung.php | 1 + public/js/components/Notiz/Notiz.js | 101 ++++++++++++---------- public/js/components/tinymce.js.php | 22 ----- 3 files changed, 57 insertions(+), 67 deletions(-) delete mode 100644 public/js/components/tinymce.js.php diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php index 613a40abe..4fbc0fecd 100644 --- a/application/views/Studentenverwaltung.php +++ b/application/views/Studentenverwaltung.php @@ -8,6 +8,7 @@ #'primevue3' => true, #'filtercomponent' => true, 'tabulator5' => true, + 'tinymce5' => true, 'phrases' => [], 'customCSSs' => [ 'public/css/components/vue-datepicker.css', diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 0882b41b5..f1aa63280 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -1,7 +1,7 @@ import VueDatePicker from '../vueDatepicker.js.php'; -import tinymce from '../tinymce.js.php'; import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; import File from '../Form/Upload/File.js'; +import FormUploadDms from '../Form/Upload/Dms.js'; import {CoreRESTClient} from "../../RESTClient"; export default { @@ -9,12 +9,12 @@ export default { VueDatePicker, File, PvAutoComplete, - tinymce + FormUploadDms }, props: [ 'typeId', 'titel', - 'text', + 'propText', 'lastChange', 'von', 'bis', @@ -32,6 +32,7 @@ export default { multiupload: true, mitarbeiter: [], filteredMitarbeiter: [], + zwischenvar: null } }, computed: { @@ -51,6 +52,14 @@ export default { this.$emit('update:text', value); } }, +/* intPropText: { + get() { + return this.propText; + }, + set(value) { + this.$emit('update:propText', value); + } + },*/ intVon: { get() { return this.von; @@ -131,19 +140,35 @@ export default { this.filteredMitarbeiter = CoreRESTClient.getData(result.data); }); }, - methods: { - initTinyMCE() { - //console.log(" before initfile"); - tinymce.init({ - selector: '#editor', // Use the ID of your textarea or div - plugins: ['autoresize', 'lists'], - toolbar: 'undo redo | styleselect | bold italic | bullist numlist', - autoresize_bottom_margin: 16, - setup: (editor) => { - // for additional setup or customization here - }, - }); - }, + initTinyMCE() { + tinymce.init({ + selector: '#editor', + //height: 800, + plugins: ['autoresize', 'lists'], + toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent", + + autoresize_bottom_margin: 16, + setup: (editor) => { + +/* editor.on('input', () => { + this.$emit('update:propText', editor.getContent()); + });*/ + + // workaround for avoiding conflict id of frame: same Id as textarea + // working just for new notes + //Todo(manu) find a solution for update notes + editor.on('input', () => { + this.intText = editor.getContent(); + //this.$emit('update:intText', editor.getContent()); + + }); + }, + }); + }, + updateContent(event) { + // Manually update the content when the textarea is edited + tinymce.get('editor').setContent(event.target.value); + console.log(event.target.value); }, }, mounted() { @@ -152,7 +177,6 @@ export default { beforeDestroy() { tinymce.get('editor').destroy(); }, - template: `
- -
- - - - -
-
- +
+ +
- + +
- -
+ - - -
- +
+ + +
+
-
@@ -274,8 +282,11 @@ export default {

{{this.lastChange}}

- + + + intText: {{intText}} |
propText: {{propText}} |
text: {{text}}
{{intPropText}} +
` } diff --git a/public/js/components/tinymce.js.php b/public/js/components/tinymce.js.php deleted file mode 100644 index 101306442..000000000 --- a/public/js/components/tinymce.js.php +++ /dev/null @@ -1,22 +0,0 @@ - Date: Thu, 18 Jan 2024 15:40:42 +0100 Subject: [PATCH 110/464] Tabs: rename prop configUrl => config --- public/js/components/Tabs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js index 1e77fa996..fed6957a0 100644 --- a/public/js/components/Tabs.js +++ b/public/js/components/Tabs.js @@ -12,7 +12,7 @@ export default { ], props: { // TODO(chris): rename to config? - configUrl: { + config: { type: [String, Object], required: true }, @@ -43,7 +43,7 @@ export default { } }, watch: { - configUrl(n) { + config(n) { this.initConfig(n); } }, @@ -101,7 +101,7 @@ export default { } }, created() { - this.initConfig(this.configUrl); + this.initConfig(this.config); }, template: `
From dc973217b7d4026e9702256ae26312286df36f8f Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 18 Jan 2024 15:40:56 +0100 Subject: [PATCH 111/464] Css improvements --- public/css/Fhc.css | 55 ++++++++++++++++++++++++++++-- public/css/components/primevue.css | 11 ++++++ 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/public/css/Fhc.css b/public/css/Fhc.css index 1376a251f..30fa212d7 100644 --- a/public/css/Fhc.css +++ b/public/css/Fhc.css @@ -1,11 +1,60 @@ .text-prewrap { - white-space: pre-line; + white-space: pre-line; } .btn-p-0 { - padding: 0 .375rem; + padding: 0 .375rem; } .z-1 { - z-index: 1; + z-index: 1; } + +.input-group > .input-group-item { + position: relative; + flex: 1 1 auto; + width: 1%; + min-width: 0; +} + +.input-group > .input-group-item .form-control:focus, +.input-group > .input-group-item .form-select:focus { + z-index: 3; + position: relative; +} + +.input-group-lg > .input-group-item .form-control, +.input-group-lg > .input-group-item .form-select { + padding: 0.5rem 1rem; + font-size: 1.25rem; + border-radius: 0.3rem; +} + + +.input-group-sm > .input-group-item .form-control, +.input-group-sm > .input-group-item .form-select { + padding: 0.25rem 0.5rem; + font-size: 0.875rem; + border-radius: 0.2rem; +} + +.input-group-lg > .input-group-item .form-select, +.input-group-sm > .input-group-item .form-select { + padding-right: 3rem; +} + +.input-group:not(.has-validation) > .input-group-item:not(:last-child) .form-control, +.input-group:not(.has-validation) > .input-group-item:not(:last-child) .form-select { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.input-group.has-validation > .input-group-item:nth-last-child(n+3) .form-control, +.input-group.has-validation > .input-group-item:nth-last-child(n+3) .form-select { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.input-group > .input-group-item:not(:first-child) .form-control, +.input-group > .input-group-item:not(:first-child) .form-select { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} \ No newline at end of file diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css index 0f5caaa6f..6e27bbc10 100644 --- a/public/css/components/primevue.css +++ b/public/css/components/primevue.css @@ -5664,3 +5664,14 @@ } /* Customizations to the designer theme should be defined here */ +.p-inputtext { + padding: 0.375rem 0.75rem; +} + +.p-inputtext:enabled:focus { + color: #212529; + background-color: #fff; + border-color: #86b7fe; + outline: 0; + box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); +} From 604bfeea2009fc321c7368c4418d51d6a80cbe82 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 18 Jan 2024 15:41:24 +0100 Subject: [PATCH 112/464] Form input component: improvements --- public/js/components/Form/Form.js | 8 +++ public/js/components/Form/Input.js | 68 ++++++++++++++++++++++--- public/js/components/Form/Upload/Dms.js | 8 +-- 3 files changed, 74 insertions(+), 10 deletions(-) diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js index 9ca6af7e3..2257eb289 100644 --- a/public/js/components/Form/Form.js +++ b/public/js/components/Form/Form.js @@ -30,6 +30,14 @@ export default { if (!a[name]) a[name] = []; a[name].push(c); + + if (c.lcType == 'checkbox' && name.substr(-1) == ']' && name.indexOf('[')) { + name = name.substr(0, name.lastIndexOf('[')); + if (!a[name]) + a[name] = []; + a[name].push(c); + } + return a; }, {}); } diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js index 8107c1a19..ba63b8fdc 100644 --- a/public/js/components/Form/Input.js +++ b/public/js/components/Form/Input.js @@ -13,6 +13,8 @@ export default { props: { bsFeedback: Boolean, noAutoClass: Boolean, + noFeedback: Boolean, + inputGroup: Boolean, type: String, name: String, containerClass: [String, Array, Object] @@ -29,8 +31,38 @@ export default { return true; if (this.containerClass) return true; + if (this.autoContainerClass) + return true; return false; }, + acc() { + if (!this.containerClass) + return {}; + if (typeof this.containerClass === 'string' || this.containerClass instanceof String) + return this.containerClass.split(' ').reduce((a,c) => {a[c] = true; return a}, {}); + if (Array.isArray(this.containerClass)) + return this.containerClass.reduce((a,c) => {a[c] = true; return a}, {}); + return this.containerClass; + }, + autoContainerClass() { + if (this.noAutoClass) + return this.acc; + + const acc = {...this.acc}; + + if (this.inputGroup) + acc['input-group-item'] = true; + + if (this.lcType == 'radio' || this.lcType == 'checkbox') + acc['form-check'] = true; + + if (this.inputGroup && acc['form-check']) { + acc['input-group-item'] = false; + acc['form-check'] = false; + acc['input-group-text'] = true; + } + return acc; + }, lcType() { if (!this.type) return 'text'; @@ -47,6 +79,9 @@ export default { return 'PvAutocomplete'; case 'uploadimage': return 'UploadImage'; + case 'uploadfile': + case 'uploaddms': + return 'UploadDms'; default: return 'input'; } @@ -81,6 +116,8 @@ export default { classes.push('p-0'); classes.push('border-0'); case 'text': + case 'number': + case 'password': case 'textarea': if (!c.includes('form-control')) classes.push('form-control'); @@ -146,6 +183,8 @@ export default { this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js")); } else if (this.tag == 'UploadImage' && !this._.components.UploadImage) { this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js")); + } else if (this.tag == 'UploadDms' && !this._.components.UploadDms) { + this._.components.UploadDms = Vue.defineAsyncComponent(() => import("./Upload/Dms.js")); } } }, @@ -158,10 +197,9 @@ export default { mounted() { if (this.$registerToForm) this.$registerToForm(this); - // TODO(chris): wrap check in div? }, template: ` - + @@ -174,10 +212,11 @@ export default { :type="type" v-model="modelValueCmp" v-bind="$attrs" - :uid="idCmp.substr(9)" + :uid="idCmp ? idCmp.substr(9) : idCmp" :name="name" :class="validationClass" - :input-class-name="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')" + :input-class-name= + "[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')" @update:model-value="clearValidation" > @@ -189,13 +228,28 @@ export default { v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" - :name="name" + :input-props="{name}" :class="validationClass" :input-class="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class'] ? $attrs['input-class'].split(' ') : [])].join(' ')" @update:model-value="clearValidation" > + + + -
+ +
- ` } \ No newline at end of file diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js index 1c2f476e8..da37a2105 100644 --- a/public/js/components/Form/Upload/Dms.js +++ b/public/js/components/Form/Upload/Dms.js @@ -9,7 +9,9 @@ export default { }, multiple: Boolean, id: String, - name: String + name: String, + inputClass: [String, Array, Object], + noList: Boolean }, methods: { stringifyFile(file) { @@ -71,8 +73,8 @@ export default { }, template: `
- -
    + +
    • {{ file.name }} From 7861829ee4d9a84499e59573c015fc6b0079aaae Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 18 Jan 2024 15:54:23 +0100 Subject: [PATCH 113/464] input color --- public/css/Fhc.css | 10 +++++++++- public/js/components/Form/Input.js | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/css/Fhc.css b/public/css/Fhc.css index 30fa212d7..20bfd85d7 100644 --- a/public/css/Fhc.css +++ b/public/css/Fhc.css @@ -57,4 +57,12 @@ .input-group > .input-group-item:not(:first-child) .form-select { border-top-left-radius: 0; border-bottom-left-radius: 0; -} \ No newline at end of file +} + +.form-control-color.is-invalid, +.was-validated .form-control-color:invalid, +.form-control-color.is-valid, +.was-validated .form-control-color:valid { + padding-right: .375rem; + background-image: none; +} diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js index ba63b8fdc..1fc318523 100644 --- a/public/js/components/Form/Input.js +++ b/public/js/components/Form/Input.js @@ -115,6 +115,9 @@ export default { case 'datepicker': classes.push('p-0'); classes.push('border-0'); + case 'color': + if (!c.includes('form-control-color')) + classes.push('form-control-color'); case 'text': case 'number': case 'password': From 3e912f9545aa936af307146297b658d02ab8393e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 19 Jan 2024 09:04:37 +0100 Subject: [PATCH 114/464] bugfix prop --- public/js/components/Notiz/Notiz.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index f1aa63280..a6e4c7183 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -14,7 +14,7 @@ export default { props: [ 'typeId', 'titel', - 'propText', + 'text', 'lastChange', 'von', 'bis', @@ -211,6 +211,11 @@ export default {
+ + +
From 33a93457ec5f0682ae86bedc0ccf7d3819f326ef Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 19 Jan 2024 15:19:57 +0100 Subject: [PATCH 115/464] finished Handling of Fileuploads --- .../controllers/components/stv/Notiz.php | 110 ++++++++++++++---- public/js/components/Notiz/Notiz.js | 19 +-- 2 files changed, 91 insertions(+), 38 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index d5307f7c2..4c999b7c1 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -50,7 +50,7 @@ class Notiz extends FHC_Controller } else { - //Todo manu (correct return to ajax) + //Todo manu (phrases, response?) $result = "datatype not yet implemented for notes"; $this->outputJson(getError($result)); } @@ -107,6 +107,8 @@ class Notiz extends FHC_Controller if(isset($_POST['typeId'])) $type = $this->input->post('typeId'); + //var_dump($_POST); + if(!$type) { $result = error('kein Type für ID vorhanden', EXIT_ERROR); @@ -155,7 +157,9 @@ class Notiz extends FHC_Controller 'insertvon' => $uid ); - $result = $this->dmslib->upload($dms, $k, array('pdf')); + //Todo(manu) check if filetypes weiter eingeschränkt werden sollen + $result = $this->dmslib->upload($dms, $k, ['*']); +/* $result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/ if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -221,7 +225,7 @@ class Notiz extends FHC_Controller $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid; $erledigt = $this->input->post('erledigt'); - $type = $this->input->post('typeId'); + //$type = $this->input->post('typeId'); //soll auch dieser geändert werden können? $start = $this->input->post('von'); $ende = $this->input->post('bis'); @@ -247,34 +251,90 @@ class Notiz extends FHC_Controller return $this->outputJson(getError($result)); } - //Todo(manu) update von Notizzuordnung?? typeId? + //update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge + $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); + $this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id'); + + $result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id)); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson(getError($result)); + } + elseif (!hasData($result)) + { + $dms_id_arr = null; + } + else + { + $result = getData($result); + foreach($result as $doc) { + $dms_id_arr[] = array( + 'name' => $doc->name, + 'dms_id' => $doc->dms_id + ); + } + } - //neue Files speichern - //Todo(manu) update files foreach ($_FILES as $k => $file) { - $dms = array( - 'kategorie_kurzbz' => 'notiz', - 'version' => 0, - 'name' => $file["name"], - 'mimetype' => $file["type"], - 'insertamum' => date('c'), - 'insertvon' => $uid - ); - - $result = $this->dmslib->upload($dms, $k, array('pdf')); - if (isError($result)) + //update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen + if($file["type"] == 'application/x.fhc-dms+json') { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); + $dms_uploaded[] = array( + 'name' => $file["name"] + ); } - $dms_id = $result->retval['dms_id']; - - $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); - if (isError($result)) + else { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); + $dms = array( + 'kategorie_kurzbz' => 'notiz', + 'version' => 0, + 'name' => $file["name"], + 'mimetype' => $file["type"], + 'insertamum' => date('c'), + 'insertvon' => $uid + ); + + //Todo(manu) check if filetypes weiter eingeschränkt werden sollen + $result = $this->dmslib->upload($dms, $k, array('*')); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $dms_id = $result->retval['dms_id']; + + $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + } + } + + //update(3) check if Dateien gelöscht wurden + if(count($dms_uploaded) != count($dms_id_arr)) + { + $upload_new_names = array_column($dms_uploaded, "name"); + + $filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) { + return !in_array($file["name"], $upload_new_names); + }); + + foreach ($filesDeleted as $file) + { + $result = $this->dmslib->removeAll($file['dms_id']); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + else + $this->outputJson($result); } } return $this->outputJsonSuccess(true); diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index a6e4c7183..fd1639bfb 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -32,7 +32,6 @@ export default { multiupload: true, mitarbeiter: [], filteredMitarbeiter: [], - zwischenvar: null } }, computed: { @@ -52,14 +51,6 @@ export default { this.$emit('update:text', value); } }, -/* intPropText: { - get() { - return this.propText; - }, - set(value) { - this.$emit('update:propText', value); - } - },*/ intVon: { get() { return this.von; @@ -179,8 +170,8 @@ export default { }, template: `
- + +
@@ -225,7 +216,7 @@ export default {
- +
@@ -289,8 +280,10 @@ export default {
+ - intText: {{intText}} |
propText: {{propText}} |
text: {{text}}
{{intPropText}} +
` From 4bd430ae795b2b78dcdea45a0c3e0ea9563e0431 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 22 Jan 2024 14:51:40 +0100 Subject: [PATCH 116/464] tiny mce, workaround for binding textfield variable --- public/js/components/Notiz/Notiz.js | 62 +++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index fd1639bfb..14e34ee58 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -31,7 +31,7 @@ export default { return { multiupload: true, mitarbeiter: [], - filteredMitarbeiter: [], + filteredMitarbeiter: [] } }, computed: { @@ -132,41 +132,72 @@ export default { }); }, initTinyMCE() { + //const vm = this.intText; tinymce.init({ selector: '#editor', +/* selector: `#${this.$refs.editor.id}`,*/ //height: 800, - plugins: ['autoresize', 'lists'], - toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent", + plugins: ['lists'], +/* toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",*/ + toolbar: "undo redo", autoresize_bottom_margin: 16, setup: (editor) => { -/* editor.on('input', () => { - this.$emit('update:propText', editor.getContent()); - });*/ - // workaround for avoiding conflict id of frame: same Id as textarea // working just for new notes - //Todo(manu) find a solution for update notes + //solution for update notes: now working + //todo(manu) but now: cursor position!! + editor.on('input', () => { - this.intText = editor.getContent(); - //this.$emit('update:intText', editor.getContent()); + + const newContent = editor.getContent(); +/* const contentLength = newContent.length; + console.log(contentLength); + + editor.selection.setCursorLocation(editor.getBody(), contentLength);*/ + this.intText = newContent; }); + +/* editor.on('change', () => { + const newContent = editor.getContent(); + const contentLength = newContent.length; + + //editor.selection.setCursorLocation(editor.getBody(), contentLength); + + // Vue-Instanz-Referenz (vm), um auf die Daten zuzugreifen + this.intText = newContent; + });*/ }, }); }, updateContent(event) { // Manually update the content when the textarea is edited tinymce.get('editor').setContent(event.target.value); - console.log(event.target.value); + //console.log(event.target.value); }, }, mounted() { this.initTinyMCE(); }, + watch: { + intText: function(newVal, oldVal) { + // Überprüfen, ob sich der Wert von intText geändert hat + if (newVal !== oldVal) { + + const editor = tinymce.get('editor'); + + // Aktualisieren Inhalt des Editors + editor.setContent(newVal); + //tinymce.get(this.$refs.editor.id).setContent(newVal); + + } + }, + }, beforeDestroy() { tinymce.get('editor').destroy(); +/* tinymce.get(this.$refs.editor.id).destroy();*/ }, template: `
@@ -199,8 +230,9 @@ export default {
- - + + +
@@ -280,10 +312,8 @@ export default {
- - + intText: {{intText}}
` From e513550cba0f94982080b70b2ebd145b043237df Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 23 Jan 2024 13:22:26 +0100 Subject: [PATCH 117/464] bugfix eingabe textarea Tinymce --- public/js/components/Notiz/Notiz.js | 79 ++++++++--------------------- 1 file changed, 22 insertions(+), 57 deletions(-) diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 14e34ee58..d965ce3ac 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -31,7 +31,10 @@ export default { return { multiupload: true, mitarbeiter: [], - filteredMitarbeiter: [] + filteredMitarbeiter: [], + zwischenvar: '', + editorInitialized: false, + editor: null } }, computed: { @@ -132,77 +135,45 @@ export default { }); }, initTinyMCE() { - //const vm = this.intText; + + const vm = this; tinymce.init({ - selector: '#editor', -/* selector: `#${this.$refs.editor.id}`,*/ + target: this.$refs.editor, //Important: not selector: to enable multiple import of component //height: 800, plugins: ['lists'], -/* toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",*/ - toolbar: "undo redo", - + toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent", autoresize_bottom_margin: 16, - setup: (editor) => { - // workaround for avoiding conflict id of frame: same Id as textarea - // working just for new notes - //solution for update notes: now working - //todo(manu) but now: cursor position!! + setup: (editor) => { + vm.editor = editor; editor.on('input', () => { - const newContent = editor.getContent(); -/* const contentLength = newContent.length; - console.log(contentLength); - - editor.selection.setCursorLocation(editor.getBody(), contentLength);*/ - this.intText = newContent; - + vm.intText = newContent; }); - -/* editor.on('change', () => { - const newContent = editor.getContent(); - const contentLength = newContent.length; - - //editor.selection.setCursorLocation(editor.getBody(), contentLength); - - // Vue-Instanz-Referenz (vm), um auf die Daten zuzugreifen - this.intText = newContent; - });*/ }, }); }, - updateContent(event) { - // Manually update the content when the textarea is edited - tinymce.get('editor').setContent(event.target.value); - //console.log(event.target.value); - }, }, mounted() { this.initTinyMCE(); }, watch: { - intText: function(newVal, oldVal) { - // Überprüfen, ob sich der Wert von intText geändert hat - if (newVal !== oldVal) { - - const editor = tinymce.get('editor'); - - // Aktualisieren Inhalt des Editors - editor.setContent(newVal); - //tinymce.get(this.$refs.editor.id).setContent(newVal); + intText: function(newVal) { + const tinymcsVal = this.editor.getContent(); + if (tinymcsVal != newVal) { + //Inhalt des Editors aktualisieren + this.editor.setContent(newVal); } }, }, beforeDestroy() { - tinymce.get('editor').destroy(); -/* tinymce.get(this.$refs.editor.id).destroy();*/ + this.editor.destroy(); }, template: `
-
@@ -227,18 +198,12 @@ export default {
- - + +
- - - +
- - - +
@@ -313,7 +278,7 @@ export default { - intText: {{intText}} +
` From 2f5d93daa226bccd193a6a45399c14d5247e0006 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 23 Jan 2024 13:38:47 +0100 Subject: [PATCH 118/464] change config-ul auf config --- public/js/components/Stv/Studentenverwaltung/Details.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js index d502adc5e..c34cf2684 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details.js @@ -33,8 +33,8 @@ export default {

{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}

- - + +
` }; \ No newline at end of file From b8c885c8a4a25e777a1a52fce65d40a57b234b20 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 24 Jan 2024 09:04:53 +0100 Subject: [PATCH 119/464] Remove html-Tags in tabulator text --- .../controllers/components/stv/Notiz.php | 4 +--- application/models/person/Notiz_model.php | 3 ++- public/js/components/Notiz/Notiz.js | 17 ++++++++++++++--- .../Stv/Studentenverwaltung/Details/Notizen.js | 14 +++++++++----- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 4c999b7c1..a73014b59 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -107,11 +107,9 @@ class Notiz extends FHC_Controller if(isset($_POST['typeId'])) $type = $this->input->post('typeId'); - //var_dump($_POST); - if(!$type) { - $result = error('kein Type für ID vorhanden', EXIT_ERROR); + $result = error('kein Type für ID vorhanden', ERROR); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 5684bf3ed..ea0d7d361 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -293,7 +293,8 @@ class Notiz_model extends DB_Model TO_CHAR (CASE WHEN n.updateamum >= n.insertamum THEN n.updateamum ELSE n.insertamum - END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate + END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate, + regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped FROM public.tbl_notiz n JOIN diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index d965ce3ac..bafaa5479 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -140,8 +140,19 @@ export default { tinymce.init({ target: this.$refs.editor, //Important: not selector: to enable multiple import of component //height: 800, - plugins: ['lists'], - toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent", + //plugins: ['lists'], + //toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify", + toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify', + style_formats: [ + { title: 'Blocks', block: 'div' }, + { title: 'Paragraph', block: 'p' }, + { title: 'Heading 1', block: 'h1' }, + { title: 'Heading 2', block: 'h2' }, + { title: 'Heading 3', block: 'h3' }, + { title: 'Heading 4', block: 'h4' }, + { title: 'Heading 5', block: 'h5' }, + { title: 'Heading 6', block: 'h6' }, + ], autoresize_bottom_margin: 16, setup: (editor) => { @@ -278,7 +289,7 @@ export default { - +
` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index f31cf745a..0b19280d3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -24,15 +24,14 @@ export default { return { tabulatorOptions: { ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'), - //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.typeId), + //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId), columns: [ {title: "Titel", field: "titel"}, - {title: "Text", field: "text", width: 350}, + {title: "Text", field: "text_stripped", width: 350}, {title: "VerfasserIn", field: "verfasser_uid"}, {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, {title: "Start", field: "start", visible: false}, {title: "Ende", field: "ende", visible: false}, - /* {title: "Dokumente", field: "dms_id"},*/ {title: "Dokumente", field: "countdoc"}, {title: "Erledigt", field: "erledigt", visible: false}, {title: "Notiz_id", field: "notiz_id", visible: false}, @@ -54,8 +53,14 @@ export default { layout: 'fitDataFill', layoutColumnsOnNewData: false, height: '150', + selectableRangeMode: 'click', selectable: true, - index: 'notiz_id' + index: 'notiz_id', +/* rowClick: (e, row) => { + const notizId = row.getData().notiz_id; + console.log(notizId); + this.actionEditNotiz(notizId); + },*/ }, tabulatorEvents: [], notizen: [], @@ -132,7 +137,6 @@ export default { formData.append('data', JSON.stringify(this.formData)); Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); - CoreRESTClient.post( 'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, From 4653e070b186e6c484f308998a47ac76b91d03b4 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 25 Jan 2024 10:27:43 +0100 Subject: [PATCH 120/464] =?UTF-8?q?Notiztab:=20Phrasen=20f=C3=BCr=20Form?= =?UTF-8?q?=20und=20Tabulator=20Notiz,=20Update=20Actionbuttons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/Studentenverwaltung.php | 6 +- public/js/apps/Studentenverwaltung.js | 2 + public/js/components/Notiz/Notiz.js | 33 ++--- .../Studentenverwaltung/Details/Notizen.js | 96 +++++++++---- system/phrasesupdate.php | 133 ++++++++++++++++++ 5 files changed, 223 insertions(+), 47 deletions(-) diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php index 4fbc0fecd..01b616397 100644 --- a/application/views/Studentenverwaltung.php +++ b/application/views/Studentenverwaltung.php @@ -9,7 +9,11 @@ #'filtercomponent' => true, 'tabulator5' => true, 'tinymce5' => true, - 'phrases' => [], + 'phrases' => array( + 'global', + 'ui', + 'notiz', + ), 'customCSSs' => [ 'public/css/components/vue-datepicker.css', 'public/css/components/primevue.css', diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js index a8eb5a578..e1dacf792 100644 --- a/public/js/apps/Studentenverwaltung.js +++ b/public/js/apps/Studentenverwaltung.js @@ -19,6 +19,7 @@ import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js"; import fhcapifactory from "./api/fhcapifactory.js"; import FhcAlert from "../plugin/FhcAlert.js"; +import FhcPhrasen from "../plugin/Phrasen.js"; //import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js"); //const PrimeVue = await import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").default; @@ -47,5 +48,6 @@ import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_route } }) .use(FhcAlert) + .use(FhcPhrasen) .mount('#main'); }); diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index bafaa5479..c3eead4bb 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -4,6 +4,7 @@ import File from '../Form/Upload/File.js'; import FormUploadDms from '../Form/Upload/Dms.js'; import {CoreRESTClient} from "../../RESTClient"; + export default { components: { VueDatePicker, @@ -115,7 +116,6 @@ export default { return this.anhang; }, set(value) { - //console.log(value); this.$emit('update:anhang', value); } } @@ -130,7 +130,6 @@ export default { return CoreRESTClient .get('components/stv/Notiz/getMitarbeiter/' + event.query) .then(result => { - //console.log(result); this.filteredMitarbeiter = CoreRESTClient.getData(result.data); }); }, @@ -195,20 +194,20 @@ export default {
-

Neue Notiz

-

Notiz bearbeiten

+

{{$p.t('notiz','notiz_new')}}

+

{{$p.t('notiz','notiz_edit')}}

- +
- +
@@ -221,7 +220,7 @@ export default {
- +
@@ -234,12 +233,12 @@ export default {
- +
- +
- +
- +
- + +
-
+
- +
@@ -281,7 +281,7 @@ export default {
- +

{{this.lastChange}}

@@ -289,9 +289,6 @@ export default { - - -
` } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 0b19280d3..131b4fd55 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -3,13 +3,6 @@ import {CoreFilterCmpt} from "../../../filter/Filter.js"; import Notiz from "../../../Notiz/Notiz.js"; import BsModal from "../../../Bootstrap/Modal"; -var editIcon = function (cell, formatterParams) { - return ""; -}; -var deleteIcon = function (cell, formatterParams) { - return ""; -}; - export default { components: { CoreRESTClient, @@ -27,8 +20,8 @@ export default { //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId), columns: [ {title: "Titel", field: "titel"}, - {title: "Text", field: "text_stripped", width: 350}, - {title: "VerfasserIn", field: "verfasser_uid"}, + {title: "Text", field: "text_stripped", width: 250}, + {title: "VerfasserIn", field: "verfasser_uid"}, {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, {title: "Start", field: "start", visible: false}, {title: "Ende", field: "ende", visible: false}, @@ -37,22 +30,37 @@ export default { {title: "Notiz_id", field: "notiz_id", visible: false}, {title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false}, {title: "letzte Änderung", field: "lastupdate", visible: false}, - { - formatter: editIcon, cellClick: (e, cell) => { - this.actionEditNotiz(cell.getData().notiz_id); - //console.log(cell.getRow().getIndex(), cell.getData(), this); - }, width: 50, headerSort: false, headerVisible: false - }, - { - formatter: deleteIcon, cellClick: (e, cell) => { - this.actionDeleteNotiz(cell.getData().notiz_id); + {title: 'Aktionen', field: 'actions', + minWidth: 150, // Ensures Action-buttons will be always fully displayed + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; - }, width: 50, headerSort: false, headerVisible: false - }, + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', (event) => + this.actionEditNotiz(cell.getData().notiz_id) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', () => + this.actionDeleteNotiz(cell.getData().notiz_id) + ); + container.append(button); + + return container; + }, + frozen: true + } ], + layout: 'fitDataFill', layoutColumnsOnNewData: false, - height: '150', + height: '250', selectableRangeMode: 'click', selectable: true, index: 'notiz_id', @@ -82,8 +90,7 @@ export default { anhang: [] }, showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt - showDocument: true //show upload documents - + showDocument: true, //show upload documents }; }, methods:{ @@ -113,7 +120,6 @@ export default { if(this.notizen.dms_id){ console.log("loadEntries with " + this.notizen.notiz_id); this.loadDocEntries(this.notizen.notiz_id); - //console.log(this.formData.anhang); } }); }, @@ -271,7 +277,41 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - computed: { }, + async mounted() { + await this.$p.loadCategory(['notiz','global']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('verfasser_uid').component.updateDefinition({ + title: this.$p.t('notiz', 'verfasser') + }); + cm.getColumnByField('titel').component.updateDefinition({ + title: this.$p.t('global', 'titel') + }); + cm.getColumnByField('text_stripped').component.updateDefinition({ + title: this.$p.t('global', 'text') + }); + cm.getColumnByField('bearbeiter_uid').component.updateDefinition({ + title: this.$p.t('notiz', 'bearbeiter') + }); + cm.getColumnByField('start').component.updateDefinition({ + title: this.$p.t('global', 'gueltigVon') + }); + cm.getColumnByField('ende').component.updateDefinition({ + title: this.$p.t('global', 'gueltigBis') + }); + cm.getColumnByField('countdoc').component.updateDefinition({ + title: this.$p.t('notiz', 'document') + }); + cm.getColumnByField('erledigt').component.updateDefinition({ + title: this.$p.t('notiz', 'erledigt') + }); + cm.getColumnByField('lastupdate').component.updateDefinition({ + title: this.$p.t('notiz', 'letzte_aenderung') + }); + }, +/* computed: { + },*/ template: `
@@ -321,9 +361,9 @@ export default { > - - - + + +
` }; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 971b9dab1..c7f3659fb 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -21782,6 +21782,139 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'document', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anhänge', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Attachments', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'notiz_new', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Neue Notiz', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'New Note', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'notiz_edit', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Notiz bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit Note', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'verfasser', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Verfasser*in', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'author', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'bearbeiter', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bearbeiter*in', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'editor', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'erledigt', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'erledigt', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'completed', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'letzte_aenderung', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'letzte Änderung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Last updated', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From c49a36e9ca1892221fda1d057d26e995004ed9be Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 26 Jan 2024 14:02:34 +0100 Subject: [PATCH 121/464] insert Phrasen to Modals and Tables in Tab Kontakt --- .../Studentenverwaltung/Details/Kontakt.js | 6 +- .../Details/Kontakt/Address.js | 117 +++- .../Details/Kontakt/Bankaccount.js | 63 +- .../Details/Kontakt/Contact.js | 58 +- system/phrasesupdate.php | 638 ++++++++++++++++++ 5 files changed, 805 insertions(+), 77 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js index 0ed0fcb35..2adc5129d 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js @@ -23,17 +23,17 @@ export default { template: `
- Adressen + {{this.$p.t('person', 'adressen')}}

- Kontakt + {{this.$p.t('global', 'kontakt')}}

- Bankverbindungen + {{this.$p.t('person', 'bankverbindungen')}}
` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index 834f857e6..2b9f9c0fe 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -41,9 +41,9 @@ export default{ } }, {title:"Abweich.Empf", field:"co_name"}, - {title:"Name", field:"name"}, {title:"Firma", field:"firmenname"}, {title:"Firma_id", field:"firma_id", visible:false}, + {title:"Name", field:"name"}, {title:"Adresse_id", field:"adresse_id", visible:false}, {title:"Person_id", field:"person_id", visible:false}, {title:"Name", field:"name", visible:false}, @@ -263,15 +263,60 @@ export default{ console.error(err.response.data || err.message); }); }, + async mounted() { + await this.$p.loadCategory(['notiz','global','person']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('bezeichnung').component.updateDefinition({ + title: this.$p.t('global', 'typ') + }); + cm.getColumnByField('strasse').component.updateDefinition({ + title: this.$p.t('person', 'strasse') + }); + cm.getColumnByField('plz').component.updateDefinition({ + title: this.$p.t('person', 'plz') + }); + cm.getColumnByField('ort').component.updateDefinition({ + title: this.$p.t('person', 'ort') + }); + cm.getColumnByField('gemeinde').component.updateDefinition({ + title: this.$p.t('person', 'gemeinde') + }); + cm.getColumnByField('nation').component.updateDefinition({ + title: this.$p.t('person', 'nation') + }); + cm.getColumnByField('heimatadresse').component.updateDefinition({ + title: this.$p.t('person', 'heimatadresse') + }); + cm.getColumnByField('co_name').component.updateDefinition({ + title: this.$p.t('person', 'co_name') + }); + cm.getColumnByField('name').component.updateDefinition({ + title: this.$p.t('person', 'firma_zusatz') + }); + cm.getColumnByField('firmenname').component.updateDefinition({ + title: this.$p.t('person', 'firma') + }); + cm.getColumnByField('updateamum').component.updateDefinition({ + title: this.$p.t('notiz', 'letzte_aenderung') + }); + cm.getColumnByField('rechnungsadresse').component.updateDefinition({ + title: this.$p.t('person', 'rechnungsadresse') + }); + cm.getColumnByField('anmerkung').component.updateDefinition({ + title: this.$p.t('notiz', 'document') + }); + }, template: `
- +
- +
- +
- +
@@ -324,7 +369,7 @@ export default{
- +
@@ -333,7 +378,7 @@ export default{
- +
@@ -342,14 +387,14 @@ export default{
- +
- +
@@ -358,37 +403,37 @@ export default{
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -454,7 +499,7 @@ export default{
- +
@@ -463,14 +508,14 @@ export default{
- +
- +
@@ -479,7 +524,7 @@ export default{
- +
@@ -493,14 +538,14 @@ export default{
- +
- +
@@ -508,19 +553,19 @@ export default{ - + diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js index d8e3227c6..c4f457260 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js @@ -184,12 +184,33 @@ export default{ this.bankverbindungData = this.initData; }, }, + async mounted() { + await this.$p.loadCategory(['global','person']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('anschrift').component.updateDefinition({ + title: this.$p.t('person', 'anschrift') + }); + cm.getColumnByField('kontonr').component.updateDefinition({ + title: this.$p.t('person', 'kontonr') + }); + cm.getColumnByField('blz').component.updateDefinition({ + title: this.$p.t('person', 'blz') + }); + cm.getColumnByField('typ').component.updateDefinition({ + title: this.$p.t('global', 'typ') + }); + cm.getColumnByField('verrechnung').component.updateDefinition({ + title: this.$p.t('person', 'verrechnung') + }); + }, template: `
- +
@@ -198,7 +219,7 @@ export default{
- +
@@ -217,28 +238,28 @@ export default{
- +
- +
- +
- +
@@ -247,14 +268,14 @@ export default{
- +
@@ -264,7 +285,7 @@ export default{
- +
@@ -282,28 +303,28 @@ export default{
- +
- +
- +
- +
@@ -312,19 +333,19 @@ export default{
- + diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js index 27d84bc34..806f07fdd 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -187,16 +187,40 @@ export default{ console.error(err.response.data || err.message); }); }, + async mounted() { + await this.$p.loadCategory(['notiz','global','person']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('kontakttyp').component.updateDefinition({ + title: this.$p.t('global', 'typ') + }); + cm.getColumnByField('kontakt').component.updateDefinition({ + title: this.$p.t('global', 'kontakt') + }); + cm.getColumnByField('zustellung').component.updateDefinition({ + title: this.$p.t('person', 'zustellung') + }); + cm.getColumnByField('anmerkung').component.updateDefinition({ + title: this.$p.t('global', 'anmerkung') + }); + cm.getColumnByField('kurz_bz').component.updateDefinition({ + title: this.$p.t('person', 'firma') + }); + cm.getColumnByField('updateamum').component.updateDefinition({ + title: this.$p.t('notiz', 'letzte_aenderung') + }); + }, template: `
- +
- +
- +
- +
@@ -227,24 +251,24 @@ export default{
- +
- +
- +
- +
- +
@@ -277,7 +301,7 @@ export default{
- +
@@ -287,19 +311,19 @@ export default{
- + diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index c7f3659fb..df493751f 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -2081,6 +2081,166 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'adressen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Adressen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'addresses', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bankverbindungen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bankverbindungen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'bank details', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'rechnungsadresse', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Rechnungsadresse', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'billing address', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'heimatadresse', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Heimatadresse', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'home address', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'co_name', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'abweichender Empfänger', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'c/o', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'gemeinde', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Gemeinde', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'municipality', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'gemeinde_waehlen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bitte gültige Gemeinde wählen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Please select a valid municipality', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'plz_waehlen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bitte gültige PLZ wählen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Please select a valid zip code', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'person', @@ -2121,6 +2281,26 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'plz', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'plz', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'code', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'person', @@ -2141,6 +2321,26 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'zustellung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zustellung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'delivery', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'person', @@ -21915,6 +22115,444 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'error_fieldRequired', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Das Eingabefeld {field} ist erforderlich', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The Input Field {field} is required', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'notiz', + 'phrase' => 'error_textFieldRequired', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Das Eingabefeld textField ist erforderlich', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The Field textField is required', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'firma_zusatz', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Firmenzusatz', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'add.company info', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'firma', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Firma', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'company', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'standort', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Standort', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'location', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'adresse_new', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Adresse anlegen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'create address', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'adresse_edit', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Adresse bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'edit address', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'adresse_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Adresse löschen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'delete address', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'adresse_confirm_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Adresse wirklich löschen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Really delete address?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'kontakt_new', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontakt anlegen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'create contact data', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'kontakt_edit', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontakt bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'edit contact data', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'kontakt_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontakt löschen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'delete contact data', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'kontakt_confirm_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontakt wirklich löschen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Really delete contact data?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'kontonr', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontonummer', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Address', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'anschrift', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anschrift', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Bank account number', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'verrechnung', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Verrechnung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Billing', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'blz', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'BLZ', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Bank code', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'privatkonto', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Privatkonto', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Private account', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'firmenkonto', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Firmenkonto', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Company Account', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bankvb_new', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bankverbindung anlegen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'create bank details', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bankvb_edit', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bankverbindung bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'edit bank details', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bankvb_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bankverbindung löschen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'delete bank details', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bankvb_confirm_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bankverbindung wirklich löschen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Really delete bank details?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + ); From e824d48edf4a9adb05e063a3a4a5db7975dc8b6d Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 26 Jan 2024 14:40:57 +0100 Subject: [PATCH 122/464] update action and delete buttons in Kontakt-Tab --- .../Details/Kontakt/Address.js | 40 ++++++++++++------- .../Details/Kontakt/Bankaccount.js | 38 ++++++++++++------ .../Details/Kontakt/Contact.js | 38 ++++++++++++------ 3 files changed, 76 insertions(+), 40 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index 2b9f9c0fe..8905ed52a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -4,14 +4,6 @@ import PvAutoComplete from "../../../../../../../index.ci.php/public/js/componen import FhcFormValidation from '../../../../Form/Validation.js'; import BsModal from "../../../../Bootstrap/Modal.js"; - -var editIcon = function (cell, formatterParams) { - return ""; -}; -var deleteIcon = function (cell, formatterParams) { - return ""; -}; - export default{ components: { CoreFilterCmpt, @@ -55,12 +47,32 @@ export default{ } }, {title:"Anmerkung", field:"anmerkung", visible:false}, - {formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => { - this.actionEditAdress(cell.getData().adresse_id); - }, width:50, headerSort:false}, - {formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => { - this.actionDeleteAdress(cell.getData().adresse_id); - }, width:50, headerSort:false }, + {title: 'Aktionen', field: 'actions', + minWidth: 150, // Ensures Action-buttons will be always fully displayed + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; + + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', (event) => + this.actionEditAdress(cell.getData().adresse_id) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', () => + this.actionDeleteAdress(cell.getData().adresse_id) + ); + container.append(button); + + return container; + }, + frozen: true + }, ], layout: 'fitDataFill', layoutColumnsOnNewData: false, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js index c4f457260..cd3bbbfad 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js @@ -2,13 +2,6 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; import {CoreRESTClient} from "../../../../../RESTClient"; import BsModal from "../../../../Bootstrap/Modal.js"; -var editIcon = function (cell, formatterParams) { - return ""; -}; -var deleteIcon = function (cell, formatterParams) { - return ""; -}; - export default{ components: { CoreFilterCmpt, @@ -50,13 +43,32 @@ export default{ }, {title:"Person_id", field:"person_id", visible:false}, {title:"Bankverbindung_id", field:"bankverbindung_id", visible:false}, - {formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => { - this.actionEditBankverbindung(cell.getData().bankverbindung_id); - }, width:50, headerSort:false}, - {formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => { - this.actionDeleteBankverbindung(cell.getData().bankverbindung_id); - }, width:50, headerSort:false }, + {title: 'Aktionen', field: 'actions', + minWidth: 150, // Ensures Action-buttons will be always fully displayed + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', (event) => + this.actionEditBankverbindung(cell.getData().bankverbindung_id) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', () => + this.actionDeleteBankverbindung(cell.getData().bankverbindung_id) + ); + container.append(button); + + return container; + }, + frozen: true + }, ], layout: 'fitDataFill', layoutColumnsOnNewData: false, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js index 806f07fdd..0ed648b5c 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -4,13 +4,6 @@ import BsModal from "../../../../Bootstrap/Modal.js"; /*import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/ import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; -var editIcon = function (cell, formatterParams) { - return ""; -}; -var deleteIcon = function (cell, formatterParams){ - return ""; -}; - export default{ components: { CoreFilterCmpt, @@ -39,13 +32,32 @@ export default{ {title:"Kontakt_id", field:"kontakt_id", visible:false}, {title:"Standort_id", field:"standort_id", visible:false}, {title:"letzte Änderung", field:"updateamum", visible:false}, - {formatter:editIcon, cellClick: (e, cell) => { - this.actionEditContact(cell.getData().kontakt_id); - }, width:50, headerSort:false, headerVisible:false}, - {formatter:deleteIcon, cellClick: (e, cell) => { - this.actionDeleteContact(cell.getData().kontakt_id); + {title: 'Aktionen', field: 'actions', + minWidth: 150, // Ensures Action-buttons will be always fully displayed + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; - }, width:50, headerSort:false, headerVisible:false}, + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', (event) => + this.actionEditContact(cell.getData().kontakt_id) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', () => + this.actionDeleteContact(cell.getData().kontakt_id) + ); + container.append(button); + + return container; + }, + frozen: true + }, ], layout: 'fitDataFill', layoutColumnsOnNewData: false, From b7fa6b2072a34cf2a94e679214a96489cf0853d5 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 29 Jan 2024 07:52:15 +0100 Subject: [PATCH 123/464] update Forms --- public/js/components/Notiz/Notiz.js | 2 +- .../Details/Kontakt/Address.js | 70 +++++++++---------- .../Details/Kontakt/Bankaccount.js | 42 +++++------ .../Details/Kontakt/Contact.js | 36 +++++----- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index c3eead4bb..988c6d7ec 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -188,7 +188,7 @@ export default {
- [{{this.typeId}}] + [{{typeId}}]
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index 8905ed52a..b9edfb634 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -325,10 +325,10 @@ export default{ - +
- +
- +
- +
@@ -381,7 +381,7 @@ export default{
- +
@@ -390,7 +390,7 @@ export default{
- +
@@ -399,14 +399,14 @@ export default{
- +
- +
@@ -415,37 +415,37 @@ export default{
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -511,7 +511,7 @@ export default{
- +
@@ -520,14 +520,14 @@ export default{
- +
- +
@@ -536,7 +536,7 @@ export default{
- +
@@ -550,14 +550,14 @@ export default{
- +
- +
@@ -565,19 +565,19 @@ export default{ - + diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js index cd3bbbfad..0c6e6dda7 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js @@ -222,7 +222,7 @@ export default{ - +
@@ -231,7 +231,7 @@ export default{
- +
@@ -250,28 +250,28 @@ export default{
- +
- +
- +
- +
@@ -280,14 +280,14 @@ export default{
- +
@@ -297,7 +297,7 @@ export default{
- +
@@ -315,28 +315,28 @@ export default{
- +
- +
- +
- +
@@ -345,19 +345,19 @@ export default{
- + diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js index 0ed648b5c..5645dd519 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -18,7 +18,7 @@ export default{ tabulatorOptions: { ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getKontakte/' + this.uid), columns:[ - {title:"Typ", field:"kontakttyp"}, //TODO(manu) mix ok? + {title:"Typ", field:"kontakttyp"}, {title:"Kontakt", field:"kontakt"}, {title:"Zustellung", field:"zustellung", formatter: (cell, formatterParams, onRendered) => { @@ -228,11 +228,11 @@ export default{ - +
- +
- +
- +
@@ -263,24 +263,24 @@ export default{
- +
- +
- +
- +
- +
@@ -313,7 +313,7 @@ export default{
- +
@@ -323,19 +323,19 @@ export default{
- + From b99b09ca6a75c9732b9e09dfcfccbf706c93354b Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 29 Jan 2024 14:24:47 +0100 Subject: [PATCH 124/464] Form Validation Notiz und Kontakt-Tab --- .../controllers/components/stv/Kontakt.php | 112 ++++++++++++++---- .../controllers/components/stv/Notiz.php | 32 ++++- system/phrasesupdate.php | 29 ++++- 3 files changed, 143 insertions(+), 30 deletions(-) diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php index d8ed352f6..62a28d7eb 100644 --- a/application/controllers/components/stv/Kontakt.php +++ b/application/controllers/components/stv/Kontakt.php @@ -13,6 +13,7 @@ class Kontakt extends FHC_Controller // Load Libraries $this->load->library('AuthLib'); $this->load->library('VariableLib', ['uid' => getAuthUID()]); + $this->load->library('form_validation'); // Load language phrases $this->loadPhrases([ @@ -44,10 +45,9 @@ class Kontakt extends FHC_Controller public function addNewAddress($person_id) { - $this->load->library('form_validation'); $_POST = json_decode($this->input->raw_input_stream, true); - $this->form_validation->set_rules('plz', 'PLZ', 'required|numeric'); + $this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric'); if ($this->form_validation->run() == false) { @@ -115,10 +115,9 @@ class Kontakt extends FHC_Controller public function updateAddress($address_id) { $uid = getAuthUID(); - $this->load->library('form_validation'); $_POST = json_decode($this->input->raw_input_stream, true); - $this->form_validation->set_rules('plz', 'PLZ', 'required'); + $this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric'); if ($this->form_validation->run() == false) { @@ -339,28 +338,18 @@ class Kontakt extends FHC_Controller public function addNewContact($person_id) { - $this->load->library('form_validation'); - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt']))) - $this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email'); + $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email'); else - $this->form_validation->set_rules('kontakt', 'Kontakt', 'required'); - -/* if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt']))) - { - $this->form_validation->set_data(['email' => $_POST['kontakt']]); - $this->form_validation->set_rules('email', 'email', 'valid_email|required]'); - }*/ - + $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required'); if ($this->form_validation->run() == false) { return $this->outputJsonError($this->form_validation->error_array()); } - $this->load->model('person/Kontakt_model', 'KontaktModel'); if(isset($_POST['standort'])) @@ -410,6 +399,16 @@ class Kontakt extends FHC_Controller return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } + if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt']))) + $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email'); + else + $this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required'); + + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + } + if(isset($_POST['standort'])) { $standort_id = $_POST['standort']['standort_id']; @@ -491,8 +490,8 @@ class Kontakt extends FHC_Controller $this->load->library('form_validation'); $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - $this->form_validation->set_rules('iban', 'IBAN', 'required'); - $this->form_validation->set_rules('typ', 'TYP', 'required'); + $this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required'); + $this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required'); if ($this->form_validation->run() == false) { @@ -564,11 +563,10 @@ class Kontakt extends FHC_Controller public function updateBankverbindung($bankverbindung_id) { - $this->load->library('form_validation'); $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - $this->form_validation->set_rules('iban', 'IBAN', 'required'); - $this->form_validation->set_rules('typ', 'TYP', 'required'); + $this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required'); + $this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required'); $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); @@ -632,4 +630,76 @@ class Kontakt extends FHC_Controller } return $this->outputJsonSuccess(current(getData($result))); } + + public function plz_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('plz_required', $this->p->t('ui','error_fieldRequired',['field' => 'PLZ'])); + return false; + } + else + { + return true; + } + } + + public function kontakt_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('kontakt_required', $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])); + return false; + } + else + { + return true; + } + } + + public function iban_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('iban_required', $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff'])); + return false; + } + else + { + return true; + } + } + + public function typ_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('typ_required', $this->p->t('ui','error_fieldRequired',['field' => 'Typ'])); + return false; + } + else + { + return true; + } + } + + public function plz_numeric($value) + { + if (!is_numeric($value)) { + $this->form_validation->set_message('plz_numeric', $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])); + return false; + } + else + { + return true; + } + } + + public function kontakt_valid_email($email) + { + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $this->form_validation->set_message('kontakt_valid_email', $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])); + return false; + } + else + { + return true; + } + } } diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index a73014b59..f370e8abe 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -116,8 +116,8 @@ class Notiz extends FHC_Controller } //Form Validation - $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required'); + $this->form_validation->set_rules('titel', 'titel', 'callback_titel_required'); + $this->form_validation->set_rules('text', 'text', 'callback_text_required'); if ($this->form_validation->run() == false) { @@ -208,8 +208,8 @@ class Notiz extends FHC_Controller } //Form Validation - $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required'); + $this->form_validation->set_rules('titel', 'titel', 'callback_titel_required'); + $this->form_validation->set_rules('text', 'text', 'callback_text_required'); if ($this->form_validation->run() == false) { @@ -438,4 +438,28 @@ class Notiz extends FHC_Controller } $this->outputJson($result); } + + public function titel_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('titel_required', $this->p->t('ui','error_fieldRequired',['field' => 'Titel'])); + return false; + } + else + { + return true; + } + } + + public function text_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('text_required', $this->p->t('ui','error_fieldRequired',['field' => 'Text'])); + return false; + } + else + { + return true; + } + } } diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index df493751f..47fe8a4a4 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -22117,7 +22117,7 @@ array( ), array( 'app' => 'core', - 'category' => 'notiz', + 'category' => 'ui', 'phrase' => 'error_fieldRequired', 'phrases' => array( array( @@ -22136,18 +22136,37 @@ array( ), array( 'app' => 'core', - 'category' => 'notiz', - 'phrase' => 'error_textFieldRequired', + 'category' => 'ui', + 'phrase' => 'error_fieldNotNumeric', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Das Eingabefeld textField ist erforderlich', + 'text' => 'Das Eingabefeld {field} darf nur Zahlen enthalten.', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'The Field textField is required', + 'text' => 'The Field {Field} must contain only numbers.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'error_fieldNoValidEmail', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Das Eingabefeld {field} muss eine gültige Email-Adresse enthalten.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The field {field} must contain a valid email address.', 'description' => '', 'insertvon' => 'system' ) From ed71077243b9ee5c19c5663959b4de0b6e68b71c Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 29 Jan 2024 16:09:07 +0100 Subject: [PATCH 125/464] update lastupdate Contacttable --- application/controllers/components/stv/Kontakt.php | 8 ++++++-- .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js | 6 +++--- system/phrasesupdate.php | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php index 62a28d7eb..85071c416 100644 --- a/application/controllers/components/stv/Kontakt.php +++ b/application/controllers/components/stv/Kontakt.php @@ -279,8 +279,12 @@ class Kontakt extends FHC_Controller { $this->load->model('person/Kontakt_model', 'KontaktModel'); $this->load->model('organisation/standort_model', 'StandortModel'); - - $this->KontaktModel->addSelect('*'); + $this->KontaktModel->addSelect("*, + TO_CHAR (CASE + WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum + THEN public.tbl_kontakt.updateamum + ELSE public.tbl_kontakt.insertamum + END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate"); $this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT'); $result = $this->KontaktModel->loadWhere( diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js index 5645dd519..d901fa7e1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -31,7 +31,7 @@ export default{ {title:"Person_id", field:"person_id", visible:false}, {title:"Kontakt_id", field:"kontakt_id", visible:false}, {title:"Standort_id", field:"standort_id", visible:false}, - {title:"letzte Änderung", field:"updateamum", visible:false}, + {title:"letzte Änderung", field:"lastupdate", visible:false}, {title: 'Aktionen', field: 'actions', minWidth: 150, // Ensures Action-buttons will be always fully displayed formatter: (cell, formatterParams, onRendered) => { @@ -216,10 +216,10 @@ export default{ cm.getColumnByField('anmerkung').component.updateDefinition({ title: this.$p.t('global', 'anmerkung') }); - cm.getColumnByField('kurz_bz').component.updateDefinition({ + cm.getColumnByField('kurzbz').component.updateDefinition({ title: this.$p.t('person', 'firma') }); - cm.getColumnByField('updateamum').component.updateDefinition({ + cm.getColumnByField('lastupdate').component.updateDefinition({ title: this.$p.t('notiz', 'letzte_aenderung') }); }, diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 47fe8a4a4..2ff8f1489 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -22413,7 +22413,7 @@ array( ), array( 'sprache' => 'English', - 'text' => 'Bank account number', + 'text' => 'Address', 'description' => '', 'insertvon' => 'system' ) From 2fcbbcac840c6cfd35a98d504bc74e7b5b3d749e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 2 Feb 2024 15:10:46 +0100 Subject: [PATCH 126/464] refactor NotizComponent --- .../controllers/components/stv/Notiz.php | 13 +- public/js/components/Notiz/NotizComponent.js | 526 ++++++++++++++++++ .../Notiz/{Notiz.js => NotizForm.js} | 1 + .../Studentenverwaltung/Details/Notizen.js | 361 +----------- 4 files changed, 544 insertions(+), 357 deletions(-) create mode 100644 public/js/components/Notiz/NotizComponent.js rename public/js/components/Notiz/{Notiz.js => NotizForm.js} (99%) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index f370e8abe..ddf10b8a9 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -127,11 +127,11 @@ class Notiz extends FHC_Controller $titel = $this->input->post('titel'); $text = $this->input->post('text'); $erledigt = $this->input->post('erledigt'); - $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; + $verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid; $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null; $type = $this->input->post('typeId'); - $start = $this->input->post('von'); - $ende = $this->input->post('bis'); + $start = $this->input->post('Von'); + $ende = $this->input->post('Bis'); //Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); @@ -220,12 +220,12 @@ class Notiz extends FHC_Controller $uid = getAuthUID(); $titel = $this->input->post('titel'); $text = $this->input->post('text'); - $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; + $verfasser_uid = $this->input->post('verfasser'); $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid; $erledigt = $this->input->post('erledigt'); //$type = $this->input->post('typeId'); //soll auch dieser geändert werden können? - $start = $this->input->post('von'); - $ende = $this->input->post('bis'); + $start = $this->input->post('Von'); + $ende = $this->input->post('Bis'); $result = $this->NotizModel->update( [ @@ -252,6 +252,7 @@ class Notiz extends FHC_Controller //update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); $this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id'); + $dms_uploaded = null; $result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id)); if (isError($result)) diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js new file mode 100644 index 000000000..5f7ea9993 --- /dev/null +++ b/public/js/components/Notiz/NotizComponent.js @@ -0,0 +1,526 @@ +import VueDatePicker from '../vueDatepicker.js.php'; +import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; +import FormUploadDms from '../Form/Upload/Dms.js'; +import {CoreRESTClient} from "../../RESTClient"; +import {CoreFilterCmpt} from "../filter/Filter.js"; +import BsModal from "../Bootstrap/Modal"; + + +export default { + components: { + CoreFilterCmpt, + VueDatePicker, + PvAutoComplete, + FormUploadDms, + BsModal + }, + props: [ + 'typeId', + 'id', + 'showErweitert', + 'showDocument' + ], + data(){ + return { + tabulatorOptions: { + ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId), + columns: [ + {title: "Titel", field: "titel"}, + {title: "Text", field: "text_stripped", width: 250}, + {title: "VerfasserIn", field: "verfasser_uid"}, + {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, + {title: "Start", field: "start", visible: false}, + {title: "Ende", field: "ende", visible: false}, + {title: "Dokumente", field: "countdoc"}, + {title: "Erledigt", field: "erledigt", visible: false}, + {title: "Notiz_id", field: "notiz_id", visible: false}, + {title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false}, + {title: "letzte Änderung", field: "lastupdate", visible: false}, + {title: 'Aktionen', field: 'actions', + minWidth: 150, // Ensures Action-buttons will be always fully displayed + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; + + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', (event) => + this.actionEditNotiz(cell.getData().notiz_id) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener('click', () => + this.actionDeleteNotiz(cell.getData().notiz_id) + ); + container.append(button); + + return container; + }, + frozen: true + } + ], + layout: 'fitDataFill', + layoutColumnsOnNewData: false, + height: '250', + selectableRangeMode: 'click', + selectable: true, + index: 'notiz_id' + }, + tabulatorEvents: [], + notizen: [], + multiupload: true, + mitarbeiter: [], + filteredMitarbeiter: [], + zwischenvar: '', + editorInitialized: false, + editor: null, + notizData: { + typeId: this.typeId, + titel: null, + statusNew: true, + text: null, + lastChange: null, + von: null, + bis: null, + document: null, + erledigt: false, + verfasser: null, + bearbeiter: null, + anhang: [] + }, + }; + }, + methods: { + actionDeleteNotiz(notiz_id){ + this.loadNotiz(notiz_id).then(() => { + if(this.notizen.notiz_id) { + this.$refs.deleteNotizModal.show(); + } + }); + }, + actionEditNotiz(notiz_id){ + this.loadNotiz(notiz_id).then(() => { + console.log(this.notizen); + if(this.notizen.notiz_id) { + this.notizData.titel = this.notizen.titel; + this.notizData.statusNew = false; + this.notizData.text = this.notizen.text; + this.notizData.lastChange = this.notizen.lastupdate; + this.notizData.von = this.notizen.start; + this.notizData.bis = this.notizen.ende; + this.notizData.document = this.notizen.dms_id; + this.notizData.erledigt = this.notizen.erledigt; + this.notizData.verfasser = this.notizen.verfasser_uid; //todo(manu) better + this.notizData.intVerfasser = this.notizen.verfasser_uid; + this.notizData.intBearbeiter = this.notizen.bearbeiter_uid; //todo(manu) better + this.notizData.bearbeiter = this.notizen.bearbeiter_uid; + } + }) + .then(() => { + if(this.notizen.dms_id){ + console.log("loadEntries with " + this.notizen.notiz_id); + this.loadDocEntries(this.notizen.notiz_id); + } + }); + }, + actionNewNotiz(){ + this.resetFormData(); + }, + addNewNotiz(notizData) { + const formData = new FormData(); + + formData.append('data', JSON.stringify(this.notizData)); + Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v)); + CoreRESTClient.post( + 'components/stv/Notiz/addNewNotiz/' + this.id, + formData, + { Headers: { "Content-Type": "multipart/form-data" } } + ).then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich'); + this.resetFormData(); + this.reload(); + } else { + const errorData = response.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + }); + } + }).catch(error => { + if (error.response) { + this.$fhcAlert.alertError(error.response.data); + } + }).finally(() => { + window.scrollTo(0, 0); + }); + }, + deleteNotiz(notiz_id){ + CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id) + .then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Löschen erfolgreich'); + this.$refs.deleteNotizModal.hide(); + this.reload(); + } else { + this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); + } + }).catch(error => { + this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); + }).finally(()=> { + window.scrollTo(0, 0); + }); + }, + loadNotiz(notiz_id){ + return CoreRESTClient.get( + 'components/stv/Notiz/loadNotiz/' + notiz_id) + .then( + result => { + if(result.data.retval) { + this.notizen = result.data.retval; + //console.log(this.notizen); + } + else { + this.notizen = {}; + this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); + } + return result; + } + ); + }, + loadDocEntries(notiz_id){ + return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id) + .then( + result => { + if(result.data.retval) { + this.notizData.anhang = result.data.retval; + console.log(this.notizData.anhang); + } + else + { + this.notizData.anhang = {}; + this.$fhcAlert.alertError('Kein Dokumenteneintrag mit NotizId ' + notiz_id + ' gefunden'); + } + return result; + } + ); + }, + updateNotiz(notiz_id){ + const formData = new FormData(); + formData.append('data', JSON.stringify(this.notizData)); + Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v)); + + CoreRESTClient.post( + 'components/stv/Notiz/updateNotiz/' + notiz_id, + formData, + { Headers: { "Content-Type": "multipart/form-data" } } + ).then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich'); + this.resetFormData(); + this.reload(); + } else { + const errorData = response.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + }); + } + }).catch(error => { + this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + }); + }, + reload(){ + this.$refs.table.reloadTable(); + }, + resetFormData() { + this.$refs.formc.reset(); + this.notizData = { + typeId: this.typeId, + titel: null, + statusNew: true, + text: null, + lastChange: null, + von: null, + bis: null, + document: null, + erledigt: false, + verfasser: this.uid, + bearbeiter: null, + anhang: [] + }; + }, + getUid(){ + CoreRESTClient + .get('components/stv/Notiz/getUid') + .then(result => { + if(result.data.retval) { + this.notizData.intVerfasser = result.data.retval; + } + }) + .catch(this.$fhcAlert.handleSystemError); + }, + search(event) { + return CoreRESTClient + .get('components/stv/Notiz/getMitarbeiter/' + event.query) + .then(result => { + this.filteredMitarbeiter = CoreRESTClient.getData(result.data); + }); + }, +/* initTinyMCE() { + + const vm = this; + tinymce.init({ + target: this.$refs.editor, //Important: not selector: to enable multiple import of component + //height: 800, + //plugins: ['lists'], + //toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify", + toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify', + style_formats: [ + { title: 'Blocks', block: 'div' }, + { title: 'Paragraph', block: 'p' }, + { title: 'Heading 1', block: 'h1' }, + { title: 'Heading 2', block: 'h2' }, + { title: 'Heading 3', block: 'h3' }, + { title: 'Heading 4', block: 'h4' }, + { title: 'Heading 5', block: 'h5' }, + { title: 'Heading 6', block: 'h6' }, + ], + autoresize_bottom_margin: 16, + + setup: (editor) => { + vm.editor = editor; + + editor.on('input', () => { + const newContent = editor.getContent(); + vm.intText = newContent; + }); + }, + }); + },*/ + }, + created(){ + this.getUid(); + }, + async mounted() { + await this.$p.loadCategory(['notiz','global']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('verfasser_uid').component.updateDefinition({ + title: this.$p.t('notiz', 'verfasser') + }); + cm.getColumnByField('titel').component.updateDefinition({ + title: this.$p.t('global', 'titel') + }); + cm.getColumnByField('text_stripped').component.updateDefinition({ + title: this.$p.t('global', 'text') + }); + cm.getColumnByField('bearbeiter_uid').component.updateDefinition({ + title: this.$p.t('notiz', 'bearbeiter') + }); + cm.getColumnByField('start').component.updateDefinition({ + title: this.$p.t('global', 'gueltigVon') + }); + cm.getColumnByField('ende').component.updateDefinition({ + title: this.$p.t('global', 'gueltigBis') + }); + cm.getColumnByField('countdoc').component.updateDefinition({ + title: this.$p.t('notiz', 'document') + }); + cm.getColumnByField('erledigt').component.updateDefinition({ + title: this.$p.t('notiz', 'erledigt') + }); + cm.getColumnByField('lastupdate').component.updateDefinition({ + title: this.$p.t('notiz', 'letzte_aenderung') + }); + }, +/* mounted() { + this.initTinyMCE(); + },*/ +/* watch: { + intText: function(newVal) { + const tinymcsVal = this.editor.getContent(); + + if (tinymcsVal != newVal) { + //Inhalt des Editors aktualisieren + this.editor.setContent(newVal); + } + }, + },*/ + beforeDestroy() { + this.editor.destroy(); + }, + watch: { + //Watcher für autocomplete Bearbeiter und Verfasser + 'notizData.intBearbeiter': { + handler(newVal) { + if(typeof newVal === 'object') { + this.notizData.bearbeiter = newVal.mitarbeiter_uid; + } + }, + deep: true + }, + 'notizData.intVerfasser': { + handler(newVal) { + if(typeof newVal === 'object') { + this.notizData.verfasser = newVal.mitarbeiter_uid; + } + }, + deep: true + } + }, + template: ` +
+ + + + + + + + + + +

+ +
+

+
+
+
+ [{{notizData.typeId}}] +
+
+ +
+
+

{{$p.t('notiz','notiz_new')}}

+

{{$p.t('notiz','notiz_edit')}}

+
+
+ +
+ +
+ +
+
+ +
+ + + + + + +
+ +
+ +
+ + +
+
+ + +
+ + +
+ +
+
+ + +
+ +
+ +
+ +
+ + +
+ +
+
+ +
+ +
+ +
+ + + +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+

{{notizData.lastChange}}

+
+
+ + + + + + +
` +} + diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/NotizForm.js similarity index 99% rename from public/js/components/Notiz/Notiz.js rename to public/js/components/Notiz/NotizForm.js index 988c6d7ec..b65e2be20 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/NotizForm.js @@ -174,6 +174,7 @@ export default { if (tinymcsVal != newVal) { //Inhalt des Editors aktualisieren + //Todo(manu) hier gibts ein problem mit update function this.editor.setContent(newVal); } }, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 131b4fd55..31a92a9e7 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -1,369 +1,28 @@ -import {CoreRESTClient} from "../../../../RESTClient.js"; -import {CoreFilterCmpt} from "../../../filter/Filter.js"; -import Notiz from "../../../Notiz/Notiz.js"; -import BsModal from "../../../Bootstrap/Modal"; +import NotizComponent from "../../../Notiz/NotizComponent.js"; export default { components: { - CoreRESTClient, - CoreFilterCmpt, - Notiz, - BsModal + NotizComponent }, props: { modelValue: Object }, data(){ return { - tabulatorOptions: { - ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'), - //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId), - columns: [ - {title: "Titel", field: "titel"}, - {title: "Text", field: "text_stripped", width: 250}, - {title: "VerfasserIn", field: "verfasser_uid"}, - {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, - {title: "Start", field: "start", visible: false}, - {title: "Ende", field: "ende", visible: false}, - {title: "Dokumente", field: "countdoc"}, - {title: "Erledigt", field: "erledigt", visible: false}, - {title: "Notiz_id", field: "notiz_id", visible: false}, - {title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false}, - {title: "letzte Änderung", field: "lastupdate", visible: false}, - {title: 'Aktionen', field: 'actions', - minWidth: 150, // Ensures Action-buttons will be always fully displayed - formatter: (cell, formatterParams, onRendered) => { - let container = document.createElement('div'); - container.className = "d-flex gap-2"; - - let button = document.createElement('button'); - button.className = 'btn btn-outline-secondary btn-action'; - button.innerHTML = ''; - button.addEventListener('click', (event) => - this.actionEditNotiz(cell.getData().notiz_id) - ); - container.append(button); - - button = document.createElement('button'); - button.className = 'btn btn-outline-secondary btn-action'; - button.innerHTML = ''; - button.addEventListener('click', () => - this.actionDeleteNotiz(cell.getData().notiz_id) - ); - container.append(button); - - return container; - }, - frozen: true - } - ], - - layout: 'fitDataFill', - layoutColumnsOnNewData: false, - height: '250', - selectableRangeMode: 'click', - selectable: true, - index: 'notiz_id', -/* rowClick: (e, row) => { - const notizId = row.getData().notiz_id; - console.log(notizId); - this.actionEditNotiz(notizId); - },*/ - }, - tabulatorEvents: [], - notizen: [], - uid: '', - intVerfasser: '', - filteredMitarbeiter: [], - formData: { - typeId: 'person_id', - titel: null, - statusNew: true, - text: null, - lastChange: null, - von: null, - bis: null, - document: null, - erledigt: false, - verfasser: this.uid, - bearbeiter: null, - anhang: [] - }, showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt showDocument: true, //show upload documents }; }, - methods:{ - actionDeleteNotiz(notiz_id){ - this.loadNotiz(notiz_id).then(() => { - if(this.notizen.notiz_id) { - this.$refs.deleteNotizModal.show(); - } - }); - }, - actionEditNotiz(notiz_id){ - this.loadNotiz(notiz_id).then(() => { - if(this.notizen.notiz_id) { - this.formData.titel = this.notizen.titel; - this.formData.statusNew = false; - this.formData.text = this.notizen.text; - this.formData.lastChange = this.notizen.lastupdate; - this.formData.von = this.notizen.start; - this.formData.bis = this.notizen.ende; - this.formData.document = this.notizen.dms_id; - this.formData.erledigt = this.notizen.erledigt; - this.formData.verfasser = this.notizen.verfasser_uid; - this.formData.bearbeiter = this.notizen.bearbeiter_uid; - } - }) - .then(() => { - if(this.notizen.dms_id){ - console.log("loadEntries with " + this.notizen.notiz_id); - this.loadDocEntries(this.notizen.notiz_id); - } - }); - }, - actionNewNotiz(){ - this.resetFormData(); - this.formData.typeId = 'person_id'; - this.formData.titel = ''; - this.formData.statusNew = true; - this.formData.text = null; - this.formData.lastChange = null; - this.formData.von = null; - this.formData.bis = null; - this.formData.document = null; - this.formData.erledigt = false; - this.formData.verfasser = this.uid; - this.formData.bearbeiter = null; - this.formData.anhang = []; - }, - addNewNotiz(notizData) { - const formData = new FormData(); - - formData.append('data', JSON.stringify(this.formData)); - Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); - CoreRESTClient.post( - 'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, - formData, - { Headers: { "Content-Type": "multipart/form-data" } } - ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich'); - this.resetFormData(); - this.reload(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - if (error.response) { - this.$fhcAlert.alertError(error.response.data); - } - }).finally(() => { - window.scrollTo(0, 0); - }); - }, - deleteNotiz(notiz_id){ - CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id) - .then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Löschen erfolgreich'); - this.$refs.deleteNotizModal.hide(); - this.reload(); - } else { - this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); - } - }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); - }).finally(()=> { - window.scrollTo(0, 0); - }); - }, - loadDocEntries(notiz_id){ - return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id) - .then( - result => { - if(result.data.retval) { - this.formData.anhang = result.data.retval; - console.log(this.formData.anhang); - } - else - { - this.formData.anhang = {}; - this.$fhcAlert.alertError('Kein Dokumenteneintrag mit NotizId ' + notiz_id + ' gefunden'); - } - return result; - } - ); - }, - loadNotiz(notiz_id){ - return CoreRESTClient.get( - 'components/stv/Notiz/loadNotiz/' + notiz_id) - .then( - result => { - if(result.data.retval) { - this.notizen = result.data.retval; - //console.log(this.notizen); - } - else { - this.notizen = {}; - this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); - } - return result; - } - ); - }, - reload(){ - this.$refs.table.reloadTable(); - }, - resetFormData(){ - this.$refs.form.reset(); - this.formData = { - typeId: 'person_id', - titel: null, - statusNew: true, - text: null, - lastChange: null, - von: null, - bis: null, - document: null, - erledigt: false, - verfasser: this.uid, - bearbeiter: null, - anhang: [] - }; - }, - updateNotiz(notiz_id){ - const formData = new FormData(); - - formData.append('data', JSON.stringify(this.formData)); - Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v)); - //console.log(this.formData); - - CoreRESTClient.post( - 'components/stv/Notiz/updateNotiz/' + notiz_id, - formData, - { Headers: { "Content-Type": "multipart/form-data" } } - ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich'); - this.resetFormData(); - this.reload(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten'); - }).finally(() => { - window.scrollTo(0, 0); - }); - }, - }, - created(){ - CoreRESTClient - .get('components/stv/Notiz/getUid') - .then(result => { - if(result.data.retval) { - this.formData.verfasser = result.data.retval; - } - }) - .catch(this.$fhcAlert.handleSystemError); - }, - async mounted() { - await this.$p.loadCategory(['notiz','global']); - - let cm = this.$refs.table.tabulator.columnManager; - - cm.getColumnByField('verfasser_uid').component.updateDefinition({ - title: this.$p.t('notiz', 'verfasser') - }); - cm.getColumnByField('titel').component.updateDefinition({ - title: this.$p.t('global', 'titel') - }); - cm.getColumnByField('text_stripped').component.updateDefinition({ - title: this.$p.t('global', 'text') - }); - cm.getColumnByField('bearbeiter_uid').component.updateDefinition({ - title: this.$p.t('notiz', 'bearbeiter') - }); - cm.getColumnByField('start').component.updateDefinition({ - title: this.$p.t('global', 'gueltigVon') - }); - cm.getColumnByField('ende').component.updateDefinition({ - title: this.$p.t('global', 'gueltigBis') - }); - cm.getColumnByField('countdoc').component.updateDefinition({ - title: this.$p.t('notiz', 'document') - }); - cm.getColumnByField('erledigt').component.updateDefinition({ - title: this.$p.t('notiz', 'erledigt') - }); - cm.getColumnByField('lastupdate').component.updateDefinition({ - title: this.$p.t('notiz', 'letzte_aenderung') - }); - }, -/* computed: { - },*/ template: `
- - - - - - - - - - - -
-
- - - - - - + +
` }; From 23853e4a19377f3ec8fae2f2d48e7febe710cdae Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 5 Feb 2024 07:56:24 +0100 Subject: [PATCH 127/464] temp --- public/js/components/Notiz/NotizComponent.js | 4 +- public/js/components/Notiz/NotizForm.js | 295 ------------------ .../Studentenverwaltung/Details/Notizen.js | 23 ++ 3 files changed, 25 insertions(+), 297 deletions(-) delete mode 100644 public/js/components/Notiz/NotizForm.js diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js index 5f7ea9993..0d6dbae69 100644 --- a/public/js/components/Notiz/NotizComponent.js +++ b/public/js/components/Notiz/NotizComponent.js @@ -65,7 +65,7 @@ export default { ], layout: 'fitDataFill', layoutColumnsOnNewData: false, - height: '250', + height: '150', selectableRangeMode: 'click', selectable: true, index: 'notiz_id' @@ -403,7 +403,7 @@ export default { @click:new="actionNewNotiz" > -

+


diff --git a/public/js/components/Notiz/NotizForm.js b/public/js/components/Notiz/NotizForm.js deleted file mode 100644 index b65e2be20..000000000 --- a/public/js/components/Notiz/NotizForm.js +++ /dev/null @@ -1,295 +0,0 @@ -import VueDatePicker from '../vueDatepicker.js.php'; -import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; -import File from '../Form/Upload/File.js'; -import FormUploadDms from '../Form/Upload/Dms.js'; -import {CoreRESTClient} from "../../RESTClient"; - - -export default { - components: { - VueDatePicker, - File, - PvAutoComplete, - FormUploadDms - }, - props: [ - 'typeId', - 'titel', - 'text', - 'lastChange', - 'von', - 'bis', - 'statusNew', - 'document', - 'erledigt', - 'verfasser', - 'bearbeiter', - 'showErweitert', - 'showDocument', - 'anhang' - ], - data(){ - return { - multiupload: true, - mitarbeiter: [], - filteredMitarbeiter: [], - zwischenvar: '', - editorInitialized: false, - editor: null - } - }, - computed: { - intTitel: { - get() { - return this.titel; - }, - set(value) { - this.$emit('update:titel', value); - } - }, - intText: { - get() { - return this.text; - }, - set(value) { - this.$emit('update:text', value); - } - }, - intVon: { - get() { - return this.von; - }, - set(value) { - const tempVon = new Date(value).toISOString().split('T')[0]; - this.$emit('update:von', tempVon); - } - }, - intBis: { - get() { - return this.bis; - }, - set(value) { - const tempBis = new Date(value).toISOString().split('T')[0]; - this.$emit('update:bis', tempBis); - } - }, - intDocument: { - get() { - return this.document; - }, - set(value) { - this.$emit('update:document', value); - } - }, - intErledigt: { - get() { - return this.erledigt; - }, - set(value) { - this.$emit('update:erledigt', value); - } - }, - intVerfasser: { - get() { - return this.verfasser; - }, - set(value) { - //this.$emit('update:verfasser', value); - this.$emit('update:verfasser', value.mitarbeiter_uid); - } - }, - intBearbeiter: { - get() { - return this.bearbeiter; - }, - set(value) { - if(value) - { - this.$emit('update:bearbeiter', value.mitarbeiter_uid); - } - else - this.$emit('update:bearbeiter', value); - } - }, - intAnhang: { - get() { - return this.anhang; - }, - set(value) { - this.$emit('update:anhang', value); - } - } - }, - methods: { - reset() { - this.$refs.form.reset(); - this.intAnhang = null; - }, - - search(event) { - return CoreRESTClient - .get('components/stv/Notiz/getMitarbeiter/' + event.query) - .then(result => { - this.filteredMitarbeiter = CoreRESTClient.getData(result.data); - }); - }, - initTinyMCE() { - - const vm = this; - tinymce.init({ - target: this.$refs.editor, //Important: not selector: to enable multiple import of component - //height: 800, - //plugins: ['lists'], - //toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify", - toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify', - style_formats: [ - { title: 'Blocks', block: 'div' }, - { title: 'Paragraph', block: 'p' }, - { title: 'Heading 1', block: 'h1' }, - { title: 'Heading 2', block: 'h2' }, - { title: 'Heading 3', block: 'h3' }, - { title: 'Heading 4', block: 'h4' }, - { title: 'Heading 5', block: 'h5' }, - { title: 'Heading 6', block: 'h6' }, - ], - autoresize_bottom_margin: 16, - - setup: (editor) => { - vm.editor = editor; - - editor.on('input', () => { - const newContent = editor.getContent(); - vm.intText = newContent; - }); - }, - }); - }, - }, - mounted() { - this.initTinyMCE(); - }, - watch: { - intText: function(newVal) { - const tinymcsVal = this.editor.getContent(); - - if (tinymcsVal != newVal) { - //Inhalt des Editors aktualisieren - //Todo(manu) hier gibts ein problem mit update function - this.editor.setContent(newVal); - } - }, - }, - beforeDestroy() { - this.editor.destroy(); - }, - template: ` -
- - -
-
-
- [{{typeId}}] -
-
- -
-
-

{{$p.t('notiz','notiz_new')}}

-

{{$p.t('notiz','notiz_edit')}}

-
-
- -
- -
- -
-
- -
- - - -
- -
- -
- - -
-
- - -
- - -
- -
-
- - -
- -
- -
- -
- - -
- -
-
- -
- -
- -
- - - -
- -
- -
- -
- -
- -
-
-
- -
- -
-

{{this.lastChange}}

-
-
- - - -
` -} - diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 31a92a9e7..498096ad3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -15,6 +15,7 @@ export default { }, template: `
+

Notizen

+ +

+

Test prestudentId

+ + + +

+

Test Projekt

+ +
` }; From 1ddf5a8370ba5f76786d9fd30bce18b4f56042f9 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 6 Feb 2024 08:08:17 +0100 Subject: [PATCH 128/464] Notizcomponent: Tinymce optional --- .../controllers/components/stv/Notiz.php | 8 +- public/js/components/Notiz/NotizComponent.js | 81 ++++++++++--------- .../Studentenverwaltung/Details/Notizen.js | 19 ++--- 3 files changed, 55 insertions(+), 53 deletions(-) diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index ddf10b8a9..4918e6627 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -224,8 +224,8 @@ class Notiz extends FHC_Controller $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid; $erledigt = $this->input->post('erledigt'); //$type = $this->input->post('typeId'); //soll auch dieser geändert werden können? - $start = $this->input->post('Von'); - $ende = $this->input->post('Bis'); + $start = $this->input->post('von'); + $ende = $this->input->post('bis'); $result = $this->NotizModel->update( [ @@ -443,7 +443,7 @@ class Notiz extends FHC_Controller public function titel_required($value) { if (empty($value)) { - $this->form_validation->set_message('titel_required', $this->p->t('ui','error_fieldRequired',['field' => 'Titel'])); + $this->form_validation->set_message('titel_required', $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])); return false; } else @@ -455,7 +455,7 @@ class Notiz extends FHC_Controller public function text_required($value) { if (empty($value)) { - $this->form_validation->set_message('text_required', $this->p->t('ui','error_fieldRequired',['field' => 'Text'])); + $this->form_validation->set_message('text_required', $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])); return false; } else diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js index 0d6dbae69..dd0abab23 100644 --- a/public/js/components/Notiz/NotizComponent.js +++ b/public/js/components/Notiz/NotizComponent.js @@ -18,7 +18,8 @@ export default { 'typeId', 'id', 'showErweitert', - 'showDocument' + 'showDocument', + 'showTinyMCE' ], data(){ return { @@ -45,7 +46,9 @@ export default { let button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.addEventListener('click', (event) => + button.addEventListener( + 'click', + (event) => this.actionEditNotiz(cell.getData().notiz_id) ); container.append(button); @@ -53,7 +56,9 @@ export default { button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.addEventListener('click', () => + button.addEventListener( + 'click', + () => this.actionDeleteNotiz(cell.getData().notiz_id) ); container.append(button); @@ -61,8 +66,7 @@ export default { return container; }, frozen: true - } - ], + }], layout: 'fitDataFill', layoutColumnsOnNewData: false, height: '150', @@ -109,14 +113,15 @@ export default { this.notizData.titel = this.notizen.titel; this.notizData.statusNew = false; this.notizData.text = this.notizen.text; + this.notizData.intText = this.notizen.text; this.notizData.lastChange = this.notizen.lastupdate; this.notizData.von = this.notizen.start; this.notizData.bis = this.notizen.ende; this.notizData.document = this.notizen.dms_id; this.notizData.erledigt = this.notizen.erledigt; - this.notizData.verfasser = this.notizen.verfasser_uid; //todo(manu) better + this.notizData.verfasser = this.notizen.verfasser_uid; this.notizData.intVerfasser = this.notizen.verfasser_uid; - this.notizData.intBearbeiter = this.notizen.bearbeiter_uid; //todo(manu) better + this.notizData.intBearbeiter = this.notizen.bearbeiter_uid; this.notizData.bearbeiter = this.notizen.bearbeiter_uid; } }) @@ -170,19 +175,17 @@ export default { this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden'); } }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); - }).finally(()=> { - window.scrollTo(0, 0); - }); + this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); + }).finally(()=> { + window.scrollTo(0, 0); + }); }, loadNotiz(notiz_id){ - return CoreRESTClient.get( - 'components/stv/Notiz/loadNotiz/' + notiz_id) + return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id) .then( result => { if(result.data.retval) { this.notizen = result.data.retval; - //console.log(this.notizen); } else { this.notizen = {}; @@ -273,7 +276,7 @@ export default { this.filteredMitarbeiter = CoreRESTClient.getData(result.data); }); }, -/* initTinyMCE() { + initTinyMCE() { const vm = this; tinymce.init({ @@ -299,16 +302,22 @@ export default { editor.on('input', () => { const newContent = editor.getContent(); - vm.intText = newContent; + vm.notizData.text = newContent; + //vm.text = newContent; + console.log('vm.text: ' + newContent); }); }, }); - },*/ + }, + updateText(value) { + this.notizData.text = value; + } }, created(){ this.getUid(); }, async mounted() { + this.initTinyMCE(); await this.$p.loadCategory(['notiz','global']); let cm = this.$refs.table.tabulator.columnManager; @@ -341,11 +350,9 @@ export default { title: this.$p.t('notiz', 'letzte_aenderung') }); }, -/* mounted() { - this.initTinyMCE(); - },*/ -/* watch: { - intText: function(newVal) { + watch: { + //watcher für Tinymce-Textfeld + 'notizData.text': function (newVal) { const tinymcsVal = this.editor.getContent(); if (tinymcsVal != newVal) { @@ -353,11 +360,6 @@ export default { this.editor.setContent(newVal); } }, - },*/ - beforeDestroy() { - this.editor.destroy(); - }, - watch: { //Watcher für autocomplete Bearbeiter und Verfasser 'notizData.intBearbeiter': { handler(newVal) { @@ -376,6 +378,9 @@ export default { deep: true } }, + beforeDestroy() { + this.editor.destroy(); + }, template: `
@@ -431,14 +436,18 @@ export default {
- - - -
+ +
@@ -470,7 +479,7 @@ export default {
-
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 498096ad3..6281401df 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -9,8 +9,10 @@ export default { }, data(){ return { - showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt +/* showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt showDocument: true, //show upload documents + showTinyMCE: true + */ }; }, template: ` @@ -22,7 +24,8 @@ export default { :id="modelValue.person_id" :showErweitert=true :showDocument=true - > + :showTinyMCE=true + >

@@ -33,19 +36,9 @@ export default { :id="modelValue.prestudent_id" :showErweitert=false :showDocument=true - > + > -

-

Test Projekt

- -
` }; From d56dbdf563c0ee933b87dc1c87bc18770c452d58 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 7 Feb 2024 09:28:30 +0100 Subject: [PATCH 129/464] Adaptierung Notizcomponent: teleport datepicker, tinymce mount conditionally, fehlerhandling missing id and type --- .../controllers/components/stv/Notiz.php | 15 --------- application/models/person/Notiz_model.php | 18 +++++------ public/js/components/Notiz/NotizComponent.js | 31 +++++++++++------- .../Studentenverwaltung/Details/Notizen.js | 32 ++++++++++++------- .../Studentenverwaltung/Details/Prestudent.js | 0 5 files changed, 47 insertions(+), 49 deletions(-) create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 4918e6627..7b78b06f8 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -100,21 +100,6 @@ class Notiz extends FHC_Controller } } - //Überprüfung ob type übergeben wurde (via Funktions- oder Postparameter) - $type = null; - if ($paramTyp) - $type = $paramTyp; - if(isset($_POST['typeId'])) - $type = $this->input->post('typeId'); - - if(!$type) - { - $result = error('kein Type für ID vorhanden', ERROR); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - - return $this->outputJson(getError($result)); - } - //Form Validation $this->form_validation->set_rules('titel', 'titel', 'callback_titel_required'); $this->form_validation->set_rules('text', 'text', 'callback_text_required'); diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index ea0d7d361..2822cac47 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -152,6 +152,13 @@ class Notiz_model extends DB_Model $verfasser_uid = null, $bearbeiter_uid = null ) { + + //check, ob id und type valid + if (!isset($id) || ($id == "undefined")) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return error("Id(". $id. ') ist keine gültige ID!'); + } + // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); @@ -160,17 +167,8 @@ class Notiz_model extends DB_Model if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - - $result = error($result->retval, EXIT_ERROR); - return $result; + return error($type . ' ist kein gültiger ID_TYP!'); } -/* - if(!$isValidType) - { - //Todo manu (correct return to controller) - $msg = "datatype " . $type . " not implemented for notes"; - return error($msg, EXIT_ERROR); - }*/ // Start DB transaction $this->db->trans_start(false); diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js index dd0abab23..eb8b8dd1d 100644 --- a/public/js/components/Notiz/NotizComponent.js +++ b/public/js/components/Notiz/NotizComponent.js @@ -67,7 +67,7 @@ export default { }, frozen: true }], - layout: 'fitDataFill', + layout: 'fitColumns', layoutColumnsOnNewData: false, height: '150', selectableRangeMode: 'click', @@ -135,7 +135,7 @@ export default { actionNewNotiz(){ this.resetFormData(); }, - addNewNotiz(notizData) { + addNewNotiz() { const formData = new FormData(); formData.append('data', JSON.stringify(this.notizData)); @@ -158,6 +158,7 @@ export default { } }).catch(error => { if (error.response) { + console.log(error.response); this.$fhcAlert.alertError(error.response.data); } }).finally(() => { @@ -303,8 +304,6 @@ export default { editor.on('input', () => { const newContent = editor.getContent(); vm.notizData.text = newContent; - //vm.text = newContent; - console.log('vm.text: ' + newContent); }); }, }); @@ -317,7 +316,10 @@ export default { this.getUid(); }, async mounted() { - this.initTinyMCE(); + if(this.showTinyMCE){ + this.initTinyMCE(); + } + await this.$p.loadCategory(['notiz','global']); let cm = this.$refs.table.tabulator.columnManager; @@ -353,11 +355,13 @@ export default { watch: { //watcher für Tinymce-Textfeld 'notizData.text': function (newVal) { - const tinymcsVal = this.editor.getContent(); + if(this.showTinyMCE) { + const tinymcsVal = this.editor.getContent(); - if (tinymcsVal != newVal) { - //Inhalt des Editors aktualisieren - this.editor.setContent(newVal); + if (tinymcsVal != newVal) { + //Inhalt des Editors aktualisieren + this.editor.setContent(newVal); + } } }, //Watcher für autocomplete Bearbeiter und Verfasser @@ -379,7 +383,9 @@ export default { } }, beforeDestroy() { - this.editor.destroy(); + if(this.showTinyMCE) { + this.editor.destroy(); + } }, template: `
@@ -484,6 +490,7 @@ export default { auto-apply :enable-time-picker="false" format="dd.MM.yyyy" + :teleport="true" preview-format="dd.MM.yyyy">
@@ -504,6 +511,7 @@ export default { auto-apply :enable-time-picker="false" format="dd.MM.yyyy" + :teleport="true" preview-format="dd.MM.yyyy">
@@ -528,8 +536,7 @@ export default { - - +
` } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 6281401df..3b95ed156 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -7,14 +7,6 @@ export default { props: { modelValue: Object }, - data(){ - return { -/* showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt - showDocument: true, //show upload documents - showTinyMCE: true - */ - }; - }, template: `

Notizen

@@ -24,21 +16,37 @@ export default { :id="modelValue.person_id" :showErweitert=true :showDocument=true - :showTinyMCE=true + :showTinyMCE="true" > -

+ + + +
` }; diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js new file mode 100644 index 000000000..e69de29bb From 9d6159c2021869d5f1188455202584480047d7a2 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 7 Feb 2024 17:54:52 +0100 Subject: [PATCH 130/464] Start Prestudent Tab - Forms --- .../controllers/components/stv/Config.php | 12 +- .../controllers/components/stv/Prestudent.php | 110 ++++++ .../Studentenverwaltung/Details/Prestudent.js | 338 ++++++++++++++++++ 3 files changed, 456 insertions(+), 4 deletions(-) create mode 100644 application/controllers/components/stv/Prestudent.php diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php index efc93e3d8..5c6b52c9c 100644 --- a/application/controllers/components/stv/Config.php +++ b/application/controllers/components/stv/Config.php @@ -19,18 +19,22 @@ class Config extends FHC_Controller 'title' => 'Details', 'component' => './Stv/Studentenverwaltung/Details/Details.js' ]; + $result['notizen'] = [ + 'title' => 'Notizen', + 'component' => './Stv/Studentenverwaltung/Details/Notizen.js' + ]; $result['kontakt'] = [ 'title' => 'Kontakt', 'component' => './Stv/Studentenverwaltung/Details/Kontakt.js' ]; + $result['prestudent'] = [ + 'title' => 'PreStudentIn', + 'component' => './Stv/Studentenverwaltung/Details/Prestudent.js' + ]; $result['noten'] = [ 'title' => 'Noten', 'component' => './Stv/Studentenverwaltung/Details/Noten.js' ]; - $result['notizen'] = [ - 'title' => 'Notizen', - 'component' => './Stv/Studentenverwaltung/Details/Notizen.js' - ]; Events::trigger('stv_conf_student', function & () use (&$result) { return $result; diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php new file mode 100644 index 000000000..c045a4be2 --- /dev/null +++ b/application/controllers/components/stv/Prestudent.php @@ -0,0 +1,110 @@ +load->library('AuthLib'); + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + + // Load language phrases + /* $this->loadPhrases([ + 'ui' + ]);*/ + } + + public function get($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $this->PrestudentModel->addSelect('*'); + $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson(getError($result)); + } elseif (!hasData($result)) { + $this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND); + $this->outputJson('NOT FOUND'); + } else { + $this->outputJson(current(getData($result))); + } + } + + public function getBezeichnungZgv(){ + $this->load->model('codex/Zgv_model', 'ZgvModel'); + + $this->ZgvModel->addOrder('zgv_code'); + + $result = $this->ZgvModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function getAusbildung(){ + $this->load->model('codex/Ausbildung_model', 'AusbildungModel'); + + $this->AusbildungModel->addOrder('ausbildungcode'); + + $result = $this->AusbildungModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function getAufmerksamdurch(){ + $this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel'); + + $this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz'); + + $result = $this->AufmerksamdurchModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function getBerufstaetigkeit(){ + $this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel'); + + $this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code'); + + $result = $this->BerufstaetigkeitModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function getTypenStg(){ + $this->load->model('organisation/Studiengangstyp_model', 'StudiengangstypModel'); + + $this->StudiengangstypModel->addOrder('typ'); + + $result = $this->StudiengangstypModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $data = $result->retval; + + //filter NullValues + $filteredData = array_filter($data, function ($entry) { + return $entry->bezeichnung !== null; + }); + $result->retval = $filteredData; + + $this->outputJson($result); + } + + +} \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index e69de29bb..e1c6a1ccd 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -0,0 +1,338 @@ +import {CoreRESTClient} from '../../../../RESTClient.js'; +import FormForm from '../../../Form/Form.js'; +import FormInput from '../../../Form/Input.js'; + +export default { + components: { + CoreRESTClient, + FormForm, + FormInput + }, + inject: { + lists: { + from: 'lists' + } + }, + props: { + modelValue: Object + }, + data(){ + return { + data: [], + listZgvs: [], + listStgs: [], + listAusbildung: [], + listAufmerksamdurch: [], + listBerufe: [], + listStgTyp: [], + listFoerderrelevant: [] + }; + }, + methods: { + loadData(prestudent_id){ + console.log("prestudent_id: " + prestudent_id); + return CoreRESTClient.get('components/stv/Zusatzfelder/loadData/' + prestudent_id) + .then( + result => { + if(result) + this.data = result.data.retval; + else + { + this.data = []; + this.$fhcAlert.alertError('Keine Prestudent_id ' + prestudent_id + ' gefunden'); + } + return result; + } + ); + }, + updatePrestudent() { + CoreRESTClient + .get('components/stv/Prestudent/get/' + this.modelValue.prestudent_id) + .then(result => result.data) + .then(result => { + this.data = result; + console.log(result); + }) + .catch(this.$fhcAlert.handleSystemError); + }, + }, + created() { + this.updatePrestudent(); + CoreRESTClient + .get('components/stv/Prestudent/getBezeichnungZGV') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listZgvs = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Lists/getStgs') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listStgs = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getAusbildung') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listAusbildung = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getAufmerksamdurch') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listAufmerksamdurch = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getBerufstaetigkeit') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listBerufe = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getTypenStg') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listStgTyp = result; + }) + .catch(this.$fhcAlert.handleSystemError); + }, + template: ` +
+ + +
+ Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}} + +
+ + + + +
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + + +
+ +
+
+ PrestudentIn + +
+ + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + +
+ + +
+
+ + +
+ + + + + + + +
+ +
+ + + +
+ {{modelValue}} +
+ {{data}} +
+ {{listStgTyp}} + + +
+ ` +}; \ No newline at end of file From c5f69d0e44a222cc9e84ea2c69719f7cf44a4e3a Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 9 Feb 2024 08:36:33 +0100 Subject: [PATCH 131/464] Prestudent: Form und Save/Upload Logic --- application/config/stv.php | 0 .../controllers/components/stv/Prestudent.php | 133 +++++++++ .../Studentenverwaltung/Details/Prestudent.js | 281 +++++++++++++++--- 3 files changed, 375 insertions(+), 39 deletions(-) create mode 100644 application/config/stv.php diff --git a/application/config/stv.php b/application/config/stv.php new file mode 100644 index 000000000..e69de29bb diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index c045a4be2..2b08b549c 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -38,6 +38,114 @@ class Prestudent extends FHC_Controller } } + public function updatePrestudent($prestudent_id) + { + $this->load->library('form_validation'); + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + +/* $result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } elseif (!hasData($result)) { + return $this->outputJson(getError($result)); + } else { + $prestudentData = current(getData($result)); + } + + var_dump($prestudentData);*/ + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + $deltaData = $_POST[0]; + + if(!$prestudent_id) + { + return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + + //Todo(manu) updateamum, updatevon ergänzen + $uid = getAuthUID(); + + $array_allowed_props_prestudent = [ + 'aufmerksamdurch_kurzbz', + 'studiengang_kz', + 'gsstudientyp_kurzbz', + 'person_id', + 'berufstaetigkeit_code', + 'ausbildungcode', + 'zgv_code', + 'zgvort', + 'zgvdatum', + 'zgvnation', + 'zgvmas_code', + 'zgvmaort', + 'zgvmadatum', + 'zgvmanation', + 'facheinschlberuf', + 'bismelden', + 'anmerkung', + 'dual', + 'zgvdoktor_code', //Todo(Manu) tabelle leer? db zum testen + 'zgvdoktorort', + 'zgvdoktordatum', + 'zgvdoktornation', + 'aufnahmegruppe_kurzbz', + 'priorisierung', + 'foerderrelevant', + 'zgv_erfuellt', + 'zgvmas_erfuellt', + 'zgvdoktor_erfuellt', + 'mentor', + 'aufnahmeschluessel', + 'standort_code' + ]; + +/* foreach ($array_allowed_props_prestudent as $prop) + { + + + }*/ + +/* "insertamum": "2021-05-27 13:03:08", + "insertvon": "online", + "updateamum": "2022-10-10 15:37:31.903056", + "updatevon": "poeckl", "ext_id": null,*/ + + $update_prestudent = array(); + foreach ($array_allowed_props_prestudent as $prop) + { + $val = isset($deltaData[$prop]) ? $deltaData[$prop] : null; + if ($val !== null) { + $update_prestudent[$prop] = $val; + } + } +/* + var_dump("update Array"); + var_dump($update_prestudent);*/ + + + + if (count($update_prestudent) && $prestudent_id === null) { + $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); + // TODO(manu): phrase + return $this->outputJson("Kein/e PrestudentIn vorhanden!"); + } + + if (count($update_prestudent)) + { + $result = $this->PrestudentModel->update( + $prestudent_id, + $update_prestudent + ); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + return $this->outputJsonSuccess(true); + } + + } + public function getBezeichnungZgv(){ $this->load->model('codex/Zgv_model', 'ZgvModel'); @@ -50,6 +158,30 @@ class Prestudent extends FHC_Controller $this->outputJson($result); } + public function getBezeichnungDZgv(){ + $this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel'); + + $this->ZgvdoktorModel->addOrder('zgvdoktor_code'); + + $result = $this->ZgvdoktorModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function getBezeichnungMZgv(){ + $this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel'); + + $this->ZgvmasterModel->addOrder('zgvmas_code'); + + $result = $this->ZgvmasterModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + public function getAusbildung(){ $this->load->model('codex/Ausbildung_model', 'AusbildungModel'); @@ -87,6 +219,7 @@ class Prestudent extends FHC_Controller } public function getTypenStg(){ + //TODO(manu) hier soll bis.tbl_gsstudientyp herangezogen werden $this->load->model('organisation/Studiengangstyp_model', 'StudiengangstypModel'); $this->StudiengangstypModel->addOrder('typ'); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index e1c6a1ccd..7c79bf6b2 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -18,46 +18,89 @@ export default { }, data(){ return { + config: {}, data: [], listZgvs: [], + listZgvsmaster: [], + listZgvsdoktor: [], listStgs: [], listAusbildung: [], listAufmerksamdurch: [], listBerufe: [], listStgTyp: [], - listFoerderrelevant: [] + listFoerderrelevant: [], + initialFormData: {}, + deltaArray: [], + actionUpdate: false }; }, + watch: { + }, + methods: { - loadData(prestudent_id){ - console.log("prestudent_id: " + prestudent_id); - return CoreRESTClient.get('components/stv/Zusatzfelder/loadData/' + prestudent_id) - .then( - result => { - if(result) - this.data = result.data.retval; - else - { - this.data = []; - this.$fhcAlert.alertError('Keine Prestudent_id ' + prestudent_id + ' gefunden'); - } - return result; - } - ); - }, - updatePrestudent() { + loadPrestudent() { CoreRESTClient .get('components/stv/Prestudent/get/' + this.modelValue.prestudent_id) .then(result => result.data) .then(result => { this.data = result; - console.log(result); + //neue DataVariable um ein Delta der vorgenommenen Änderungen berechnen zu können + this.initialFormData = {...this.data}; }) .catch(this.$fhcAlert.handleSystemError); }, + updatePrestudent(){ + this.detectChanges(); + +/* this.$nextTick(() => { + + if (this.actionUpdate) { + console.log("Action");*/ + //todo(manu) checken, ob überhaupt eine Änderung vorgenommen wurde + CoreRESTClient.post('components/stv/Prestudent/updatePrestudent/' + this.modelValue.prestudent_id, + this.deltaArray + ).then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Speichern erfolgreich'); + this.deltaArray = []; + this.actionUpdate = false; + } else { + const errorData = response.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + }); + } + }).catch(error => { + this.statusMsg = 'Error in Catch'; + this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + }); + +/* } else { + console.log("no action"); + } + });*/ + + + + }, + detectChanges() { + const delta = {}; + for (const key in this.data) { + if (this.data[key] !== this.initialFormData[key]) { + delta[key] = this.data[key]; + this.actionUpdate = true; + } + } + this.deltaArray.push(delta); + }, }, created() { - this.updatePrestudent(); + this.loadPrestudent(); + //initiale Daten nach dem Laden + //this.initialFormData = {...this.data}; CoreRESTClient .get('components/stv/Prestudent/getBezeichnungZGV') .then(result => CoreRESTClient.getData(result.data) || []) @@ -65,6 +108,20 @@ export default { this.listZgvs = result; }) .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getBezeichnungMZGV') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listZgvsmaster = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getBezeichnungDZGV') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listZgvsdoktor = result; + }) + .catch(this.$fhcAlert.handleSystemError); CoreRESTClient .get('components/stv/Lists/getStgs') .then(result => CoreRESTClient.getData(result.data) || []) @@ -101,9 +158,21 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, + mounted(){ + fetch('config/stv') + .then(result => result.json()) + .then(result => { + this.config = result; + console.log('Konfiguration geladen:', this.config); + }) + .catch(error => console.error('Fehler beim Laden der Konfiguration:', error)); + }, template: `
- + +
+ +
Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}} @@ -175,11 +244,11 @@ export default { - + {{nation.kurztext}}
+ +
+ + + + + + + + + + + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
@@ -249,6 +398,40 @@ export default {
+
+ + + +
+ + +
+ + + + + +
+
- - - - - + +
+ + + +
+
+ +
+ + +

- {{modelValue}} + + + +
` From 898f40e8a5afacda8abdada3b0a6a539d804c8f3 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 9 Feb 2024 12:14:14 +0100 Subject: [PATCH 132/464] hidden fields ZGV depending on Config entries --- application/config/stv.php | 0 application/views/Studentenverwaltung.php | 10 ++++++- .../js/components/Stv/Studentenverwaltung.js | 2 ++ .../Studentenverwaltung/Details/Prestudent.js | 29 ++++++++++--------- 4 files changed, 26 insertions(+), 15 deletions(-) delete mode 100644 application/config/stv.php diff --git a/application/config/stv.php b/application/config/stv.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php index 01b616397..54354578e 100644 --- a/application/views/Studentenverwaltung.php +++ b/application/views/Studentenverwaltung.php @@ -31,6 +31,14 @@ $this->load->view('templates/FHC-Header', $includesArray); ?> + !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT, + 'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? true : ZGV_DOKTOR_ANZEIGEN, + 'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? true : ZGV_ERFUELLT_ANZEIGEN +]; +?> +
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 908a98ae3..e097dc92e 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -46,6 +46,8 @@ export default { cisRoot: this.cisRoot, activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung'), configGenerateAlias: this.config.generateAlias, + configShowZgvDoktor: this.config.showZgvDoktor, + configShowZgvErfuellt: this.config.showZgvErfuellt, hasBpkPermission: this.permissions['student/bpk'], hasAliasPermission: this.permissions['student/alias'], lists: this.lists diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 7c79bf6b2..e27cf3a14 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -11,14 +11,21 @@ export default { inject: { lists: { from: 'lists' - } + }, + showZgvErfuellt: { + from: 'configShowZgvErfuellt', + default: false + }, + showZgvDoktor: { + from: 'configShowZgvDoktor', + default: false + }, }, props: { modelValue: Object }, data(){ return { - config: {}, data: [], listZgvs: [], listZgvsmaster: [], @@ -158,15 +165,7 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - mounted(){ - fetch('config/stv') - .then(result => result.json()) - .then(result => { - this.config = result; - console.log('Konfiguration geladen:', this.config); - }) - .catch(error => console.error('Fehler beim Laden der Konfiguration:', error)); - }, + mounted(){}, template: `
@@ -284,7 +283,7 @@ export default {
-
+
-
+
-
+

+ + {{showZgvDoktor}} || {{generateAlias}} || {{showZgvErfuellt}} From a21a5ce0445d9adf92191d4386c6b8f6978d7e4a Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 12 Feb 2024 09:18:33 +0100 Subject: [PATCH 133/464] edit field priority only with right basis/prestudent --- application/controllers/Studentenverwaltung.php | 4 +++- public/js/components/Stv/Studentenverwaltung.js | 1 + .../Stv/Studentenverwaltung/Details/Prestudent.js | 10 ++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php index d2574c500..29a04e51d 100644 --- a/application/controllers/Studentenverwaltung.php +++ b/application/controllers/Studentenverwaltung.php @@ -21,7 +21,9 @@ class Studentenverwaltung extends FHC_Controller $this->load->view('Studentenverwaltung', [ 'permissions' => [ 'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'), - 'student/alias' => $this->permissionlib->isBerechtigt('student/alias') + 'student/alias' => $this->permissionlib->isBerechtigt('student/alias'), + 'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'), + ], 'variables' => [ 'semester_aktuell' => $this->variablelib->getVar('semester_aktuell') diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index e097dc92e..4706b5b93 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -50,6 +50,7 @@ export default { configShowZgvErfuellt: this.config.showZgvErfuellt, hasBpkPermission: this.permissions['student/bpk'], hasAliasPermission: this.permissions['student/alias'], + hasPrestudentPermission: this.permissions['basis/prestudent'], lists: this.lists } }, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index e27cf3a14..4043e2aa5 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -20,6 +20,10 @@ export default { from: 'configShowZgvDoktor', default: false }, + hasPrestudentPermission: { + from: 'hasPrestudentPermission', + default: false + }, }, props: { modelValue: Object @@ -41,6 +45,8 @@ export default { actionUpdate: false }; }, + computed: { + }, watch: { }, @@ -496,13 +502,13 @@ export default { -->
-
@@ -524,7 +530,7 @@ export default {
- {{showZgvDoktor}} || {{generateAlias}} || {{showZgvErfuellt}} + {{hasPrestudentPermission}} From 824423f3eaa4ca4b2df440275840f5a503884d8c Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 12 Feb 2024 11:00:35 +0100 Subject: [PATCH 134/464] Update Fkt getTypenStg() --- .../controllers/components/stv/Prestudent.php | 51 ++++++++++--------- .../models/education/Gsstudientyp_model.php | 14 +++++ 2 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 application/models/education/Gsstudientyp_model.php diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 2b08b549c..1c456db10 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -146,67 +146,78 @@ class Prestudent extends FHC_Controller } - public function getBezeichnungZgv(){ + public function getBezeichnungZgv() + { $this->load->model('codex/Zgv_model', 'ZgvModel'); $this->ZgvModel->addOrder('zgv_code'); $result = $this->ZgvModel->load(); - if (isError($result)) { + if (isError($result)) + { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } $this->outputJson($result); } - public function getBezeichnungDZgv(){ + public function getBezeichnungDZgv() + { $this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel'); $this->ZgvdoktorModel->addOrder('zgvdoktor_code'); $result = $this->ZgvdoktorModel->load(); - if (isError($result)) { + if (isError($result)) + { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } $this->outputJson($result); } - public function getBezeichnungMZgv(){ + public function getBezeichnungMZgv() + { $this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel'); $this->ZgvmasterModel->addOrder('zgvmas_code'); $result = $this->ZgvmasterModel->load(); - if (isError($result)) { + if (isError($result)) + { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } $this->outputJson($result); } - public function getAusbildung(){ + public function getAusbildung() + { $this->load->model('codex/Ausbildung_model', 'AusbildungModel'); $this->AusbildungModel->addOrder('ausbildungcode'); $result = $this->AusbildungModel->load(); - if (isError($result)) { + if (isError($result)) + { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } $this->outputJson($result); } - public function getAufmerksamdurch(){ + public function getAufmerksamdurch() + { $this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel'); $this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz'); $result = $this->AufmerksamdurchModel->load(); - if (isError($result)) { + if (isError($result)) + { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } $this->outputJson($result); } - public function getBerufstaetigkeit(){ + public function getBerufstaetigkeit() + { $this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel'); $this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code'); @@ -218,24 +229,16 @@ class Prestudent extends FHC_Controller $this->outputJson($result); } - public function getTypenStg(){ - //TODO(manu) hier soll bis.tbl_gsstudientyp herangezogen werden - $this->load->model('organisation/Studiengangstyp_model', 'StudiengangstypModel'); + public function getTypenStg() + { + $this->load->model('education/Gsstudientyp_model', 'GsstudientypModel'); - $this->StudiengangstypModel->addOrder('typ'); + $this->GsstudientypModel->addOrder('gsstudientyp_kurzbz'); - $result = $this->StudiengangstypModel->load(); + $result = $this->GsstudientypModel->load(); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } - $data = $result->retval; - - //filter NullValues - $filteredData = array_filter($data, function ($entry) { - return $entry->bezeichnung !== null; - }); - $result->retval = $filteredData; - $this->outputJson($result); } diff --git a/application/models/education/Gsstudientyp_model.php b/application/models/education/Gsstudientyp_model.php new file mode 100644 index 000000000..ca9106d99 --- /dev/null +++ b/application/models/education/Gsstudientyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_gsstudientyp'; + $this->pk = 'gsstudientyp_kurzbz'; + } +} \ No newline at end of file From f4197f090b8edb9290656d21ea361a9a6791c237 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 12 Feb 2024 15:11:00 +0100 Subject: [PATCH 135/464] Component Gesamthistorie --- .../controllers/components/stv/Prestudent.php | 16 +++++++ application/models/crm/Prestudent_model.php | 26 ++++++++++++ .../Studentenverwaltung/Details/Prestudent.js | 39 +++++++++++------ .../Details/Prestudent/History.js | 42 +++++++++++++++++++ .../Details/Prestudent/Status.js | 0 5 files changed, 110 insertions(+), 13 deletions(-) create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 1c456db10..40c5d32f6 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -43,6 +43,8 @@ class Prestudent extends FHC_Controller $this->load->library('form_validation'); $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + //Todo(manu) Validierungen + /* $result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -146,6 +148,20 @@ class Prestudent extends FHC_Controller } + public function getHistoryPrestudents($person_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->getHistoryPrestudents($person_id); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + + $this->outputJson(getData($result) ?: []); + + } + public function getBezeichnungZgv() { $this->load->model('codex/Zgv_model', 'ZgvModel'); diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 7b24b8769..55c06dc21 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -700,4 +700,30 @@ class Prestudent_model extends DB_Model return $this->execQuery($query, array($prestudent_id)); } + /** + * Gets history of all prestudents, person given + * @param int $person_id + * @return object + */ + public function getHistoryPrestudents($person_id) + { + $query = " + SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester, + CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status + FROM public.tbl_prestudent p + JOIN ( + SELECT DISTINCT ON(prestudent_id) * + FROM public.tbl_prestudentstatus + WHERE prestudent_id IN (SELECT prestudent_id FROM public.tbl_prestudent WHERE person_id = ?) + ORDER BY prestudent_id, datum desc, insertamum desc + ) ps USING(prestudent_id) + JOIN public.tbl_status USING(status_kurzbz) + JOIN public.tbl_studiengang sg USING(studiengang_kz) + LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id) + LEFT JOIN public.tbl_student s USING (prestudent_id) + ORDER BY p.priorisierung + "; + + return $this->execQuery($query, array($person_id)); + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 4043e2aa5..b7a616db9 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -1,12 +1,16 @@ import {CoreRESTClient} from '../../../../RESTClient.js'; import FormForm from '../../../Form/Form.js'; import FormInput from '../../../Form/Input.js'; +import TblHistory from "./Prestudent/History.js"; +/*import TblStatus from "./Prestudent/Status.js";*/ export default { components: { CoreRESTClient, FormForm, - FormInput + FormInput, + TblHistory, +/* TblStatus*/ }, inject: { lists: { @@ -42,7 +46,7 @@ export default { listFoerderrelevant: [], initialFormData: {}, deltaArray: [], - actionUpdate: false + actionUpdate: false, }; }, computed: { @@ -112,6 +116,13 @@ export default { }, created() { this.loadPrestudent(); +/* CoreRESTClient + .get('components/stv/Prestudent/getHistoryPrestudents/'+ this.modelValue.person_id) + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.historyPrestudents = result; + }) + .catch(this.$fhcAlert.handleSystemError);*/ //initiale Daten nach dem Laden //this.initialFormData = {...this.data}; CoreRESTClient @@ -410,6 +421,7 @@ export default { type="text" v-model="data.aufnahmeschluessel" name="aufnahmeschluessel" + disabled > @@ -529,18 +541,19 @@ export default {
- - {{hasPrestudentPermission}} - +
+
+ Status + +
+ +
+ Gesamthistorie + +
+ +
-
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js new file mode 100644 index 000000000..fd280fd5a --- /dev/null +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js @@ -0,0 +1,42 @@ +import {CoreFilterCmpt} from "../../../../filter/Filter.js"; +import {CoreRESTClient} from "../../../../../RESTClient"; + +export default{ + components: { + CoreFilterCmpt + }, + props: { + person_id: String + }, + data() { + return { + tabulatorOptions: { + ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudents/' + this.person_id), + //autoColumns: true, + columns:[ + {title:"StSem", field:"studiensemester_kurzbz"}, + {title:"Prio", field:"priorisierung"}, + {title:"Stg", field:"kurzbzlang"}, + {title:"Orgform", field:"orgform_kurzbz"}, + {title:"Studienplan", field:"bezeichnung"}, + {title:"UID", field:"student_uid"}, + {title:"Status", field:"status"} + ], + layout: 'fitDataFill', + layoutColumnsOnNewData: false, + height: 'auto', + selectable: false, + }, + } + }, + template: ` +
+ + +
` +} \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js new file mode 100644 index 000000000..e69de29bb From 7ec24bfc7bc10de2f7ed9a288e1bd46cce4e9d5d Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 13 Feb 2024 10:45:00 +0100 Subject: [PATCH 136/464] Component Status: Tabelle --- .../controllers/components/stv/Prestudent.php | 12 +- application/models/crm/Prestudent_model.php | 46 ++++- .../Studentenverwaltung/Details/Prestudent.js | 24 ++- .../Details/Prestudent/Status.js | 164 ++++++++++++++++++ 4 files changed, 236 insertions(+), 10 deletions(-) diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 40c5d32f6..855d53a56 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -157,9 +157,19 @@ class Prestudent extends FHC_Controller { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } - $this->outputJson(getData($result) ?: []); + } + public function getHistoryPrestudent($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson(getData($result) ?: []); } public function getBezeichnungZgv() diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 55c06dc21..a8dab8a6a 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -701,7 +701,7 @@ class Prestudent_model extends DB_Model } /** - * Gets history of all prestudents, person given + * Gets history of all prestudents, person_id given * @param int $person_id * @return object */ @@ -726,4 +726,48 @@ class Prestudent_model extends DB_Model return $this->execQuery($query, array($person_id)); } + + /** + * Gets history of prestudent, prestudent_id given + * @param int $prestudent_id + * @return object + */ + public function getHistoryPrestudent($prestudent_id) + { + $query = " + SELECT + ps.status_kurzbz, + ps.studiensemester_kurzbz, + ps.ausbildungssemester, + CASE WHEN ps.status_kurzbz = 'Student' THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, + ps.datum, + TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum, + sp.bezeichnung, + ps.bestaetigtam, + TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam, + ps.bewerbung_abgeschicktamum, + TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum, + stg.statusgrund_kurzbz, + ps.orgform_kurzbz, + ps.prestudent_id, + sp.studienplan_id, + ps.anmerkung, + ps.bestaetigtvon, + ps.insertamum, + ps.insertvon, + ps.updateamum, + ps.updatevon + FROM public.tbl_prestudentstatus ps + JOIN public.tbl_student st USING (prestudent_id) + JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid) + JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz) + LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id) + LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id) + WHERE prestudent_id = ? + and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz + ORDER BY datum DESC + "; + + return $this->execQuery($query, array($prestudent_id)); + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index b7a616db9..394a6de27 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -2,7 +2,7 @@ import {CoreRESTClient} from '../../../../RESTClient.js'; import FormForm from '../../../Form/Form.js'; import FormInput from '../../../Form/Input.js'; import TblHistory from "./Prestudent/History.js"; -/*import TblStatus from "./Prestudent/Status.js";*/ +import TblStatus from "./Prestudent/Status.js"; export default { components: { @@ -10,7 +10,7 @@ export default { FormForm, FormInput, TblHistory, -/* TblStatus*/ + TblStatus }, inject: { lists: { @@ -541,18 +541,26 @@ export default {
-
-
+ +
+ Status + +
+ +
+ + -
+ +
--> -
+
Gesamthistorie
-
+ diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index e69de29bb..777a94e9e 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -0,0 +1,164 @@ +import {CoreFilterCmpt} from "../../../../filter/Filter.js"; +import {CoreRESTClient} from "../../../../../RESTClient"; + +export default{ + components: { + CoreFilterCmpt + }, + props: { + prestudent_id: String + }, + data() { + return { + tabulatorOptions: { + ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudent/' + this.prestudent_id), + //autoColumns: true, + columns:[ + {title:"Kurzbz", field:"status_kurzbz"}, + {title:"StSem", field:"studiensemester_kurzbz"}, + {title:"Sem", field:"ausbildungssemester"}, + {title:"Lehrverband", field:"lehrverband"}, + {title:"Datum", field:"format_datum"}, + {title:"Studienplan", field:"bezeichnung"}, + {title:"BestätigtAm", field:"format_bestaetigtam"}, + {title:"AbgeschicktAm", field:"format_bewerbung_abgeschicktamum"}, + {title:"Statusgrund", field:"statusgrund_kurzbz"}, + {title:"Organisationsform", field:"ps.orgform_kurzbz"}, + {title:"PrestudentInId", field:"prestudent_id"}, + {title:"StudienplanId", field:"studienplan_id"}, + {title:"Anmerkung", field:"anmerkung"}, + {title:"BestätigtVon", field:"bestaetigtvon"}, + {title:"InsertAmUm", field:"insertamum"}, + {title:"InsertVon", field:"insertvon"}, + {title:"UpdateAmUm", field:"updateamum"}, + {title:"UpdateVon", field:"updatevon"}, + ], + layout: 'fitDataFill', + layoutColumnsOnNewData: false, + height: 'auto', + selectable: false, + rowClickMenu:[ + { + label:"Bearbeiten", + action:function(e, row){ + console.log("bearbeiten: " + row.getData().status_kurzbz + ' ' + row.getData().prestudent_id); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Status bestätigen", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Neuen Status hinzufügen", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Entfernen", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Status vorrücken", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + label:" Select Row", + action:function(e, row){ + row.select(); + } + }, + ], +/* rowContextMenu:[ + { + label:"Bearbeiten", + action:function(e, column){ + console.log("bearbeiten" + column); + column.hide(); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Status bestätigen", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Neuen Status hinzufügen", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Entfernen", + action:function(e, column){ + column.move("col"); + } + }, + { + separator:true, + }, + { + disabled:true, + label:"Status vorrücken", + action:function(e, column){ + column.move("col"); + } + }, + ]*/ + }, + } + }, + template: ` +
+ + +
` +} \ No newline at end of file From 6a5b2db79df8380c13a7d4a09f0e03f80c730734 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 15 Feb 2024 17:02:16 +0100 Subject: [PATCH 137/464] Start Actions New, Edit, Delete --- .../controllers/components/stv/Prestudent.php | 52 +- .../controllers/components/stv/Status.php | 171 +++++ application/models/crm/Prestudent_model.php | 4 + .../Details/Prestudent/Status.js | 692 ++++++++++++++---- 4 files changed, 774 insertions(+), 145 deletions(-) create mode 100644 application/controllers/components/stv/Status.php diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 855d53a56..3851a0144 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -160,18 +160,6 @@ class Prestudent extends FHC_Controller $this->outputJson(getData($result) ?: []); } - public function getHistoryPrestudent($prestudent_id) - { - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - $result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson(getData($result) ?: []); - } - public function getBezeichnungZgv() { $this->load->model('codex/Zgv_model', 'ZgvModel'); @@ -268,5 +256,45 @@ class Prestudent extends FHC_Controller $this->outputJson($result); } + public function getStudiensemester() + { + $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + + $this->StudiensemesterModel->addOrder('start', 'DESC'); + $this->StudiensemesterModel->addLimit(20); + + $result = $this->StudiensemesterModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function getStudienplaene($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->loadWhere( + array('prestudent_id' => $prestudent_id) + ); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + + $result = current(getData($result)); + $studiengang_kz = $result->studiengang_kz; + + $this->load->model('organisation/Studienplan_model', 'StudienplanModel'); + + $this->StudienplanModel->addOrder('studienplan_id', 'DESC'); + + $result = $this->StudienplanModel->getStudienplaene($studiengang_kz); + + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + } \ No newline at end of file diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php new file mode 100644 index 000000000..fa0ea5a80 --- /dev/null +++ b/application/controllers/components/stv/Status.php @@ -0,0 +1,171 @@ +load->library('AuthLib'); + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + + // Load language phrases + /* $this->loadPhrases([ + 'ui' + ]);*/ + } + + public function getHistoryPrestudent($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson(getData($result) ?: []); + } + + public function getStatusgruende() + { + $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); + + $result = $this->StatusgrundModel->load(); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + } + $this->outputJson($result); + } + + public function addNewStatus($prestudent_id) + { +/* $this->load->library('form_validation'); + + + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + }*/ + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + //var_dump($_POST); + + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $studienplan_id = $this->input->post('studienplan_id'); + $anmerkung = $this->input->post('anmerkung '); + $statusgrund_id = $this->input->post('statusgrund_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $bestaetigtvon = $this->input->post('bestaetigtvon'); + + // Start DB transaction + //$this->db->trans_start(false); + + $result = $this->PrestudentstatusModel->insert( + [ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studienplan_id' => $studienplan_id, + 'ausbildungssemester' => $ausbildungssemester, + 'anmerkung' => $anmerkung, + 'statusgrund_id' => $statusgrund_id, + 'insertvon' => 'uid', + 'insertamum' => date('c'), + 'bestaetigtam' => $bestaetigtam, + 'bestaetigtvon' => $bestaetigtvon, + 'datum' => $datum, + 'rt_stufe' => $rt_stufe + ] + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + return $this->outputJsonSuccess(true); + } + + public function loadStatus() + { + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $prestudent_id = $this->input->post('prestudent_id'); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + //echo $prestudent_id . $status_kurzbz . $ausbildungssemester . $studiensemester_kurzbz; + + + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson($result); + } + + elseif (!hasData($result)) { + $this->outputJson($result); + } + else + { + //var_dump($result); + $this->outputJsonSuccess(current(getData($result))); + } + } + + public function deleteStatus() + { + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $prestudent_id = $this->input->post('prestudent_id'); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->delete( + array( + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson($result); + } + elseif (!hasData($result)) { + $this->outputJson($result); + } + return $this->outputJsonSuccess(current(getData($result))); + } + + + +} diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index a8dab8a6a..0d0399bed 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -754,8 +754,10 @@ class Prestudent_model extends DB_Model ps.anmerkung, ps.bestaetigtvon, ps.insertamum, + TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum, ps.insertvon, ps.updateamum, + TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum, ps.updatevon FROM public.tbl_prestudentstatus ps JOIN public.tbl_student st USING (prestudent_id) @@ -768,6 +770,8 @@ class Prestudent_model extends DB_Model ORDER BY datum DESC "; + // var_dump($query); + return $this->execQuery($query, array($prestudent_id)); } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 777a94e9e..6acb6259b 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -1,9 +1,15 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; import {CoreRESTClient} from "../../../../../RESTClient"; +import BsModal from "../../../../Bootstrap/Modal.js"; +import FormForm from '../../../../Form/Form.js'; +import FormInput from '../../../../Form/Input.js'; export default{ components: { - CoreFilterCmpt + CoreFilterCmpt, + BsModal, + FormForm, + FormInput, }, props: { prestudent_id: String @@ -11,143 +17,562 @@ export default{ data() { return { tabulatorOptions: { - ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudent/' + this.prestudent_id), + ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Status/getHistoryPrestudent/' + this.prestudent_id), //autoColumns: true, - columns:[ - {title:"Kurzbz", field:"status_kurzbz"}, - {title:"StSem", field:"studiensemester_kurzbz"}, - {title:"Sem", field:"ausbildungssemester"}, - {title:"Lehrverband", field:"lehrverband"}, - {title:"Datum", field:"format_datum"}, - {title:"Studienplan", field:"bezeichnung"}, - {title:"BestätigtAm", field:"format_bestaetigtam"}, - {title:"AbgeschicktAm", field:"format_bewerbung_abgeschicktamum"}, - {title:"Statusgrund", field:"statusgrund_kurzbz"}, - {title:"Organisationsform", field:"ps.orgform_kurzbz"}, - {title:"PrestudentInId", field:"prestudent_id"}, - {title:"StudienplanId", field:"studienplan_id"}, - {title:"Anmerkung", field:"anmerkung"}, - {title:"BestätigtVon", field:"bestaetigtvon"}, - {title:"InsertAmUm", field:"insertamum"}, - {title:"InsertVon", field:"insertvon"}, - {title:"UpdateAmUm", field:"updateamum"}, - {title:"UpdateVon", field:"updatevon"}, + columns: [ + {title: "Kurzbz", field: "status_kurzbz", tooltip: true}, + {title: "StSem", field: "studiensemester_kurzbz"}, + {title: "Sem", field: "ausbildungssemester"}, + {title: "Lehrverband", field: "lehrverband"}, + {title: "Datum", field: "format_datum"}, + {title: "Studienplan", field: "bezeichnung"}, + {title: "BestätigtAm", field: "format_bestaetigtam"}, + {title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum"}, + {title: "Statusgrund", field: "statusgrund_kurzbz", visible: false}, + {title: "Organisationsform", field: "ps.orgform_kurzbz", visible: false}, + {title: "PrestudentInId", field: "prestudent_id", visible: false}, + {title: "StudienplanId", field: "studienplan_id", visible: false}, + {title: "Anmerkung", field: "anmerkung", visible: false}, + {title: "BestätigtVon", field: "bestaetigtvon", visible: false}, + {title: "InsertAmUm", field: "format_insertamum", visible: false}, + {title: "InsertVon", field: "insertvon", visible: false}, + {title: "UpdateAmUm", field: "format_updateamum", visible: false}, + {title: "UpdateVon", field: "updatevon", visible: false}, + { + title: 'Aktionen', field: 'actions', + minWidth: 150, // Ensures Action-buttons will be always fully displayed + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; + + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.title = 'Status vorrücken'; + button.addEventListener('click', () => + this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.title = 'Status bestätigen'; + button.addEventListener('click', () => + this.actionConfirmStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.title = 'Status bearbeiten'; + button.addEventListener('click', (event) => + this.actionEditStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + ); + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.title = 'Status löschen'; + button.addEventListener('click', () => + this.actionDeleteStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + ); + container.append(button); + + return container; + }, + frozen: true + }, ], layout: 'fitDataFill', - layoutColumnsOnNewData: false, - height: 'auto', - selectable: false, - rowClickMenu:[ - { - label:"Bearbeiten", - action:function(e, row){ - console.log("bearbeiten: " + row.getData().status_kurzbz + ' ' + row.getData().prestudent_id); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Status bestätigen", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Neuen Status hinzufügen", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Entfernen", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Status vorrücken", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - label:" Select Row", - action:function(e, row){ - row.select(); - } - }, - ], -/* rowContextMenu:[ - { - label:"Bearbeiten", - action:function(e, column){ - console.log("bearbeiten" + column); - column.hide(); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Status bestätigen", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Neuen Status hinzufügen", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Entfernen", - action:function(e, column){ - column.move("col"); - } - }, - { - separator:true, - }, - { - disabled:true, - label:"Status vorrücken", - action:function(e, column){ - column.move("col"); - } - }, - ]*/ + layoutColumnsOnNewData: false, + height: 'auto', + selectable: false, }, + tabulatorEvents: [], + statusData: {}, + listStudiensemester: [], + //maySem: [0,1,2,4,6,7], + maxSem: Array.from({ length: 11 }, (_, index) => index), + listStudienplaene: [], + aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3}, + listStatusgruende: [] } }, + computed: { + gruende() { + return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz); + }, + }, + methods:{ + actionNewStatus(){ + console.log("Action: Neuen Status hinzufügen"); + this.$refs.newStatusModal.show(); + }, + actionEditStatus(status, stdsem, ausbildungssemester){ + console.log("Action: Status bearbeiten: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") + this.loadStatus({ + 'prestudent_id': this.prestudent_id, + 'status_kurzbz': status, + 'studiensemester_kurzbz': stdsem, + 'ausbildungssemester': ausbildungssemester + }).then(() => { + if(this.statusData) + this.$refs.editStatusModal.show(); + }); + }, + actionDeleteStatus(status, stdsem, ausbildungssemester){ + console.log("Action: Status löschen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") + //this.$refs.deleteStatusModal.show(); + + this.loadStatus({ + 'prestudent_id': this.prestudent_id, + 'status_kurzbz': status, + 'studiensemester_kurzbz': stdsem, + 'ausbildungssemester': ausbildungssemester + }).then(() => { + if(this.statusData) + this.$refs.deleteStatusModal.show(); + }); + }, + actionAdvanceStatus(status, stdsem, ausbildungssemester){ + console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") + //this.$refs.deleteStatusModal.show(); + + /* this.loadStatus(status_id).then(() => { + if(this.statusData.bankverbindung_id) + this.$refs.deleteStatusModal.show(); + });*/ + }, + actionConfirmStatus(status, stdsem, ausbildungssemester){ + console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") + //this.$refs.deleteStatusModal.show(); + + /* this.loadStatus(status_id).then(() => { + if(this.statusData.bankverbindung_id) + this.$refs.deleteStatusModal.show(); + });*/ + }, + addNewStatus(statusData){ + CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id, + this.statusData + ).then(response => { + if (!response.data.error) { + this.$fhcAlert.alertSuccess('Speichern erfolgreich'); + this.hideModal('newStatusModal'); + this.resetModal(); + } else { + const errorData = response.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + }); + } + }).catch(error => { + this.$fhcAlert.alertError('Fehler bei Speichern Status aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + this.reload(); + }); + }, + loadStatus(status_id){ + return CoreRESTClient.post('components/stv/Status/loadStatus/', + status_id) + .then( + result => { + if(result.data.retval) + this.statusData = result.data.retval; + else + { + this.statusData = {}; + this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); + } + return result; + } + ); + }, + reload(){ + this.$refs.table.reloadTable(); + }, + hideModal(modalRef){ + this.$refs[modalRef].hide(); + }, + resetModal(){ + this.statusData = {}; + }, + }, + created(){ + CoreRESTClient + .get('components/stv/Prestudent/getStudiensemester') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listStudiensemester = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id) + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listStudienplaene = result; + }) + .catch(this.$fhcAlert.handleSystemError); + CoreRESTClient + .get('components/stv/Status/getStatusgruende/') + .then(result => CoreRESTClient.getData(result.data) || []) + .then(result => { + this.listStatusgruende = result; + }) + .catch(this.$fhcAlert.handleSystemError); + }, template: `
+ + +

TestData

+ {{statusData}} + + + + + + + +
+ +
+ + + + + + + + + + +
+
+
+ +
+ + + +
+
+ +
+ +
+ + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ + +
+
+ +
+ +
+ + + +
+
+ + +
+ +
+ + + +
+
+ + + + + + + + + + + + +
+ +
+ + + + + + + + + + +
+
+
+ +
+ + + f +
+
+ +
+ +
+ + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ + +
+
+ +
+ +
+ + + +
+
+ + +
+ +
+ + + +
+
+ + + + + + + + + + + + + + + +
` -} \ No newline at end of file +}; \ No newline at end of file From 843ddad987785d5dcefcb0b8b538248b8fa561fa Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 23 Feb 2024 12:28:26 +0100 Subject: [PATCH 138/464] Statuschecks, Berechtigungen, add new Status --- .../controllers/Studentenverwaltung.php | 4 + .../controllers/components/stv/Status.php | 225 ++++++++++++- application/models/crm/Prestudent_model.php | 81 +++-- .../models/crm/Prestudentstatus_model.php | 315 ++++++++++++++++++ application/models/crm/Student_model.php | 21 ++ .../js/components/Stv/Studentenverwaltung.js | 7 +- .../Studentenverwaltung/Details/Prestudent.js | 32 +- .../Details/Prestudent/Status.js | 176 ++++++++-- 8 files changed, 802 insertions(+), 59 deletions(-) diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php index 29a04e51d..bd8ef7aa9 100644 --- a/application/controllers/Studentenverwaltung.php +++ b/application/controllers/Studentenverwaltung.php @@ -23,6 +23,10 @@ class Studentenverwaltung extends FHC_Controller 'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'), 'student/alias' => $this->permissionlib->isBerechtigt('student/alias'), 'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'), + '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') ], 'variables' => [ diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index fa0ea5a80..a4ad5fd62 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -13,6 +13,7 @@ class Status extends FHC_Controller // Load Libraries $this->load->library('AuthLib'); $this->load->library('VariableLib', ['uid' => getAuthUID()]); + $this->load->library('PermissionLib'); // Load language phrases /* $this->loadPhrases([ @@ -53,11 +54,42 @@ class Status extends FHC_Controller return $this->outputJsonError($this->form_validation->error_array()); }*/ + //check rights + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $prestudent_id, + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + + //Variablen für Statuscheck + $stg = $result->studiengang_kz; + $reihungstest_angetreten = $result->reihungstestangetreten; + $name = trim($result->vorname . " ". $result->nachname); + $zgv_code = $result->zgv_code; + + //TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird! + $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz'); + $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin'); + $granted = array_merge($granted_Ass, $granted_Adm); + + if(!in_array($stg, $granted)){ + $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); //var_dump($_POST); - + $uid = getAuthUID(); $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $datum = $this->input->post('datum'); @@ -65,7 +97,7 @@ class Status extends FHC_Controller $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); $studienplan_id = $this->input->post('studienplan_id'); - $anmerkung = $this->input->post('anmerkung '); + $anmerkung = $this->input->post('anmerkung'); $statusgrund_id = $this->input->post('statusgrund_id'); $rt_stufe = $this->input->post('rt_stufe'); $bestaetigtvon = $this->input->post('bestaetigtvon'); @@ -73,6 +105,123 @@ class Status extends FHC_Controller // Start DB transaction //$this->db->trans_start(false); + //GET lastStatus + $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $lastStatusData = current(getData($result)); + //var_dump($lastStatusData); + + //Different handling depending on newStatus + if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand') + { + //$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint? + $ausbildungssemester = $lastStatusData->ausbildungssemester; + } + + if($status_kurzbz != 'Student') + { + $ausbildungssemester = $lastStatusData->ausbildungssemester; + } + + //check if Rolle already exists + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + //return $this->outputJson("DEBUG: in Funktion checkIfExistingPrestudentRolle"); + } + + //Check ob Reihungstest berücksichtigt werden soll + if(REIHUNGSTEST_CHECK) + { + if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben"); + } + } + + //Check ZGV + if(!defined("ZGV_CHECK") || ZGV_CHECK) + { + if($status_kurzbz=='Bewerber' && $zgv_code=='') + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein."); + } + } + + //Check ZGV-Master + $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); + $result = $this->StudiengangModel->load([ + 'studiengang_kz'=> $stg + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + $typ = $result->typ; + + if(!defined("ZGV_CHECK") || ZGV_CHECK) + { + if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m') + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein."); + } + } + + //check if bewerberstatus exists + if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender') + { + //TODO(manu) Wartender NICHT in Liste!? nur in diesem Code + //FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629 + + $result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + } + + //TODO(Manu) permission not working here... + $hasPermissionToSkipStatusCheck = $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung'); + /* var_dump($hasPermissionToSkipStatusCheck); + + $basis = $this->permissionlib->isBerechtigt('basis/prestudent'); + var_dump($basis);*/ + if(!$hasPermissionToSkipStatusCheck) + { + //Block STATUSCHECKS + $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); + $result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + + $result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + //return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory"); + } + $statusArr = $result; //wenn return result ok + + } + + $result = $this->PrestudentstatusModel->insert( [ 'prestudent_id' => $prestudent_id, @@ -83,7 +232,7 @@ class Status extends FHC_Controller 'ausbildungssemester' => $ausbildungssemester, 'anmerkung' => $anmerkung, 'statusgrund_id' => $statusgrund_id, - 'insertvon' => 'uid', + 'insertvon' => $uid, 'insertamum' => date('c'), 'bestaetigtam' => $bestaetigtam, 'bestaetigtvon' => $bestaetigtvon, @@ -94,8 +243,10 @@ class Status extends FHC_Controller if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); + //return $this->outputJson(getError($result)); + return $this->outputJson("DEBUG: in insert Funktion"); } + return $this->outputJsonSuccess(true); } @@ -143,6 +294,13 @@ class Status extends FHC_Controller $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); +/* var_dump($prestudent_id); + var_dump($status_kurzbz);*/ + + //var_dump($_POST); + + //Todo(manu) + //Löschen auch aus anderen Tabellen $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); @@ -166,6 +324,65 @@ class Status extends FHC_Controller return $this->outputJsonSuccess(current(getData($result))); } + public function updateStatus($prestudent_id) + { + /* $this->load->library('form_validation'); + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + }*/ + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + var_dump($_POST); + + $uid = getAuthUID(); + //$prestudent_id = $this->input->post('prestudent_id'); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $studienplan_id = $this->input->post('studienplan_id'); + $anmerkung = $this->input->post('anmerkung '); + $statusgrund_id = $this->input->post('statusgrund_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $bestaetigtvon = $this->input->post('bestaetigtvon'); + + // Start DB transaction + //$this->db->trans_start(false); + + $result = $this->PrestudentstatusModel->update( + [ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + ], + [ + + 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, + 'studienplan_id' => $studienplan_id, + 'anmerkung' => $anmerkung, + 'statusgrund_id' => $statusgrund_id, + 'updatevon' => $uid, + 'updateamum' => date('c'), + 'bestaetigtam' => $bestaetigtam, + 'bestaetigtvon' => $bestaetigtvon, + 'datum' => $datum, + 'rt_stufe' => $rt_stufe + ] + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + return $this->outputJsonSuccess(true); + } + } diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 0d0399bed..742a823f5 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -734,20 +734,26 @@ class Prestudent_model extends DB_Model */ public function getHistoryPrestudent($prestudent_id) { - $query = " + //TODO(Manu) refactor + $this->load->model('crm/Student_model', 'StudentModel'); + + $result = $this->StudentModel->checkIfUID($prestudent_id); + + if(isError($result)) + { + $query = " SELECT - ps.status_kurzbz, - ps.studiensemester_kurzbz, - ps.ausbildungssemester, - CASE WHEN ps.status_kurzbz = 'Student' THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, - ps.datum, - TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum, - sp.bezeichnung, - ps.bestaetigtam, - TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam, - ps.bewerbung_abgeschicktamum, - TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum, - stg.statusgrund_kurzbz, + ps.status_kurzbz, + ps.studiensemester_kurzbz, + ps.ausbildungssemester, + ps.datum, + TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum, + sp.bezeichnung, + ps.bestaetigtam, + TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam, + ps.bewerbung_abgeschicktamum, + TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum, + stg.statusgrund_kurzbz, ps.orgform_kurzbz, ps.prestudent_id, sp.studienplan_id, @@ -760,17 +766,54 @@ class Prestudent_model extends DB_Model TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum, ps.updatevon FROM public.tbl_prestudentstatus ps - JOIN public.tbl_student st USING (prestudent_id) - JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid) - JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz) + LEFT JOIN public.tbl_student st USING (prestudent_id) + LEFT JOIN public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz) LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id) LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id) WHERE prestudent_id = ? - and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz - ORDER BY datum DESC + ORDER BY datum DESC "; + } + else + { + $query = " + SELECT + ps.status_kurzbz, + ps.studiensemester_kurzbz, + ps.ausbildungssemester, + CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, + ps.datum, + TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum, + sp.bezeichnung, + ps.bestaetigtam, + TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam, + ps.bewerbung_abgeschicktamum, + TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum, + stg.statusgrund_kurzbz, + ps.orgform_kurzbz, + ps.prestudent_id, + sp.studienplan_id, + ps.anmerkung, + ps.bestaetigtvon, + ps.insertamum, + TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum, + ps.insertvon, + ps.updateamum, + TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum, + ps.updatevon + FROM public.tbl_prestudentstatus ps + JOIN public.tbl_student st USING (prestudent_id) + JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid) + JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz) + LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id) + LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id) + WHERE prestudent_id = ? + and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz + ORDER BY datum DESC + "; + + } - // var_dump($query); return $this->execQuery($query, array($prestudent_id)); } diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index 08c081153..84d281877 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -338,4 +338,319 @@ class Prestudentstatus_model extends DB_Model return $this; } + + /** + * Check if Rolle already exists + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $studiensemester_kurzbz + * @param integer $ausbildungssemester + * @return error if already exists, success if not + * Copy from studentDBDML.php + */ + public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) + { + $qry = "SELECT + * + FROM + public.tbl_prestudentstatus + WHERE + prestudent_id = ? + AND + status_kurzbz = ? + AND + studiensemester_kurzbz = ? + AND + ausbildungssemester = ?"; + + $result = $this->execQuery($qry, array($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)); + + if (isError($result)) + { + return error($result); + } + elseif (!hasData($result)) { + return success($result); + } + else + { + return error('Diese Rolle ist bereits vorhanden: ' . $prestudent_id . ' / ' . $studiensemester_kurzbz . ' : ' . $status_kurzbz . ' /' . $ausbildungssemester . ')'); + } + } + + /** + * Check if Rolle there is an existing Bewerberstatus + * @param integer $prestudent_id + * @return error if no bewerberstatus, success if existing + */ + public function checkIfExistingBewerberstatus($prestudent_id) + { + $qry = "SELECT + * + FROM + public.tbl_prestudentstatus + WHERE + prestudent_id = ? + AND + status_kurzbz = 'Bewerber'"; + + $result = $this->execQuery($qry, array($prestudent_id)); + + if (isError($result)) + { + return error($result); + } + elseif (!hasData($result)) { + return error("Person muss zuerst zum Bewerber gemacht werden! " . $prestudent_id ); + } + else + { + return success($result); + } + } + + /** + * Check if Datum New Status is in the Past + * @param integer $prestudent_id + * @return error if in past + */ + public function checkDatumNewStatus($new_status_datum) + { + $today = new DateTime('today'); + $new_status_datum = new DateTime($new_status_datum); + + if($new_status_datum < $today) + { + return error("Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen "); + } + + else + { + return success(); + } + } + + /** + * Check if History of StatusData is valid + * @param integer $prestudent_id + * @return error if not valid, array StatusArr if valid + */ + public function checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $new_status_studiensemester_kurzbz, $new_status_datum, $new_status_ausbildungssemester, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '') + { + //$isNewStatus = $this->checkIfNewStatus($prestudent_id, $status_kurzbz); + $isNewStatus = $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == ''; + + //get start studiensemester + $result = $this->StudiensemesterModel->load([ + 'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + elseif(!hasData($result)) { + return error("Kein Eintrag für Studiensemester vorhanden! :-/" . $new_status_studiensemester_kurzbz); + } + + $studiensemester = current($result->retval); + $new_status_semesterstart = $studiensemester->start; + + //print_r($new_status_semesterstart); + + //get all prestudentstati + $resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id); + if (isError($resultPs)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($resultPs)); + } + $resultArr = $resultPs->retval; + $statusArr = array(); + + $newStatusInserted = false; + $new_status_datum_form = new DateTime($new_status_datum); + $new_status_semesterstart_form = new DateTime($new_status_semesterstart); + + foreach ($resultArr as $row) + { +/* print_r($row->studiensemester_start . " >= " . $row->datum . " UND "); + print_r($new_status_semesterstart . " >= " . $new_status_datum . " ? ");*/ + + $studiensemester_start = new DateTime($row->studiensemester_start); + $status_datum = new DateTime ($row->datum); + + + if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start) { + + if (!$newStatusInserted) + { + // neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung + $neuer_status = new stdClass(); + $neuer_status->status_kurzbz = $status_kurzbz; + $neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz; + $neuer_status->datum = $new_status_datum; + $neuer_status->ausbildungssemester = $new_status_ausbildungssemester; + $statusArr[] = $neuer_status; + $newStatusInserted = true; + } + $statusArr[] = $row; + } + elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start){ + $statusArr[] = $row; + //print_r( "cond 2 met\n"); + + } + else + { + return error("Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein"); + // print_r( "cond not met" . $count . "\n"); + } + + } + //var_dump($statusArr); + + $endstatusArr = array('Absolvent', 'Abbrecher'); + // Über alle gespeicherten Status gehen und Statusabfolge prüfen + for ($i = 0; $i < count($statusArr); $i++) { + $curr_status = $statusArr[$i]; + $curr_status_kurzbz = $curr_status->status_kurzbz; + $curr_status_ausbildungssemester = $curr_status->ausbildungssemester; + $next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag + $next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null; + + // Abbrecher- oder Absolventenstatus muss Endstatus sein + if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) { + + return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden"); + } + + // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein + //TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird + if ( + $curr_status_kurzbz == 'Unterbrecher' && isset($next_status) && $next_status->status_kurzbz == 'Unterbrecher' + && $curr_status_ausbildungssemester != $next_status->ausbildungssemester + ) + { + return error("Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben"); + } + + // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein + //TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird + if ( + isset($next_status) && $curr_status_kurzbz == 'Unterbrecher' + && $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester + ) + { + return error("Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben"); + } + + // keine Studenten nach Diplomand Status + if ( + isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student' + ) + { + return error("Nach Diplomantenstatus darf kein Studentenstatus mehr eingetragen werden"); + } + + } + + //return $statusArr; //rot + //return $resultPs->retval; //rot + //TODO(Manu) check, warum Fehlermeldung bei anderem returnwert! + return $resultPs; + } + + public function miniFunction() + { + $array = [ + 'key1' => 'value1', + 'key2' => 'value2', + 'key3' => 'value3' + ]; + + return $array; + } + + public function checkStatusabfolge($statusArr) + { + $endstatusArr = array('Absolvent', 'Abbrecher'); + $statusArr = json_decode($statusArr); + + //var_dump($statusArr); + var_dump($statusArr[0]->status_kurzbz); + // Prüfungen den Prestudentstatus betreffend + // Über alle gespeicherten Status gehen und Statusabfolge prüfen +/* for ($i = 0; $i < count($statusArr); $i++) { + $curr_status = $statusArr[$i]; + $curr_status_kurzbz = $curr_status->status_kurzbz; + $curr_status_ausbildungssemester = $curr_status->ausbildungssemester; + $next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag + $next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null; + + // Abbrecher- oder Absolventenstatus muss Endstatus sein + if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) { + + return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden"); + } + }*/ + + return $endstatusArr; + + } + + public function getAllPrestudentstatiWithStudiensemester($prestudent_id, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '') + { + + $isNewStatus = $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == ''; + + $qry = " + SELECT public.tbl_prestudentstatus.status_kurzbz, + public.tbl_prestudentstatus.studiensemester_kurzbz, + public.tbl_prestudentstatus.ausbildungssemester, + public.tbl_prestudentstatus.datum, + s.start AS studiensemester_start + FROM public.tbl_prestudentstatus + JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz) + WHERE prestudent_id = ? + ORDER BY public.tbl_prestudentstatus.datum DESC, + public.tbl_prestudentstatus.insertamum DESC, + public.tbl_prestudentstatus.ext_id DESC + "; + + $result = $this->execQuery($qry, array($prestudent_id)); + + if (isError($result)) + { + return error($result); + } + if (!hasData($result)) { + return error('No Statusdata vorhanden'); + } + + return $result; + + + +/* $this->addSelect($this->dbTable . '.status_kurzbz'); + $this->addSelect($this->dbTable . '.studiensemester_kurzbz'); + $this->addSelect($this->dbTable . '.ausbildungssemester'); + $this->addSelect($this->dbTable . '.datum'); + $this->addSelect('s.start AS studiensemester_start'); + + $this->addJoin('public.tbl_studiensemester s', 'studiensemester_kurzbz'); + $this->addOrder($this->dbTable . '.datum', 'DESC'); + $this->addOrder($this->dbTable . '.insertamum', 'DESC'); + + $this->addOrder($this->dbTable . '.ext_id', 'DESC'); + + return $this->loadWhere([ + 'prestudent_id' => $prestudent_id + ] + );*/ + + + } + + } diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php index e27fa68dc..d307c36c0 100644 --- a/application/models/crm/Student_model.php +++ b/application/models/crm/Student_model.php @@ -67,6 +67,27 @@ class Student_model extends DB_Model return $result->retval[0]->student_uid; } + /** + * Get students UID by PrestudentID. + * @param $prestudent_id + * @return mixed + */ + public function checkIfUID($prestudent_id) + { + $this->addSelect('student_uid'); + + $result = $this->loadWhere( + array('prestudent_id' => $prestudent_id) + ); + + if (!hasData($result)) + { + return error($result); + } + + return $result->retval[0]->student_uid; + } + public function searchStudent($filter) { $this->addSelect('vorname, nachname, gebdatum, person.person_id, student_uid'); diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 4706b5b93..5a6e62a38 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -51,7 +51,12 @@ export default { hasBpkPermission: this.permissions['student/bpk'], hasAliasPermission: this.permissions['student/alias'], hasPrestudentPermission: this.permissions['basis/prestudent'], - lists: this.lists + hasAssistenzPermissionForStgs: this.permissions['assistenz_stgs'], + hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'], + hasAdminPermission: this.permissions['admin'], + //hasPermissionToSkipStatusCheck: this.permission['student/keine_studdatuspruefung'], + lists: this.lists, + defaultSemester: this.defaultSemester } }, data() { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 394a6de27..aaab14983 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -28,9 +28,20 @@ export default { from: 'hasPrestudentPermission', default: false }, + hasAssistenzPermission: { + from: 'hasAssistenzPermission', + default: false + }, + hasAdminPermission: { + from: 'hasAdminPermission', + default: false + }, + defaultSemester: { + from: 'defaultSemester', + } }, props: { - modelValue: Object + modelValue: Object, }, data(){ return { @@ -541,6 +552,8 @@ export default {
+ +
Status @@ -549,18 +562,13 @@ export default {
- - -
- Gesamthistorie - -
+ +
+ Gesamthistorie + +
- + diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 6acb6259b..b7e2c1b93 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -11,6 +11,35 @@ export default{ FormForm, FormInput, }, + inject: { + defaultSemester: { + from: 'defaultSemester', + }, + hasPermissionToSkipStatusCheck: { + from: 'hasPermissionToSkipStatusCheck', + default: false + }, + hasPrestudentPermission: { + from: 'hasPrestudentPermission', + default: false + }, + hasAssistenzPermission: { + from: 'hasAssistenzPermission', + default: false + }, + hasAdminPermission: { + from: 'hasAdminPermission', + default: false + }, + hasAssistenzPermissionForStgs: { + from: 'hasAssistenzPermissionForStgs', + default: false + }, + hasSchreibrechtAss: { + from: 'hasSchreibrechtAss', + default: false + } + }, props: { prestudent_id: String }, @@ -94,11 +123,11 @@ export default{ tabulatorEvents: [], statusData: {}, listStudiensemester: [], - //maySem: [0,1,2,4,6,7], maxSem: Array.from({ length: 11 }, (_, index) => index), listStudienplaene: [], aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3}, - listStatusgruende: [] + listStatusgruende: [], + statusId: {} } }, computed: { @@ -106,19 +135,25 @@ export default{ return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz); }, }, - methods:{ - actionNewStatus(){ + methods: { + actionNewStatus() { console.log("Action: Neuen Status hinzufügen"); + this.statusData.status_kurzbz = 'Interessent'; + this.statusData.studiensemester_kurzbz = this.defaultSemester; + this.statusData.ausbildungssemester = 1; + this.statusData.datum = this.getDefaultDate(); + this.statusData.bestaetigtam = this.getDefaultDate(); this.$refs.newStatusModal.show(); }, actionEditStatus(status, stdsem, ausbildungssemester){ console.log("Action: Status bearbeiten: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") - this.loadStatus({ + this.statusId = { 'prestudent_id': this.prestudent_id, 'status_kurzbz': status, 'studiensemester_kurzbz': stdsem, 'ausbildungssemester': ausbildungssemester - }).then(() => { + }; + this.loadStatus(this.statusId).then(() => { if(this.statusData) this.$refs.editStatusModal.show(); }); @@ -126,8 +161,19 @@ export default{ actionDeleteStatus(status, stdsem, ausbildungssemester){ console.log("Action: Status löschen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") //this.$refs.deleteStatusModal.show(); + this.statusId = { + 'prestudent_id': this.prestudent_id, + 'status_kurzbz': status, + 'studiensemester_kurzbz': stdsem, + 'ausbildungssemester': ausbildungssemester + }; - this.loadStatus({ + this.loadStatus(this.statusId).then(() => { + if(this.statusData) + this.$refs.deleteStatusModal.show(); + }); + +/* this.loadStatus({ 'prestudent_id': this.prestudent_id, 'status_kurzbz': status, 'studiensemester_kurzbz': stdsem, @@ -135,7 +181,7 @@ export default{ }).then(() => { if(this.statusData) this.$refs.deleteStatusModal.show(); - }); + });*/ }, actionAdvanceStatus(status, stdsem, ausbildungssemester){ console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") @@ -155,7 +201,7 @@ export default{ this.$refs.deleteStatusModal.show(); });*/ }, - addNewStatus(statusData){ + addNewStatus(){ CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id, this.statusData ).then(response => { @@ -171,12 +217,61 @@ export default{ }); } }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Speichern Status aufgetreten'); + if (error.response) { + console.log(error.response); + this.$fhcAlert.alertError(error.response.data); + } }).finally(() => { window.scrollTo(0, 0); this.reload(); }); }, + deleteStatus(status_id){ + return CoreRESTClient.post('components/stv/Status/deleteStatus/', + status_id) + .then( + result => { + if(!result.data.error) { + this.$fhcAlert.alertSuccess('Löschen erfolgreich'); + this.hideModal('deleteStatusModal'); + this.resetModal(); + } + else + { + const errorData = result.data.retval; + this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); + } +/* return result;*/ + }).catch(error => { + this.$fhcAlert.alertError('Fehler bei Löschen von Status aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + this.reload(); + }); + }, + editStatus(status_id){ + return CoreRESTClient.post('components/stv/Status/updateStatus/' + this.prestudent_id, + this.statusData) + .then( + result => { + if(!result.data.error) { + this.$fhcAlert.alertSuccess('Bearbeitung Status erfolgreich'); + this.hideModal('editStatusModal'); + this.resetModal(); + } + else + { + const errorData = result.data.retval; + this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); + } + /* return result;*/ + }).catch(error => { + this.$fhcAlert.alertError('Fehler beim Bearbeiten des Status aufgetreten'); + }).finally(() => { + window.scrollTo(0, 0); + this.reload(); + }); + }, loadStatus(status_id){ return CoreRESTClient.post('components/stv/Status/loadStatus/', status_id) @@ -201,7 +296,12 @@ export default{ }, resetModal(){ this.statusData = {}; + this.statusId = {}; }, + getDefaultDate() { + const today = new Date(); + return today; + } }, created(){ CoreRESTClient @@ -230,13 +330,23 @@ export default{
-

TestData

+ + + + + - +
@@ -256,6 +366,8 @@ export default{ + +
@@ -267,8 +379,8 @@ export default{ type="select" name="studiensemester_kurzbz" v-model="statusData['studiensemester_kurzbz']" - > - + > +
@@ -280,7 +392,7 @@ export default{ type="select" :readonly="readonly" name="ausbildungssemester" - v-model="statusData['ausbildungssemester']" + v-model="statusData.ausbildungssemester" > @@ -294,7 +406,7 @@ export default{ type="DatePicker" :readonly="readonly" name="datum" - v-model="statusData['datum']" + v-model="statusData.datum" auto-apply :enable-time-picker="false" format="dd.MM.yyyy" @@ -310,7 +422,7 @@ export default{ type="DatePicker" :readonly="readonly" name="datum" - v-model="statusData['bestaetigtam']" + v-model="statusData.bestaetigtam" auto-apply :enable-time-picker="false" format="dd.MM.yyyy" @@ -320,7 +432,7 @@ export default{
- +
+ @@ -419,6 +532,8 @@ export default{ + +
@@ -432,7 +547,7 @@ export default{ v-model="statusData['studiensemester_kurzbz']" > - f +
@@ -555,7 +670,7 @@ export default{ @@ -565,10 +680,25 @@ export default{ + / {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?

+ + + From 88df5057fbcfbca2f720f454a1a1e7dde60d3a64 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 27 Feb 2024 16:53:37 +0100 Subject: [PATCH 139/464] =?UTF-8?q?Update,=20Vorr=C3=BCcken,=20Delete,=20R?= =?UTF-8?q?efactoring=20Statusvalidations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/components/stv/Status.php | 427 ++++++++++++++++-- application/models/crm/Prestudent_model.php | 8 +- .../models/crm/Prestudentstatus_model.php | 130 +++--- application/models/crm/Student_model.php | 55 ++- .../education/Studentlehrverband_model.php | 35 ++ .../Details/Prestudent/Status.js | 73 ++- 6 files changed, 597 insertions(+), 131 deletions(-) diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index a4ad5fd62..1618a3d52 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -55,7 +55,6 @@ class Status extends FHC_Controller }*/ //check rights - //get Studiengang von prestudent_id $this->load->model('crm/Prestudent_model', 'PrestudentModel'); $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)'); $result = $this->PrestudentModel->load([ @@ -75,8 +74,8 @@ class Status extends FHC_Controller $zgv_code = $result->zgv_code; //TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird! - $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz'); - $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin'); + $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : []; + $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : []; $granted = array_merge($granted_Ass, $granted_Adm); if(!in_array($stg, $granted)){ @@ -88,7 +87,6 @@ class Status extends FHC_Controller $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - //var_dump($_POST); $uid = getAuthUID(); $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); @@ -100,7 +98,7 @@ class Status extends FHC_Controller $anmerkung = $this->input->post('anmerkung'); $statusgrund_id = $this->input->post('statusgrund_id'); $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $this->input->post('bestaetigtvon'); + $bestaetigtvon = $uid; // Start DB transaction //$this->db->trans_start(false); @@ -123,10 +121,11 @@ class Status extends FHC_Controller $ausbildungssemester = $lastStatusData->ausbildungssemester; } - if($status_kurzbz != 'Student') + //Todo(manu) check if this check makes sense? +/* if($status_kurzbz != 'Student') { $ausbildungssemester = $lastStatusData->ausbildungssemester; - } + }*/ //check if Rolle already exists $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); @@ -134,8 +133,13 @@ class Status extends FHC_Controller { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); - //return $this->outputJson("DEBUG: in Funktion checkIfExistingPrestudentRolle"); } + if($result->retval == '1') + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + //Check ob Reihungstest berücksichtigt werden soll if(REIHUNGSTEST_CHECK) @@ -185,7 +189,24 @@ class Status extends FHC_Controller //TODO(manu) Wartender NICHT in Liste!? nur in diesem Code //FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629 - $result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id); + $result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if($result->retval == "0") + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + } + + //check if studentrolle already exists + if($status_kurzbz == 'Student') + { + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -215,13 +236,9 @@ class Status extends FHC_Controller { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); - //return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory"); } - $statusArr = $result; //wenn return result ok - } - $result = $this->PrestudentstatusModel->insert( [ 'prestudent_id' => $prestudent_id, @@ -243,8 +260,7 @@ class Status extends FHC_Controller if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - //return $this->outputJson(getError($result)); - return $this->outputJson("DEBUG: in insert Funktion"); + return $this->outputJson(getError($result)); } return $this->outputJsonSuccess(true); @@ -258,8 +274,6 @@ class Status extends FHC_Controller $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - //echo $prestudent_id . $status_kurzbz . $ausbildungssemester . $studiensemester_kurzbz; - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); @@ -281,29 +295,74 @@ class Status extends FHC_Controller } else { - //var_dump($result); $this->outputJsonSuccess(current(getData($result))); } } public function deleteStatus() { + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $prestudent_id = $this->input->post('prestudent_id'); $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); -/* var_dump($prestudent_id); - var_dump($status_kurzbz);*/ - //var_dump($_POST); + //TODO(Manu) check: warum sind beim Löschen andere Berechtigungen? + //ich darf keine Stati anlegen, aber löschen, wenn mehr als einer übrig??? +/* $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz'); + $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin'); + $granted = array_merge($granted_Ass, $granted_Adm); - //Todo(manu) - //Löschen auch aus anderen Tabellen + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $prestudent_id, + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + $stg = $result->studiengang_kz; - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + if(!in_array($stg, $granted)) + { + $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + }*/ + $isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid'); + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); + + + if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson("Studentenrolle kann nur durch den Administrator geloescht werden"); + } + + + if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) + { + //check if last status + $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + if($result->retval == "1") + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + } + + //Delete Status $result = $this->PrestudentstatusModel->delete( array( 'prestudent_id' => $prestudent_id, @@ -312,20 +371,88 @@ class Status extends FHC_Controller 'studiensemester_kurzbz' => $studiensemester_kurzbz ) ); - if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); $this->outputJson($result); } - elseif (!hasData($result)) { + elseif(!hasData($result)) { $this->outputJson($result); } - return $this->outputJsonSuccess(current(getData($result))); + //return $this->outputJsonSuccess(current(getData($result))); + + // Delete Studentlehrverband if no Status left + $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); + + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if(!hasData($result)) + { + //get student_uid + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfUid($prestudent_id); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $student_uid = $result->retval; + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->delete( + array( + 'student_uid' => $student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung"); + } + if(!hasData($result)) { + $this->outputJson($result); + } + return $this->outputJsonSuccess(true); + } + //TODO(manu) $this->db->trans_start(false); and rollback? + //TODO(manu) ganzen Prestudenten löschen, wenn kein Eintrag mehr + return $this->outputJsonSuccess(true); + + } - public function updateStatus($prestudent_id) + public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) { + //TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird! + $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : []; + $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : []; + $granted = array_merge($granted_Ass, $granted_Adm); + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $key_prestudent_id, + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if(!in_array($stg, $granted)){ + $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + //var_dump($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester); + /* $this->load->library('form_validation'); @@ -337,10 +464,8 @@ class Status extends FHC_Controller $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - var_dump($_POST); - $uid = getAuthUID(); - //$prestudent_id = $this->input->post('prestudent_id'); + $prestudent_id = $this->input->post('prestudent_id'); $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $datum = $this->input->post('datum'); @@ -348,23 +473,74 @@ class Status extends FHC_Controller $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); $studienplan_id = $this->input->post('studienplan_id'); - $anmerkung = $this->input->post('anmerkung '); + $anmerkung = $this->input->post('anmerkung'); $statusgrund_id = $this->input->post('statusgrund_id'); $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $this->input->post('bestaetigtvon'); + $bestaetigtvon = $uid; // Start DB transaction //$this->db->trans_start(false); + //check if Rolle already exists + if(($key_studiensemester_kurzbz != $studiensemester_kurzbz) + || ($key_ausbildungssemester != $ausbildungssemester)) + { + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if($result->retval == '1') + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + } + + //TODO(Manu) permission not working here... + $hasPermissionToSkipStatusCheck = $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung'); + /* var_dump($hasPermissionToSkipStatusCheck); + + $basis = $this->permissionlib->isBerechtigt('basis/prestudent'); + var_dump($basis);*/ + if(!$hasPermissionToSkipStatusCheck) + { + //Block STATUSCHECKS + //bei update wohl nicht? +/* $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); + $result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + }*/ + + $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); + + $result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + //return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory"); + } + $statusArr = $result; //wenn return result ok + + } + $result = $this->PrestudentstatusModel->update( + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + ], [ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => $status_kurzbz, 'studiensemester_kurzbz' => $studiensemester_kurzbz, 'ausbildungssemester' => $ausbildungssemester, - ], - [ - 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, 'studienplan_id' => $studienplan_id, 'anmerkung' => $anmerkung, @@ -382,7 +558,186 @@ class Status extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } + if (!hasData($result)) { + return error('No Statusdata vorhanden'); + } return $this->outputJsonSuccess(true); } + public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + { + //TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird! + $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : []; + $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : []; + $granted = array_merge($granted_Ass, $granted_Adm); + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $key_prestudent_id, + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if(!in_array($stg, $granted)){ + $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + + //Data Vorrücken + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz + ) + ); + + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson($result); + } + + elseif (!hasData($result)) { + $this->outputJson($result); + } + else + { + $statusData = current(getData($result)); + } + + $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + $result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $studiensem_next = current(getData($result)); + $studiensem_next = $studiensem_next->studiensemester_kurzbz; + + $ausbildungssem_next = $key_ausbildungssemester+1; + + //check if Rolle already exists + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($key_prestudent_id, $key_status_kurzbz, $studiensem_next, $ausbildungssem_next); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if($result->retval == '1') + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + + //check if studentrolle already exists + if($key_status_kurzbz == 'Student') + { + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if ($result->retval == "0") + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + } + + //insert prestudentstatus + $uid = getAuthUID(); + $result = $this->PrestudentstatusModel->insert( + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $studiensem_next, + 'ausbildungssemester' => $ausbildungssem_next, + 'insertamum' => date('c'), + 'insertvon' => $uid, + 'bestaetigtam' => date('c'), + 'bestaetigtvon' => $uid, + 'studienplan_id' => $statusData->studienplan_id, + 'datum' => date('c'), + 'anmerkung' => $statusData->anmerkung + + ] + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + //return $this->outputJson(getError($result)); + return $this->outputJson("DEBUG: in insert Funktion"); + } + + //Studentlehrverband anlegen + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfUid($key_prestudent_id); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $student_uid = $result->retval; + + //check if Lehrverband exists + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensem_next); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if ($result->retval == "0") + { + //load Data Lehrverband + $result = $this->StudentlehrverbandModel->load( + [ + 'student_uid' => $student_uid, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz + ]); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + + return $this->outputJson("Error in insert Studentlehrverband"); + } + $lvbData = current(getData($result)); + + $result = $this->StudentlehrverbandModel->insert( + [ + 'student_uid' => $student_uid, + 'studiensemester_kurzbz' => $studiensem_next, + 'semester' => $ausbildungssem_next, + 'verband' => $lvbData->verband, + 'gruppe' => $lvbData->gruppe, + 'insertamum' => date('c'), + 'insertvon' => $uid, + 'studiengang_kz' => $lvbData->studiengang_kz + ]); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + + return $this->outputJson("Error in insert Studentlehrverband"); + } + } + return $this->outputJsonSuccess(true); + + } + } diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 742a823f5..08653c481 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -740,6 +740,10 @@ class Prestudent_model extends DB_Model $result = $this->StudentModel->checkIfUID($prestudent_id); if(isError($result)) + { + return getData($result); + } + if($result->retval != "0") { $query = " SELECT @@ -778,7 +782,7 @@ class Prestudent_model extends DB_Model { $query = " SELECT - ps.status_kurzbz, + ps.status_kurzbz2, ps.studiensemester_kurzbz, ps.ausbildungssemester, CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, @@ -813,8 +817,6 @@ class Prestudent_model extends DB_Model "; } - - return $this->execQuery($query, array($prestudent_id)); } } diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index 84d281877..e824ebaf3 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -345,7 +345,7 @@ class Prestudentstatus_model extends DB_Model * @param string $status_kurzbz * @param string $studiensemester_kurzbz * @param integer $ausbildungssemester - * @return error if already exists, success if not + * @return 1: if Rolle exists, 0: if it doesn't * Copy from studentDBDML.php */ public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) @@ -369,12 +369,13 @@ class Prestudentstatus_model extends DB_Model { return error($result); } - elseif (!hasData($result)) { - return success($result); + elseif (!hasData($result)) + { + return success(0); } else { - return error('Diese Rolle ist bereits vorhanden: ' . $prestudent_id . ' / ' . $studiensemester_kurzbz . ' : ' . $status_kurzbz . ' /' . $ausbildungssemester . ')'); + return success("1","Diese Rolle ist bereits vorhanden!"); } } @@ -383,7 +384,7 @@ class Prestudentstatus_model extends DB_Model * @param integer $prestudent_id * @return error if no bewerberstatus, success if existing */ - public function checkIfExistingBewerberstatus($prestudent_id) + public function checkIfExistingBewerberstatus($prestudent_id, $name = null) { $qry = "SELECT * @@ -400,8 +401,10 @@ class Prestudentstatus_model extends DB_Model { return error($result); } - elseif (!hasData($result)) { - return error("Person muss zuerst zum Bewerber gemacht werden! " . $prestudent_id ); + elseif (!hasData($result)) + { + $person = $name ? $name : "Person"; + return success("0", $person . " muss zuerst zum Bewerber gemacht werden!"); } else { @@ -409,6 +412,50 @@ class Prestudentstatus_model extends DB_Model } } + /** + * Check if there is only one prestudentstatus left + * @param integer $prestudent_id + * @return success("1") if last prestudentstatusentry, else success("0") + */ + public function checkIfLastStatusEntry($prestudent_id) + { + $qry = "SELECT + COUNT(*) as anzahl + FROM + public.tbl_prestudentstatus + WHERE + prestudent_id = ? "; + + $result = $this->execQuery($qry, array($prestudent_id)); + + if (isError($result)) + { + return error($result); + } + else + { + $resultObject = current(getData($result)); + + if (property_exists($resultObject, 'anzahl')) + { + $anzahl = (int) $resultObject->anzahl; + if ($anzahl <= 1 ) + { + return success ("1", "Die letzte Rolle kann nur durch den Administrator geloescht werden"); + //return error("Die letzte Rolle kann nur durch den Administrator geloescht werden"); + } + else + return success("0", $anzahl . " Rollen vorhanden"); + //return success($anzahl); + + } + else + { + return error("PrestudentstatusModel: Error During Check if Last Status Entry."); + } + } + } + /** * Check if Datum New Status is in the Past * @param integer $prestudent_id @@ -456,8 +503,6 @@ class Prestudentstatus_model extends DB_Model $studiensemester = current($result->retval); $new_status_semesterstart = $studiensemester->start; - //print_r($new_status_semesterstart); - //get all prestudentstati $resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id); if (isError($resultPs)) @@ -474,9 +519,6 @@ class Prestudentstatus_model extends DB_Model foreach ($resultArr as $row) { -/* print_r($row->studiensemester_start . " >= " . $row->datum . " UND "); - print_r($new_status_semesterstart . " >= " . $new_status_datum . " ? ");*/ - $studiensemester_start = new DateTime($row->studiensemester_start); $status_datum = new DateTime ($row->datum); @@ -498,17 +540,14 @@ class Prestudentstatus_model extends DB_Model } elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start){ $statusArr[] = $row; - //print_r( "cond 2 met\n"); } else { return error("Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein"); - // print_r( "cond not met" . $count . "\n"); } } - //var_dump($statusArr); $endstatusArr = array('Absolvent', 'Abbrecher'); // Über alle gespeicherten Status gehen und Statusabfolge prüfen @@ -526,7 +565,6 @@ class Prestudentstatus_model extends DB_Model } // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein - //TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird if ( $curr_status_kurzbz == 'Unterbrecher' && isset($next_status) && $next_status->status_kurzbz == 'Unterbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester @@ -536,7 +574,6 @@ class Prestudentstatus_model extends DB_Model } // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein - //TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird if ( isset($next_status) && $curr_status_kurzbz == 'Unterbrecher' && $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester @@ -561,47 +598,10 @@ class Prestudentstatus_model extends DB_Model return $resultPs; } - public function miniFunction() - { - $array = [ - 'key1' => 'value1', - 'key2' => 'value2', - 'key3' => 'value3' - ]; - - return $array; - } - - public function checkStatusabfolge($statusArr) - { - $endstatusArr = array('Absolvent', 'Abbrecher'); - $statusArr = json_decode($statusArr); - - //var_dump($statusArr); - var_dump($statusArr[0]->status_kurzbz); - // Prüfungen den Prestudentstatus betreffend - // Über alle gespeicherten Status gehen und Statusabfolge prüfen -/* for ($i = 0; $i < count($statusArr); $i++) { - $curr_status = $statusArr[$i]; - $curr_status_kurzbz = $curr_status->status_kurzbz; - $curr_status_ausbildungssemester = $curr_status->ausbildungssemester; - $next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag - $next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null; - - // Abbrecher- oder Absolventenstatus muss Endstatus sein - if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) { - - return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden"); - } - }*/ - - return $endstatusArr; - - } - public function getAllPrestudentstatiWithStudiensemester($prestudent_id, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '') { + //Todo(manu) check isNewStatus $isNewStatus = $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == ''; $qry = " @@ -630,26 +630,6 @@ class Prestudentstatus_model extends DB_Model return $result; - - -/* $this->addSelect($this->dbTable . '.status_kurzbz'); - $this->addSelect($this->dbTable . '.studiensemester_kurzbz'); - $this->addSelect($this->dbTable . '.ausbildungssemester'); - $this->addSelect($this->dbTable . '.datum'); - $this->addSelect('s.start AS studiensemester_start'); - - $this->addJoin('public.tbl_studiensemester s', 'studiensemester_kurzbz'); - $this->addOrder($this->dbTable . '.datum', 'DESC'); - $this->addOrder($this->dbTable . '.insertamum', 'DESC'); - - $this->addOrder($this->dbTable . '.ext_id', 'DESC'); - - return $this->loadWhere([ - 'prestudent_id' => $prestudent_id - ] - );*/ - - } diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php index d307c36c0..9ccaff1a4 100644 --- a/application/models/crm/Student_model.php +++ b/application/models/crm/Student_model.php @@ -80,12 +80,20 @@ class Student_model extends DB_Model array('prestudent_id' => $prestudent_id) ); - if (!hasData($result)) + if(isError($result)) { - return error($result); + return error("0", "Error while checking student_uid"); } - return $result->retval[0]->student_uid; + if (!hasData($result)) + { + return success("0","Keine Student_uid vorhanden"); + } + + $student_uid = $result->retval[0]->student_uid; + + return success ($student_uid); + } public function searchStudent($filter) @@ -113,4 +121,45 @@ class Student_model extends DB_Model { return $student_uid . '@' . DOMAIN; } + + /** + * Check if StudentenRolle already exists + * @param integer $prestudent_id + * @return 0 if not exists, count(rollen) if it does + * Copy from studentDBDML.php + */ + public function checkIfExistingStudentRolle($prestudent_id) + { + $qry = "SELECT + count(*) as anzahl + FROM + public.tbl_student + WHERE + prestudent_id = ? "; + + $result = $this->execQuery($qry, array($prestudent_id)); + + if (isError($result)) + { + return error($result); + } + else { + $resultObject = current(getData($result)); + + if (property_exists($resultObject, 'anzahl')) { + $resultValue = (int) $resultObject->anzahl; + + if ($resultValue > 0) + { + return success($resultValue, $resultValue . " vorhandene Rollen"); + } + else + { + return success("0", "Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter 'Status aendern' den Punkt 'Student'"); + } + } else { + return error("StudentModel: Error During Check if Existing Student Rolle."); + } + } + } } diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php index 765429396..e27b14b00 100644 --- a/application/models/education/Studentlehrverband_model.php +++ b/application/models/education/Studentlehrverband_model.php @@ -12,4 +12,39 @@ class Studentlehrverband_model extends DB_Model $this->pk = array('studiensemester_kurzbz', 'student_uid'); $this->hasSequence = false; } + + /** + * Check if Rolle already exists + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $studiensemester_kurzbz + * @param integer $ausbildungssemester + * @return 1: if Rolle exists, 0: if it doesn't + */ + public function checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz) + { + $qry = "SELECT + * + FROM + public.tbl_studentlehrverband + WHERE + student_uid = ? + AND + studiensemester_kurzbz = ?"; + + $result = $this->execQuery($qry, array($student_uid, $studiensemester_kurzbz)); + + if (isError($result)) + { + return error($result); + } + elseif (!hasData($result)) + { + return success("0", "Kein Lehrverband vorhanden!"); + } + else + { + return success("1","Lehrverband vorhanden!"); + } + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index b7e2c1b93..1d83db1b1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -186,11 +186,16 @@ export default{ actionAdvanceStatus(status, stdsem, ausbildungssemester){ console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") //this.$refs.deleteStatusModal.show(); - - /* this.loadStatus(status_id).then(() => { - if(this.statusData.bankverbindung_id) - this.$refs.deleteStatusModal.show(); - });*/ + this.statusId = { + 'prestudent_id': this.prestudent_id, + 'status_kurzbz': status, + 'studiensemester_kurzbz': stdsem, + 'ausbildungssemester': ausbildungssemester + }; + this.loadStatus(this.statusId).then(() => { + if(this.statusData) + this.advanceStatus(this.statusId); + }); }, actionConfirmStatus(status, stdsem, ausbildungssemester){ console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") @@ -226,6 +231,33 @@ export default{ this.reload(); }); }, + advanceStatus(statusId){ + return CoreRESTClient.post('components/stv/Status/advanceStatus/' + + this.statusId.prestudent_id + '/' + + this.statusId.status_kurzbz + '/' + + this.statusId.studiensemester_kurzbz + '/' + + this.statusId.ausbildungssemester) + .then( + result => { + if(!result.data.error) { + this.$fhcAlert.alertSuccess('Vorrückung Status erfolgreich'); + } + else + { + const errorData = result.data.retval; + this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); + } + /* return result;*/ + }).catch(error => { + if (error.response) { + console.log(error.response); + this.$fhcAlert.alertError(error.response.data); + } + }).finally(() => { + window.scrollTo(0, 0); + this.reload(); + }); + }, deleteStatus(status_id){ return CoreRESTClient.post('components/stv/Status/deleteStatus/', status_id) @@ -243,14 +275,21 @@ export default{ } /* return result;*/ }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Löschen von Status aufgetreten'); + if (error.response) { + //console.log(error.response); + this.$fhcAlert.alertError(error.response.data); + } }).finally(() => { window.scrollTo(0, 0); this.reload(); }); }, - editStatus(status_id){ - return CoreRESTClient.post('components/stv/Status/updateStatus/' + this.prestudent_id, + editStatus(){ + return CoreRESTClient.post('components/stv/Status/updateStatus/' + + this.statusId.prestudent_id + '/' + + this.statusId.status_kurzbz + '/' + + this.statusId.studiensemester_kurzbz + '/' + + this.statusId.ausbildungssemester, this.statusData) .then( result => { @@ -266,7 +305,10 @@ export default{ } /* return result;*/ }).catch(error => { - this.$fhcAlert.alertError('Fehler beim Bearbeiten des Status aufgetreten'); + if (error.response) { + console.log(error.response); + this.$fhcAlert.alertError(error.response.data); + } }).finally(() => { window.scrollTo(0, 0); this.reload(); @@ -330,17 +372,17 @@ export default{
- +
- +
+

{{statusId}}

@@ -515,6 +557,8 @@ export default{ + +
@@ -524,6 +568,7 @@ export default{ v-model="statusData['status_kurzbz']" name="status_kurzbz" type="select" + disabled > @@ -670,7 +715,7 @@ export default{ From 77e31f2da6421164c7efd60021b38304e0649079 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 29 Feb 2024 10:58:45 +0100 Subject: [PATCH 140/464] Delete Prestudent --- .../controllers/components/stv/Status.php | 94 ++++++++++++++----- application/models/crm/Prestudent_model.php | 4 +- .../models/crm/Prestudentstatus_model.php | 14 ++- application/models/crm/Student_model.php | 2 +- .../Studentenverwaltung/Details/Prestudent.js | 1 + .../Details/Prestudent/Status.js | 14 +-- 6 files changed, 90 insertions(+), 39 deletions(-) diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index 1618a3d52..fa1ec9295 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -111,7 +111,14 @@ class Status extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } - $lastStatusData = current(getData($result)); + elseif(!hasData($result)) + { + $lastStatusData = []; +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson("donn holt nittan");*/ + } + else + $lastStatusData = current(getData($result)); //var_dump($lastStatusData); //Different handling depending on newStatus @@ -214,7 +221,7 @@ class Status extends FHC_Controller } } - //TODO(Manu) permission not working here... + //TODO(Manu) check permission... $hasPermissionToSkipStatusCheck = $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung'); /* var_dump($hasPermissionToSkipStatusCheck); @@ -309,8 +316,9 @@ class Status extends FHC_Controller $status_kurzbz = $this->input->post('status_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $deletePrestudent = false; - //TODO(Manu) check: warum sind beim Löschen andere Berechtigungen? + //TODO(Manu) check permissions: warum sind beim Löschen andere Berechtigungen? //ich darf keine Stati anlegen, aber löschen, wenn mehr als einer übrig??? /* $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz'); $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin'); @@ -346,22 +354,28 @@ class Status extends FHC_Controller } - if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) + //check if last status + $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); + if (isError($result)) { - //check if last status - $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - if($result->retval == "1") + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + if($result->retval == "1") + { + //Berechtigungen nach Check prüfen! + if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson($result->code); } + else + { + $deletePrestudent = true; + } } + //TODO(manu) $this->db->trans_start(false); and rollback? //Delete Status $result = $this->PrestudentstatusModel->delete( array( @@ -376,29 +390,31 @@ class Status extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); $this->outputJson($result); } - elseif(!hasData($result)) { + if(!hasData($result)) { $this->outputJson($result); } - //return $this->outputJsonSuccess(current(getData($result))); - // Delete Studentlehrverband if no Status left + //Delete Studentlehrverband if no Status left $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); - if(isError($result)) - { + if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } - if(!hasData($result)) + if (!hasData($result)) { //get student_uid $this->load->model('crm/Student_model', 'StudentModel'); $result = $this->StudentModel->checkIfUid($prestudent_id); - if(isError($result)) + if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } + if (!hasData($result)) + { + $this->outputJson($result); + } $student_uid = $result->retval; $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); @@ -413,16 +429,42 @@ class Status extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); $this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung"); } - if(!hasData($result)) { + if (!hasData($result)) + { + $this->outputJson($result); + var_dump("no data2"); + } + $this->outputJsonSuccess(true); + + } + + //Delete Prestudent if no data is left + if($deletePrestudent) + { + //TODO(manu) check all connected tables and delete them + //es wird noch auf prestudent_dokumentprestudent verwiesen + //löschen zuerst von Doks + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->delete( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); $this->outputJson($result); } - return $this->outputJsonSuccess(true); + if(!hasData($result)) + { + $this->outputJson($result); + } + $this->outputJson($result); + + } - //TODO(manu) $this->db->trans_start(false); and rollback? - //TODO(manu) ganzen Prestudenten löschen, wenn kein Eintrag mehr + return $this->outputJsonSuccess(true); - - } public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) @@ -498,7 +540,7 @@ class Status extends FHC_Controller } } - //TODO(Manu) permission not working here... + //TODO(Manu) check permissions $hasPermissionToSkipStatusCheck = $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung'); /* var_dump($hasPermissionToSkipStatusCheck); diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 08653c481..1938e661a 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -743,7 +743,7 @@ class Prestudent_model extends DB_Model { return getData($result); } - if($result->retval != "0") + if($result->retval == "0") //wenn kein studentlehrband eingetragen { $query = " SELECT @@ -782,7 +782,7 @@ class Prestudent_model extends DB_Model { $query = " SELECT - ps.status_kurzbz2, + ps.status_kurzbz, ps.studiensemester_kurzbz, ps.ausbildungssemester, CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index e824ebaf3..593a13452 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -504,13 +504,19 @@ class Prestudentstatus_model extends DB_Model $new_status_semesterstart = $studiensemester->start; //get all prestudentstati + //TODO(manu) errorlogic $resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id); if (isError($resultPs)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($resultPs)); + $resultArr = []; } - $resultArr = $resultPs->retval; + if(!hasData($resultPs)) + { + $resultArr = []; + } + else + $resultArr = $resultPs->retval; + $statusArr = array(); $newStatusInserted = false; @@ -625,7 +631,7 @@ class Prestudentstatus_model extends DB_Model return error($result); } if (!hasData($result)) { - return error('No Statusdata vorhanden'); + return success("0",'No Statusdata vorhanden'); } return $result; diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php index 9ccaff1a4..364524df9 100644 --- a/application/models/crm/Student_model.php +++ b/application/models/crm/Student_model.php @@ -82,7 +82,7 @@ class Student_model extends DB_Model if(isError($result)) { - return error("0", "Error while checking student_uid"); + return error( "Error while checking student_uid"); } if (!hasData($result)) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index aaab14983..7f3517ee9 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -198,6 +198,7 @@ export default {
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 1d83db1b1..4969d9b55 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -200,11 +200,13 @@ export default{ actionConfirmStatus(status, stdsem, ausbildungssemester){ console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") //this.$refs.deleteStatusModal.show(); - - /* this.loadStatus(status_id).then(() => { - if(this.statusData.bankverbindung_id) - this.$refs.deleteStatusModal.show(); - });*/ + this.statusId = { + 'prestudent_id': this.prestudent_id, + 'status_kurzbz': status, + 'studiensemester_kurzbz': stdsem, + 'ausbildungssemester': ausbildungssemester + }; + console.log(this.statusId); }, addNewStatus(){ CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id, @@ -590,7 +592,7 @@ export default{ type="select" name="studiensemester_kurzbz" v-model="statusData['studiensemester_kurzbz']" - > + >
From b98794a292daa684352d24bd05875c78ab0c55a2 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 4 Mar 2024 08:40:08 +0100 Subject: [PATCH 141/464] fix bug Validierung checkifExistingStudentRolle --- application/controllers/components/stv/Status.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index fa1ec9295..4c5770779 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -219,6 +219,11 @@ class Status extends FHC_Controller $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } + if($result->retval == "0") + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } } //TODO(Manu) check permission... From a7f1e43225ffc563b18f4dffdc2f9c8b23181334 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 4 Mar 2024 10:10:35 +0100 Subject: [PATCH 142/464] Status als eigener Tab --- .../controllers/components/stv/Config.php | 4 ++++ application/models/crm/Student_model.php | 3 ++- .../Studentenverwaltung/Details/Prestudent.js | 17 +++++------------ .../Details/Prestudent/Status.js | 2 +- .../Stv/Studentenverwaltung/Details/Status.js | 18 ++++++++++++++++++ 5 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Status.js diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php index 5c6b52c9c..47842822c 100644 --- a/application/controllers/components/stv/Config.php +++ b/application/controllers/components/stv/Config.php @@ -31,6 +31,10 @@ class Config extends FHC_Controller 'title' => 'PreStudentIn', 'component' => './Stv/Studentenverwaltung/Details/Prestudent.js' ]; + $result['status'] = [ + 'title' => 'Status', + 'component' => './Stv/Studentenverwaltung/Details/Status.js' + ]; $result['noten'] = [ 'title' => 'Noten', 'component' => './Stv/Studentenverwaltung/Details/Noten.js' diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php index 364524df9..e6df423d4 100644 --- a/application/models/crm/Student_model.php +++ b/application/models/crm/Student_model.php @@ -143,7 +143,8 @@ class Student_model extends DB_Model { return error($result); } - else { + else + { $resultObject = current(getData($result)); if (property_exists($resultObject, 'anzahl')) { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 7f3517ee9..6f067795c 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -554,24 +554,17 @@ export default {
- - -
- Status - -
- -
-
Gesamthistorie
+ + - - -
` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 4969d9b55..97e47dfa1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -356,7 +356,7 @@ export default{ }) .catch(this.$fhcAlert.handleSystemError); CoreRESTClient - .get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id) + .get('components/stv/Prestudent/getStudienplaene/' + this.modelValue.prestudent_id) .then(result => CoreRESTClient.getData(result.data) || []) .then(result => { this.listStudienplaene = result; diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Status.js new file mode 100644 index 000000000..b7ecc556d --- /dev/null +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status.js @@ -0,0 +1,18 @@ +import TblStatus from "./Prestudent/Status.js"; + +export default { + components: { + TblStatus + }, + props: { + modelValue: Object, + }, + template: ` +
+
+ Status + +
+
+ ` +} \ No newline at end of file From caac612a0d4247c7ce3155b0c97472dc010f7c6b Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 4 Mar 2024 15:45:54 +0100 Subject: [PATCH 143/464] confirm status and add transactions --- .../controllers/components/stv/Status.php | 145 ++++++++++++++++-- .../Studentenverwaltung/Details/Prestudent.js | 6 +- .../Details/Prestudent/Status.js | 52 ++++--- 3 files changed, 164 insertions(+), 39 deletions(-) diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index 4c5770779..d29c32982 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -100,9 +100,6 @@ class Status extends FHC_Controller $rt_stufe = $this->input->post('rt_stufe'); $bestaetigtvon = $uid; - // Start DB transaction - //$this->db->trans_start(false); - //GET lastStatus $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); @@ -114,12 +111,9 @@ class Status extends FHC_Controller elseif(!hasData($result)) { $lastStatusData = []; -/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson("donn holt nittan");*/ } else $lastStatusData = current(getData($result)); - //var_dump($lastStatusData); //Different handling depending on newStatus if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand') @@ -251,6 +245,9 @@ class Status extends FHC_Controller } } + // Start DB transaction + $this->db->trans_start(false); + $result = $this->PrestudentstatusModel->insert( [ 'prestudent_id' => $prestudent_id, @@ -269,13 +266,21 @@ class Status extends FHC_Controller 'rt_stufe' => $rt_stufe ] ); - if (isError($result)) + + // Transaction complete! + $this->db->trans_complete(); + + if ($this->db->trans_status() === false || isError($result)) { + $this->db->trans_rollback(); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson(getError($result)); } - - return $this->outputJsonSuccess(true); + else + { + $this->db->trans_commit(); + return $this->outputJsonSuccess(true); + } } public function loadStatus() @@ -380,6 +385,9 @@ class Status extends FHC_Controller } } + // Start DB transaction + $this->db->trans_start(false); + //TODO(manu) $this->db->trans_start(false); and rollback? //Delete Status $result = $this->PrestudentstatusModel->delete( @@ -390,15 +398,22 @@ class Status extends FHC_Controller 'studiensemester_kurzbz' => $studiensemester_kurzbz ) ); - if (isError($result)) + + // Transaction complete! + $this->db->trans_complete(); + + if ( $this->db->trans_status() === false || isError($result)) { + $this->db->trans_rollback(); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); + return $this->outputJson($result); } if(!hasData($result)) { $this->outputJson($result); } + $this->db->trans_commit(); + //Delete Studentlehrverband if no Status left $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); @@ -706,6 +721,9 @@ class Status extends FHC_Controller } } + // Start DB transaction + $this->db->trans_start(false); + //insert prestudentstatus $uid = getAuthUID(); $result = $this->PrestudentstatusModel->insert( @@ -721,14 +739,17 @@ class Status extends FHC_Controller 'studienplan_id' => $statusData->studienplan_id, 'datum' => date('c'), 'anmerkung' => $statusData->anmerkung - ] ); - if (isError($result)) + + // Transaction complete! + $this->db->trans_complete(); + + if ($this->db->trans_status() === false || isError($result)) { + $this->db->trans_rollback(); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - //return $this->outputJson(getError($result)); - return $this->outputJson("DEBUG: in insert Funktion"); + return $this->outputJson(getError($result)); } //Studentlehrverband anlegen @@ -778,13 +799,105 @@ class Status extends FHC_Controller ]); if (isError($result)) { + $this->db->trans_rollback(); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson("Error in insert Studentlehrverband"); } } + $this->db->trans_commit(); + return $this->outputJsonSuccess(true); + } + + public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + { + $uid = getAuthUID(); + //TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird! + $granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : []; + $granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : []; + $granted = array_merge($granted_Ass, $granted_Adm); + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $key_prestudent_id, + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if(!in_array($stg, $granted)){ + $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz + ) + ); + + if (isError($result)) { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $this->outputJson($result); + } + + elseif (!hasData($result)) { + $this->outputJson($result); + } + else + { + $statusData = current(getData($result)); + } + + //check if Status is unconfirmed.. TODO(manu) check further conditions? Status < Student + if($statusData->bestaetigtam != NULL) + { + $result = "Der Status ist bereits bestätigt!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + + //check if Bewerbung abgeschickt + if($statusData->bewerbung_abgeschicktamum == NULL) + { + $result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + + $result = $this->PrestudentstatusModel->update( + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + ], + [ + 'bestaetigtam' => date('c'), + 'bestaetigtvon' => $uid + ] + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if (!hasData($result)) { + return error('No Statusdata vorhanden'); + } return $this->outputJsonSuccess(true); } - } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 6f067795c..c4015114d 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -111,8 +111,6 @@ export default { } });*/ - - }, detectChanges() { const delta = {}; @@ -537,7 +535,7 @@ export default {
-
+ diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 97e47dfa1..03effa24b 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -206,7 +206,10 @@ export default{ 'studiensemester_kurzbz': stdsem, 'ausbildungssemester': ausbildungssemester }; - console.log(this.statusId); + this.loadStatus(this.statusId).then(() => { + if(this.statusData) + this.confirmStatus(this.statusId); + }); }, addNewStatus(){ CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id, @@ -260,6 +263,33 @@ export default{ this.reload(); }); }, + confirmStatus(statusId){ + return CoreRESTClient.post('components/stv/Status/confirmStatus/' + + this.statusId.prestudent_id + '/' + + this.statusId.status_kurzbz + '/' + + this.statusId.studiensemester_kurzbz + '/' + + this.statusId.ausbildungssemester) + .then( + result => { + if(!result.data.error) { + this.$fhcAlert.alertSuccess('Bestätigung Status erfolgreich'); + } + else + { + const errorData = result.data.retval; + this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); + } + /* return result;*/ + }).catch(error => { + if (error.response) { + console.log(error.response); + this.$fhcAlert.alertError(error.response.data); + } + }).finally(() => { + window.scrollTo(0, 0); + this.reload(); + }); + }, deleteStatus(status_id){ return CoreRESTClient.post('components/stv/Status/deleteStatus/', status_id) @@ -356,7 +386,7 @@ export default{ }) .catch(this.$fhcAlert.handleSystemError); CoreRESTClient - .get('components/stv/Prestudent/getStudienplaene/' + this.modelValue.prestudent_id) + .get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id) .then(result => CoreRESTClient.getData(result.data) || []) .then(result => { this.listStudienplaene = result; @@ -388,7 +418,6 @@ export default{ - @@ -428,7 +457,7 @@ export default{
- +
@@ -729,21 +758,6 @@ export default{

Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}} / {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?

- - From 861f8a728873f4f6124c76d9190663bb7ed19eae Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 5 Mar 2024 08:47:45 +0100 Subject: [PATCH 144/464] Prestudent: Button Save inactive, if there are changes --- .../Studentenverwaltung/Details/Prestudent.js | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index c4015114d..9407355cd 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -56,13 +56,32 @@ export default { listStgTyp: [], listFoerderrelevant: [], initialFormData: {}, - deltaArray: [], - actionUpdate: false, + deltaArray: {}, + actionUpdate: false }; }, computed: { + deltaLength() { + return Object.keys(this.deltaArray).length; + } }, watch: { + data: { + // TODO(chris): use @input instead? + handler(n) { + + const delta = {}; + for (const key in this.data) { + if (this.data[key] !== this.initialFormData[key]) { + delta[key] = this.data[key]; + this.actionUpdate = true; + } + } + //this.deltaArray.push(delta); + this.deltaArray = delta; + }, + deep: true + } }, methods: { @@ -78,13 +97,6 @@ export default { .catch(this.$fhcAlert.handleSystemError); }, updatePrestudent(){ - this.detectChanges(); - -/* this.$nextTick(() => { - - if (this.actionUpdate) { - console.log("Action");*/ - //todo(manu) checken, ob überhaupt eine Änderung vorgenommen wurde CoreRESTClient.post('components/stv/Prestudent/updatePrestudent/' + this.modelValue.prestudent_id, this.deltaArray ).then(response => { @@ -105,14 +117,9 @@ export default { }).finally(() => { window.scrollTo(0, 0); }); - -/* } else { - console.log("no action"); - } - });*/ - }, - detectChanges() { +/* //besser im watch teil, dann wird Änderung immer verfolgt +detectChanges() { const delta = {}; for (const key in this.data) { if (this.data[key] !== this.initialFormData[key]) { @@ -121,7 +128,7 @@ export default { } } this.deltaArray.push(delta); - }, + },*/ }, created() { this.loadPrestudent(); @@ -196,13 +203,11 @@ export default {
- - +
-
Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}} - +
- -
+ +
Gesamthistorie
From 35bf6a2efd592972dbc1641d5f8830f2933448b4 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 5 Mar 2024 09:31:50 +0100 Subject: [PATCH 145/464] Tab Status: show Dropdown Statusgruende only if exisiting --- .../Details/Prestudent/Status.js | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 03effa24b..450ca6283 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -127,13 +127,26 @@ export default{ listStudienplaene: [], aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3}, listStatusgruende: [], - statusId: {} + statusId: {}, + gruendeLength: {} } }, computed: { gruende() { return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz); }, +/* gruendeLength() { + //return Object.keys(this.gruende).length; + return 33; + }*/ + }, + watch: { + data: { + handler(n) { + const start = this.status_kurzbz; + }, + deep: true + } }, methods: { actionNewStatus() { @@ -407,6 +420,9 @@ export default{

TestData

{{statusData}}
+ {{gruende}} + {{gruendeLength}} + -
+ +
- @@ -728,8 +742,7 @@ export default{
- -
+
Date: Tue, 5 Mar 2024 10:34:01 +0100 Subject: [PATCH 146/464] css --- public/css/Tabulator5.css | 8 +++++++- .../Details/Prestudent/Status.js | 15 --------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css index 2c7fa9117..c5e0b6486 100644 --- a/public/css/Tabulator5.css +++ b/public/css/Tabulator5.css @@ -1,4 +1,4 @@ -@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css'; +@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_simple.min.css'; /* Apply borders and background to Cell instead of the Row * otherwise frozen columns won't look good (columns behind @@ -38,6 +38,12 @@ .tabulator .tabulator-col-resize-handle:last-of-type { z-index: 999999; } +.tabulator-cell .btn { + padding: 0 .5rem; + max-height: 22px; + min-width: 30px; +} + .tabulator { font-size: 1rem; } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 450ca6283..3b7c5a341 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -135,18 +135,6 @@ export default{ gruende() { return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz); }, -/* gruendeLength() { - //return Object.keys(this.gruende).length; - return 33; - }*/ - }, - watch: { - data: { - handler(n) { - const start = this.status_kurzbz; - }, - deep: true - } }, methods: { actionNewStatus() { @@ -419,9 +407,6 @@ export default{

TestData

{{statusData}} -
- {{gruende}} - {{gruendeLength}}
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 - +
` From 27715c7f5ffcf0052532ee446461186210e1750e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 21 Mar 2024 13:28:51 +0100 Subject: [PATCH 161/464] update prestudent: uft8-coding, foerderrelevant, permissions --- .../controllers/components/stv/Prestudent.php | 59 +++++++++++++------ .../Studentenverwaltung/Details/Prestudent.js | 55 +++++++---------- 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 3851a0144..7cc6bc768 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -13,6 +13,7 @@ class Prestudent extends FHC_Controller // Load Libraries $this->load->library('AuthLib'); $this->load->library('VariableLib', ['uid' => getAuthUID()]); + $this->load->library('PermissionLib'); // Load language phrases /* $this->loadPhrases([ @@ -57,15 +58,36 @@ class Prestudent extends FHC_Controller var_dump($prestudentData);*/ + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $prestudent_id, + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) ) + { + $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result); + } + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - $deltaData = $_POST[0]; + + $deltaData = $_POST; if(!$prestudent_id) { return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); } - //Todo(manu) updateamum, updatevon ergänzen $uid = getAuthUID(); $array_allowed_props_prestudent = [ @@ -87,7 +109,7 @@ class Prestudent extends FHC_Controller 'bismelden', 'anmerkung', 'dual', - 'zgvdoktor_code', //Todo(Manu) tabelle leer? db zum testen + 'zgvdoktor_code', 'zgvdoktorort', 'zgvdoktordatum', 'zgvdoktornation', @@ -102,31 +124,30 @@ class Prestudent extends FHC_Controller 'standort_code' ]; -/* foreach ($array_allowed_props_prestudent as $prop) - { - - - }*/ - -/* "insertamum": "2021-05-27 13:03:08", - "insertvon": "online", - "updateamum": "2022-10-10 15:37:31.903056", - "updatevon": "poeckl", "ext_id": null,*/ - $update_prestudent = array(); foreach ($array_allowed_props_prestudent as $prop) { $val = isset($deltaData[$prop]) ? $deltaData[$prop] : null; - if ($val !== null) { + if ($val !== null || $prop == 'foerderrelevant') { $update_prestudent[$prop] = $val; } } -/* - var_dump("update Array"); - var_dump($update_prestudent);*/ + $update_prestudent['updateamum'] = date('c'); + $update_prestudent['updatevon'] = $uid; + function utf8_decode_if_string($value) { + if (is_string($value)) { + return utf8_decode($value); + } else { + return $value; + } + } + $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent); + //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) + //$update_prestudent_encoded = array_map('utf8_decode', $update_prestudent); + var_dump($update_prestudent_encoded); if (count($update_prestudent) && $prestudent_id === null) { $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); // TODO(manu): phrase @@ -137,7 +158,7 @@ class Prestudent extends FHC_Controller { $result = $this->PrestudentModel->update( $prestudent_id, - $update_prestudent + $update_prestudent_encoded ); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index b59a50b55..c56ef4286 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -57,8 +57,12 @@ export default { listAusbildung: [], listAufmerksamdurch: [], listBerufe: [], + listFoerderrelevant: [ + { text: 'wie Studiengang', value: null }, + { text: 'Ja', value: true }, + { text: 'Nein', value: false } + ], listStgTyp: [], - listFoerderrelevant: [], initialFormData: {}, deltaArray: {}, actionUpdate: false @@ -493,7 +497,7 @@ detectChanges() {
- -
- - - -
+ + + + +
- - - +
@@ -563,16 +553,11 @@ detectChanges() {
-
+
Gesamthistorie
- - - +
` From 9038910303ea0af3827ee98dce7b5ee8212a12d4 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 22 Mar 2024 10:36:57 +0100 Subject: [PATCH 162/464] phrases --- .../controllers/components/stv/Prestudent.php | 5 +- .../Studentenverwaltung/Details/Prestudent.js | 92 +-- .../Details/Prestudent/History.js | 11 + .../Details/Prestudent/Status.js | 131 ++-- system/phrasesupdate.php | 727 +++++++++++++++--- 5 files changed, 751 insertions(+), 215 deletions(-) diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 7cc6bc768..3b71ff73e 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -136,6 +136,7 @@ class Prestudent extends FHC_Controller $update_prestudent['updateamum'] = date('c'); $update_prestudent['updatevon'] = $uid; + //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) function utf8_decode_if_string($value) { if (is_string($value)) { return utf8_decode($value); @@ -145,9 +146,7 @@ class Prestudent extends FHC_Controller } $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent); - //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) - //$update_prestudent_encoded = array_map('utf8_decode', $update_prestudent); - var_dump($update_prestudent_encoded); + if (count($update_prestudent) && $prestudent_id === null) { $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); // TODO(manu): phrase diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index c56ef4286..008e581fa 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -28,10 +28,6 @@ export default { from: 'hasPrestudentPermission', default: false }, -/* hasPermissionToSkipStatusCheck: { - from: 'hasPermissionToSkipStatusCheck', - default: false - },*/ hasAssistenzPermission: { from: 'hasAssistenzPermission', default: false @@ -126,29 +122,9 @@ export default { window.scrollTo(0, 0); }); }, -/* //besser im watch teil, dann wird Änderung immer verfolgt -detectChanges() { - const delta = {}; - for (const key in this.data) { - if (this.data[key] !== this.initialFormData[key]) { - delta[key] = this.data[key]; - this.actionUpdate = true; - } - } - this.deltaArray.push(delta); - },*/ }, created() { this.loadPrestudent(); -/* CoreRESTClient - .get('components/stv/Prestudent/getHistoryPrestudents/'+ this.modelValue.person_id) - .then(result => CoreRESTClient.getData(result.data) || []) - .then(result => { - this.historyPrestudents = result; - }) - .catch(this.$fhcAlert.handleSystemError);*/ - //initiale Daten nach dem Laden - //this.initialFormData = {...this.data}; CoreRESTClient .get('components/stv/Prestudent/getBezeichnungZGV') .then(result => CoreRESTClient.getData(result.data) || []) @@ -206,7 +182,6 @@ detectChanges() { }) .catch(this.$fhcAlert.handleSystemError); }, - mounted(){}, template: `
@@ -215,7 +190,7 @@ detectChanges() {
- Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}} + {{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}
-
- - - + + - -
- - -
+
+
Gesamthistorie
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js index fd280fd5a..78c004538 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js @@ -29,6 +29,17 @@ export default{ }, } }, + async mounted(){ + await this.$p.loadCategory(['lehre']); + + cm.getColumnByField('orgform_kurzbz').component.updateDefinition({ + title: this.$p.t('lehre', 'Organisationsform') + }); + + cm.getColumnByField('bezeichnung').component.updateDefinition({ + title: this.$p.t('lehre', 'studienplan') + }); + }, template: `
- - - - - - - - -
- - + - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- Meldestichtag erreicht - Bearbeiten nicht mehr möglich + {{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- + diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 706d84a0a..cc09201d5 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -23038,7 +23038,7 @@ array( 'insertvon' => 'system' ) ) - ) + ), // Personalverwaltung begin array( 'app' => 'core', @@ -24990,25 +24990,6 @@ array( ) ) ), - array( - 'app' => 'core', - 'category' => 'person', - 'phrase' => 'standort', - 'phrases' => array( - array( - 'sprache' => 'German', - 'text' => 'Standort', - 'description' => '', - 'insertvon' => 'system' - ), - array( - 'sprache' => 'English', - 'text' => 'location', - 'description' => '', - 'insertvon' => 'system' - ) - ) - ), array( 'app' => 'core', 'category' => 'person', @@ -25161,82 +25142,6 @@ array( ) ) ), - array( - 'app' => 'core', - 'category' => 'person', - 'phrase' => 'kontonr', - 'phrases' => array( - array( - 'sprache' => 'German', - 'text' => 'Kontonummer', - 'description' => '', - 'insertvon' => 'system' - ), - array( - 'sprache' => 'English', - 'text' => 'Address', - 'description' => '', - 'insertvon' => 'system' - ) - ) - ), - array( - 'app' => 'core', - 'category' => 'person', - 'phrase' => 'anschrift', - 'phrases' => array( - array( - 'sprache' => 'German', - 'text' => 'Anschrift', - 'description' => '', - 'insertvon' => 'system' - ), - array( - 'sprache' => 'English', - 'text' => 'Address', - 'description' => '', - 'insertvon' => 'system' - ) - ) - ), - array( - 'app' => 'core', - 'category' => 'person', - 'phrase' => 'verrechnung', - 'phrases' => array( - array( - 'sprache' => 'German', - 'text' => 'Verrechnung', - 'description' => '', - 'insertvon' => 'system' - ), - array( - 'sprache' => 'English', - 'text' => 'Billing', - 'description' => '', - 'insertvon' => 'system' - ) - ) - ), - array( - 'app' => 'core', - 'category' => 'person', - 'phrase' => 'blz', - 'phrases' => array( - array( - 'sprache' => 'German', - 'text' => 'BLZ', - 'description' => '', - 'insertvon' => 'system' - ), - array( - 'sprache' => 'English', - 'text' => 'Bank code', - 'description' => '', - 'insertvon' => 'system' - ) - ) - ), array( 'app' => 'core', 'category' => 'person', @@ -25351,6 +25256,636 @@ array( ) ) ), + //Status + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'status_rolle', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Rolle', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'role', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'status_new', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Neuen Status hinzufügen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'add new status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'status_edit', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'edit status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'status_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status löschen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'delete status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'bestaetigt_am', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bestätigt am', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'confirmed on', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'bestaetigt_von', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bestätigt von', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'confirmed by', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'insert_am', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'InsertAmUm', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'inserted on', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'insert_von', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'InsertVon', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'inserted by', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'bewerbung_abgeschickt_am', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bewerbung abgeschickt am', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'application sent on', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'aufnahmestufe', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Aufnahmestufe', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'entrance level', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'bismeldestichtag', + 'phrase' => 'meldestichtag_erreicht', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Meldestichtag erreicht - Bearbeiten nicht mehr möglich', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'report target date reached - editing no longer possible', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'status_confirm_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Prestudentstatus wirklich löschen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Really delete prestudent status?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'last_status_confirm_delete', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Das Löschen der letzten Rolle löscht auch den gesamten Prestudent-Datensatz! Möchten Sie fortfahren?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Deleting the last role also deletes the entire Prestudent record! Do you want to continue?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + //Prestudent + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'title_zgv', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zugangsvoraussetzungen für ', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Access requirements for ', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvMaster', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Master', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV master', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvMasterOrt', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Master Ort', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV master place', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvMasterDatum', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Master Datum', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV master date', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvMasterNation', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Master Nation', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV master nation', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvMasterErfuellt', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Master erfüllt', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV master fulfilled', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvDoktor', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Doktor', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV doctor', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvDoktorOrt', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Doktor Ort', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV doctor place', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvDoktorDatum', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Doktor Datum', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV doctor date', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvDoktorNation', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Doktor Nation', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV doctor nation', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zgvDoktorErfuellt', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'ZGV Doktor erfüllt', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'ZGV doctor fulfilled', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'aufmerksamDurch', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Aufmerksam durch', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'been brought to attention by', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'berufstaetigkeit', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Berufstätigkeit', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'professional activity', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'facheinschlaegigBerufstaetig', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Facheinschlägig berufstätig', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'employed in a relevant field', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bisstandort', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bisstandort', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'bis location', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'studientyp', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studientyp', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'study type', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'dual', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Duales Studium', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'dual study', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'foerderrelevant', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'förderrelevant', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'relevant for funding', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'prioritaet', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Priorität', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'priority', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'title_history', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Gesamthistorie', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Overall history', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From 1b3c052c124b80f3275208163d609454fc418e84 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 22 Mar 2024 13:00:05 +0100 Subject: [PATCH 163/464] codesniffer --- .../controllers/components/stv/Prestudent.php | 10 +- .../controllers/components/stv/Status.php | 148 ++++++++++----- .../Details/Prestudent/Status.js | 168 +++++++++--------- 3 files changed, 188 insertions(+), 138 deletions(-) diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 3b71ff73e..1a47b2162 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -72,7 +72,7 @@ class Prestudent extends FHC_Controller $stg = $result->studiengang_kz; - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) ) + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -137,7 +137,8 @@ class Prestudent extends FHC_Controller $update_prestudent['updatevon'] = $uid; //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) - function utf8_decode_if_string($value) { + function utf8_decode_if_string($value) + { if (is_string($value)) { return utf8_decode($value); } else { @@ -165,7 +166,6 @@ class Prestudent extends FHC_Controller } return $this->outputJsonSuccess(true); } - } public function getHistoryPrestudents($person_id) @@ -315,6 +315,4 @@ class Prestudent extends FHC_Controller } $this->outputJson($result); } - - -} \ No newline at end of file +} diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php index 772567106..ac880be37 100644 --- a/application/controllers/components/stv/Status.php +++ b/application/controllers/components/stv/Status.php @@ -16,9 +16,9 @@ class Status extends FHC_Controller $this->load->library('PermissionLib'); // Load language phrases - /* $this->loadPhrases([ - 'ui' - ]);*/ + $this->loadPhrases([ + 'ui', 'bismeldestichtag','lehre' + ]); } public function getHistoryPrestudent($prestudent_id) @@ -94,7 +94,7 @@ class Status extends FHC_Controller $isStudent = false; - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) ) + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -132,10 +132,10 @@ class Status extends FHC_Controller $lastStatusData = current(getData($result)); //Different handling depending on newStatus - //Todo(manu) check if these checks makes sense? + //Todo(manu) check later with multiactions /* if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand') { - //$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint? + //$studiensemester = $semester_aktuell; $ausbildungssemester = $lastStatusData->ausbildungssemester; }*/ @@ -145,7 +145,12 @@ class Status extends FHC_Controller }*/ //check if Rolle already exists - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -221,7 +226,7 @@ class Status extends FHC_Controller //check if studentrolle already exists //TODO(manu) eigener Code für Diplomand? - if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' ) + if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand') { $this->load->model('crm/Student_model', 'StudentModel'); $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); @@ -254,7 +259,13 @@ class Status extends FHC_Controller return $this->outputJson(getError($result)); } - $result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester); + $result = $this->PrestudentstatusModel->checkIfValidStatusHistory( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $new_status_datum, + $ausbildungssemester + ); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -349,7 +360,14 @@ class Status extends FHC_Controller //process studentlehrverband $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz); + $result = $this->StudentlehrverbandModel->processStudentlehrverband( + $student_uid, + $studiengang_kz, + $ausbildungssemester, + $verband, + $gruppe, + $studiensemester_kurzbz + ); if ($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); @@ -359,7 +377,7 @@ class Status extends FHC_Controller //Student updaten (fuer Abbrecher und Unterbrecher) //not active yet: works only for "status ändern" in FAS - //Later for multiactions + //Todo(Manu) Later for multiactions /* if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher') @@ -491,7 +509,6 @@ class Status extends FHC_Controller //Data of current Rolle $statusData = current(getData($result)); - //var_dump($statusData); $datum = $statusData->datum == '' ? 'null' : $statusData->datum; $insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum; @@ -523,25 +540,27 @@ class Status extends FHC_Controller $quotes_rt_stufe = $rt_stufe == "null" ? " " : "'"; $quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'"; -$sqlundo = - " - INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id) - VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "'," - . $quotes_datum . $datum . $quotes_datum . "," - . $quotes_insertamum . $insertamum . $quotes_insertamum . "," - . $quotes_insertvon . $insertvon . $quotes_insertvon . "," - . $quotes_updateamum . $updateamum . $quotes_updateamum . "," - . $quotes_updatevon . $updatevon . $quotes_updatevon . "," - . $quotes_ext_id . $ext_id . $quotes_ext_id . "," - . $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . "," - . $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . "," - . $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . "," - . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," - . $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . "," - . $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . "," - . $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . "," - . $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . "); - "; + $sqlundo = + " + INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, + datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, + anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id) + VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "'," + . $quotes_datum . $datum . $quotes_datum . "," + . $quotes_insertamum . $insertamum . $quotes_insertamum . "," + . $quotes_insertvon . $insertvon . $quotes_insertvon . "," + . $quotes_updateamum . $updateamum . $quotes_updateamum . "," + . $quotes_updatevon . $updatevon . $quotes_updatevon . "," + . $quotes_ext_id . $ext_id . $quotes_ext_id . "," + . $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . "," + . $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . "," + . $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . "," + . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," + . $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . "," + . $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . "," + . $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . "," + . $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . "); + "; //Delete Status $result = $this->PrestudentstatusModel->delete( @@ -553,8 +572,7 @@ $sqlundo = ] ); - if ( $this->db->trans_status() === false || isError($result)) - //if (isError($result)) + if($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -698,7 +716,7 @@ $sqlundo = $uid = getAuthUID(); $beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id; $sql = "DELETE FROM public.tbl_prestudent - WHERE prestudent_id = " . $prestudent_id ; + WHERE prestudent_id = " . $prestudent_id; //load prestudent für LOG sqlundo $this->load->model('crm/Prestudent_model', 'PrestudentModel'); @@ -874,7 +892,7 @@ $sqlundo = 'prestudent_id' => $prestudent_id ) ); - if ($this->db->trans_status() === FALSE) + if ($this->db->trans_status() === false) { $this->db->trans_rollback(); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -886,7 +904,6 @@ $sqlundo = } $this->db->trans_commit(); $this->outputJson($result); - } $this->db->trans_commit(); return $this->outputJsonSuccess(true); @@ -911,7 +928,7 @@ $sqlundo = $stg = $result->studiengang_kz; - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) ) + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -950,7 +967,11 @@ $sqlundo = $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); //return $this->outputJson($result->code); //Fehlermeldung überschrieben, passender - return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich"); + //TODO(Manu) phrase + //$this->p->t('bismeldestichtag','meldestichtag_erreicht'); + //return $this->outputJson($this->p->t('bismeldestichtag','status_confirm_delete')); + return $this->outputJson($this->p->t('lehre', 'meldestichtag_erreicht')); + //return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich"); } } @@ -958,7 +979,12 @@ $sqlundo = if(($key_studiensemester_kurzbz != $studiensemester_kurzbz) || ($key_ausbildungssemester != $ausbildungssemester)) { - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -997,7 +1023,13 @@ $sqlundo = { //Block STATUSCHECKS - $result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $datum, $ausbildungssemester); + $result = $this->PrestudentstatusModel->checkIfValidStatusHistory( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $datum, + $ausbildungssemester + ); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -1073,7 +1105,14 @@ $sqlundo = $studentlvbData = current(getData($result)); $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssemester, $studentlvbData->verband, $studentlvbData->gruppe, $studiensemester_kurzbz); + $result = $this->StudentlehrverbandModel->processStudentlehrverband( + $student_uid, + $studentlvbData->studiengang_kz, + $ausbildungssemester, + $studentlvbData->verband, + $studentlvbData->gruppe, + $studiensemester_kurzbz + ); if ($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); @@ -1104,7 +1143,7 @@ $sqlundo = $stg = $result->studiengang_kz; - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) ) + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -1151,7 +1190,12 @@ $sqlundo = $ausbildungssem_next = $key_ausbildungssemester+1; //check if Rolle already exists - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($key_prestudent_id, $key_status_kurzbz, $studiensem_next, $ausbildungssem_next); + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( + $key_prestudent_id, + $key_status_kurzbz, + $studiensem_next, + $ausbildungssem_next + ); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -1239,7 +1283,14 @@ $sqlundo = $studentlvbData = current($result); $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next); + $result = $this->StudentlehrverbandModel->processStudentlehrverband( + $student_uid, + $studentlvbData->studiengang_kz, + $ausbildungssem_next, + $studentlvbData->verband, + $studentlvbData->gruppe, + $studiensem_next + ); if ($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); @@ -1270,7 +1321,7 @@ $sqlundo = $stg = $result->studiengang_kz; - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) ) + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -1301,8 +1352,8 @@ $sqlundo = $statusData = current(getData($result)); } - //check if Status is unconfirmed.. TODO(manu) check further conditions? Status < Student - if($statusData->bestaetigtam != NULL) + //check if Status is unconfirmed.. + if($statusData->bestaetigtam != null) { $result = "Der Status ist bereits bestätigt!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -1310,7 +1361,7 @@ $sqlundo = } //check if Bewerbung abgeschickt - if($statusData->bewerbung_abgeschicktamum == NULL) + if($statusData->bewerbung_abgeschicktamum == null) { $result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!"; $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); @@ -1344,6 +1395,5 @@ $sqlundo = return error('No Statusdata vorhanden'); } return $this->outputJsonSuccess(true); - } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 6a800e4c9..79eec07cc 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -88,7 +88,9 @@ export default{ button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; button.title = 'Status vorrücken'; - button.addEventListener('click', () => + button.addEventListener( + 'click', + () => this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) ); container.append(button); @@ -528,9 +530,9 @@ export default{
- +
-
+
- @@ -564,10 +566,10 @@ export default{
- @@ -578,10 +580,10 @@ export default{
-
-
+
-
-
- + >
@@ -639,22 +641,22 @@ export default{
- + >
-
+
- @@ -665,10 +667,10 @@ export default{
- @@ -689,7 +691,7 @@ export default{ -
+
{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}
@@ -700,7 +702,7 @@ export default{
-
+
- @@ -735,10 +737,10 @@ export default{
- @@ -749,10 +751,10 @@ export default{
-
-
+
-
-
- + >
@@ -810,22 +812,22 @@ export default{
- + >
-
+
- @@ -836,10 +838,10 @@ export default{
- @@ -857,7 +859,7 @@ export default{ - + + - - +
` + }; \ No newline at end of file From b907f01ebb5a68d0346c1c74f0842b7f3ccd8674 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 25 Mar 2024 09:09:40 +0100 Subject: [PATCH 164/464] Phrases History and Status, Formvalidation Prestudent --- .../controllers/components/stv/Prestudent.php | 40 +++++++++---------- .../Studentenverwaltung/Details/Prestudent.js | 7 +++- .../Details/Prestudent/History.js | 5 ++- .../Details/Prestudent/Status.js | 6 ++- system/phrasesupdate.php | 21 +++++++++- 5 files changed, 53 insertions(+), 26 deletions(-) diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 1a47b2162..093126272 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -16,9 +16,9 @@ class Prestudent extends FHC_Controller $this->load->library('PermissionLib'); // Load language phrases - /* $this->loadPhrases([ - 'ui' - ]);*/ + $this->loadPhrases([ + 'ui', 'studierendenantrag' + ]); } public function get($prestudent_id) @@ -44,20 +44,6 @@ class Prestudent extends FHC_Controller $this->load->library('form_validation'); $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - //Todo(manu) Validierungen - -/* $result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } elseif (!hasData($result)) { - return $this->outputJson(getError($result)); - } else { - $prestudentData = current(getData($result)); - } - - var_dump($prestudentData);*/ - //get Studiengang von prestudent_id $this->load->model('crm/Prestudent_model', 'PrestudentModel'); $result = $this->PrestudentModel->load([ @@ -74,13 +60,25 @@ class Prestudent extends FHC_Controller if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { - $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; + $result = $this->p->t('lehre','error_keineSchreibrechte'); $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); return $this->outputJson($result); } + //TODO(Manu) neuer API Controller $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + //Form validation + $this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [ + 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung']) + ]); + + if ($this->form_validation->run() == false) + { + return $this->outputJsonError($this->form_validation->error_array()); + } + $deltaData = $_POST; if(!$prestudent_id) @@ -147,11 +145,11 @@ class Prestudent extends FHC_Controller } $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent); - if (count($update_prestudent) && $prestudent_id === null) { $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - // TODO(manu): phrase - return $this->outputJson("Kein/e PrestudentIn vorhanden!"); + // TODO(manu): check phrase + //return $this->outputJson("Kein/e PrestudentIn vorhanden!"); + return $this->outputJson($this->p->t('studierendenantrag','error_no_prestudent', $prestudent_id)); } if (count($update_prestudent)) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 008e581fa..3c33c7d55 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -116,8 +116,11 @@ export default { }); } }).catch(error => { - this.statusMsg = 'Error in Catch'; - this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten'); + if (error.response && error.response.data) { + this.$fhcAlert.alertError(error.response.data); + } else { + this.$fhcAlert.alertError("Fehler bei Speicherroutine aufgetreten"); + } }).finally(() => { window.scrollTo(0, 0); }); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js index 78c004538..54a42bba8 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js @@ -22,6 +22,7 @@ export default{ {title:"UID", field:"student_uid"}, {title:"Status", field:"status"} ], + // tabulatorEvents: [], layout: 'fitDataFill', layoutColumnsOnNewData: false, height: 'auto', @@ -32,8 +33,10 @@ export default{ async mounted(){ await this.$p.loadCategory(['lehre']); + let cm = this.$refs.table.tabulator.columnManager; + cm.getColumnByField('orgform_kurzbz').component.updateDefinition({ - title: this.$p.t('lehre', 'Organisationsform') + title: this.$p.t('lehre', 'organisationsform') }); cm.getColumnByField('bezeichnung').component.updateDefinition({ diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 79eec07cc..22b64a393 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -375,7 +375,11 @@ export default{ } else { - const errorData = result.data.retval; +/* const errorData = result.data.retval; + Object.entries(errorData).forEach(entry => { + const [key, value] = entry; + this.$fhcAlert.alertError(value); + });*/ this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); } /* return result;*/ diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index cc09201d5..8f53c4bf6 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -21991,7 +21991,7 @@ array( ), array( 'app' => 'core', - 'category' => 'studierendenantrag', + 'category' => 'studierendenantrag',q 'phrase' => 'error_no_prestudent', 'insertvon' => 'system', 'phrases' => array( @@ -25886,6 +25886,25 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_keineSchreibrechte', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Sie haben keine Schreibrechte fuer diesen Studiengang!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'You do not have writing rights for this course!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From 65c7db7ae4a3eca8e874b1a4fd7ee7d69321e5c8 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 25 Mar 2024 13:28:28 +0100 Subject: [PATCH 165/464] bugfix phrases tabulator, refactor Prestudent.js using FHCAPI_CONTROLLER --- .../api/frontend/v1/stv/Prestudent.php | 301 ++++++++++++++++++ .../api/frontend/v1/stv/Status.php | 0 .../controllers/components/stv/Prestudent.php | 4 +- .../models/crm/Prestudentstatus_model.php | 11 +- .../Studentenverwaltung/Details/Prestudent.js | 86 +++-- .../Details/Prestudent/History.js | 38 ++- .../Details/Prestudent/Status.js | 99 +++--- system/phrasesupdate.php | 19 ++ 8 files changed, 442 insertions(+), 116 deletions(-) create mode 100644 application/controllers/api/frontend/v1/stv/Prestudent.php create mode 100644 application/controllers/api/frontend/v1/stv/Status.php diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php new file mode 100644 index 000000000..1663e0dae --- /dev/null +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -0,0 +1,301 @@ + ['admin:r', 'assistenz:r'], + 'updatePrestudent' => ['admin:w', 'assistenz:w'], + 'getHistoryPrestudents' => ['admin:r', 'assistenz:r'], + 'getBezeichnungZGV' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getBezeichnungDZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getBezeichnungMZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getAusbildung' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getAufmerksamdurch' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getBerufstaetigkeit' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getTypenStg' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getStudiensemester' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getStudienplaene' => 'admin:r', // TODO(manu): self::PERM_LOGGED + ]); + + // Load Libraries + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + + + // Load language phrases + $this->loadPhrases([ + 'ui', 'studierendenantrag' + ]); + } + + public function get($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $this->PrestudentModel->addSelect('*'); + $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } elseif (!hasData($result)) { + return show_404(); + } else { + $this->terminateWithSuccess(current(getData($result))); + } + } + + public function updatePrestudent($prestudent_id) + { + $this->load->library('form_validation'); + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $prestudent_id, + ]); + if(isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + //Form validation + $this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [ + 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + $deltaData = $_POST; + + $uid = getAuthUID(); + + $array_allowed_props_prestudent = [ + 'aufmerksamdurch_kurzbz', + 'studiengang_kz', + 'gsstudientyp_kurzbz', + 'person_id', + 'berufstaetigkeit_code', + 'ausbildungcode', + 'zgv_code', + 'zgvort', + 'zgvdatum', + 'zgvnation', + 'zgvmas_code', + 'zgvmaort', + 'zgvmadatum', + 'zgvmanation', + 'facheinschlberuf', + 'bismelden', + 'anmerkung', + 'dual', + 'zgvdoktor_code', + 'zgvdoktorort', + 'zgvdoktordatum', + 'zgvdoktornation', + 'aufnahmegruppe_kurzbz', + 'priorisierung', + 'foerderrelevant', + 'zgv_erfuellt', + 'zgvmas_erfuellt', + 'zgvdoktor_erfuellt', + 'mentor', + 'aufnahmeschluessel', + 'standort_code' + ]; + + $update_prestudent = array(); + foreach ($array_allowed_props_prestudent as $prop) + { + $val = isset($deltaData[$prop]) ? $deltaData[$prop] : null; + if ($val !== null || $prop == 'foerderrelevant') { + $update_prestudent[$prop] = $val; + } + } + + $update_prestudent['updateamum'] = date('c'); + $update_prestudent['updatevon'] = $uid; + + //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) + function utf8_decode_if_string($value) + { + if (is_string($value)) { + return utf8_decode($value); + } else { + return $value; + } + } + $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent); + + if (count($update_prestudent)) + { + $result = $this->PrestudentModel->update( + $prestudent_id, + $update_prestudent_encoded + ); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(true); + } + } + + public function getHistoryPrestudents($person_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->getHistoryPrestudents($person_id); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getBezeichnungZGV() + { + $this->load->model('codex/Zgv_model', 'ZgvModel'); + + $this->ZgvModel->addOrder('zgv_code'); + + $result = $this->ZgvModel->load(); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getBezeichnungDZgv() + { + $this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel'); + + $this->ZgvdoktorModel->addOrder('zgvdoktor_code'); + + $result = $this->ZgvdoktorModel->load(); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getBezeichnungMZgv() + { + $this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel'); + + $this->ZgvmasterModel->addOrder('zgvmas_code'); + + $result = $this->ZgvmasterModel->load(); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getAusbildung() + { + $this->load->model('codex/Ausbildung_model', 'AusbildungModel'); + + $this->AusbildungModel->addOrder('ausbildungcode'); + + $result = $this->AusbildungModel->load(); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getAufmerksamdurch() + { + $this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel'); + + $this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz'); + + $result = $this->AufmerksamdurchModel->load(); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getBerufstaetigkeit() + { + $this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel'); + + $this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code'); + + $result = $this->BerufstaetigkeitModel->load(); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getTypenStg() + { + $this->load->model('education/Gsstudientyp_model', 'GsstudientypModel'); + + $this->GsstudientypModel->addOrder('gsstudientyp_kurzbz'); + + $result = $this->GsstudientypModel->load(); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getStudiensemester() + { + $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + + $this->StudiensemesterModel->addOrder('start', 'DESC'); + $this->StudiensemesterModel->addLimit(20); + + $result = $this->StudiensemesterModel->load(); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getStudienplaene($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->loadWhere( + array('prestudent_id' => $prestudent_id) + ); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + $result = current(getData($result)); + $studiengang_kz = $result->studiengang_kz; + + $this->load->model('organisation/Studienplan_model', 'StudienplanModel'); + + $this->StudienplanModel->addOrder('studienplan_id', 'DESC'); + + $result = $this->StudienplanModel->getStudienplaene($studiengang_kz); + + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } +} diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php new file mode 100644 index 000000000..e69de29bb diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php index 093126272..2a1364c87 100644 --- a/application/controllers/components/stv/Prestudent.php +++ b/application/controllers/components/stv/Prestudent.php @@ -13,7 +13,7 @@ class Prestudent extends FHC_Controller // Load Libraries $this->load->library('AuthLib'); $this->load->library('VariableLib', ['uid' => getAuthUID()]); - $this->load->library('PermissionLib'); + // Load language phrases $this->loadPhrases([ @@ -65,7 +65,7 @@ class Prestudent extends FHC_Controller return $this->outputJson($result); } - //TODO(Manu) neuer API Controller + //TODO(Manu) API Controller $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index d3f99801c..db860f1e6 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -15,6 +15,15 @@ class Prestudentstatus_model extends DB_Model $this->dbTable = 'public.tbl_prestudentstatus'; $this->pk = array('ausbildungssemester', 'studiensemester_kurzbz', 'status_kurzbz', 'prestudent_id'); $this->hasSequence = false; + +/* $CI =& get_instance(); + + $CI->load->library('PhrasesLib'); + + // Load language phrases + $CI->loadPhrases([ + 'ui', 'lehre' + ]);*/ } /** @@ -375,7 +384,7 @@ class Prestudentstatus_model extends DB_Model } else { - return success("1","Diese Rolle ist bereits vorhanden!"); + return success("1", $this->p->t('studierendenantrag','error_rolleBereitsVorhanden')); } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 3c33c7d55..cd3afe91a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -90,8 +90,8 @@ export default { methods: { loadPrestudent() { - CoreRESTClient - .get('components/stv/Prestudent/get/' + this.modelValue.prestudent_id) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/get/' + this.modelValue.prestudent_id) .then(result => result.data) .then(result => { this.data = result; @@ -101,85 +101,73 @@ export default { .catch(this.$fhcAlert.handleSystemError); }, updatePrestudent(){ - CoreRESTClient.post('components/stv/Prestudent/updatePrestudent/' + this.modelValue.prestudent_id, - this.deltaArray - ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Speichern erfolgreich'); - this.deltaArray = []; - this.actionUpdate = false; - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - if (error.response && error.response.data) { - this.$fhcAlert.alertError(error.response.data); - } else { - this.$fhcAlert.alertError("Fehler bei Speicherroutine aufgetreten"); - } - }).finally(() => { - window.scrollTo(0, 0); - }); + this.$refs.form + .post('api/frontend/v1/stv/prestudent/updatePrestudent/' + this.modelValue.prestudent_id, this.deltaArray) + .then(response => { + this.$fhcAlert.alertSuccess('Speichern erfolgreich'); + this.deltaArray = []; + this.actionUpdate = false; + }) + .catch(this.$fhcAlert.handleSystemError) + .finally(() => { + window.scrollTo(0, 0); + }); }, }, created() { this.loadPrestudent(); - CoreRESTClient - .get('components/stv/Prestudent/getBezeichnungZGV') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getBezeichnungZGV') + .then(result => result.data) .then(result => { this.listZgvs = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getBezeichnungMZGV') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getBezeichnungMZgv') + .then(result => result.data) .then(result => { this.listZgvsmaster = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getBezeichnungDZGV') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getBezeichnungDZgv') + .then(result => result.data) .then(result => { this.listZgvsdoktor = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient + CoreRESTClient //TODO(manu) FHCAPI .get('components/stv/Lists/getStgs') .then(result => CoreRESTClient.getData(result.data) || []) .then(result => { this.listStgs = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getAusbildung') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getAusbildung') + .then(result => result.data) .then(result => { this.listAusbildung = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getAufmerksamdurch') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getAufmerksamdurch') + .then(result => result.data) .then(result => { this.listAufmerksamdurch = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getBerufstaetigkeit') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getBerufstaetigkeit') + .then(result => result.data) .then(result => { this.listBerufe = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getTypenStg') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getTypenStg') + .then(result => result.data) .then(result => { this.listStgTyp = result; }) @@ -192,7 +180,7 @@ export default {
-
+
{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}
@@ -383,7 +371,7 @@ export default {
-
+
PrestudentIn
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js index 54a42bba8..41a5241db 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js @@ -1,5 +1,4 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; -import {CoreRESTClient} from "../../../../../RESTClient"; export default{ components: { @@ -11,7 +10,9 @@ export default{ data() { return { tabulatorOptions: { - ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudents/' + this.person_id), + ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.person_id, + ajaxRequestFunc: this.$fhcApi.get, + ajaxResponse: (url, params, response) => response.data, //autoColumns: true, columns:[ {title:"StSem", field:"studiensemester_kurzbz"}, @@ -22,7 +23,24 @@ export default{ {title:"UID", field:"student_uid"}, {title:"Status", field:"status"} ], - // tabulatorEvents: [], + tabulatorEvents: [ + { + event: 'tableBuilt', + handler: async () => { + await this.$p.loadCategory(['lehre']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('orgform_kurzbz').component.updateDefinition({ + title: this.$p.t('lehre', 'organisationsform') + }); + + cm.getColumnByField('bezeichnung').component.updateDefinition({ + title: this.$p.t('lehre', 'studienplan') + }); + } + } + ], layout: 'fitDataFill', layoutColumnsOnNewData: false, height: 'auto', @@ -30,24 +48,12 @@ export default{ }, } }, - async mounted(){ - await this.$p.loadCategory(['lehre']); - - let cm = this.$refs.table.tabulator.columnManager; - - cm.getColumnByField('orgform_kurzbz').component.updateDefinition({ - title: this.$p.t('lehre', 'organisationsform') - }); - - cm.getColumnByField('bezeichnung').component.updateDefinition({ - title: this.$p.t('lehre', 'studienplan') - }); - }, template: `
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 22b64a393..2fc00a642 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -149,7 +149,56 @@ export default{ height: 'auto', selectable: false, }, - tabulatorEvents: [], + tabulatorEvents: [ + { + event: 'tableBuilt', + handler: async () => { + await this.$p.loadCategory(['lehre','global','person']); + + let cm = this.$refs.table.tabulator.columnManager; + + /* cm.getColumnByField('lehrverband').component.updateDefinition({ + title: this.$p.t('lehre', 'lehrverband') + });*/ + + cm.getColumnByField('format_bestaetigtam').component.updateDefinition({ + title: this.$p.t('lehre', 'bestaetigt_am') + }); + + cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({ + title: this.$p.t('lehre', 'bewerbung_abgeschickt_am') + }); + + cm.getColumnByField('bezeichnung').component.updateDefinition({ + title: this.$p.t('lehre', 'studienplan') + }); + + cm.getColumnByField('actions').component.updateDefinition({ + title: this.$p.t('global', 'aktionen') + }); + + cm.getColumnByField('format_datum').component.updateDefinition({ + title: this.$p.t('global', 'datum') + }); + + cm.getColumnByField('anmerkung').component.updateDefinition({ + title: this.$p.t('global', 'anmerkung') + }); + + cm.getColumnByField('bestaetigtvon').component.updateDefinition({ + title: this.$p.t('lehre', 'bestaetigt_von') + }); + + cm.getColumnByField('format_insertamum').component.updateDefinition({ + title: this.$p.t('lehre', 'insert_am') + }); + + cm.getColumnByField('insertvon').component.updateDefinition({ + title: this.$p.t('lehre', 'insert_von') + }); + } + } + ], statusData: {}, listStudiensemester: [], maxSem: Array.from({ length: 11 }, (_, index) => index), @@ -472,54 +521,8 @@ export default{ }) .catch(this.$fhcAlert.handleSystemError); }, - async mounted(){ - await this.$p.loadCategory(['lehre','global','person']); + mounted(){ - let cm = this.$refs.table.tabulator.columnManager; - -/* cm.getColumnByField('lehrverband').component.updateDefinition({ - title: this.$p.t('lehre', 'lehrverband') - });*/ - - cm.getColumnByField('format_bestaetigtam').component.updateDefinition({ - title: this.$p.t('lehre', 'bestaetigt_am') - }); - - cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({ - title: this.$p.t('lehre', 'bewerbung_abgeschickt_am') - }); - - cm.getColumnByField('bezeichnung').component.updateDefinition({ - title: this.$p.t('lehre', 'studienplan') - }); - - cm.getColumnByField('actions').component.updateDefinition({ - title: this.$p.t('global', 'aktionen') - }); - - cm.getColumnByField('format_datum').component.updateDefinition({ - title: this.$p.t('global', 'datum') - }); - - cm.getColumnByField('anmerkung').component.updateDefinition({ - title: this.$p.t('global', 'anmerkung') - }); - -/* cm.getColumnByField('format_bestaetigtam').component.updateDefinition({ - title: this.$p.t('lehre', 'bestaetigt_am') - });*/ - - cm.getColumnByField('bestaetigtvon').component.updateDefinition({ - title: this.$p.t('lehre', 'bestaetigt_von') - }); - - cm.getColumnByField('format_insertamum').component.updateDefinition({ - title: this.$p.t('lehre', 'insert_am') - }); - - cm.getColumnByField('insertvon').component.updateDefinition({ - title: this.$p.t('lehre', 'insert_von') - }); }, template: `
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 8f53c4bf6..753991992 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -25905,6 +25905,25 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_rolleBereitsVorhanden', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Diese Rolle ist bereits vorhanden!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'This role already exists!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From 3023cd2e94c9ae0b1f743b8ab64f9b771aa01347 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 27 Mar 2024 11:23:38 +0100 Subject: [PATCH 166/464] Refactor status for api-controller, add phrases for alerts --- .../api/frontend/v1/stv/Prestudent.php | 38 +- .../api/frontend/v1/stv/Status.php | 1362 ++++++++++++++++ .../controllers/components/stv/Prestudent.php | 316 ---- .../controllers/components/stv/Status.php | 1399 ----------------- .../models/crm/Prestudentstatus_model.php | 16 +- .../Studentenverwaltung/Details/Prestudent.js | 1 - .../Details/Prestudent/Status.js | 170 +- system/phrasesupdate.php | 251 ++- 8 files changed, 1688 insertions(+), 1865 deletions(-) delete mode 100644 application/controllers/components/stv/Prestudent.php delete mode 100644 application/controllers/components/stv/Status.php diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index 1663e0dae..93a6c381b 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -12,24 +12,23 @@ class Prestudent extends FHCAPI_Controller 'get' => ['admin:r', 'assistenz:r'], 'updatePrestudent' => ['admin:w', 'assistenz:w'], 'getHistoryPrestudents' => ['admin:r', 'assistenz:r'], - 'getBezeichnungZGV' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getBezeichnungDZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getBezeichnungMZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getAusbildung' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getAufmerksamdurch' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getBerufstaetigkeit' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getTypenStg' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getStudiensemester' => 'admin:r', // TODO(manu): self::PERM_LOGGED - 'getStudienplaene' => 'admin:r', // TODO(manu): self::PERM_LOGGED + 'getBezeichnungZGV' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getBezeichnungDZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getBezeichnungMZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getAusbildung' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getAufmerksamdurch' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getBerufstaetigkeit' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getTypenStg' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getStudiensemester' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getStudienplaene' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED ]); // Load Libraries $this->load->library('VariableLib', ['uid' => getAuthUID()]); - // Load language phrases $this->loadPhrases([ - 'ui', 'studierendenantrag' + 'ui', 'studierendenantrag', 'lehre' ]); } @@ -40,13 +39,15 @@ class Prestudent extends FHCAPI_Controller $this->PrestudentModel->addSelect('*'); $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); - if (isError($result)) { + if (isError($result)) + { $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } elseif (!hasData($result)) { - return show_404(); - } else { - $this->terminateWithSuccess(current(getData($result))); } + if(!hasData($result)) + { + return show_404(); + } + $this->terminateWithSuccess(current(getData($result))); } public function updatePrestudent($prestudent_id) @@ -67,6 +68,11 @@ class Prestudent extends FHCAPI_Controller $stg = $result->studiengang_kz; + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); + } + //Form validation $this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [ 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung']) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index e69de29bb..00602cf95 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -0,0 +1,1362 @@ + ['admin:r', 'assistenz:r'], + 'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], + 'getStatusgruende' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'getLastBismeldestichtag' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'isLastStatus' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'deleteStatus' => ['admin:r','assistenz:r'], + 'loadStatus' => ['admin:r', 'assistenz:r'], + 'updateStatus' => ['admin:r', 'assistenz:r'], + 'advanceStatus' => ['admin:r', 'assistenz:r'], + 'confirmStatus' => ['admin:r', 'assistenz:r'] + ]); + + // Load Libraries + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + + // Load language phrases + $this->loadPhrases([ + 'ui', 'bismeldestichtag','lehre' + ]); + } + + public function getHistoryPrestudent($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess((getData($result) ?: [])); + } + + public function getStatusgruende() + { + $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); + + $result = $this->StatusgrundModel->load(); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getLastBismeldestichtag() + { + $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); + + $result = $this->BismeldestichtagModel->getLastReachedMeldestichtag(); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess($result); + } + + public function isLastStatus($prestudent_id) + { + //TODO(Manu) translate here + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if($result->retval == "1") + { + //return $this->outputJson($result->retval); + return $this->terminateWithError("Die letzte Rolle kann nur durch den Administrator geloescht werden", self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess($result); + } + + public function addNewStatus($prestudent_id) + { + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $prestudent_id, + ]); + if(isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + //Variablen für Statuscheck + $stg = $result->studiengang_kz; + $reihungstest_angetreten = $result->reihungstestangetreten; + $name = trim($result->vorname . " ". $result->nachname); + $zgv_code = $result->zgv_code; + + $isStudent = false; + + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + $result = $this->p->t('lehre','error_keineSchreibrechte'); + + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $uid = getAuthUID(); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $anmerkung = $this->input->post('anmerkung'); + $statusgrund_id = $this->input->post('statusgrund_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $bestaetigtvon = $uid; + + //GET lastStatus + $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + elseif(!hasData($result)) + { + $lastStatusData = []; + } + else + $lastStatusData = current(getData($result)); + + //Different handling depending on newStatus + //Todo(manu) check later with multiactions + /* if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand') + { + //$studiensemester = $semester_aktuell; + $ausbildungssemester = $lastStatusData->ausbildungssemester; + }*/ + + /* if($status_kurzbz != 'Student') + { + $ausbildungssemester = $lastStatusData->ausbildungssemester; + }*/ + + //check if Rolle already exists + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result));*/ + } + if($result->retval == '1') + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code);*/ + return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL); + //return $this->terminateWithError("test error_rolleBereitsVorhanden", self::ERROR_TYPE_GENERAL); + } + + + //Check Reihungstest + //TODO(manu) erst später für multiactions releveant + if(REIHUNGSTEST_CHECK) + { + if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten) + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben");*/ + return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', $name), self::ERROR_TYPE_GENERAL); + } + } + + //Check ZGV + //TODO(manu) erst später für multiactions releveant + if(!defined("ZGV_CHECK") || ZGV_CHECK) + { + if($status_kurzbz=='Bewerber' && $zgv_code=='') + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.");*/ + return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', $name), self::ERROR_TYPE_GENERAL); + + } + } + + //Check ZGV-Master + //TODO(manu) erst später für multiactions releveant + $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); + $result = $this->StudiengangModel->load([ + 'studiengang_kz'=> $stg + ]); + if(isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $result = current(getData($result)); + $typ = $result->typ; + + if(!defined("ZGV_CHECK") || ZGV_CHECK) + { + if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m') + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.");*/ + return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', $name), self::ERROR_TYPE_GENERAL); + } + } + + //check if bewerberstatus exists + if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender') + { + //TODO(manu) erst später für multiactions releveant + //FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629 + + $result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name); + if (isError($result)) + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result));*/ + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if($result->retval == "0") + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code);*/ + return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', $name), self::ERROR_TYPE_GENERAL); + } + } + + //check if studentrolle already exists + //TODO(manu) eigener Code für Diplomand? + if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand') + { + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if($result->retval == "0") + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code);*/ + return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL); + } + if($result->retval != "0") + { + $isStudent = true; + } + } + + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); + + if(!$isBerechtigtNoStudstatusCheck) + { + //Block STATUSCHECKS + $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); + $result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum); + if (isError($result)) + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result));*/ + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + $result = $this->PrestudentstatusModel->checkIfValidStatusHistory( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $new_status_datum, + $ausbildungssemester + ); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + //check if Bismeldestichtag erreicht + $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); + $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if($result->retval == "1") + { + return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL); + } + } + + + // Start DB transaction + $this->db->trans_begin(); // Beginnen der Transaktion + + $result = $this->PrestudentstatusModel->insert( + [ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studienplan_id' => $lastStatusData->studienplan_id, + 'ausbildungssemester' => $ausbildungssemester, + 'anmerkung' => $anmerkung, + 'statusgrund_id' => $statusgrund_id, + 'insertvon' => $uid, + 'insertamum' => date('c'), + 'bestaetigtam' => $bestaetigtam, + 'bestaetigtvon' => $bestaetigtvon, + 'datum' => $datum, + 'rt_stufe' => $rt_stufe + ] + ); + + if ($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + + + if($isStudent) + { + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfUid($prestudent_id); + if (isError($result)) { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $student_uid = $result->retval; + + //load student + $result = $this->StudentModel->loadWhere( + array( + 'student_uid' => $student_uid + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + $studentData = current(getData($result) ? : []); + $verband = $studentData->verband == '' ? '' : $studentData->verband; + $gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe; + $studiengang_kz = $studentData->studiengang_kz; + + //Handle Abbrecher and Unterbrecher + //TODO (manu) implement later with multiactions + // not active yet: works only for "status ändern" in FAS + /* if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher') + { + $ausbildungssemester = 0; + $gruppe = ''; + $verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B'; + }*/ + + //process studentlehrverband + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->processStudentlehrverband( + $student_uid, + $studiengang_kz, + $ausbildungssemester, + $verband, + $gruppe, + $studiensemester_kurzbz + ); + if ($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code);*/ + return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL); + } + + //Student updaten (fuer Abbrecher und Unterbrecher) + //not active yet: works only for "status ändern" in FAS + //Todo(Manu) Later for multiactions + + /* + if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher') + { + $result = $this->StudentModel->update( + [ + 'student_uid' => $student_uid + ], + [ + 'studiengang_kz' => $studiengang_kz, + 'semester' => $ausbildungssemester, + 'verband' => $verband, + 'gruppe' => $gruppe, + 'updateamum' => date('c'), + 'updatevon' => $uid + ]); + if ($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + } + */ + } + + $this->db->trans_commit(); + + return $this->outputJsonSuccess(true); + } + + public function loadStatus() + { + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $prestudent_id = $this->input->post('prestudent_id'); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + elseif (!hasData($result)) + { + $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); + } + else + { + $this->terminateWithSuccess(current(getData($result))); + } + } + + public function deleteStatus() + { + + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $prestudent_id = $this->input->post('prestudent_id'); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $deletePrestudent = false; + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $prestudent_id, + ]); + if(isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + $isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid'); + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); + + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); + } + + if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) + { + return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteRolleStudent'), self::ERROR_TYPE_GENERAL); + } + + //check if last status + $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); + //return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + + if (isError($result)) + { +/* $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result);*/ + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if($result->retval == "1") + { + //Berechtigungen nach Check prüfen! + if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) + { + return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteLastStatus'), self::ERROR_TYPE_GENERAL); + } + else + { + $deletePrestudent = true; + } + } + + // Start DB transaction + $this->db->trans_begin(); + + //load rolle für LOG sqlundo + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) { + return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); + + } + + //Data of current Rolle + $statusData = current(getData($result)); + + $datum = $statusData->datum == '' ? 'null' : $statusData->datum; + $insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum; + $insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon; + $updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum; + $updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon; + $ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id; + $orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz; + $bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam; + $bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon; + $anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung; + $bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum; + $studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id; + $rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe; + $statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id; + + $quotes_datum = $datum == "null" ? " " : "'"; + $quotes_insertamum = $insertamum == "null" ? " " : "'"; + $quotes_insertvon = $insertvon == "null" ? " " : "'"; + $quotes_updateamum = $updateamum == "null" ? " " : "'"; + $quotes_updatevon = $updatevon == "null" ? " " : "'"; + $quotes_ext_id = $ext_id == "null" ? " " : "'"; + $quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'"; + $quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'"; + $quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'"; + $quotes_anmerkung = $anmerkung == "null" ? " " : "'"; + $quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'"; + $quotes_studienplan_id = $studienplan_id == "null" ? " " : "'"; + $quotes_rt_stufe = $rt_stufe == "null" ? " " : "'"; + $quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'"; + + $sqlundo = + " + INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, + datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, + anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id) + VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "'," + . $quotes_datum . $datum . $quotes_datum . "," + . $quotes_insertamum . $insertamum . $quotes_insertamum . "," + . $quotes_insertvon . $insertvon . $quotes_insertvon . "," + . $quotes_updateamum . $updateamum . $quotes_updateamum . "," + . $quotes_updatevon . $updatevon . $quotes_updatevon . "," + . $quotes_ext_id . $ext_id . $quotes_ext_id . "," + . $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . "," + . $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . "," + . $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . "," + . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," + . $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . "," + . $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . "," + . $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . "," + . $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . "); + "; + + //Delete Status + $result = $this->PrestudentstatusModel->delete( + [ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ] + ); + + if($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if(!hasData($result)) + { + return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); + + } + + //save log delete prestudentstatus + $uid = getAuthUID(); + $beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id; + $sql = "DELETE FROM public.tbl_prestudentstatus + WHERE prestudent_id = " . $prestudent_id . " + AND status_kurzbz = '" . $status_kurzbz . "' + AND ausbildungssemester ='" . $ausbildungssemester . "' + AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'"; + + $this->load->model('system/Log_model', 'LogModel'); + $result = $this->LogModel->insert([ + 'mitarbeiter_uid' => $uid, + 'beschreibung' => $beschreibung, + 'sql' => $sql, + 'sqlundo' => $sqlundo + ]); + if (isError($result) || !hasData($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + $logId = $result->retval; + + //Delete Studentlehrverband if no Status left + $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, true); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if ($result->retval == "1") + { + //get student_uid + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfUid($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) + { + return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL); + } + $student_uid = $result->retval; + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->delete( + array( + 'student_uid' => $student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + if ($this->db->trans_status() === false || isError($result) || !hasData($result)) + { + $this->db->trans_rollback(); + + return $this->terminateWithError($this->p->t('lehre','error_duringDeleteLehrverband'), self::ERROR_TYPE_GENERAL); + } + + $this->terminateWithSuccess(true); + + } + //Delete Prestudent if no data is left + + if($deletePrestudent && $isBerechtigtAdmin) + { + //TODO(manu) check all connected tables, Handling of Deletion + //check if existing dokumentprestudent + $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); + $result = $this->DokumentprestudentModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + + } + if (hasData($result)) + { + return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL); + } + + //check if Anrechnungen tbl_anrechnung + $output_anrechnungen = ''; + $this->load->model('education/Anrechnung_model', 'AnrechnungModel'); + $result = $this->AnrechnungModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if (hasData($result)) + { + return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL); + } + + //DELETE Prestudent + + //save log delete prestudent + $uid = getAuthUID(); + $beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id; + $sql = "DELETE FROM public.tbl_prestudent + WHERE prestudent_id = " . $prestudent_id; + + //load prestudent für LOG sqlundo + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if (isError($result) || !hasData($result)) + { + //TODO(Manu) in these case: löschen stautus erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + //Data of current Prestudent + $prestudentData = current(getData($result)); + + $aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz; + $studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz; + $berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code; + $ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode; + $zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code; + $zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort; + $zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum; + $zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation; + $zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt; + $zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code; + $zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort; + $zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum; + $zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation; + $zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt; + $aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel; + $facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf; + $anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest; + $reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false'; + $reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id; + $rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte; + $rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1; + $rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2; + $rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3; + $bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false'; + $person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id; + $anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung; + $mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor; + $ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id; + $dual = $prestudentData->dual == 1 ? 'true' : 'false'; + $ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat; + $zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code; + $zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort; + $zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum; + $zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation; + $gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz; + $aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz; + $priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung; + $zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt; + + $quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'"; + $quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'"; + $quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'"; + $quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'"; + $quotes_zgv_code = $zgv_code == "null" ? " " : "'"; + $quotes_zgvort = $zgvort == "null" ? " " : "'"; + $quotes_zgvdatum = $zgvdatum == "null" ? " " : "'"; + $quotes_zgvnation = $zgvnation == "null" ? " " : "'"; + $quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'"; + $quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'"; + $quotes_zgvmaort = $zgvmaort == "null" ? " " : "'"; + $quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'"; + $quotes_zgvmanation = $zgvmanation == "null" ? " " : "'"; + $quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'"; + $quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'"; + $quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'"; + $quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'"; + $quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'"; + $quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'"; + $quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'"; + $quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'"; + $quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'"; + $quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'"; + $quotes_bismelden = $bismelden == "null" ? " " : "'"; + $quotes_person_id = $person_id == "null" ? " " : "'"; + $quotes_anmerkung = $anmerkung == "null" ? " " : "'"; + $quotes_mentor = $mentor == "null" ? " " : "'"; + $quotes_ext_id = $ext_id == "null" ? " " : "'"; + $quotes_dual = $dual == "null" ? " " : "'"; + $quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'"; + $quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'"; + $quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'"; + $quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'"; + $quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'"; + $quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'"; + $quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'"; + $quotes_priorisierung = $priorisierung == "null" ? " " : "'"; + $quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'"; + + + $sqlundo = + " + INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode, + zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt, + aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id, + rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id, + dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation, + gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) + VALUES('" . $prestudent_id . "'," + . $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . "," + . $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . "," + . $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . "," + . $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . "," + . $quotes_zgv_code . $zgv_code . $quotes_zgv_code . "," + . $quotes_zgvort . $zgvort . $quotes_zgvort . "," + . $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . "," + . $quotes_zgvnation . $zgvnation . $quotes_zgvnation . "," + . $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . "," + . $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . "," + . $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . "," + . $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . "," + . $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . "," + . $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . "," + . $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . "," + . $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . "," + . $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . "," + . $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . "," + . $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . "," + . $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . "," + . $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . "," + . $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . "," + . $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . "," + . $quotes_bismelden . $bismelden . $quotes_bismelden . "," + . $quotes_person_id . $person_id . $quotes_person_id . "," + . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," + . $quotes_mentor . $mentor . $quotes_mentor . "," + . $quotes_ext_id . $ext_id . $quotes_ext_id . "," + . $quotes_dual . $dual . $quotes_dual . "," + . $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . "," + . $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . "," + . $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . "," + . $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . "," + . $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . "," + . $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . "," + . $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . "," + . $quotes_priorisierung . $priorisierung . $quotes_priorisierung . "," + . $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . "); + "; + + $this->load->model('system/Log_model', 'LogModel'); + $result = $this->LogModel->insert([ + 'mitarbeiter_uid' => $uid, + 'beschreibung' => $beschreibung, + 'sql' => $sql, + 'sqlundo' => $sqlundo + ]); + if (isError($result) || !hasData($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + //$logId = $result->retval; + + //independent transaction + $this->db->trans_start(); + + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->delete( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if ($this->db->trans_status() === false) + { + $this->db->trans_rollback(); + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $this->db->trans_commit(); + $this->terminateWithSuccess($result); + } + $this->db->trans_commit(); + + return $this->terminateWithSuccess(true); + } + + public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + { + $isStudent = false; + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $key_prestudent_id, + ]); + if(isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); + } + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $uid = getAuthUID(); + $prestudent_id = $this->input->post('prestudent_id'); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $studienplan_id = $this->input->post('studienplan_id'); + $anmerkung = $this->input->post('anmerkung'); + $statusgrund_id = $this->input->post('statusgrund_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $bestaetigtvon = $uid; + + //check if Bismeldestichtag erreicht + if(!$isBerechtigtNoStudstatusCheck) + { + // only check datum (without semester) + $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); + /* $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/ + $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if ($result->retval == "1") + { + return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL); + } + } + + //check if Rolle already exists + if(($key_studiensemester_kurzbz != $studiensemester_kurzbz) + || ($key_ausbildungssemester != $ausbildungssemester)) + { + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + if($result->retval == '1') + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson($result->code); + } + } + + //check if studentrolle already exists + if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand') + { + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if($result->retval == "0") + { + return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL); + } + if($result->retval != "0") + { + $isStudent = true; + } + } + + + if(!$isBerechtigtNoStudstatusCheck) + { + //Block STATUSCHECKS + + $result = $this->PrestudentstatusModel->checkIfValidStatusHistory( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $datum, + $ausbildungssemester + ); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + } + + + // Start DB transaction + $this->db->trans_begin(); + + //update status + $result = $this->PrestudentstatusModel->update( + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + ], + [ + 'status_kurzbz' => $status_kurzbz, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, + 'studienplan_id' => $studienplan_id, + 'anmerkung' => $anmerkung, + 'statusgrund_id' => $statusgrund_id, + 'updatevon' => $uid, + 'updateamum' => date('c'), + 'bestaetigtam' => $bestaetigtam, + 'bestaetigtvon' => $bestaetigtvon, + 'datum' => $datum, + 'rt_stufe' => $rt_stufe + ] + ); + if (isError($result)) + { + $this->db->trans_rollback(); + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + + + if($isStudent) + { + //check Studentlehrverband + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfUid($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) + { + $this->terminateWithError($this->p->t('lehre','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL); + } + $student_uid = $result->retval; + + //process studentlehrverband + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->loadWhere( + array( + 'student_uid' => $student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + //Data of current Semester + $studentlvbData = current(getData($result) ? : []); + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->processStudentlehrverband( + $student_uid, + $studentlvbData->studiengang_kz, + $ausbildungssemester, + $studentlvbData->verband, + $studentlvbData->gruppe, + $studiensemester_kurzbz + ); + if ($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); + return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL); + } + } + $this->db->trans_commit(); + return $this->outputJsonSuccess(true); + } + + public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + { + $isStudent = false; + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $key_prestudent_id, + ]); + if(isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); + } + + //Data Vorrücken + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz + ) + ); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + elseif (!hasData($result)) + { + return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); + } + else + { + $statusData = current(getData($result)); + } + + $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + $result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz); + + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + return $this->outputJson(getError($result)); + } + $studiensem_next = current(getData($result)); + $studiensem_next = $studiensem_next->studiensemester_kurzbz; + + $ausbildungssem_next = $key_ausbildungssemester+1; + + //check if Rolle already exists + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( + $key_prestudent_id, + $key_status_kurzbz, + $studiensem_next, + $ausbildungssem_next + ); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if($result->retval == '1') + { + return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL); + } + + //check if studentrolle already exists + if($key_status_kurzbz == 'Student') + { + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if ($result->retval == "0") + { + return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL); + } + } + + // Start DB transaction + $this->db->trans_begin(); + + //insert prestudentstatus + $uid = getAuthUID(); + $result = $this->PrestudentstatusModel->insert( + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $studiensem_next, + 'ausbildungssemester' => $ausbildungssem_next, + 'insertamum' => date('c'), + 'insertvon' => $uid, + 'bestaetigtam' => date('c'), + 'bestaetigtvon' => $uid, + 'studienplan_id' => $statusData->studienplan_id, + 'datum' => date('c'), + 'anmerkung' => $statusData->anmerkung + ] + ); + + if (isError($result)) + { + $this->db->trans_rollback(); + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + $this->load->model('crm/Student_model', 'StudentModel'); + $result = $this->StudentModel->checkIfUid($key_prestudent_id); + if(isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) + { + $this->terminateWithError($this->p->t('lehre','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL); + } + $student_uid = $result->retval; + + //process studentlehrverband + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->loadWhere( + array( + 'student_uid' => $student_uid, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + //Data of current Semester + $result = getData($result) ? : []; + $studentlvbData = current($result); + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->processStudentlehrverband( + $student_uid, + $studentlvbData->studiengang_kz, + $ausbildungssem_next, + $studentlvbData->verband, + $studentlvbData->gruppe, + $studiensem_next + ); + if ($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); + return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL); + } + + $this->db->trans_commit(); + + return $this->outputJsonSuccess(true); + } + + public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + { + $uid = getAuthUID(); + + //get Studiengang von prestudent_id + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $result = $this->PrestudentModel->load([ + 'prestudent_id'=> $key_prestudent_id, + ]); + if(isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + $stg = $result->studiengang_kz; + + if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); + } + + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $result = $this->PrestudentstatusModel->loadWhere( + array( + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz + ) + ); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + elseif (!hasData($result)) + { + return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); + } + + $statusData = current(getData($result)); + + //check if Status is unconfirmed.. + if($statusData->bestaetigtam != null) + { + //return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + return $this->terminateWithError($this->p->t('lehre','error_statusConfirmedYet'), self::ERROR_TYPE_GENERAL); + } + + //check if Bewerbung abgeschickt + if($statusData->bewerbung_abgeschicktamum == null) + { + return $this->terminateWithError($this->p->t('lehre','error_bewerbungNochNichtAbgeschickt'), self::ERROR_TYPE_GENERAL); + } + + $result = $this->PrestudentstatusModel->update( + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + ], + [ + 'prestudent_id' => $key_prestudent_id, + 'status_kurzbz' => $key_status_kurzbz, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + 'bestaetigtam' => date('c'), + 'bestaetigtvon' => $uid, + 'updateamum' => date('c'), + 'updatevon' => $uid + ] + ); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } +} diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php deleted file mode 100644 index 2a1364c87..000000000 --- a/application/controllers/components/stv/Prestudent.php +++ /dev/null @@ -1,316 +0,0 @@ -load->library('AuthLib'); - $this->load->library('VariableLib', ['uid' => getAuthUID()]); - - - // Load language phrases - $this->loadPhrases([ - 'ui', 'studierendenantrag' - ]); - } - - public function get($prestudent_id) - { - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - $this->PrestudentModel->addSelect('*'); - $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); - - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } elseif (!hasData($result)) { - $this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND); - $this->outputJson('NOT FOUND'); - } else { - $this->outputJson(current(getData($result))); - } - } - - public function updatePrestudent($prestudent_id) - { - $this->load->library('form_validation'); - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $prestudent_id, - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - - $stg = $result->studiengang_kz; - - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = $this->p->t('lehre','error_keineSchreibrechte'); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - //TODO(Manu) API Controller - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - - //Form validation - $this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [ - 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung']) - ]); - - if ($this->form_validation->run() == false) - { - return $this->outputJsonError($this->form_validation->error_array()); - } - - $deltaData = $_POST; - - if(!$prestudent_id) - { - return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - - $uid = getAuthUID(); - - $array_allowed_props_prestudent = [ - 'aufmerksamdurch_kurzbz', - 'studiengang_kz', - 'gsstudientyp_kurzbz', - 'person_id', - 'berufstaetigkeit_code', - 'ausbildungcode', - 'zgv_code', - 'zgvort', - 'zgvdatum', - 'zgvnation', - 'zgvmas_code', - 'zgvmaort', - 'zgvmadatum', - 'zgvmanation', - 'facheinschlberuf', - 'bismelden', - 'anmerkung', - 'dual', - 'zgvdoktor_code', - 'zgvdoktorort', - 'zgvdoktordatum', - 'zgvdoktornation', - 'aufnahmegruppe_kurzbz', - 'priorisierung', - 'foerderrelevant', - 'zgv_erfuellt', - 'zgvmas_erfuellt', - 'zgvdoktor_erfuellt', - 'mentor', - 'aufnahmeschluessel', - 'standort_code' - ]; - - $update_prestudent = array(); - foreach ($array_allowed_props_prestudent as $prop) - { - $val = isset($deltaData[$prop]) ? $deltaData[$prop] : null; - if ($val !== null || $prop == 'foerderrelevant') { - $update_prestudent[$prop] = $val; - } - } - - $update_prestudent['updateamum'] = date('c'); - $update_prestudent['updatevon'] = $uid; - - //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) - function utf8_decode_if_string($value) - { - if (is_string($value)) { - return utf8_decode($value); - } else { - return $value; - } - } - $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent); - - if (count($update_prestudent) && $prestudent_id === null) { - $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - // TODO(manu): check phrase - //return $this->outputJson("Kein/e PrestudentIn vorhanden!"); - return $this->outputJson($this->p->t('studierendenantrag','error_no_prestudent', $prestudent_id)); - } - - if (count($update_prestudent)) - { - $result = $this->PrestudentModel->update( - $prestudent_id, - $update_prestudent_encoded - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - return $this->outputJsonSuccess(true); - } - } - - public function getHistoryPrestudents($person_id) - { - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - $result = $this->PrestudentModel->getHistoryPrestudents($person_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson(getData($result) ?: []); - } - - public function getBezeichnungZgv() - { - $this->load->model('codex/Zgv_model', 'ZgvModel'); - - $this->ZgvModel->addOrder('zgv_code'); - - $result = $this->ZgvModel->load(); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getBezeichnungDZgv() - { - $this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel'); - - $this->ZgvdoktorModel->addOrder('zgvdoktor_code'); - - $result = $this->ZgvdoktorModel->load(); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getBezeichnungMZgv() - { - $this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel'); - - $this->ZgvmasterModel->addOrder('zgvmas_code'); - - $result = $this->ZgvmasterModel->load(); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getAusbildung() - { - $this->load->model('codex/Ausbildung_model', 'AusbildungModel'); - - $this->AusbildungModel->addOrder('ausbildungcode'); - - $result = $this->AusbildungModel->load(); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getAufmerksamdurch() - { - $this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel'); - - $this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz'); - - $result = $this->AufmerksamdurchModel->load(); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getBerufstaetigkeit() - { - $this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel'); - - $this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code'); - - $result = $this->BerufstaetigkeitModel->load(); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getTypenStg() - { - $this->load->model('education/Gsstudientyp_model', 'GsstudientypModel'); - - $this->GsstudientypModel->addOrder('gsstudientyp_kurzbz'); - - $result = $this->GsstudientypModel->load(); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getStudiensemester() - { - $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - - $this->StudiensemesterModel->addOrder('start', 'DESC'); - $this->StudiensemesterModel->addLimit(20); - - $result = $this->StudiensemesterModel->load(); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getStudienplaene($prestudent_id) - { - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - $result = $this->PrestudentModel->loadWhere( - array('prestudent_id' => $prestudent_id) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - - $result = current(getData($result)); - $studiengang_kz = $result->studiengang_kz; - - $this->load->model('organisation/Studienplan_model', 'StudienplanModel'); - - $this->StudienplanModel->addOrder('studienplan_id', 'DESC'); - - $result = $this->StudienplanModel->getStudienplaene($studiengang_kz); - - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } -} diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php deleted file mode 100644 index ac880be37..000000000 --- a/application/controllers/components/stv/Status.php +++ /dev/null @@ -1,1399 +0,0 @@ -load->library('AuthLib'); - $this->load->library('VariableLib', ['uid' => getAuthUID()]); - $this->load->library('PermissionLib'); - - // Load language phrases - $this->loadPhrases([ - 'ui', 'bismeldestichtag','lehre' - ]); - } - - public function getHistoryPrestudent($prestudent_id) - { - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - $result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson(getData($result) ?: []); - } - - public function getStatusgruende() - { - $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); - - $result = $this->StatusgrundModel->load(); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function getLastBismeldestichtag() - { - $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); - - $result = $this->BismeldestichtagModel->getLastReachedMeldestichtag(); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - $this->outputJson($result); - } - - public function isLastStatus($prestudent_id) - { - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - if($result->retval == "1") - { - return $this->outputJson($result->retval); - } - $this->outputJson($result); - } - - public function addNewStatus($prestudent_id) - { - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $prestudent_id, - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - - //Variablen für Statuscheck - $stg = $result->studiengang_kz; - $reihungstest_angetreten = $result->reihungstestangetreten; - $name = trim($result->vorname . " ". $result->nachname); - $zgv_code = $result->zgv_code; - - $isStudent = false; - - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $uid = getAuthUID(); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $datum = $this->input->post('datum'); - $bestaetigtam = $this->input->post('bestaetigtam'); - $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $anmerkung = $this->input->post('anmerkung'); - $statusgrund_id = $this->input->post('statusgrund_id'); - $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $uid; - - //GET lastStatus - $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); - - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - elseif(!hasData($result)) - { - $lastStatusData = []; - } - else - $lastStatusData = current(getData($result)); - - //Different handling depending on newStatus - //Todo(manu) check later with multiactions - /* if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand') - { - //$studiensemester = $semester_aktuell; - $ausbildungssemester = $lastStatusData->ausbildungssemester; - }*/ - - /* if($status_kurzbz != 'Student') - { - $ausbildungssemester = $lastStatusData->ausbildungssemester; - }*/ - - //check if Rolle already exists - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == '1') - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - - - //Check Reihungstest - if(REIHUNGSTEST_CHECK) - { - if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben"); - } - } - - //Check ZGV - if(!defined("ZGV_CHECK") || ZGV_CHECK) - { - if($status_kurzbz=='Bewerber' && $zgv_code=='') - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein."); - } - } - - //Check ZGV-Master - $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); - $result = $this->StudiengangModel->load([ - 'studiengang_kz'=> $stg - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - $typ = $result->typ; - - if(!defined("ZGV_CHECK") || ZGV_CHECK) - { - if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m') - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein."); - } - } - - //check if bewerberstatus exists - if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender') - { - //TODO(manu) erst später für multiactions releveant - //FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629 - - $result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == "0") - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - } - - //check if studentrolle already exists - //TODO(manu) eigener Code für Diplomand? - if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand') - { - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == "0") - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - if($result->retval != "0") - { - $isStudent = true; - } - } - - $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - - if(!$isBerechtigtNoStudstatusCheck) - { - //Block STATUSCHECKS - $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); - $result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - $result = $this->PrestudentstatusModel->checkIfValidStatusHistory( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $new_status_datum, - $ausbildungssemester - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - //check if Bismeldestichtag erreicht - $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); - $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == "1") - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result->code)); - } - } - - - // Start DB transaction - $this->db->trans_begin(); // Beginnen der Transaktion - - $result = $this->PrestudentstatusModel->insert( - [ - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'studienplan_id' => $lastStatusData->studienplan_id, - 'ausbildungssemester' => $ausbildungssemester, - 'anmerkung' => $anmerkung, - 'statusgrund_id' => $statusgrund_id, - 'insertvon' => $uid, - 'insertamum' => date('c'), - 'bestaetigtam' => $bestaetigtam, - 'bestaetigtvon' => $bestaetigtvon, - 'datum' => $datum, - 'rt_stufe' => $rt_stufe - ] - ); - - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - - - if($isStudent) - { - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $student_uid = $result->retval; - - //load student - $result = $this->StudentModel->loadWhere( - array( - 'student_uid' => $student_uid - ) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - if (!hasData($result)) { - $this->outputJson($result); - } - - $studentData = current(getData($result)); - $verband = $studentData->verband == '' ? '' : $studentData->verband; - $gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe; - $studiengang_kz = $studentData->studiengang_kz; - - //Handle Abbrecher and Unterbrecher - //TODO (manu) implement later with multiactions - // not active yet: works only for "status ändern" in FAS - /* if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher') - { - $ausbildungssemester = 0; - $gruppe = ''; - $verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B'; - }*/ - - //process studentlehrverband - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband( - $student_uid, - $studiengang_kz, - $ausbildungssemester, - $verband, - $gruppe, - $studiensemester_kurzbz - ); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - - //Student updaten (fuer Abbrecher und Unterbrecher) - //not active yet: works only for "status ändern" in FAS - //Todo(Manu) Later for multiactions - - /* - if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher') - { - $result = $this->StudentModel->update( - [ - 'student_uid' => $student_uid - ], - [ - 'studiengang_kz' => $studiengang_kz, - 'semester' => $ausbildungssemester, - 'verband' => $verband, - 'gruppe' => $gruppe, - 'updateamum' => date('c'), - 'updatevon' => $uid - ]); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - } - */ - } - - $this->db->trans_commit(); - - return $this->outputJsonSuccess(true); - } - - - - public function loadStatus() - { - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - $prestudent_id = $this->input->post('prestudent_id'); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $result = $this->PrestudentstatusModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - - elseif (!hasData($result)) { - $this->outputJson($result); - } - else - { - $this->outputJsonSuccess(current(getData($result))); - } - } - - public function deleteStatus() - { - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - $prestudent_id = $this->input->post('prestudent_id'); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $deletePrestudent = false; - - $isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid'); - $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); - - - if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson("Studentenrolle kann nur durch den Administrator geloescht werden"); - } - - //check if last status - $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - if($result->retval == "1") - { - //Berechtigungen nach Check prüfen! - if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - else - { - $deletePrestudent = true; - } - } - - // Start DB transaction - $this->db->trans_begin(); - - //load rolle für LOG sqlundo - $result = $this->PrestudentstatusModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - if (!hasData($result)) { - return $this->outputJson($result); - } - - //Data of current Rolle - $statusData = current(getData($result)); - - $datum = $statusData->datum == '' ? 'null' : $statusData->datum; - $insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum; - $insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon; - $updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum; - $updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon; - $ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id; - $orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz; - $bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam; - $bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon; - $anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung; - $bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum; - $studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id; - $rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe; - $statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id; - - $quotes_datum = $datum == "null" ? " " : "'"; - $quotes_insertamum = $insertamum == "null" ? " " : "'"; - $quotes_insertvon = $insertvon == "null" ? " " : "'"; - $quotes_updateamum = $updateamum == "null" ? " " : "'"; - $quotes_updatevon = $updatevon == "null" ? " " : "'"; - $quotes_ext_id = $ext_id == "null" ? " " : "'"; - $quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'"; - $quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'"; - $quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'"; - $quotes_anmerkung = $anmerkung == "null" ? " " : "'"; - $quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'"; - $quotes_studienplan_id = $studienplan_id == "null" ? " " : "'"; - $quotes_rt_stufe = $rt_stufe == "null" ? " " : "'"; - $quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'"; - - $sqlundo = - " - INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, - datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, - anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id) - VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "'," - . $quotes_datum . $datum . $quotes_datum . "," - . $quotes_insertamum . $insertamum . $quotes_insertamum . "," - . $quotes_insertvon . $insertvon . $quotes_insertvon . "," - . $quotes_updateamum . $updateamum . $quotes_updateamum . "," - . $quotes_updatevon . $updatevon . $quotes_updatevon . "," - . $quotes_ext_id . $ext_id . $quotes_ext_id . "," - . $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . "," - . $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . "," - . $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . "," - . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," - . $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . "," - . $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . "," - . $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . "," - . $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . "); - "; - - //Delete Status - $result = $this->PrestudentstatusModel->delete( - [ - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ] - ); - - if($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - if(!hasData($result)) - { - $this->outputJson($result); - } - - //save log delete prestudentstatus - $uid = getAuthUID(); - $beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id; - $sql = "DELETE FROM public.tbl_prestudentstatus - WHERE prestudent_id = " . $prestudent_id . " - AND status_kurzbz = '" . $status_kurzbz . "' - AND ausbildungssemester ='" . $ausbildungssemester . "' - AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'"; - - $this->load->model('system/Log_model', 'LogModel'); - $result = $this->LogModel->insert([ - 'mitarbeiter_uid' => $uid, - 'beschreibung' => $beschreibung, - 'sql' => $sql, - 'sqlundo' => $sqlundo - ]); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if (!hasData($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - $logId = $result->retval; - - //Delete Studentlehrverband if no Status left - $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); - - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if (!hasData($result)) - { - //get student_uid - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if (!hasData($result)) - { - $this->outputJson($result); - } - $student_uid = $result->retval; - - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->delete( - array( - 'student_uid' => $student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung"); - } - if (!hasData($result)) - { - $this->outputJson($result); - //var_dump("no data Löschen der Lehrverbandszuordnung"); - } - $this->outputJsonSuccess(true); - } - - //Delete Prestudent if no data is left - - if($deletePrestudent && $isBerechtigtAdmin) - { - //TODO(manu) check all connected tables - - //check if existing dokumentprestudent - $output = ""; - $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); - $result = $this->DokumentprestudentModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - if (hasData($result)) - { - $documentPrestudent = $result->retval; - foreach ($documentPrestudent as $doc) - { - $output .= ' '. $doc->dokument_kurzbz; - } - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson("Es sind noch zu loeschende Dokumente vorhanden: " . $output); - } - - //check if Anrechnungen tbl_anrechnung - $output_anrechnungen = ''; - $this->load->model('education/Anrechnung_model', 'AnrechnungModel'); - $result = $this->AnrechnungModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - if (hasData($result)) - { - $anrechnungPrestudent = $result->retval; - foreach ($anrechnungPrestudent as $anr) - { - $output_anrechnungen .= ' '. $anr->anrechnung_id; - } - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden (id) : " . $output_anrechnungen); - } - - //DELETE Prestudent - - //save log delete prestudent - $uid = getAuthUID(); - $beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id; - $sql = "DELETE FROM public.tbl_prestudent - WHERE prestudent_id = " . $prestudent_id; - - //load prestudent für LOG sqlundo - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - if (!hasData($result)) { - return $this->outputJson($result); - } - - //Data of current Prestudent - $prestudentData = current(getData($result)); - - $aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz; - $studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz; - $berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code; - $ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode; - $zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code; - $zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort; - $zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum; - $zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation; - $zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt; - $zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code; - $zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort; - $zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum; - $zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation; - $zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt; - $aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel; - $facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf; - $anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest; - $reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false'; - $reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id; - $rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte; - $rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1; - $rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2; - $rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3; - $bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false'; - $person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id; - $anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung; - $mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor; - $ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id; - $dual = $prestudentData->dual == 1 ? 'true' : 'false'; - $ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat; - $zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code; - $zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort; - $zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum; - $zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation; - $gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz; - $aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz; - $priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung; - $zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt; - - $quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'"; - $quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'"; - $quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'"; - $quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'"; - $quotes_zgv_code = $zgv_code == "null" ? " " : "'"; - $quotes_zgvort = $zgvort == "null" ? " " : "'"; - $quotes_zgvdatum = $zgvdatum == "null" ? " " : "'"; - $quotes_zgvnation = $zgvnation == "null" ? " " : "'"; - $quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'"; - $quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'"; - $quotes_zgvmaort = $zgvmaort == "null" ? " " : "'"; - $quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'"; - $quotes_zgvmanation = $zgvmanation == "null" ? " " : "'"; - $quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'"; - $quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'"; - $quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'"; - $quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'"; - $quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'"; - $quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'"; - $quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'"; - $quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'"; - $quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'"; - $quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'"; - $quotes_bismelden = $bismelden == "null" ? " " : "'"; - $quotes_person_id = $person_id == "null" ? " " : "'"; - $quotes_anmerkung = $anmerkung == "null" ? " " : "'"; - $quotes_mentor = $mentor == "null" ? " " : "'"; - $quotes_ext_id = $ext_id == "null" ? " " : "'"; - $quotes_dual = $dual == "null" ? " " : "'"; - $quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'"; - $quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'"; - $quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'"; - $quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'"; - $quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'"; - $quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'"; - $quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'"; - $quotes_priorisierung = $priorisierung == "null" ? " " : "'"; - $quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'"; - - - $sqlundo = - " - INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode, - zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt, - aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id, - rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id, - dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation, - gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) - VALUES('" . $prestudent_id . "'," - . $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . "," - . $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . "," - . $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . "," - . $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . "," - . $quotes_zgv_code . $zgv_code . $quotes_zgv_code . "," - . $quotes_zgvort . $zgvort . $quotes_zgvort . "," - . $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . "," - . $quotes_zgvnation . $zgvnation . $quotes_zgvnation . "," - . $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . "," - . $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . "," - . $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . "," - . $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . "," - . $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . "," - . $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . "," - . $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . "," - . $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . "," - . $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . "," - . $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . "," - . $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . "," - . $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . "," - . $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . "," - . $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . "," - . $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . "," - . $quotes_bismelden . $bismelden . $quotes_bismelden . "," - . $quotes_person_id . $person_id . $quotes_person_id . "," - . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," - . $quotes_mentor . $mentor . $quotes_mentor . "," - . $quotes_ext_id . $ext_id . $quotes_ext_id . "," - . $quotes_dual . $dual . $quotes_dual . "," - . $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . "," - . $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . "," - . $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . "," - . $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . "," - . $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . "," - . $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . "," - . $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . "," - . $quotes_priorisierung . $priorisierung . $quotes_priorisierung . "," - . $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . "); - "; - - $this->load->model('system/Log_model', 'LogModel'); - $result = $this->LogModel->insert([ - 'mitarbeiter_uid' => $uid, - 'beschreibung' => $beschreibung, - 'sql' => $sql, - 'sqlundo' => $sqlundo - ]); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if (!hasData($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - $logId = $result->retval; - - //independent transaction - $this->db->trans_start(); - - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->delete( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if ($this->db->trans_status() === false) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - if(!hasData($result)) - { - $this->outputJson($result); - } - $this->db->trans_commit(); - $this->outputJson($result); - } - $this->db->trans_commit(); - return $this->outputJsonSuccess(true); - } - - public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) - { - $isStudent = false; - $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $key_prestudent_id, - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - - $stg = $result->studiengang_kz; - - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $uid = getAuthUID(); - $prestudent_id = $this->input->post('prestudent_id'); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $datum = $this->input->post('datum'); - $bestaetigtam = $this->input->post('bestaetigtam'); - $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $studienplan_id = $this->input->post('studienplan_id'); - $anmerkung = $this->input->post('anmerkung'); - $statusgrund_id = $this->input->post('statusgrund_id'); - $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $uid; - - //check if Bismeldestichtag erreicht - if(!$isBerechtigtNoStudstatusCheck) - { - //Fas only check datum - $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); -/* $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/ - $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if ($result->retval == "1") { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - //return $this->outputJson($result->code); - //Fehlermeldung überschrieben, passender - //TODO(Manu) phrase - //$this->p->t('bismeldestichtag','meldestichtag_erreicht'); - //return $this->outputJson($this->p->t('bismeldestichtag','status_confirm_delete')); - return $this->outputJson($this->p->t('lehre', 'meldestichtag_erreicht')); - //return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich"); - } - } - - //check if Rolle already exists - if(($key_studiensemester_kurzbz != $studiensemester_kurzbz) - || ($key_ausbildungssemester != $ausbildungssemester)) - { - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == '1') - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - } - - //check if studentrolle already exists - if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand') - { - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == "0") - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - if($result->retval != "0") - { - $isStudent = true; - } - } - - - if(!$isBerechtigtNoStudstatusCheck) - { - //Block STATUSCHECKS - - $result = $this->PrestudentstatusModel->checkIfValidStatusHistory( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $datum, - $ausbildungssemester - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - } - - - // Start DB transaction - $this->db->trans_begin(); - - //update status - //var_dump($ausbildungssemester, $studiensemester_kurzbz); - $result = $this->PrestudentstatusModel->update( - [ - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - ], - [ - 'status_kurzbz' => $status_kurzbz, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, - 'studienplan_id' => $studienplan_id, - 'anmerkung' => $anmerkung, - 'statusgrund_id' => $statusgrund_id, - 'updatevon' => $uid, - 'updateamum' => date('c'), - 'bestaetigtam' => $bestaetigtam, - 'bestaetigtvon' => $bestaetigtvon, - 'datum' => $datum, - 'rt_stufe' => $rt_stufe - ] - ); - if (isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - - if($isStudent) - { - //check Studentlehrverband - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $student_uid = $result->retval; - - //process studentlehrverband - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->loadWhere( - array( - 'student_uid' => $student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - if (!hasData($result)) { - $this->outputJson($result); - } - - //Data of current Semester - $studentlvbData = current(getData($result)); - - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband( - $student_uid, - $studentlvbData->studiengang_kz, - $ausbildungssemester, - $studentlvbData->verband, - $studentlvbData->gruppe, - $studiensemester_kurzbz - ); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - } - - $this->db->trans_commit(); - return $this->outputJsonSuccess(true); - } - - public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) - { - $isStudent = false; - - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $key_prestudent_id, - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - - $stg = $result->studiengang_kz; - - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - - //Data Vorrücken - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $result = $this->PrestudentstatusModel->loadWhere( - array( - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz - ) - ); - - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - - elseif (!hasData($result)) { - $this->outputJson($result); - } - else - { - $statusData = current(getData($result)); - } - - $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - $result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz); - - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $studiensem_next = current(getData($result)); - $studiensem_next = $studiensem_next->studiensemester_kurzbz; - - $ausbildungssem_next = $key_ausbildungssemester+1; - - //check if Rolle already exists - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle( - $key_prestudent_id, - $key_status_kurzbz, - $studiensem_next, - $ausbildungssem_next - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if($result->retval == '1') - { - $isStudent = true; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - - //check if studentrolle already exists - if($key_status_kurzbz == 'Student') - { - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if ($result->retval == "0") - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - } - - // Start DB transaction - $this->db->trans_begin(); - - //insert prestudentstatus - $uid = getAuthUID(); - $result = $this->PrestudentstatusModel->insert( - [ - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'studiensemester_kurzbz' => $studiensem_next, - 'ausbildungssemester' => $ausbildungssem_next, - 'insertamum' => date('c'), - 'insertvon' => $uid, - 'bestaetigtam' => date('c'), - 'bestaetigtvon' => $uid, - 'studienplan_id' => $statusData->studienplan_id, - 'datum' => date('c'), - 'anmerkung' => $statusData->anmerkung - ] - ); - - if (isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($key_prestudent_id); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $student_uid = $result->retval; - - //process studentlehrverband - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->loadWhere( - array( - 'student_uid' => $student_uid, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz - ) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - if (!hasData($result)) { - $this->outputJson($result); - } - - //Data of current Semester - $result = getData($result) ? : []; - $studentlvbData = current($result); - - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband( - $student_uid, - $studentlvbData->studiengang_kz, - $ausbildungssem_next, - $studentlvbData->verband, - $studentlvbData->gruppe, - $studiensem_next - ); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result->code); - } - - $this->db->trans_commit(); - - return $this->outputJsonSuccess(true); - } - - public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) - { - $uid = getAuthUID(); - - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $key_prestudent_id, - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - - $stg = $result->studiengang_kz; - - if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = "Sie haben keine Schreibrechte fuer diesen Studiengang!"; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $result = $this->PrestudentstatusModel->loadWhere( - array( - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz - ) - ); - - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson($result); - } - - elseif (!hasData($result)) { - $this->outputJson($result); - } - else - { - $statusData = current(getData($result)); - } - - //check if Status is unconfirmed.. - if($statusData->bestaetigtam != null) - { - $result = "Der Status ist bereits bestätigt!"; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - //check if Bewerbung abgeschickt - if($statusData->bewerbung_abgeschicktamum == null) - { - $result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!"; - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - - $result = $this->PrestudentstatusModel->update( - [ - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - ], - [ - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - 'bestaetigtam' => date('c'), - 'bestaetigtvon' => $uid, - 'updateamum' => date('c'), - 'updatevon' => $uid - ] - ); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - if (!hasData($result)) { - return error('No Statusdata vorhanden'); - } - return $this->outputJsonSuccess(true); - } -} diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index db860f1e6..624912fe2 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -384,7 +384,8 @@ class Prestudentstatus_model extends DB_Model } else { - return success("1", $this->p->t('studierendenantrag','error_rolleBereitsVorhanden')); + //TODO(manu) nur retval übergeben + return success("1", $this->p->t('lehre','error_rolleBereitsVorhanden')); } } @@ -426,14 +427,20 @@ class Prestudentstatus_model extends DB_Model * @param integer $prestudent_id * @return success("1") if last prestudentstatusentry, else success("0") */ - public function checkIfLastStatusEntry($prestudent_id) + public function checkIfLastStatusEntry($prestudent_id, $isStudent=false ) { $qry = "SELECT COUNT(*) as anzahl FROM public.tbl_prestudentstatus WHERE - prestudent_id = ? "; + prestudent_id = ? + "; + + if($isStudent) + { + $qry .= "AND status_kurzbz = 'Student'"; + } $result = $this->execQuery($qry, array($prestudent_id)); @@ -451,11 +458,9 @@ class Prestudentstatus_model extends DB_Model if ($anzahl <= 1 ) { return success ("1", "Die letzte Rolle kann nur durch den Administrator geloescht werden"); - //return error("Die letzte Rolle kann nur durch den Administrator geloescht werden"); } else return success("0", $anzahl . " Rollen vorhanden"); - //return success($anzahl); } else @@ -479,7 +484,6 @@ class Prestudentstatus_model extends DB_Model { return error("Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen "); } - else { return success(); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index cd3afe91a..351902339 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -81,7 +81,6 @@ export default { this.actionUpdate = true; } } - //this.deltaArray.push(delta); this.deltaArray = delta; }, deep: true diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js index 2fc00a642..cf4f7728a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js @@ -1,5 +1,4 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; -import {CoreRESTClient} from "../../../../../RESTClient"; import BsModal from "../../../../Bootstrap/Modal.js"; import FormForm from '../../../../Form/Form.js'; import FormInput from '../../../../Form/Input.js'; @@ -47,8 +46,9 @@ export default{ data() { return { tabulatorOptions: { - ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Status/getHistoryPrestudent/' + this.prestudent_id), - //autoColumns: true, + ajaxURL: 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.prestudent_id, + ajaxRequestFunc: this.$fhcApi.get, + ajaxResponse: (url, params, response) => response.data, columns: [ {title: "Kurzbz", field: "status_kurzbz", tooltip: true}, {title: "StSem", field: "studiensemester_kurzbz"}, @@ -237,7 +237,6 @@ export default{ }, methods: { actionNewStatus() { - console.log("Action: Neuen Status hinzufügen"); this.statusData.status_kurzbz = 'Interessent'; this.statusData.studiensemester_kurzbz = this.defaultSemester; this.statusData.ausbildungssemester = 1; @@ -246,7 +245,6 @@ export default{ this.$refs.newStatusModal.show(); }, actionEditStatus(status, stdsem, ausbildungssemester){ - console.log("Action: Status bearbeiten: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") this.statusId = { 'prestudent_id': this.prestudent_id, 'status_kurzbz': status, @@ -259,8 +257,6 @@ export default{ }); }, actionDeleteStatus(status, stdsem, ausbildungssemester){ - console.log("Action: Status löschen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") - //this.$refs.deleteStatusModal.show(); this.statusId = { 'prestudent_id': this.prestudent_id, 'status_kurzbz': status, @@ -276,8 +272,6 @@ export default{ }); }, actionAdvanceStatus(status, stdsem, ausbildungssemester){ - console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") - //this.$refs.deleteStatusModal.show(); this.statusId = { 'prestudent_id': this.prestudent_id, 'status_kurzbz': status, @@ -290,8 +284,6 @@ export default{ }); }, actionConfirmStatus(status, stdsem, ausbildungssemester){ - console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")") - //this.$refs.deleteStatusModal.show(); this.statusId = { 'prestudent_id': this.prestudent_id, 'status_kurzbz': status, @@ -304,112 +296,67 @@ export default{ }); }, addNewStatus(){ - CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id, + this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + this.prestudent_id, this.statusData ).then(response => { - if (!response.data.error) { this.$fhcAlert.alertSuccess('Speichern erfolgreich'); this.hideModal('newStatusModal'); this.resetModal(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - if (error.response) { - console.log(error.response); - this.$fhcAlert.alertError(error.response.data); - } - }).finally(() => { + }).catch(this.$fhcAlert.handleSystemError) + .finally(() => { window.scrollTo(0, 0); this.reload(); }); }, advanceStatus(statusId){ - return CoreRESTClient.post('components/stv/Status/advanceStatus/' + + return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' + this.statusId.prestudent_id + '/' + this.statusId.status_kurzbz + '/' + this.statusId.studiensemester_kurzbz + '/' + this.statusId.ausbildungssemester) .then( result => { - if(!result.data.error) { this.$fhcAlert.alertSuccess('Vorrückung Status erfolgreich'); - } - else - { - const errorData = result.data.retval; - this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); - } - /* return result;*/ - }).catch(error => { - if (error.response) { - console.log(error.response); - this.$fhcAlert.alertError(error.response.data); - } - }).finally(() => { + }) + .catch(this.$fhcAlert.handleSystemError) + .finally(() => { window.scrollTo(0, 0); this.reload(); }); }, confirmStatus(statusId){ - return CoreRESTClient.post('components/stv/Status/confirmStatus/' + + return this.$fhcApi.post('api/frontend/v1/stv/status/confirmStatus/' + this.statusId.prestudent_id + '/' + this.statusId.status_kurzbz + '/' + this.statusId.studiensemester_kurzbz + '/' + this.statusId.ausbildungssemester) .then( result => { - if(!result.data.error) { this.$fhcAlert.alertSuccess('Bestätigung Status erfolgreich'); - } - else - { - const errorData = result.data.retval; - this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); - } - } - ).catch(error => { - if (error.response) { - console.log(error.response); - this.$fhcAlert.alertError(error.response.data); - } - }).finally(() => { - window.scrollTo(0, 0); + }) + .catch(this.$fhcAlert.handleSystemError) + .finally(() => { +/* window.scrollTo(0, 0);*/ this.reload(); }); }, deleteStatus(status_id){ - return CoreRESTClient.post('components/stv/Status/deleteStatus/', + return this.$fhcApi.post('api/frontend/v1/stv/status/deleteStatus/', status_id) .then( result => { - if(!result.data.error) { this.$fhcAlert.alertSuccess('Löschen erfolgreich'); this.hideModal('deleteStatusModal'); this.resetModal(); - } - else - { - const errorData = result.data.retval; - this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); - } - /* return result;*/ - }).catch(error => { - if (error.response) { - //console.log(error.response); - this.$fhcAlert.alertError(error.response.data); - } - }).finally(() => { + }) + .catch(this.$fhcAlert.handleSystemError) + .finally(() => { window.scrollTo(0, 0); this.reload(); }); }, editStatus(){ - return CoreRESTClient.post('components/stv/Status/updateStatus/' + + return this.$fhcApi.post('api/frontend/v1/stv/status/updateStatus/' + this.statusId.prestudent_id + '/' + this.statusId.status_kurzbz + '/' + this.statusId.studiensemester_kurzbz + '/' + @@ -417,33 +364,19 @@ export default{ this.statusData) .then( result => { - if(!result.data.error) { this.$fhcAlert.alertSuccess('Bearbeitung Status erfolgreich'); this.hideModal('editStatusModal'); this.resetModal(); - } - else - { -/* const errorData = result.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - });*/ - this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); - } - /* return result;*/ - }).catch(error => { - if (error.response) { - console.log(error.response); - this.$fhcAlert.alertError(error.response.data); - } - }).finally(() => { + }) + .catch(this.$fhcAlert.handleSystemError) + .finally(() => { window.scrollTo(0, 0); this.reload(); }); }, checkIfLastStatus(){ - return CoreRESTClient.get('components/stv/Status/isLastStatus/' + this.prestudent_id) + return this.$fhcApi + .get('api/frontend/v1/stv/status/isLastStatus/' + this.prestudent_id) .then( result => { if(result.data){ @@ -452,29 +385,17 @@ export default{ this.isLastStatus = {}; } return result; - }).catch(error => { - if (error.response) { - console.log(error.response); - this.$fhcAlert.alertError(error.response.data); - } - } - ); + }) + .catch(this.$fhcAlert.handleSystemError); }, loadStatus(status_id){ - return CoreRESTClient.post('components/stv/Status/loadStatus/', + return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/', status_id) - .then( - result => { - if(result.data.retval) - this.statusData = result.data.retval; - else - { - this.statusData = {}; - this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden'); - } + .then(result => { + this.statusData = result.data; return result; - } - ); + }) + .catch(this.$fhcAlert.handleSystemError); }, reload(){ this.$refs.table.reloadTable(); @@ -492,32 +413,32 @@ export default{ } }, created(){ - CoreRESTClient - .get('components/stv/Prestudent/getStudiensemester') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getStudiensemester') + .then(result => result.data) .then(result => { this.listStudiensemester = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id) - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.prestudent_id) + .then(result => result.data) .then(result => { this.listStudienplaene = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Status/getStatusgruende/') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/status/getStatusgruende/') + .then(result => result.data) .then(result => { this.listStatusgruende = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Status/getLastBismeldestichtag/') - .then(result => CoreRESTClient.getData(result.data) || []) + this.$fhcApi + .get('api/frontend/v1/stv/status/getLastBismeldestichtag/') + .then(result => result.data) .then(result => { - this.dataMeldestichtag = result[0].meldestichtag; + this.dataMeldestichtag = result.retval[0].meldestichtag; }) .catch(this.$fhcAlert.handleSystemError); }, @@ -526,7 +447,6 @@ export default{ }, template: `
- diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 753991992..8e4581fc9 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -21991,7 +21991,7 @@ array( ), array( 'app' => 'core', - 'category' => 'studierendenantrag',q + 'category' => 'studierendenantrag', 'phrase' => 'error_no_prestudent', 'insertvon' => 'system', 'phrases' => array( @@ -25893,7 +25893,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Sie haben keine Schreibrechte fuer diesen Studiengang!', + 'text' => 'Sie haben keine Schreibrechte für diesen Studiengang!', 'description' => '', 'insertvon' => 'system' ), @@ -25924,6 +25924,253 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_keinReihungstestverfahren', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '{name}: Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '{name}: In order to turn an interested party into an applicant the person must have completed the ranking test process!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_ZGVNichtEingetragen', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '{name}: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '{name}: In order to turn an interested party into an applicant, the entry requirements must be entered!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_ZGVMasterNichtEingetragen', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '{name}: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '{name}: In order to turn an interested party into an applicant, the entry requirements for master studies must be entered!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_keinBewerber', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '{name} muss zuerst zum Bewerber gemacht werden!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '{name} must be made an applicant first!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_noStudstatus', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student"', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Student status can only be added here if the person is already a student. To turn an applicant into a student, please select "Student" under "Change status".', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_dataVorMeldestichtag', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag kann nicht hinzugefügt werden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Student status with a date or end of semester before the reporting deadline cannot be added', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_duringInsertUpdateLehrverband', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Fehler beim Ermitteln bzw Aktualisieren des Lehrverbands: es wurden keine Änderungen in der Datenbank gespeichert', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Error during insert or update of Lehrverband: no changes were saved in the database', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_duringDeleteLehrverband', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Fehler beim Löschen des Lehrverbands: es wurden keine Änderungen in der Datenbank gespeichert', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Error during deletion of Lehrverband: no changes were saved in the database', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_onlyAdminDeleteRolleStudent', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studentenrolle kann nur durch den Administrator geloescht werden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Error during insert or update of Lehrverband: no changes were saved in the database', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_onlyAdminDeleteLastStatus', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Die letzte Rolle kann nur durch den Administrator geloescht werden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The last role can only be deleted by the administrator', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_noStatusFound', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Fehler: Status nicht gefunden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Error: Status not found', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_statusConfirmedYet', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Der Status ist bereits bestätigt!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The status is already confirmed!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_bewerbungNochNichtAbgeschickt', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The application has not yet been sent and therefore cannot be confirmed!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From abfd92e38748e9bf58a3e61063c587a47f566b89 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 28 Mar 2024 15:35:26 +0100 Subject: [PATCH 167/464] Fetch: check for intermediate properties of error object --- public/js/components/Fetch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Fetch.js b/public/js/components/Fetch.js index 9a34e1a3f..f683c0655 100644 --- a/public/js/components/Fetch.js +++ b/public/js/components/Fetch.js @@ -99,7 +99,7 @@ export const CoreFetchCmpt = { * */ errorHandler: function(error) { - if (error.response.data.retval) + if (error.response?.data?.retval) this.setError(error.response.data.retval); else this.setError(error.message); From 24641d1444ce52aff0604000afb8e7da45224a3b Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 28 Mar 2024 15:35:43 +0100 Subject: [PATCH 168/464] Tabs: use computed on titles --- public/js/components/Tabs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js index 36b6406c5..085c63566 100644 --- a/public/js/components/Tabs.js +++ b/public/js/components/Tabs.js @@ -71,7 +71,7 @@ export default { tabs[key] = { component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))), - title: item.title || key, + title: Vue.computed(() => item.title || key), config: item.config, key } @@ -83,7 +83,7 @@ export default { tabs[key] = { component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))), - title: item.title || key, + title: Vue.computed(() => item.title || key), config: item.config, key } From 46fff01eaad1f3b7285d648cd952a818de9b883b Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 28 Mar 2024 15:37:50 +0100 Subject: [PATCH 169/464] Form_validation: extra functions --- application/helpers/hlp_common_helper.php | 38 +++++++++++++++++ .../language/english/form_validation_lang.php | 42 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 application/language/english/form_validation_lang.php diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php index 3e682e56c..688fae965 100644 --- a/application/helpers/hlp_common_helper.php +++ b/application/helpers/hlp_common_helper.php @@ -422,3 +422,41 @@ function isValidDate($dateString) return false; } } + + +// ------------------------------------------------------------------------ +// Collection of utility functions for form validation purposes +// ------------------------------------------------------------------------ + +/** + * check if string can be converted to a date + */ +function is_valid_date($dateString) +{ + try + { + return (new DateTime($dateString)) !== false; + } + catch(Exception $e) + { + return false; + } +} + +/** + * check if given permissions are met + */ +function has_write_permissions($value, $permissions = '') +{ + if (!$permissions) + $permissions = $value; // TODO(chris): ?? + $permissions = explode(',', $permissions); + + $CI =& get_instance(); + $CI->load->library('PermissionLib'); + return $CI->permissionlib->hasAtLeastOne( + $permissions, + 'sometable', + 'w' + ); +} diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php new file mode 100644 index 000000000..9e942f8e5 --- /dev/null +++ b/application/language/english/form_validation_lang.php @@ -0,0 +1,42 @@ + Date: Thu, 28 Mar 2024 15:38:50 +0100 Subject: [PATCH 170/464] Udf Component --- .../controllers/api/frontend/v1/Udf.php | 142 ++++++++++++++++ application/core/DB_Model.php | 17 ++ application/libraries/UDFLib.php | 156 ++++++++++++++++++ public/js/components/Udf/Udf.js | 156 ++++++++++++++++++ 4 files changed, 471 insertions(+) create mode 100644 application/controllers/api/frontend/v1/Udf.php create mode 100644 public/js/components/Udf/Udf.js diff --git a/application/controllers/api/frontend/v1/Udf.php b/application/controllers/api/frontend/v1/Udf.php new file mode 100644 index 000000000..99ed2a10d --- /dev/null +++ b/application/controllers/api/frontend/v1/Udf.php @@ -0,0 +1,142 @@ +. + */ + +if (! defined('BASEPATH')) exit('No direct script access allowed'); + +/** + * This controller operates between (interface) the JS (GUI) and the UDFLib (back-end) + * Provides data to the ajax get calls about the Udf component + * Listens to ajax post calls to change the Udf data + * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON + */ +class Udf extends FHCAPI_Controller +{ + /** + * Calls the parent's constructor and prepares the UDFLib + */ + public function __construct() + { + // TODO(chris): permissions + // NOTE: UdfLib has its own permissions checks + parent::__construct([ + 'load' => 'admin:r',#self::PERM_LOGGED, + 'save' => 'admin:r'#self::PERM_LOGGED + ]); + + // Libraries + $this->load->library('form_validation'); + $this->load->library('UDFLib'); + + // Models + $this->load->model($this->getTargetModelPath(), 'TargetModel'); + } + + //------------------------------------------------------------------------------------------------------------------ + // Public methods + + /** + * Load all UDFs for a dataset + * + * @return void + */ + public function load() + { + $pks = $this->TargetModel->getPks(); + foreach ($pks as $id) + $this->form_validation->set_rules($id, $id, 'required'); + + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + $id = []; + foreach ($pks as $pk) + $id[$pk] = $this->input->post($pk); + if (!is_array($this->TargetModel->getPk())) + $id = current($id); + + $result = $this->udflib->getFieldArray($this->TargetModel, $id); + + #$fields = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result)); + $fields = $result->retval; + + $this->terminateWithSuccess($fields); + } + + /** + * Saves UDFs to a dataset + * + * @return void + */ + public function save() + { + $pks = $this->TargetModel->getPks(); + foreach ($pks as $id) + $this->form_validation->set_rules($id, $id, 'required'); + + $result = $this->udflib->getCiValidations($this->TargetModel, $this->input->post()); + + #$fieldValidations = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result)); + $fieldvalidations = $result->retval; + + $this->form_validation->set_rules($fieldvalidations); + + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + $id = []; + $fields = $this->input->post(); + foreach ($pks as $pk) { + $id[$pk] = $fields[$pk]; + unset($fields[$pk]); + } + if (!is_array($this->TargetModel->getPk())) + $id = current($id); + + $result = $this->TargetModel->update($id, $fields); + + #$this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + + $this->terminateWithSuccess(array_fill_keys(array_keys($fields), '')); + } + + //------------------------------------------------------------------------------------------------------------------ + // Private methods + + /** + * Get the path to the target model from the url + * + * @return string + */ + private function getTargetModelPath() + { + $ci_model_path = array_slice($this->uri->rsegments, 2); + if ($ci_model_path) + $ci_model_path[] = ucfirst(array_pop($ci_model_path)) . '_model'; + return implode(DIRECTORY_SEPARATOR, $ci_model_path); + } +} \ No newline at end of file diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php index 79040dc66..c799de516 100644 --- a/application/core/DB_Model.php +++ b/application/core/DB_Model.php @@ -827,6 +827,23 @@ class DB_Model extends CI_Model return $result; } + public function getDbTable() + { + return $this->dbTable; + } + + public function getPk() + { + return $this->pk; + } + + public function getPks() + { + if (is_array($this->pk)) + return $this->pk; + return [$this->pk]; + } + // ------------------------------------------------------------------------------------------ // Protected methods diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php index c5f0d3e98..2fa5dd0d4 100644 --- a/application/libraries/UDFLib.php +++ b/application/libraries/UDFLib.php @@ -65,6 +65,8 @@ class UDFLib private $_udfUniqueId; // Property that contains the UDF widget unique id + private $_definition_cache = []; + /** * Gets CI instance */ @@ -613,6 +615,160 @@ class UDFLib ); } + /** + * Gets the UDF definitions for a model + * + * @param DB_Model $targetModel + * + * @return stdClass + */ + public function getDefinitionForModel($targetModel) + { + $dbTable = $targetModel->getDbTable(); + if (!isset($this->_definition_cache[$dbTable])) { + $this->_ci->load->model('system/UDF_model', 'UDFModel'); + list($schema, $table) = explode('.', $dbTable); + $result = $this->_ci->UDFModel->loadWhere([ + 'schema' => $schema, + 'table' => $table + ]); + if (isError($result)) + return $result; + + $this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true); + } + return success($this->_definition_cache[$dbTable]); + } + + /** + * Gets the UDFs for db entry with translated params and resolved listValues for dropdowns + * + * @param DB_Model $targetModel + * @param mixed $id + * + * @return stdClass + */ + public function getFieldArray($targetModel, $id) + { + // Load Libraries + $this->_ci->load->library('PhrasesLib'); + $this->_ci->load->library('PermissionLib'); + + $result = $this->getDefinitionForModel($targetModel); + if (isError($result)) + return $result; + $definitions = getData($result); + + usort($definitions, function ($a, $b) { + return $a[self::SORT] - $b[self::SORT]; + }); + + $values = $targetModel->getUDFs($id); + + $fields = []; + foreach ($definitions as $field) { + // check read permissions + if (!$this->_ci->permissionlib->hasAtLeastOne( + $field[self::REQUIRED_PERMISSIONS_PARAMETER], + self::PERMISSION_TABLE_METHOD, + self::PERMISSION_TYPE_READ + )) + continue; + + // set value + if (isset($values[$field[self::NAME]])) { + $field['value'] = $values[$field[self::NAME]]; + } elseif (isset($field['defaultValue'])) { + $field['value'] = $field['defaultValue']; + } elseif (isset($field[self::TYPE]) && $field[self::TYPE] == 'checkbox') { + $field['value'] = false; + } else { + $field['value'] = ''; + } + + // translate params + foreach ([self::LABEL, self::TITLE, self::PLACEHOLDER] as $key) { + if (isset($field[$key])) { + $res = $this->_ci->phraseslib->getPhrases(self::PHRASES_APP_NAME, getUserLanguage(), $field[$key], null, null, 'no'); + if (hasData($res)) + $field[$key] = current(getData($res))->text; + } + } + + // check write permissions + $field['disabled'] = !$this->_ci->permissionlib->hasAtLeastOne( + $field[self::REQUIRED_PERMISSIONS_PARAMETER], + self::PERMISSION_TABLE_METHOD, + self::PERMISSION_TYPE_WRITE + ); + + // set listValues for dropdowns + if (isset($field[self::LIST_VALUES])) { + if (isset($field[self::LIST_VALUES]['enum'])) { + $field['options'] = $field[self::LIST_VALUES]['enum']; + } elseif (isset($field[self::LIST_VALUES]['sql'])) { + $res = $this->_ci->UDFModel->execReadOnlyQuery($field[self::LIST_VALUES]['sql']); + $field['options'] = hasData($res) ? getData($res) : []; + } + } + + // add to array + $fields[] = $field; + } + return success($fields); + } + + /** + * Gets a validation config array for CI form_validation + * + * @param DB_Model $targetModel + * @param array (optional) $filter + * + * @return stdClass + */ + public function getCiValidations($targetModel, $filter = null) + { + $result = $this->getDefinitionForModel($targetModel); + if (isError($result)) + return $result; + $definitions = getData($result); + + $result = []; + foreach ($definitions as $def) { + if ($filter && !isset($filter[$def['name']])) + continue; + $validations = []; + if (isset($def['requiredPermissions'])) + $validations[] = 'has_write_permissions[' . implode(',', $def['requiredPermissions']) . ']'; + if (isset($def['required'])) + $validations[] = 'required'; + if (isset($def['validation'])) { + if (isset($def['validation']['max-value'])) + $validations[] = 'less_than_equal_to[' . $def['validation']['max-value'] . ']'; + if (isset($def['validation']['min-value'])) + $validations[] = 'greater_than_equal_to[' . $def['validation']['min-value'] . ']'; + if (isset($def['validation']['max-length'])) + $validations[] = 'max_length[' . $def['validation']['max-length'] . ']'; + if (isset($def['validation']['min-length'])) + $validations[] = 'min_length[' . $def['validation']['min-length'] . ']'; + if (isset($def['validation']['regex']) && is_array($def['validation']['regex'])) { + foreach ($def['validation']['regex'] as $regex) { + if ($regex['language'] == 'php') { + $validations[] = 'regex_match[' . $regex['expression'] . ']'; + } + } + } + } + if ($validations) + $result[] = [ + 'field' => $def['name'], + 'label' => $def['title'], + 'rules' => $validations + ]; + } + return success($result); + } + // ------------------------------------------------------------------------------------------------- // Private methods // diff --git a/public/js/components/Udf/Udf.js b/public/js/components/Udf/Udf.js new file mode 100644 index 000000000..e9cc3c60a --- /dev/null +++ b/public/js/components/Udf/Udf.js @@ -0,0 +1,156 @@ +import { CoreFetchCmpt } from '../Fetch.js'; +import FormInput from '../Form/Input.js'; + + +export default { + components: { + CoreFetchCmpt, + FormInput + }, + emits: [ + 'update:modelValue', + 'load' + ], + props: { + // CodeIgniter model (eg: crm/prestudent) + ciModel: { + type: String, + required: true + }, + // Primarykey(s) of the record (eg: {prestudent_id: 12345}) + pk: { + type: Object, + required: true + }, + // The values as associative array + modelValue: Object, + // Show only fields with a name that exists in the filter + filter: [String, Array] + }, + data() { + return { + fields: [], + backupModelValue: {} + }; + }, + computed: { + filterArray() { + if (!this.filter || Array.isArray(this.filter)) + return this.filter; + return [this.filter]; + }, + filteredFields() { + if (!this.filterArray) + return this.fields; + return this.fields.filter(el => this.filterArray.includes(el.name)); + }, + filteredValues() { + return this.filteredFields.reduce((r,e) => (r[e.name] = this.internModelValue[e.name], r), {}); + }, + internModelValue: { + get() { + return this.modelValue || this.backupModelValue; + }, + set(value) { + this.backupModelValue = value; + this.$emit('update:modelValue', value); + this.originalValues + } + } + }, + watch: { + pk(n, o) { + if (!this.$refs.fetch) + return; // NOTE(chris): no initial load yet + + if (Object.keys(o).length == Object.keys(n).length + && Object.keys(o).every(key => n.hasOwnProperty(key) && o[key] === n[key])) + return; // NOTE(chris): old and new are the same + + this.$nextTick(this.$refs.fetch.fetchData); + } + }, + methods: { + loadF(params) { + // TODO(chris): move to fhcapi.factory + return this.$fhcApi + .post('/api/frontend/v1/udf/load/' + params.ciModel, params.pk); + }, + init(result) { + const fields = result.map(el => { + switch (el.type) { + case 'textfield': + el.type = 'text'; + break; + case 'date': + el.type = 'Datepicker'; + el.clearable = el.hasOwnProperty('clearable') ? el.clearable : false + el.autoApply = el.hasOwnProperty('autoApply') ? el.autoApply : true + el.enableTimePicker = el.hasOwnProperty('enableTimePicker') ? el.enableTimePicker : false + el.format = el.hasOwnProperty('format') ? el.format : "dd.MM.yyyy" + el.previewFormat = el.hasOwnProperty('previewFormat') ? el.previewFormat : "dd.MM.yyyy" + el.teleport = el.hasOwnProperty('teleport') ? el.teleport : true + break; + case 'multipledropdown': + el.multiple = true; + case 'dropdown': + el.type = 'select'; + el.options = el.options.map(item => { + if (Array.isArray(item)) + return { + id: item[0], + description: item[1] + }; + if (typeof item === 'object') + return item; + return { + id: item, + description: item + }; + }); + break; + } + return el; + }); + const values = fields.reduce((a,c) => { + a[c.name] = c.value; + return a; + }, {}); + + this.internModelValue = {...this.internModelValue, ...values}; + this.fields = fields; + this.$emit('load', values); + } + }, + template: ` +
+ + + +
` +} \ No newline at end of file From c6f4fbb0b864835555b58583f68ebfe99a1f0093 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 28 Mar 2024 15:39:19 +0100 Subject: [PATCH 171/464] Use Udf Component --- .../api/frontend/v1/stv/Student.php | 588 ++++++++++++++++++ .../Studentenverwaltung/Details/Details.js | 39 +- .../Stv/Studentenverwaltung/List/New.js | 15 +- 3 files changed, 622 insertions(+), 20 deletions(-) create mode 100644 application/controllers/api/frontend/v1/stv/Student.php diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php new file mode 100644 index 000000000..101d34863 --- /dev/null +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -0,0 +1,588 @@ +. + */ + +if (! defined('BASEPATH')) exit('No direct script access allowed'); + +use \DateTime as DateTime; + +/** + * This controller operates between (interface) the JS (GUI) and the back-end + * Provides data to the ajax get calls about a Student + * Listens to ajax post calls to change the Student data + * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON + */ +class Student extends FHCAPI_Controller +{ + /** + * Calls the parent's constructor and prepares libraries and phrases + */ + public function __construct() + { + // TODO(chris): permissions + parent::__construct([ + 'get' => ['admin:r', 'assistenz:r'], + 'save' => ['admin:w', 'assistenz:w'], + 'check' => ['admin:w', 'assistenz:w'], + 'add' => ['admin:w', 'assistenz:w'] + ]); + + // Load Libraries + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + + // Load language phrases + $this->loadPhrases([ + 'ui' + ]); + } + + //------------------------------------------------------------------------------------------------------------------ + // Public methods + + /** + * Get details for a prestudent + * + * @param string $prestudent_id + * @return void + */ + public function get($prestudent_id) + { + $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell'); + + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $this->PrestudentModel->addSelect('p.*'); + $this->PrestudentModel->addSelect('s.student_uid'); + $this->PrestudentModel->addSelect('matrikelnr'); + $this->PrestudentModel->addSelect('b.aktiv'); + $this->PrestudentModel->addSelect('v.semester'); + $this->PrestudentModel->addSelect('v.verband'); + $this->PrestudentModel->addSelect('v.gruppe'); + $this->PrestudentModel->addSelect('b.alias'); + + if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) { + $this->PrestudentModel->addSelect( + "( + SELECT kontakt + FROM public.tbl_kontakt + WHERE kontakttyp='email' + AND person_id=p.person_id + AND zustellung + ORDER BY kontakt_id + LIMIT 1 + ) AS email_privat", + false + ); + } + + $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); + $this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT'); + $this->PrestudentModel->addJoin( + 'public.tbl_studentlehrverband v', + 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz), + 'LEFT' + ); + $this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id'); + + $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + + #$student = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $student = $result->retval; + + if (!$student) + return show_404(); + + $this->terminateWithSuccess(current($student)); + } + + /** + * Saves data to a prestudent + * + * @param string $prestudent_id + * @return void + */ + public function save($prestudent_id) + { + $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell'); + + $this->load->model('person/Person_model', 'PersonModel'); + $this->load->model('crm/Student_model', 'StudentModel'); + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + + $this->load->library('form_validation'); + + $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date'); + + $this->form_validation->set_rules('semester', 'Semester', 'integer'); + + $this->load->library('UDFLib'); + + $result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post()); + + #$fieldValidations = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result)); + $fieldvalidations = $result->retval; + + $this->form_validation->set_rules($fieldvalidations); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + $result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + + #$student = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $student = $result->retval; + + $uid = $student ? current($student)->student_uid : null; + + $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + + #$person = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result)); + $person = $result->retval; + + $person_id = $person ? current($person)->person_id : null; + + + $array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe']; + $update_lehrverband = array(); + foreach ($array_allowed_props_lehrverband as $prop) { + $val = $this->input->post($prop); + if ($val !== null) { + $update_lehrverband[$prop] = $val; + } + } + + $array_allowed_props_person = [ + 'anrede', + 'bpk', + 'titelpre', + 'titelpost', + 'nachname', + 'vorname', + 'vornamen', + 'wahlname', + 'gebdatum', + 'gebort', + 'geburtsnation', + 'svnr', + 'ersatzkennzeichen', + 'staatsbuergerschaft', + 'matr_nr', + 'sprache', + 'geschlecht', + 'familienstand', + 'foto', + 'anmerkung', + 'homepage' + ]; + + // add UDFs + $result = $this->udflib->getDefinitionForModel($this->PersonModel); + + #$definitions = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $definitions = $result->retval; + + foreach ($definitions as $def) + $array_allowed_props_person[] = $def['name']; + + $update_person = array(); + foreach ($array_allowed_props_person as $prop) { + $val = $this->input->post($prop); + if ($val !== null) { + $update_person[$prop] = $val; + } + } + + $array_allowed_props_student = ['matrikelnr']; + $update_student = array(); + foreach ($array_allowed_props_student as $prop) { + $val = $this->input->post($prop); + if ($val !== null) { + $update_student[$prop] = $val; + } + } + + // Check PKs + if (count($update_lehrverband) + count($update_student) && $uid === null) { + // TODO(chris): phrase + $this->terminateWithValidationErrors(['' => "Kein/e StudentIn vorhanden!"]); + } + if (count($update_person) && $person_id === null) { + // TODO(chris): phrase + $this->terminateWithValidationErrors(['' => "Keine Person vorhanden!"]); + } + + // Do Updates + if (count($update_lehrverband)) { + $result = $this->StudentlehrverbandModel->update([ + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'student_uid' => $uid + ], $update_lehrverband); + #$this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + if (count($update_person)) { + $result = $this->PersonModel->update( + $person_id, + $update_person + ); + #$this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + + if (count($update_student)) { + $result = $this->StudentModel->update( + [$uid], + $update_student + ); + #$this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + + $this->terminateWithSuccess(array_fill_keys(array_merge( + array_keys($update_lehrverband), + array_keys($update_person), + array_keys($update_student) + ), '')); + } + + public function check() + { + $this->load->library('form_validation'); + + $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [ + 'isValidDate' => $this->p->t('ui', 'error_invalid_date') + ]); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + $vorname = $this->input->post('vorname'); + $nachname = $this->input->post('nachname'); + $gebdatum = $this->input->post('gebdatum'); + + if (!$vorname && !$nachname && !$gebdatum) + $this->terminateWithValidationErrors(['At least one of vorname, nachname or gebdatum must be set']); + + $this->load->model('person/Person_model', 'PersonModel'); + + if ($gebdatum) + $this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d')); + if ($vorname && $nachname) { + $this->PersonModel->db->or_group_start(); + $this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false); + $this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false); + $this->PersonModel->db->group_end(); + } elseif ($nachname) { + $this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false); + } + + $result = $this->PersonModel->load(); + + #$data = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $data = $result->retval; + + $this->terminateWithSuccess($data); + } + + public function add() + { + if (!$this->input->post('person_id')) { + if (!isset($_POST['address']) || !is_array($_POST['address'])) + $_POST['address'] = []; + $_POST['address']['func'] = 1; + } + if ($this->input->post('incoming')) { + $_POST['ausbildungssemester'] = 0; + } + + $this->load->library('form_validation'); + + $this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [ + 'requiredIfNotPersonId' => $this->p->t('ui', 'error_required') + ]); + $this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [ + 'requiredIfNotPersonId' => $this->p->t('ui', 'error_required') + ]); + $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [ + 'isValidDate' => $this->p->t('ui', 'error_invalid_date') + ]); + $this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]'); + $this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [ + 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') + ]); + $this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [ + 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') + ]); + $this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [ + 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') + ]); + $this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [ + 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') + ]); + $this->form_validation->set_rules('email', 'E-Mail', 'valid_email'); + $this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required'); + $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required'); + $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]'); + // TODO(chris): validate studienplan with studiengang, semester and orgform? + // TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht? + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + // TODO(chris): This should be in a library + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + $this->db->trans_start(); + + $result = $this->addInteressent(); + + $this->db->trans_complete(); + + if ($this->db->trans_status() === FALSE) + $this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL); + + $this->terminateWithSuccess($result); + } + + protected function addInteressent() + { + // Person anlegen wenn nötig + $person_id = $this->input->post('person_id'); + if (!$person_id) { + $this->load->model('person/Person_model', 'PersonModel'); + + $data = [ + 'nachname' => $this->input->post('nachname'), + 'insertamum' => date('c'), + 'insertvon' => getAuthUID(), + 'zugangscode' => uniqid(), + 'aktiv' => true + ]; + if ($this->input->post('anrede')) + $data['anrede'] = $this->input->post('anrede'); + if ($this->input->post('titelpre')) + $data['titelpre'] = $this->input->post('titelpre'); + if ($this->input->post('titelpost')) + $data['titelpost'] = $this->input->post('titelpost'); + if ($this->input->post('vorname')) + $data['vorname'] = $this->input->post('vorname'); + if ($this->input->post('vornamen')) + $data['vornamen'] = $this->input->post('vornamen'); + if ($this->input->post('wahlname')) + $data['wahlname'] = $this->input->post('wahlname'); + if ($this->input->post('geschlecht')) + $data['geschlecht'] = $this->input->post('geschlecht'); + if ($this->input->post('gebdatum')) + $data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d'); + if ($this->input->post('geburtsnation')) + $data['geburtsnation'] = $this->input->post('geburtsnation'); + if ($this->input->post('staatsbuergerschaft')) + $data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft'); + + $result = $this->PersonModel->insert($data); + if (isError($result)) + return $result; + $person_id = getData($result); + } + + // Addresse anlegen + $anlegen = $this->input->post('address[func]'); + if ($anlegen) { + $this->load->model('person/Adresse_model', 'AdresseModel'); + + $data = [ + 'nation' => $this->input->post('address[nation]'), + 'strasse' => $this->input->post('address[address]'), + 'plz' => $this->input->post('address[plz]'), + 'ort' => $this->input->post('address[ort]'), + 'gemeinde' => $this->input->post('address[gemeinde]'), + 'typ' => 'h', + 'zustelladresse' => true, + ]; + if ($anlegen < 0) { // Überschreiben + $this->AdresseModel->addOrder('zustelladresse', 'DESC'); + $this->AdresseModel->addOrder('sort'); + $result = $this->AdresseModel->loadWhere([ + 'person_id' => $person_id + ]); + if (isError($result)) + return $result; + if (hasData($result)) { + $address = current(getData($result)); + + $data['updateamum'] = date('c'); + $data['updatevon'] = getAuthUID(); + + $result = $this->AdresseModel->update($address->adresse_id, $data); + if (isError($result)) + return $result; + } else { + //Wenn keine Adrese vorhanden ist dann eine neue Anlegen + $anlegen = 1; + $data['heimatadresse'] = true; + } + } + if ($anlegen > 0) { + $data['person_id'] = $person_id; + $data['insertamum'] = date('c'); + $data['insertvon'] = getAuthUID(); + if (!isset($data['heimatadresse'])) + $data['heimatadresse'] = !$this->input->post('person_id'); + + $result = $this->AdresseModel->insert($data); + if (isError($result)) + return $result; + } + } + + // Kontaktdaten + $kontaktdaten = []; + foreach (['email', 'telefon', 'mobil'] as $k) { + $v = $this->input->post($k); + if ($v) + $kontaktdaten[$k] = $v; + } + if (count($kontaktdaten)) { + $this->load->model('person/Kontakt_model', 'KontaktModel'); + + foreach ($kontaktdaten as $typ => $kontakt) { + $data = [ + 'person_id' => $person_id, + 'kontakttyp' => $typ, + 'kontakt' => $kontakt, + 'zustellung' => true, + 'insertamum' => date('c'), + 'insertvon' => getAuthUID() + ]; + $result = $this->KontaktModel->insert($data); + if (isError($result)) + return $result; + } + } + + // Prestudent anlegen + $data = [ + 'aufmerksamdurch_kurzbz' => 'k.A.', + 'person_id' => $person_id, + 'studiengang_kz' => $this->input->post('studiengang_kz'), + 'ausbildungcode' => $this->input->post('letzteausbildung'), + 'anmerkung' => $this->input->post('anmerkungen'), + 'reihungstestangetreten' => false, + 'bismelden' => true + ]; + $ausbildungsart = $this->input->post('ausbildungsart'); + if ($ausbildungsart) + $data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart; + // Incomings und ausserordentliche sind bei Meldung nicht förderrelevant + $incoming = $this->input->post('incoming'); + if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9') + $data['foerderrelevant'] = false; + // Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen + $this->PrestudentModel->addOrder('zgvmas_code'); + $this->PrestudentModel->addOrder('zgv_code', 'DESC'); + $this->PrestudentModel->addLimit(1); + $result = $this->PrestudentModel->loadWhere([ + 'person_id' => $person_id + ]); + if (isError($result)) + return $result; + if (hasData($result)) { + $prestudent = current(getData($result)); + if ($prestudent->zgv_code) { + $data['zgv_code'] = $prestudent->zgv_code; + $data['zgvort'] = $prestudent->zgvort; + $data['zgvdatum'] = $prestudent->zgvdatum; + + $data['zgvmas_code'] = $prestudent->zgvmas_code; + $data['zgvmaort'] = $prestudent->zgvmaort; + $data['zgvmadatum'] = $prestudent->zgvmadatum; + } + } + // Prestudent speichern + $result = $this->PrestudentModel->insert($data); + if (isError($result)) + return $result; + $prestudent_id = getData($result); + + // Prestudent Rolle Anlegen + $data = [ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent', + 'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'), + 'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0, + 'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null, + 'studienplan_id' => $this->input->post('studienplan_id') ?: null, + 'datum' => date('Y-m-d'), + 'insertamum' => date('c'), + 'insertvon' => getAuthUID() + ]; + $result = $this->PrestudentstatusModel->insert($data); + if (isError($result)) + return $result; + + if ($incoming) { + // TODO(chris): IMPLEMENT! + //Matrikelnummer und UID generieren + //Benutzerdatensatz anlegen + //Studentendatensatz anlegen + //StudentLehrverband anlegen + } + + // TODO(chris): DEBUG + /*$result = $this->PrestudentModel->loadWhere([ + 'pestudent_id' => 1 + ]); + if (isError($result)) { + return $result; + }*/ + + return success(true); + } + + public function requiredIfNotPersonId($value) + { + if (isset($_POST['person_id'])) + return true; + return !!$value; + } + + public function requiredIfAddressFunc($value) + { + if (!$_POST['address']['func']) + return true; + return !!$value; + } +} diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js index 0c988179f..7866f1c97 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js @@ -1,14 +1,17 @@ import {CoreRESTClient} from '../../../../RESTClient.js'; -import FormForm from '../../../Form/Form.js'; +import CoreForm from '../../../Form/Form.js'; import FormInput from '../../../Form/Input.js'; import FormUploadImage from '../../../Form/Upload/Image.js'; +import CoreUdf from '../../../Udf/Udf.js'; + export default { components: { - FormForm, + CoreForm, FormInput, - FormUploadImage + FormUploadImage, + CoreUdf }, inject: { showBpk: { @@ -39,6 +42,7 @@ export default { }, data() { return { + test: {udf_viaf: 'TEST'}, familienstaende: { "": "--keine Auswahl--", "g": "geschieden", @@ -49,6 +53,7 @@ export default { original: null, data: null, changed: {}, + udfChanges: false, studentIn: null, gebDatumIsValid: false, gebDatumIsInvalid: false @@ -90,25 +95,33 @@ export default { }, methods: { updateStudent(n) { - CoreRESTClient - .get('components/stv/Student/get/' + n.prestudent_id) - .then(result => result.data) + // TODO(chris): move to fhcapi.factory + this.$fhcApi + .get('api/frontend/v1/stv/student/get/' + n.prestudent_id) .then(result => { - this.data = result; + this.data = result.data; if (!this.data.familienstand) this.data.familienstand = ''; - this.original = {...this.data}; + this.original = {...(this.original || {}), ...this.data}; }) .catch(this.$fhcAlert.handleSystemError); }, save() { + if (!this.changedLength) + return; + + this.$refs.form.clearValidation(); this.$refs.form - .send(CoreRESTClient.post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed)) + .post('api/frontend/v1/stv/student/save/' + this.modelValue.prestudent_id, this.changed) .then(result => { this.original = {...this.data}; this.changed = {}; + this.$refs.form.setFeedback(true, result.data); }) - .catch(this.$fhcAlert.handleSystemError); + .catch(this.$fhcAlert.handleSystemError) + }, + udfsLoaded(udfs) { + this.original = {...(this.original || {}), ...udfs}; } }, created() { @@ -117,7 +130,7 @@ export default { //TODO(chris): Phrasen //TODO(chris): Geburtszeit? Anzahl der Kinder? template: ` - +
@@ -235,6 +248,7 @@ export default { :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy" + teleport > Loading...
+
StudentIn @@ -441,5 +456,5 @@ export default { Loading...
- ` + ` }; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js index 7bba76e51..acc9781de 100644 --- a/public/js/components/Stv/Studentenverwaltung/List/New.js +++ b/public/js/components/Stv/Studentenverwaltung/List/New.js @@ -106,18 +106,16 @@ export default { return; this.abortController.suggestions = new AbortController(); - CoreRESTClient - .post('components/stv/student/check', { + // TODO(chris): move to fhcapi.factory + this.$fhcapi + .post('api/frontend/v1/stv/student/check', { vorname: this.formData.vorname, nachname: this.formData.nachname, gebdatum: this.formData.gebdatum }, { signal: this.abortController.suggestions.signal }) - .then(result => CoreRESTClient.getData(result.data) || []) - .then(result => { - this.suggestions = result; - }) + .then(result => this.suggestions = result.data) .catch(error => { // NOTE(chris): repeat request if (error.code != "ERR_CANCELED") @@ -191,13 +189,14 @@ export default { if (data.studiensemester_kurzbz === undefined) data.studiensemester_kurzbz = this.studiensemesterKurzbz; + // TODO(chris): move to fhcapi.factory this.$refs.form - .send(CoreRESTClient.post('components/stv/student/add', data)) + .send('api/frontend/v1/stv/student/add', data) .then(result => { this.$fhcAlert.alertSuccess('Gespeichert'); this.$refs.modal.hide(); }) - .catch(console.error); + .catch(this.$fhcAlert.handleSystemError); } }, created() { From 2d88ee031ca267f32e61397ce97f844edf6c62fd Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 2 Apr 2024 09:12:26 +0200 Subject: [PATCH 172/464] refactor Tab Kontakt api Controller, Phrases alerts --- .../api/frontend/v1/stv/Kontakt.php | 710 ++++++++++++++++++ .../Studentenverwaltung/Details/Kontakt.js | 2 - .../Details/Kontakt/Address.js | 184 ++--- .../Details/Kontakt/Bankaccount.js | 125 ++- .../Details/Kontakt/Contact.js | 149 ++-- system/phrasesupdate.php | 77 ++ 6 files changed, 975 insertions(+), 272 deletions(-) create mode 100644 application/controllers/api/frontend/v1/stv/Kontakt.php diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php new file mode 100644 index 000000000..517388b39 --- /dev/null +++ b/application/controllers/api/frontend/v1/stv/Kontakt.php @@ -0,0 +1,710 @@ + ['admin:r', 'assistenz:r'], + 'addNewAddress' => ['admin:r', 'assistenz:r'], + 'addNewContact' => ['admin:r', 'assistenz:r'], + 'addNewBankverbindung' => ['admin:r', 'assistenz:r'], + 'updateAddress' => ['admin:r', 'assistenz:r'], + 'updateContact' => ['admin:r', 'assistenz:r'], + 'updateBankverbindung' => ['admin:r', 'assistenz:r'], + 'loadAddress' => ['admin:r', 'assistenz:r'], + 'loadContact' => ['admin:r', 'assistenz:r'], + 'loadBankverbindung' => ['admin:r', 'assistenz:r'], + 'deleteAddress' => ['admin:r', 'assistenz:r'], + 'deleteContact' => ['admin:r','assistenz:r'], + 'deleteBankverbindung' => ['admin:r','assistenz:r'], + 'getAdressentypen' => ['admin:r', 'assistenz:r'], + 'getKontakttypen' => ['admin:r', 'assistenz:r'], + 'getFirmen' => ['admin:r', 'assistenz:r'], + 'getStandorte' => ['admin:r', 'assistenz:r'], + 'getKontakte' => ['admin:r', 'assistenz:r'], + 'getBankverbindung' => ['admin:r', 'assistenz:r'], + + ]); + + // Load Libraries + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + $this->load->library('form_validation'); + + // Load language phrases + $this->loadPhrases([ + 'ui' + ]); + } + + public function getAdressen($person_id) + { + $this->load->model('person/Adresse_model', 'AdresseModel'); + + $this->AdresseModel->addSelect('public.tbl_adresse.*'); + $this->AdresseModel->addSelect('t.*'); + $this->AdresseModel->addSelect('f.firma_id'); + $this->AdresseModel->addSelect('f.name as firmenname'); + $this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)'); + $this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT'); + + $result = $this->AdresseModel->loadWhere( + array('person_id' => $person_id) + ); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess((getData($result) ?: [])); + } + + public function addNewAddress($person_id) + { + $_POST = json_decode($this->input->raw_input_stream, true); + + $this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']), + 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + $this->load->model('person/Adresse_model', 'AdresseModel'); + + $uid = getAuthUID(); + $co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null; + $strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null; + $ort = isset($_POST['ort']) ? $_POST['ort'] : null; + $gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null; + $nation = isset($_POST['nation']) ? $_POST['nation'] : null; + $name = isset($_POST['name']) ? $_POST['name'] : null; + $typ = isset($_POST['typ']) ? $_POST['typ'] : null; + $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null; + + if(isset($_POST['firma'])) + { + $firma_id = $_POST['firma']['firma_id']; + } + else + $firma_id = null; + + $result = $this->AdresseModel->insert( + [ + 'person_id' => $person_id, + 'strasse' => $strasse, + 'insertvon' => $uid, + 'insertamum' => date('c'), + 'plz' => $_POST['plz'], + 'ort' => $ort, + 'gemeinde' => $gemeinde, + 'nation' => $nation, + 'heimatadresse' => $_POST['heimatadresse'], + 'zustelladresse' => $_POST['zustelladresse'], + 'co_name' => $co_name, + 'typ' => $typ, + 'firma_id' => $firma_id, + 'name' => $name, + 'rechnungsadresse' => $_POST['rechnungsadresse'], + 'anmerkung' => $anmerkung + + ] + ); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } + + public function updateAddress($address_id) + { + $uid = getAuthUID(); + $_POST = json_decode($this->input->raw_input_stream, true); + + $this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']), + 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + $this->load->model('person/Adresse_model', 'AdresseModel'); + + if(!$address_id) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL); + } + + if(isset($_POST['firma'])) + { + $firma_id = $_POST['firma']['firma_id']; + } + else + $firma_id = null; + + $person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null; + $co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null; + $strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null; + $ort = isset($_POST['ort']) ? $_POST['ort'] : null; + $gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null; + $nation = isset($_POST['nation']) ? $_POST['nation'] : null; + $name = isset($_POST['name']) ? $_POST['name'] : null; + $typ = isset($_POST['typ']) ? $_POST['typ'] : null; + $anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null; + + $result = $this->AdresseModel->update( + [ + 'adresse_id' => $address_id + ], + [ 'person_id' => $person_id, + 'strasse' => $strasse, + 'updatevon' => $uid, + 'updateamum' => date('c'), + 'plz' => $_POST['plz'], + 'ort' => $ort, + 'gemeinde' => $gemeinde, + 'nation' => $nation, + 'heimatadresse' => $_POST['heimatadresse'], + 'zustelladresse' => $_POST['zustelladresse'], + 'co_name' => $co_name, + 'typ' => $typ, + 'firma_id' => $firma_id, + 'name' => $name, + 'rechnungsadresse' => $_POST['rechnungsadresse'], + 'anmerkung' => $anmerkung + ] + ); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } + + public function loadAddress($adresse_id) + { + $this->load->model('person/Adresse_model', 'AdresseModel'); + + $this->AdresseModel->addSelect('public.tbl_adresse.*'); + $this->AdresseModel->addSelect('t.*'); + $this->AdresseModel->addSelect('f.firma_id'); + $this->AdresseModel->addSelect('f.name as firmenname'); + $this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)'); + $this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT'); + + $this->AdresseModel->addLimit(1); + + $result = $this->AdresseModel->loadWhere( + array('adresse_id' => $adresse_id) + ); + if (isError($result)) { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + if (!hasData($result)) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess(current(getData($result)) ? : null); + } + + public function deleteAddress($adresse_id) + { + $this->load->model('person/Adresse_model', 'AdresseModel'); + + $result = $this->AdresseModel->delete( + array('adresse_id' => $adresse_id) + ); + + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL); + } + //return $this->outputJsonSuccess(current(getData($result))); + return $this->terminateWithSuccess(current(getData($result)) ? : null); + } + + public function getAdressentypen() + { + $this->load->model('person/Adressentyp_model', 'AdressentypModel'); + + $result = $this->AdressentypModel->load(); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess(getData($result) ?: []); + } + + public function getFirmen($searchString) + { + $this->load->model('ressource/firma_model', 'FirmaModel'); + + $result = $this->FirmaModel->searchFirmen($searchString); + if (isError($result)) { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess($result ?: []); + } + + public function getStandorte($searchString) + { + $this->load->model('organisation/standort_model', 'StandortModel'); + + $result = $this->StandortModel->searchStandorte($searchString); + if (isError($result)) { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess($result ?: []); + } + + public function getKontakte($person_id) + { + $this->load->model('person/Kontakt_model', 'KontaktModel'); + $this->load->model('organisation/standort_model', 'StandortModel'); + $this->KontaktModel->addSelect("*, + TO_CHAR (CASE + WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum + THEN public.tbl_kontakt.updateamum + ELSE public.tbl_kontakt.insertamum + END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate"); + $this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT'); + + $result = $this->KontaktModel->loadWhere( + array('person_id' => $person_id) + ); + + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess((getData($result) ?: [])); + } + + public function getKontakttypen() + { + $this->load->model('person/Kontakttyp_model', 'KontakttypModel'); + + $result = $this->KontakttypModel->load(); + if (isError($result)) { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } else { + $this->terminateWithSuccess(getData($result) ?: []); + } + } + + public function loadContact($kontakt_id) + { + $this->load->model('person/Kontakt_model', 'KontaktModel'); + + $this->KontaktModel->addSelect('public.tbl_kontakt.*'); + $this->KontaktModel->addSelect('st.kurzbz'); + $this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT'); + + $this->KontaktModel->addLimit(1); + + $result = $this->KontaktModel->loadWhere( + array('kontakt_id' => $kontakt_id) + ); + if (isError($result)) { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL); + } + // $this->outputJsonSuccess(current(getData($result))); + $this->terminateWithSuccess(current(getData($result))); + } + + public function addNewContact($person_id) + { + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt']))) + $this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [ + 'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']) + ]); + else + $this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + $this->load->model('person/Kontakt_model', 'KontaktModel'); + + if(isset($_POST['standort'])) + { + $standort_id = $_POST['standort']['standort_id']; + } + else + $standort_id = null; + + $uid = getAuthUID(); + + $kontakttyp = $this->input->post('kontakttyp'); + $anmerkung = $this->input->post('anmerkung'); + $kontakt = $this->input->post('kontakt'); + $ext_id = $this->input->post('ext_id'); + + $result = $this->KontaktModel->insert( + [ + 'person_id' => $person_id, + 'kontakttyp' => $kontakttyp, + 'anmerkung' => $anmerkung, + 'kontakt' => $kontakt, + 'zustellung' => $_POST['zustellung'], + 'insertvon' => $uid, + 'insertamum' => date('c'), + 'standort_id' => $standort_id, + 'ext_id' => $ext_id + ] + ); + + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } + + public function updateContact($kontakt_id) + { + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $this->load->model('person/Kontakt_model', 'KontaktModel'); + + if(!$kontakt_id) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL); + } + + if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt']))) + $this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [ + 'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']) + ]); + else + $this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + if(isset($_POST['standort'])) + { + $standort_id = $_POST['standort']['standort_id']; + } + else + $standort_id = null; + + $uid = getAuthUID(); + $kontakttyp = $this->input->post('kontakttyp'); + $anmerkung = $this->input->post('anmerkung'); + $kontakt = $this->input->post('kontakt'); + $ext_id = $this->input->post('ext_id'); + $person_id = $this->input->post('person_id'); + + $result = $this->KontaktModel->update( + [ + 'kontakt_id' => $kontakt_id + ], + [ + 'person_id' => $person_id, + 'kontakttyp' => $kontakttyp, + 'anmerkung' => $anmerkung, + 'kontakt' => $kontakt, + 'zustellung' => $_POST['zustellung'], + 'insertvon' => $uid, + 'insertamum' => date('c'), + 'standort_id' => $standort_id, + 'ext_id' => $ext_id + ] + ); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } + + public function deleteContact($kontakt_id) + { + $this->load->model('person/Kontakt_model', 'KontaktModel'); + + $result = $this->KontaktModel->delete( + array('kontakt_id' => $kontakt_id) + ); + + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + elseif (!hasData($result)) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL); + } + return $this->terminateWithSuccess(current(getData($result)) ? : null); + } + + + public function getBankverbindung($person_id) + { + $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); + + $this->BankverbindungModel->addSelect('*'); + + $result = $this->BankverbindungModel->loadWhere( + array('person_id' => $person_id) + ); + if (isError($result)) + { + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess((getData($result) ?: [])); + } + + public function addNewBankverbindung($person_id) + { + $this->load->library('form_validation'); + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $this->form_validation->set_rules('iban', 'IBAN', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN']) + ]); + + $this->form_validation->set_rules('typ', 'TYP', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); + + $ext_id = $this->input->post('ext_id'); + $oe_kurzbz = $this->input->post('oe_kurzbz'); + $orgform_kurzbz = $this->input->post('orgform_kurzbz'); + $name = $this->input->post('name'); + $anschrift = $this->input->post('anschrift'); + $bic = $this->input->post('bic'); + $blz = $this->input->post('blz '); + $kontonr = $this->input->post('kontonr'); + + $result = $this->BankverbindungModel->insert( + [ + 'person_id' => $person_id, + 'name' => $name, + 'anschrift' => $anschrift, + 'bic' => $bic, + 'iban' => $_POST['iban'], + 'blz' => $blz, + 'kontonr' => $kontonr, + 'insertvon' => 'uid', + 'insertamum' => date('c'), + 'typ' => $_POST['typ'], + 'verrechnung' => $_POST['verrechnung'], + 'ext_id' => $ext_id, + 'oe_kurzbz' => $oe_kurzbz, + 'orgform_kurzbz' => $orgform_kurzbz + ] + ); + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } + + public function loadBankverbindung($bankverbindung_id) + { + $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); + + $this->BankverbindungModel->addSelect('*'); + + $this->BankverbindungModel->addLimit(1); + + $result = $this->BankverbindungModel->loadWhere( + array('bankverbindung_id' => $bankverbindung_id) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + if (!hasData($result)) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess(current(getData($result))); + } + + public function updateBankverbindung($bankverbindung_id) + { + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $this->form_validation->set_rules('iban', 'IBAN', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN']) + ]); + + $this->form_validation->set_rules('typ', 'TYP', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP']) + ]); + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); + + if(!$bankverbindung_id) + { + return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL); + } + + $uid = getAuthUID(); + + $result = $this->BankverbindungModel->update( + [ + 'bankverbindung_id' => $bankverbindung_id + ], + [ + 'person_id' => $_POST['person_id'], + 'name' => $_POST['name'], + 'anschrift' => $_POST['anschrift'], + 'bic' => $_POST['bic'], + 'iban' => $_POST['iban'], + 'blz' => $_POST['blz'], + 'kontonr' => $_POST['kontonr'], + 'updatevon' => $uid, + 'updateamum' => date('c'), + 'typ' => $_POST['typ'], + 'verrechnung' => $_POST['verrechnung'], + 'ext_id' => $_POST['ext_id'], + 'oe_kurzbz' => $_POST['oe_kurzbz'], + 'orgform_kurzbz' => $_POST['orgform_kurzbz'] + ] + ); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + return $this->outputJsonSuccess(true); + } + + public function deleteBankverbindung($bankverbindung_id) + { + $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); + + $result = $this->BankverbindungModel->delete( + array('bankverbindung_id' => $bankverbindung_id) + ); + + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if (!hasData($result)) + { + $this->outputJson($result); + } + return $this->terminateWithSuccess(current(getData($result)) ? : null); + } + +/* public function plz_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('plz_required', $this->p->t('ui','error_fieldRequired',['field' => 'PLZ'])); + return false; + } + else + { + return true; + } + }*/ + +/* public function kontakt_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('kontakt_required', $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])); + return false; + } + else + { + return true; + } + } + + public function iban_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('iban_required', $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff'])); + return false; + } + else + { + return true; + } + } + + public function typ_required($value) + { + if (empty($value)) { + $this->form_validation->set_message('typ_required', $this->p->t('ui','error_fieldRequired',['field' => 'Typ'])); + return false; + } + else + { + return true; + } + }*/ + +/* public function plz_numeric($value) + { + if (!is_numeric($value)) { + $this->form_validation->set_message('plz_numeric', $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])); + return false; + } + else + { + return true; + } + }*/ + + public function kontakt_valid_email($email) + { + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $this->form_validation->set_message('kontakt_valid_email', $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])); + return false; + } + else + { + return true; + } + } +} diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js index 2adc5129d..ce718d61b 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js @@ -2,8 +2,6 @@ import AddressList from "./Kontakt/Address.js"; import ContactList from "./Kontakt/Contact.js"; import BankaccountList from "./Kontakt/Bankaccount.js"; -import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js"; -import PvAutoComplete from "../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; export default { components: { AddressList, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index b9edfb634..6d0ba0750 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -17,7 +17,9 @@ export default{ data() { return{ tabulatorOptions: { - ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getAdressen/' + this.uid), + ajaxURL: 'api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid, + ajaxRequestFunc: this.$fhcApi.get, + ajaxResponse: (url, params, response) => response.data, //autoColumns: true, columns:[ {title:"Typ", field:"bezeichnung"}, @@ -80,7 +82,55 @@ export default{ selectable: true, index: 'adresse_id', }, - tabulatorEvents: [], + tabulatorEvents: [ + { + event: 'tableBuilt', + handler: async () => { + await this.$p.loadCategory(['notiz','global','person']); + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('bezeichnung').component.updateDefinition({ + title: this.$p.t('global', 'typ') + }); + cm.getColumnByField('strasse').component.updateDefinition({ + title: this.$p.t('person', 'strasse') + }); + cm.getColumnByField('plz').component.updateDefinition({ + title: this.$p.t('person', 'plz') + }); + cm.getColumnByField('ort').component.updateDefinition({ + title: this.$p.t('person', 'ort') + }); + cm.getColumnByField('gemeinde').component.updateDefinition({ + title: this.$p.t('person', 'gemeinde') + }); + cm.getColumnByField('nation').component.updateDefinition({ + title: this.$p.t('person', 'nation') + }); + cm.getColumnByField('heimatadresse').component.updateDefinition({ + title: this.$p.t('person', 'heimatadresse') + }); + cm.getColumnByField('co_name').component.updateDefinition({ + title: this.$p.t('person', 'co_name') + }); + cm.getColumnByField('name').component.updateDefinition({ + title: this.$p.t('person', 'firma_zusatz') + }); + cm.getColumnByField('firmenname').component.updateDefinition({ + title: this.$p.t('person', 'firma') + }); + cm.getColumnByField('updateamum').component.updateDefinition({ + title: this.$p.t('notiz', 'letzte_aenderung') + }); + cm.getColumnByField('rechnungsadresse').component.updateDefinition({ + title: this.$p.t('person', 'rechnungsadresse') + }); + cm.getColumnByField('anmerkung').component.updateDefinition({ + title: this.$p.t('notiz', 'document') + }); + } + } + ], addressData: { zustelladresse: true, heimatadresse: true, @@ -132,29 +182,20 @@ export default{ this.loadAdress(adress_id).then(() => { if(this.addressData.adresse_id) if(this.addressData.heimatadresse) - this.$fhcAlert.alertError("Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!"); + this.$fhcAlert.alertError(this.$p.t('person', 'error_deleteHomeAdress')); else this.$refs.deleteAdressModal.show(); }); }, addNewAddress(addressData) { - CoreRESTClient.post('components/stv/Kontakt/addNewAddress/' + this.uid, + this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewAddress/' + this.uid, this.addressData ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Speichern erfolgreich'); + this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); this.hideModal('newAdressModal'); this.resetModal(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten'); - }).finally(() => { + }).catch(this.$fhcAlert.handleSystemError) + .finally(() => { window.scrollTo(0, 0); this.reload(); }); @@ -163,60 +204,38 @@ export default{ this.$refs.table.reloadTable(); }, loadAdress(adress_id){ - return CoreRESTClient.get('components/stv/Kontakt/loadAddress/' + adress_id) - .then( - result => { - if(result.data.retval) - this.addressData = result.data.retval; - else - { - this.addressData = {}; - this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden'); - } + return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadAddress/' + adress_id) + .then(result => { + this.addressData = result.data; return result; - } - ); + }) + .catch(this.$fhcAlert.handleSystemError); }, updateAddress(adress_id){ - CoreRESTClient.post('components/stv/Kontakt/updateAddress/' + adress_id, + this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateAddress/' + adress_id, this.addressData ).then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Speichern erfolgreich'); + this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); this.hideModal('editAdressModal'); this.resetModal(); - } else { - const errorData = response.data.retval; - Object.entries(errorData).forEach(entry => { - const [key, value] = entry; - this.$fhcAlert.alertError(value); - }); - } - }).catch(error => { - this.statusMsg = 'Error in Catch'; - this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten'); - }).finally(() => { + }).catch(this.$fhcAlert.handleSystemError) + .finally(() => { window.scrollTo(0, 0); this.reload(); }); }, deleteAddress(adress_id){ - CoreRESTClient.post('components/stv/Kontakt/deleteAddress/' + adress_id) + this.$fhcApi.post('api/frontend/v1/stv/kontakt/deleteAddress/' + adress_id) .then(response => { - if (!response.data.error) { - this.$fhcAlert.alertSuccess('Löschen erfolgreich'); - } else { - this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden'); - } - }).catch(error => { - this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten'); - }).finally(()=> { + this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')); + }).catch(this.$fhcAlert.handleSystemError) + .finally(()=> { window.scrollTo(0, 0); this.hideModal('deleteAdressModal'); this.reload(); }); }, - loadPlaces() { + loadPlaces() { //TODO(manu) Refactor API-controller if (this.abortController.places) this.abortController.places.abort(); if (this.addressData.nation != 'A' || !this.addressData.plz) @@ -241,10 +260,10 @@ export default{ });*/ }, search(event) { - return CoreRESTClient - .get('components/stv/Kontakt/getFirmen/' + event.query) + return this.$fhcApi + .get('api/frontend/v1/stv/kontakt/getFirmen/' + event.query) .then(result => { - this.filteredFirmen = CoreRESTClient.getData(result.data); + this.filteredFirmen = result.data.retval; }); }, reload(){ @@ -266,59 +285,12 @@ export default{ this.nations = result; }) .catch(this.$fhcAlert.handleSystemError); - CoreRESTClient - .get('components/stv/Kontakt/getAdressentypen') + this.$fhcApi + .get('api/frontend/v1/stv/kontakt/getAdressentypen') .then(result => { this.adressentypen = result.data; }) - .catch(err => { - console.error(err.response.data || err.message); - }); - }, - async mounted() { - await this.$p.loadCategory(['notiz','global','person']); - - let cm = this.$refs.table.tabulator.columnManager; - - cm.getColumnByField('bezeichnung').component.updateDefinition({ - title: this.$p.t('global', 'typ') - }); - cm.getColumnByField('strasse').component.updateDefinition({ - title: this.$p.t('person', 'strasse') - }); - cm.getColumnByField('plz').component.updateDefinition({ - title: this.$p.t('person', 'plz') - }); - cm.getColumnByField('ort').component.updateDefinition({ - title: this.$p.t('person', 'ort') - }); - cm.getColumnByField('gemeinde').component.updateDefinition({ - title: this.$p.t('person', 'gemeinde') - }); - cm.getColumnByField('nation').component.updateDefinition({ - title: this.$p.t('person', 'nation') - }); - cm.getColumnByField('heimatadresse').component.updateDefinition({ - title: this.$p.t('person', 'heimatadresse') - }); - cm.getColumnByField('co_name').component.updateDefinition({ - title: this.$p.t('person', 'co_name') - }); - cm.getColumnByField('name').component.updateDefinition({ - title: this.$p.t('person', 'firma_zusatz') - }); - cm.getColumnByField('firmenname').component.updateDefinition({ - title: this.$p.t('person', 'firma') - }); - cm.getColumnByField('updateamum').component.updateDefinition({ - title: this.$p.t('notiz', 'letzte_aenderung') - }); - cm.getColumnByField('rechnungsadresse').component.updateDefinition({ - title: this.$p.t('person', 'rechnungsadresse') - }); - cm.getColumnByField('anmerkung').component.updateDefinition({ - title: this.$p.t('notiz', 'document') - }); + .catch(this.$fhcAlert.handleSystemError) }, template: `
@@ -590,7 +562,7 @@ export default{ :side-menu="false" reload new-btn-show - new-btn-label="Neu" + new-btn-label="Adresse" @click:new="actionNewAdress" > - --> +
+ {{formData}} || {{statusNew}} +
+ + Details + +
+
+

Betriebsmittel anlegen

+

Betriebsmittel bearbeiten

+
+
+ +
+ +
+ + + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
` } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js index ec8a4dfc1..9e1a2484a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js @@ -16,9 +16,6 @@ export default { :uid="modelValue.uid" > - {{modelValue}} -
- {{modelValue.person_id}}
` }; From 53e44b9df555a545af979336c9abc584e174ea50 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 5 Apr 2024 14:22:42 +0200 Subject: [PATCH 176/464] =?UTF-8?q?Action=20Print=C3=9Cbernahmebest=C3=A4t?= =?UTF-8?q?igung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Betriebsmittel/Betriebsmittel.js | 116 ++++++++++-------- 1 file changed, 65 insertions(+), 51 deletions(-) diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js index 1345d4f60..f7e036425 100644 --- a/public/js/components/Betriebsmittel/Betriebsmittel.js +++ b/public/js/components/Betriebsmittel/Betriebsmittel.js @@ -12,6 +12,11 @@ export default { FormForm, FormInput, }, + inject: { + cisRoot: { + from: 'cisRoot' + }, + }, props: [ 'person_id', 'uid' @@ -19,7 +24,6 @@ export default { data(){ return { tabulatorOptions: { - // ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Betriebsmittel/getBetriebsmittel/' + this.id + '/' + this.typeId), ajaxURL: 'api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id, ajaxRequestFunc: this.$fhcApi.get, ajaxResponse: (url, params, response) => response.data, @@ -27,9 +31,9 @@ export default { {title: "Nummer", field: "nummer"}, {title: "PersonId", field: "person_id"}, {title: "Typ", field: "betriebsmitteltyp"}, - {title: "insertVon", field: "insertvon"}, //Test - {title: "insertAmUm", field: "insertamum"}, //TESt - {title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"}, + // {title: "insertVon", field: "insertvon"}, //Test + // {title: "insertAmUm", field: "insertamum"}, //TESt + // {title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"}, {title: "Retourdatum", field: "retouram"}, {title: "Beschreibung", field: "beschreibung"}, {title: "Uid", field: "uid"}, @@ -37,7 +41,7 @@ export default { {title: "Kaution", field: "kaution", visible: false}, {title: "Ausgabedatum", field: "ausgegebenam", visible: false}, {title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false}, -/* {title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},*/ + {title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false}, { title: 'Aktionen', field: 'actions', minWidth: 150, // Ensures Action-buttons will be always fully displayed @@ -49,11 +53,16 @@ export default { button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; button.title = 'Übernahmebestätigung drucken'; + let cellData = cell.getData(); button.addEventListener( 'click', (event) => - this.actionPrintConfirmation(cell.getData().betriebsmittelperson_id) - ); + { + let linkToPdf = this.cisRoot + + '/content/pdfExport.php?xml=betriebsmittelperson.rdf.php&xsl=Uebernahme&id=' + cellData.betriebsmittelperson_id + '&output=pdf'; + + window.open(linkToPdf, '_blank'); + }); container.append(button); button = document.createElement('button'); @@ -86,30 +95,51 @@ export default { layoutColumnsOnNewData: false, height: '150', selectableRangeMode: 'click', - selectable: true, - //index: 'betriebsmittel_id', + selectable: true }, //tableData: [], tabulatorEvents: [ { -/* event: 'rowSelectionChanged', - handler: this.rowSelectionChanged*/ -/* handler: (e, row.getData().betriebsmittelperson_id) => { - // Handler-Funktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird - //this.rowSelectionChanged(row.getData().betriebsmittelperson_id); - // console.log("Selected Row Data:", row.getData()); - //console.log(cell.getData().betriebsmittelperson_id); +/* //TODO Manu phrases }*/ - }, + //TODO(manu)für editieren mit click: conflict with action buttons + +/* event: 'rowSelectionChanged', + handler: this.rowSelectionChanged*/ +/* handler: (e, row.getData().betriebsmittelperson_id) => { +// HandlerFunktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird + //this.rowSelectionChanged(row.getData().betriebsmittelperson_id); + // console.log("Selected Row Data:", row.getData()); + //console.log(cell.getData().betriebsmittelperson_id); +*/ + }, ], betriebsmittelData: {}, betriebsmittelperson_id : null, listBetriebsmitteltyp: [], - formData: {}, - statusNew: true + formData: { + ausgegebenam : this.getDefaultDate(), + }, + statusNew: true, + changesDetected: false }; }, + computed: { + deltaLength() { + return Object.keys(this.formData).length; + } + }, + watch: { + formData: { + handler: function(newVal) { + + //console.log('Das Objekt wurde geändert:', newVal); + this.changesDetected = true; + }, + deep: true // Hiermit wird auch die Veränderung von Eigenschaften des Objekts überwacht + } + }, methods: { rowSelectionChanged(data) { //console.log("Selected Row Data:", data[0].betriebsmittelperson_id); @@ -122,19 +152,14 @@ export default { console.log("action EditBM: id: " + betriebsmittelperson_id); this.statusNew = false; this.loadBetriebsmittel(betriebsmittelperson_id); -/* this.loadBetriebsmittel(betriebsmittelperson_id).then(() => { - /!* if(this.formData) { - this.$refs.deleteBetriebsmittelModal.show(); - }*!/ - console.log("nach load" + betriebsmittelperson_id); - - });*/ + this.changesDetected = false; }, actionNewBetriebsmittel(){ console.log("action newBM: person " + this.person_id); this.resetModal(); this.statusNew = true; this.formData.ausgegebenam = this.getDefaultDate(); + //this.changesDetected = false; this.reload(); }, actionDeleteBetriebsmittel(betriebsmittelperson_id){ @@ -148,23 +173,14 @@ export default { this.$refs.deleteBetriebsmittelModal.show(); }); }, - actionPrintConfirmation(betriebsmittelperson_id){ - console.log("actionPrintConfirmation of id: " + betriebsmittelperson_id); -/* this.loadBetriebsmittel(betriebsmittelperson_id).then(() => { - - if(this.betriebsmittelData) - this.$refs.editBetriebsmittelModal.show(); - });*/ - }, addNewBetriebsmittel(){ - this.param_id = { + this.param = { 'uid': this.uid, 'person_id': this.person_id, ...this.formData }; - //this.combinedObj = { ...this.param_id, ...this.formData }; this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/addNewBetriebsmittel/', - this.param_id + this.param ).then(response => { console.log(response); this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); @@ -175,13 +191,13 @@ export default { window.scrollTo(0, 0); this.reload(); }); + //this.changesDetected = false; //not working }, deleteBetriebsmittel(betriebsmittelperson_id){ console.log("Delete mit id: " + betriebsmittelperson_id); this.param = { 'betriebsmittelperson_id': betriebsmittelperson_id }; - console.log( "param_id" + this.param + "|" ); return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/deleteBetriebsmittel/', this.param) .then( @@ -219,27 +235,32 @@ export default { console.log("loadBetriebsmittel id:" + betriebsmittelperson_id); this.resetModal(); this.statusNew = false; - this.param_id = { + this.param = { 'betriebsmittelperson_id': betriebsmittelperson_id }; return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/loadBetriebsmittel/', - this.param_id) + this.param) .then(result => result.data) .then(result => { this.formData = result; }) .catch(this.$fhcAlert.handleSystemError); + // this.changesDetected = false; }, reload(){ this.$refs.table.reloadTable(); + //this.changesDetected = false; }, hideModal(modalRef){ this.$refs[modalRef].hide(); }, resetModal(){ this.formData = {}; + this.formData.ausgegebenam = this.getDefaultDate(); + this.formData.listBetriebsmitteltyp = null; this.betriebsmittelperson_id = {}; this.statusNew = true; + //this.changesDetected = false; }, getDefaultDate() { const today = new Date(); @@ -256,15 +277,7 @@ export default { .catch(this.$fhcAlert.handleSystemError); }, mounted(){ -/* this.$refs.table.on("rowSelected", (row) => { - // Hier können Sie auf das ausgewählte Zeilenobjekt zugreifen und entsprechende Aktionen durchführen - console.log("Selected Row:", row.getData()); - });*/ - //this.$refs.newBetriebsmittelModal.show(); - //loadFirstEntry for the form - console.log("mounted"); - //console.log(this.$refs.table.tableData); }, /* async mounted() { if(this.showTinyMCE){ @@ -331,7 +344,8 @@ export default { >
- {{formData}} || {{statusNew}} + {{cisRoot}} + {{formData}} {{changesDetected}}
Details @@ -457,10 +471,10 @@ export default {
- +
- +
From ee6221e325bd8a6d11e560299f1e9e4195d77b94 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 8 Apr 2024 12:40:23 +0200 Subject: [PATCH 177/464] add konto tab --- .../controllers/api/frontend/v1/stv/Konto.php | 98 ++++ .../controllers/components/stv/Config.php | 20 +- .../controllers/components/stv/Student.php | 543 ------------------ application/models/crm/Konto_model.php | 67 +++ .../Stv/Studentenverwaltung/Details/Konto.js | 133 +++++ 5 files changed, 317 insertions(+), 544 deletions(-) create mode 100644 application/controllers/api/frontend/v1/stv/Konto.php delete mode 100644 application/controllers/components/stv/Student.php create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Konto.js diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php new file mode 100644 index 000000000..7c242b2e2 --- /dev/null +++ b/application/controllers/api/frontend/v1/stv/Konto.php @@ -0,0 +1,98 @@ +. + */ + +if (! defined('BASEPATH')) exit('No direct script access allowed'); + +/** + * This controller operates between (interface) the JS (GUI) and the back-end + * Provides data to the ajax get calls about a Konto + * Listens to ajax post calls to change the Konto data + * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON + */ +class Konto extends FHCAPI_Controller +{ + /** + * Calls the parent's constructor and prepares libraries and phrases + */ + public function __construct() + { + // TODO(chris): permissions + parent::__construct([ + 'get' => 'student/stammdaten:r' + ]); + + // Load models + $this->load->model('crm/Konto_model', 'KontoModel'); + + // Load language phrases + $this->loadPhrases([ + 'ui' + ]); + } + + //------------------------------------------------------------------------------------------------------------------ + // Public methods + + /** + * Get details for a prestudent + * + * @param string $type + * @param string (optional) $studiengang_kz + * @return void + */ + public function get($type, $studiengang_kz = '') + { + // TODO(chris): validation + + $person_id = $this->input->post('person_id'); + + if ($this->input->post('only_open')) { + $result = $this->KontoModel->getOffeneBuchungen($person_id, $studiengang_kz); + } else { + $result = $this->KontoModel->getAlleBuchungen($person_id, $studiengang_kz); + } + + #$result = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $result = $result->retval; + + // sort into tree + $childs = []; + $data = []; + foreach ($result as $entry) { + if ($entry->buchungsnr_verweis) { + if (isset($data[$entry->buchungsnr_verweis])) { + if (!isset($data[$entry->buchungsnr_verweis]->_children)) + $data[$entry->buchungsnr_verweis]->_children = []; + $data[$entry->buchungsnr_verweis]->_children[] = $entry; + } else { + if (!isset($childs[$entry->buchungsnr_verweis])) + $childs[$entry->buchungsnr_verweis] = []; + $childs[$entry->buchungsnr_verweis][] = $entry; + } + } else { + $data[$entry->buchungsnr] = $entry; + if (isset($childs[$entry->buchungsnr])) + $entry->_children = $childs[$entry->buchungsnr]; + } + } + + $this->terminateWithSuccess(array_values($data)); + } +} diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php index 45c26c966..e9ed7ec44 100644 --- a/application/controllers/components/stv/Config.php +++ b/application/controllers/components/stv/Config.php @@ -14,6 +14,7 @@ class Config extends FHC_Controller public function student() { + // TODO(chris): phrases $result = []; $result['details'] = [ 'title' => 'Details', @@ -35,6 +36,11 @@ class Config extends FHC_Controller 'title' => 'Status', 'component' => './Stv/Studentenverwaltung/Details/Status.js' ]; + $result['konto'] = [ + 'title' => 'Konto', + 'component' => './Stv/Studentenverwaltung/Details/Konto.js', + 'config' => ['ZAHLUNGSBESTAETIGUNG_ANZEIGEN' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN)] + ]; $result['betriebsmittel'] = [ 'title' => 'Betriebsmittel', 'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js' @@ -53,6 +59,18 @@ class Config extends FHC_Controller public function students() { - $this->outputJsonSuccess([]); + // TODO(chris): phrases + $result = []; + $result['konto'] = [ + 'title' => 'Konto', + 'component' => './Stv/Studentenverwaltung/Details/Konto.js', + 'config' => ['ZAHLUNGSBESTAETIGUNG_ANZEIGEN' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN)] + ]; + + Events::trigger('stv_conf_students', function & () use (&$result) { + return $result; + }); + + $this->outputJsonSuccess($result); } } diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php deleted file mode 100644 index ddfd95aed..000000000 --- a/application/controllers/components/stv/Student.php +++ /dev/null @@ -1,543 +0,0 @@ -load->library('AuthLib'); - $this->load->library('VariableLib', ['uid' => getAuthUID()]); - - // Load language phrases - $this->loadPhrases([ - 'ui' - ]); - } - - public function get($prestudent_id) - { - $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell'); - - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - $this->PrestudentModel->addSelect('p.*'); - $this->PrestudentModel->addSelect('s.student_uid'); - $this->PrestudentModel->addSelect('matrikelnr'); - $this->PrestudentModel->addSelect('b.aktiv'); - $this->PrestudentModel->addSelect('v.semester'); - $this->PrestudentModel->addSelect('v.verband'); - $this->PrestudentModel->addSelect('v.gruppe'); - $this->PrestudentModel->addSelect('b.alias'); - - if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) { - $this->PrestudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung ORDER BY kontakt_id LIMIT 1) AS email_privat", false); - } - - $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); - $this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT'); - $this->PrestudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz), 'LEFT'); - $this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id'); - - $result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } elseif (!hasData($result)) { - $this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND); - $this->outputJson('NOT FOUND'); - } else { - $this->outputJson(current(getData($result))); - } - } - - public function save($prestudent_id) - { - $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell'); - - $this->load->model('person/Person_model', 'PersonModel'); - $this->load->model('crm/Student_model', 'StudentModel'); - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - - $this->load->library('form_validation'); - - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [ - 'isValidDate' => $this->p->t('ui', 'error_invalid_date') - ]); - - $this->form_validation->set_rules('semester', 'Semester', 'integer'); - - if ($this->form_validation->run() == false) { - $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - return $this->outputJsonError($this->form_validation->error_array()); - } - - $result = $this->StudentModel->loadWhere(['prestudent_id' =>$prestudent_id]); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } elseif (!hasData($result)) { - $uid = null; - } else { - $student = current(getData($result)); - $uid = $student->student_uid; - } - - $result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } elseif (!hasData($result)) { - $person_id= null; - } else { - $person = current(getData($result)); - $person_id = $person->person_id; - } - - $array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe']; - $update_lehrverband = array(); - foreach ($array_allowed_props_lehrverband as $prop) - { - $val = $this->input->post($prop); - if ($val !== null) { - $update_lehrverband[$prop] = $val; - } - } - - $array_allowed_props_person = [ - 'anrede', - 'bpk', - 'titelpre', - 'titelpost', - 'nachname', - 'vorname', - 'vornamen', - 'wahlname', - 'gebdatum', - 'gebort', - 'geburtsnation', - 'svnr', - 'ersatzkennzeichen', - 'staatsbuergerschaft', - 'matr_nr', - 'sprache', - 'geschlecht', - 'familienstand', - 'foto', - 'anmerkung', - 'homepage' - ]; - $update_person = array(); - foreach ($array_allowed_props_person as $prop) - { - $val = $this->input->post($prop); - if ($val !== null) { - $update_person[$prop] = $val; - } - } - - $array_allowed_props_student = ['matrikelnr']; - $update_student = array(); - foreach ($array_allowed_props_student as $prop) - { - $val = $this->input->post($prop); - if ($val !== null) { - $update_student[$prop] = $val; - } - } - - if (count($update_lehrverband) + count($update_student) && $uid === null) { - $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - // TODO(chris): phrase - return $this->outputJson("Kein/e StudentIn vorhanden!"); - } - if (count($update_person) && $person_id === null) { - $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - // TODO(chris): phrase - return $this->outputJson("Keine Person vorhanden!"); - } - - if (count($update_lehrverband)) - { - $result = $this->StudentlehrverbandModel->update([ - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'student_uid' => $uid - ], $update_lehrverband); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - } - - if (count($update_person)) - { - $result = $this->PersonModel->update( - $person_id, - $update_person - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - } - - - if (count($update_student)) - { - $result = $this->StudentModel->update( - [$uid], - $update_student - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - } - - $this->outputJson(success(array_fill_keys(array_merge( - array_keys($update_lehrverband), - array_keys($update_person), - array_keys($update_student) - ), ''), 1)); - } - - public function check() - { - $_POST = json_decode($this->input->raw_input_stream, true); - - $this->load->library('form_validation'); - - $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [ - 'isValidDate' => $this->p->t('ui', 'error_invalid_date') - ]); - - if ($this->form_validation->run() == false) { - $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - return $this->outputJsonError($this->form_validation->error_array()); - } - - $vorname = $this->input->post('vorname'); - $nachname = $this->input->post('nachname'); - $gebdatum = $this->input->post('gebdatum'); - - if (!$vorname && !$nachname && !$gebdatum) { - return $this->outputJsonError(['#' => 'At least one of vorname, nachname or gebdatum must be set']); - } - - $this->load->model('person/Person_model', 'PersonModel'); - - if ($gebdatum) - $this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d')); - if ($vorname && $nachname) { - $this->PersonModel->db->or_group_start(); - $this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false); - $this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false); - $this->PersonModel->db->group_end(); - } elseif ($nachname) { - $this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false); - } - - $result = $this->PersonModel->load(); - - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - - $this->outputJson($result); - } - - public function add() - { - $_POST = json_decode($this->input->raw_input_stream, true); - - if (!$this->input->post('person_id')) { - if (!isset($_POST['address']) || !is_array($_POST['address'])) - $_POST['address'] = []; - $_POST['address']['func'] = 1; - } - if ($this->input->post('incoming')) { - $_POST['ausbildungssemester'] = 0; - } - - $this->load->library('form_validation'); - - $this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [ - 'requiredIfNotPersonId' => $this->p->t('ui', 'error_required') - ]); - $this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [ - 'requiredIfNotPersonId' => $this->p->t('ui', 'error_required') - ]); - $this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [ - 'isValidDate' => $this->p->t('ui', 'error_invalid_date') - ]); - $this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]'); - $this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [ - 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') - ]); - $this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [ - 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') - ]); - $this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [ - 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') - ]); - $this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [ - 'requiredIfAddressFunc' => $this->p->t('ui', 'error_required') - ]); - $this->form_validation->set_rules('email', 'E-Mail', 'valid_email'); - $this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required'); - $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required'); - $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]'); - // TODO(chris): validate studienplan with studiengang, semester and orgform? - // TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht? - - if ($this->form_validation->run() == false) { - $this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST); - return $this->outputJsonError($this->form_validation->error_array()); - } - - // TODO(chris): This should be in a library - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - - $this->db->trans_start(); - - $result = $this->addInteressent(); - - $this->db->trans_complete(); - - if ($this->db->trans_status() === FALSE) { - return $this->outputJsonSuccess(true); // TODO(chris): DEBUG! REMOVE! - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - } - - $this->outputJson($result); - } - - protected function addInteressent() - { - // Person anlegen wenn nötig - $person_id = $this->input->post('person_id'); - if (!$person_id) { - $this->load->model('person/Person_model', 'PersonModel'); - - $data = [ - 'nachname' => $this->input->post('nachname'), - 'insertamum' => date('c'), - 'insertvon' => getAuthUID(), - 'zugangscode' => uniqid(), - 'aktiv' => true - ]; - if ($this->input->post('anrede')) - $data['anrede'] = $this->input->post('anrede'); - if ($this->input->post('titelpre')) - $data['titelpre'] = $this->input->post('titelpre'); - if ($this->input->post('titelpost')) - $data['titelpost'] = $this->input->post('titelpost'); - if ($this->input->post('vorname')) - $data['vorname'] = $this->input->post('vorname'); - if ($this->input->post('vornamen')) - $data['vornamen'] = $this->input->post('vornamen'); - if ($this->input->post('wahlname')) - $data['wahlname'] = $this->input->post('wahlname'); - if ($this->input->post('geschlecht')) - $data['geschlecht'] = $this->input->post('geschlecht'); - if ($this->input->post('gebdatum')) - $data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d'); - if ($this->input->post('geburtsnation')) - $data['geburtsnation'] = $this->input->post('geburtsnation'); - if ($this->input->post('staatsbuergerschaft')) - $data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft'); - - $result = $this->PersonModel->insert($data); - if (isError($result)) - return $result; - $person_id = getData($result); - } - - // Addresse anlegen - $anlegen = $this->input->post('address[func]'); - if ($anlegen) { - $this->load->model('person/Adresse_model', 'AdresseModel'); - - $data = [ - 'nation' => $this->input->post('address[nation]'), - 'strasse' => $this->input->post('address[address]'), - 'plz' => $this->input->post('address[plz]'), - 'ort' => $this->input->post('address[ort]'), - 'gemeinde' => $this->input->post('address[gemeinde]'), - 'typ' => 'h', - 'zustelladresse' => true, - ]; - if ($anlegen < 0) { // Überschreiben - $this->AdresseModel->addOrder('zustelladresse', 'DESC'); - $this->AdresseModel->addOrder('sort'); - $result = $this->AdresseModel->loadWhere([ - 'person_id' => $person_id - ]); - if (isError($result)) - return $result; - if (hasData($result)) { - $address = current(getData($result)); - - $data['updateamum'] = date('c'); - $data['updatevon'] = getAuthUID(); - - $result = $this->AdresseModel->update($address->adresse_id, $data); - if (isError($result)) - return $result; - } else { - //Wenn keine Adrese vorhanden ist dann eine neue Anlegen - $anlegen = 1; - $data['heimatadresse'] = true; - } - } - if ($anlegen > 0) { - $data['person_id'] = $person_id; - $data['insertamum'] = date('c'); - $data['insertvon'] = getAuthUID(); - if (!isset($data['heimatadresse'])) - $data['heimatadresse'] = !$this->input->post('person_id'); - - $result = $this->AdresseModel->insert($data); - if (isError($result)) - return $result; - } - } - - // Kontaktdaten - $kontaktdaten = []; - foreach (['email', 'telefon', 'mobil'] as $k) { - $v = $this->input->post($k); - if ($v) - $kontaktdaten[$k] = $v; - } - if (count($kontaktdaten)) { - $this->load->model('person/Kontakt_model', 'KontaktModel'); - - foreach ($kontaktdaten as $typ => $kontakt) { - $data = [ - 'person_id' => $person_id, - 'kontakttyp' => $typ, - 'kontakt' => $kontakt, - 'zustellung' => true, - 'insertamum' => date('c'), - 'insertvon' => getAuthUID() - ]; - $result = $this->KontaktModel->insert($data); - if (isError($result)) - return $result; - } - } - - // Prestudent anlegen - $data = [ - 'aufmerksamdurch_kurzbz' => 'k.A.', - 'person_id' => $person_id, - 'studiengang_kz' => $this->input->post('studiengang_kz'), - 'ausbildungcode' => $this->input->post('letzteausbildung'), - 'anmerkung' => $this->input->post('anmerkungen'), - 'reihungstestangetreten' => false, - 'bismelden' => true - ]; - $ausbildungsart = $this->input->post('ausbildungsart'); - if ($ausbildungsart) - $data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart; - // Incomings und ausserordentliche sind bei Meldung nicht förderrelevant - $incoming = $this->input->post('incoming'); - if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9') - $data['foerderrelevant'] = false; - // Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen - $this->PrestudentModel->addOrder('zgvmas_code'); - $this->PrestudentModel->addOrder('zgv_code', 'DESC'); - $this->PrestudentModel->addLimit(1); - $result = $this->PrestudentModel->loadWhere([ - 'person_id' => $person_id - ]); - if (isError($result)) - return $result; - if (hasData($result)) { - $prestudent = current(getData($result)); - if ($prestudent->zgv_code) { - $data['zgv_code'] = $prestudent->zgv_code; - $data['zgvort'] = $prestudent->zgvort; - $data['zgvdatum'] = $prestudent->zgvdatum; - - $data['zgvmas_code'] = $prestudent->zgvmas_code; - $data['zgvmaort'] = $prestudent->zgvmaort; - $data['zgvmadatum'] = $prestudent->zgvmadatum; - } - } - // Prestudent speichern - $result = $this->PrestudentModel->insert($data); - if (isError($result)) - return $result; - $prestudent_id = getData($result); - - // Prestudent Rolle Anlegen - $data = [ - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent', - 'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'), - 'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0, - 'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null, - 'studienplan_id' => $this->input->post('studienplan_id') ?: null, - 'datum' => date('Y-m-d'), - 'insertamum' => date('c'), - 'insertvon' => getAuthUID() - ]; - $result = $this->PrestudentstatusModel->insert($data); - if (isError($result)) - return $result; - - if ($incoming) { - // TODO(chris): IMPLEMENT! - //Matrikelnummer und UID generieren - //Benutzerdatensatz anlegen - //Studentendatensatz anlegen - //StudentLehrverband anlegen - } - - // TODO(chris): DEBUG - /*$result = $this->PrestudentModel->loadWhere([ - 'pestudent_id' => 1 - ]); - if (isError($result)) { - return $result; - }*/ - - return success(true); - } - - public function requiredIfNotPersonId($value) - { - if (isset($_POST['person_id'])) - return true; - return !!$value; - } - - public function requiredIfAddressFunc($value) - { - if (!$_POST['address']['func']) - return true; - return !!$value; - } - - public function isValidDate($date) - { - try { - new DateTime($date); - } catch (Exception $e) { - return false; - } - return true; - } -} diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php index e76ed9e7a..00a621d0e 100644 --- a/application/models/crm/Konto_model.php +++ b/application/models/crm/Konto_model.php @@ -12,6 +12,73 @@ class Konto_model extends DB_Model $this->pk = 'buchungsnr'; } + + /** + * Get all accounting entries for a person optionally filtered by Studiengang + * + * @param integer|array $person_id + * @param string (optional) $studiengang_kz + * + * @return stdClass + */ + public function getAlleBuchungen($person_id, $studiengang_kz = '') + { + $this->addSelect($this->dbTable . '.*'); + $this->addSelect('UPPER(typ::varchar(1) || kurzbz) AS kuerzel'); + $this->addSelect('person.anrede'); + $this->addSelect('person.titelpost'); + $this->addSelect('person.titelpre'); + $this->addSelect('person.vorname'); + $this->addSelect('person.vornamen'); + $this->addSelect('person.nachname'); + + $this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT'); + $this->addJoin('public.tbl_person person', 'person_id', 'LEFT'); + + $this->addOrder('buchungsdatum'); + + if (is_array($person_id)) + $this->db->where_in('person_id', $person_id); + else + $this->db->where('person_id', $person_id); + + if ($studiengang_kz) + return $this->loadWhere([ + 'studiengang_kz' => $studiengang_kz + ]); + return $this->load(); + } + + /** + * Get all open accounting entries for a person optionally filtered by Studiengang + * + * @param integer|array $person_id + * @param string (optional) $studiengang_kz + * + * @return stdClass + */ + public function getOffeneBuchungen($person_id, $studiengang_kz = '') + { + $this->addSelect('buchungsnr'); + $this->db->where('(betrag + ( + SELECT CASE WHEN sum(betrag) is null THEN 0 ELSE sum(betrag) END + FROM ' . $this->dbTable . ' + WHERE buchungsnr_verweis=konto_a.buchungsnr + )) !=', 0, false); + if (is_array($person_id)) + $this->db->where_in('person_id', $person_id); + else + $this->db->where('person_id', $person_id); + $sql = $this->db->get_compiled_select($this->dbTable . ' konto_a'); + + $this->db->group_start(); + $this->db->where_in('buchungsnr', $sql, false); + $this->db->or_where_in('buchungsnr_verweis', $sql, false); + $this->db->group_end(); + + return $this->getAlleBuchungen($person_id, $studiengang_kz); + } + /** * Sets a Payment as paid */ diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js new file mode 100644 index 000000000..99bb85c87 --- /dev/null +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js @@ -0,0 +1,133 @@ +import {CoreFilterCmpt} from "../../../filter/Filter.js"; + +// TODO(chris): filter +// TODO(chris): multi pers +// TODO(chris): new header(multi pers), edit/row, gegenb.(date) multi, löschen multi, best. multi(recht) + +export default { + components: { + CoreFilterCmpt + }, + props: { + modelValue: Object, + config: { + type: Object, + default: {} + } + }, + data() { + return { + filter: 'alle' + }; + }, + computed: { + stg_kz() { + if (this.modelValue.studiengang_kz) + return this.modelValue.studiengang_kz; + let values = this.modelValue.map(e => e.studiengang_kz).filter((v,i,a) => a.indexOf(v) === i); + if (values.length != 1) + return ''; + return values[0]; + }, + tabulatorOptions() { + return { + ajaxURL: 'api/frontend/v1/stv/konto/get/alle', + ajaxParams: () => { + const params = { + person_id: this.modelValue.person_id || this.modelValue.map(e => e.person_id), + only_open: (this.filter == 'offene') + }; + return params; + }, + ajaxRequestFunc: (url, config, params) => { + return this.$fhcApi.post(url, params, config); + }, + ajaxResponse: (url, params, response) => response.data, + dataTree: true, + columns: [ + { + field: "buchungsdatum", + title: "Buchungsdatum" + }, + { + field: "buchungstext", + title: "Buchungstext" + }, + { + field: "betrag", + title: "Betrag" + }, + { + field: "studiensemester_kurzbz", + title: "StSem" + }, + { + field: "buchungstyp_kurzbz", + title: "Typ", + visible: false + }, + { + field: "buchungsnr", + title: "buchungs_nr", + visible: false + }, + { + field: "insertvon", + title: "Angelegt von", + visible: false + }, + { + field: "insertamum", + title: "Anlagedatum", + visible: false + }, + { + field: "kuerzel", + title: "Studiengang", + visible: false + }, + { + field: "anmerkung", + title: "Anmerkung" + } + ], + index: 'buchungs_nr', + }; + } + }, + watch: { + modelValue() { + this.$refs.table.reloadTable(); + } + }, + methods: { + reload() { + this.$refs.table.reloadTable(); + } + }, + template: ` +
+ {{config}} +
+
+ +
+
+ +
+
+ + +
` +}; \ No newline at end of file From d63c7c345707de0ec2ec8d42df6ec82488ba711b Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 9 Apr 2024 15:03:43 +0200 Subject: [PATCH 178/464] Logik Inventar, Validierungen --- .../api/frontend/v1/stv/Betriebsmittel.php | 150 ++++++++++++------ .../models/ressource/Betriebsmittel_model.php | 25 +-- .../ressource/Betriebsmittelperson_model.php | 29 ++++ .../Betriebsmittel/Betriebsmittel.js | 122 ++++++-------- 4 files changed, 188 insertions(+), 138 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php index fb7464148..ca1bfab1d 100644 --- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php +++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php @@ -14,7 +14,8 @@ class Betriebsmittel extends FHCAPI_Controller 'updateBetriebsmittel' => ['admin:r', 'assistenz:r'], 'loadBetriebsmittel' => ['admin:r', 'assistenz:r'], 'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'], - 'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'] + 'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'], + 'loadInventarliste' => ['admin:r', 'assistenz:r'] ]); //Load Models @@ -34,17 +35,16 @@ class Betriebsmittel extends FHCAPI_Controller public function getAllBetriebsmittel($uid, $person_id) { //uid - //$result = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid); + //$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($uid, 'uid'); //person_id - $result = $this->BetriebsmittelpersonModel->getBetriebsmittel($person_id); + $result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($person_id, 'person'); if (isError($result)) { $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } - //all $this->terminateWithSuccess((getData($result) ?: [])); } @@ -61,10 +61,29 @@ class Betriebsmittel extends FHCAPI_Controller $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + $this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [ + 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Kaution']) + ]); + + $this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Typ']) + ]); + + $this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Ausgegeben am']) + ]); + + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + $uid_user = getAuthUID(); $betriebsmitteltyp = $this->input->post('betriebsmitteltyp'); $nummer = $this->input->post('nummer'); $nummer2 = $this->input->post('nummer2'); + $inventarData = $this->input->post('inventarData'); $beschreibung = $this->input->post('beschreibung'); $kaution = $this->input->post('kaution'); $anmerkung = $this->input->post('anmerkung'); @@ -73,26 +92,46 @@ class Betriebsmittel extends FHCAPI_Controller $person_id = $this->input->post('person_id'); $uid = $this->input->post('uid'); + if($inventarData) + { + $betriebsmitteltyp = $inventarData['betriebsmitteltyp']; + $betriebsmittel_id = $inventarData['betriebsmittel_id']; + } + + if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) + { + return $this->terminateWithError("Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz", self::ERROR_TYPE_GENERAL); + } + + if($retouram && $retouram < $ausgegebenam) + return $this->terminateWithError("Retourdatum darf nicht vor Datum der Ausgabe liegen", self::ERROR_TYPE_GENERAL); + + if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer'])) + return $this->terminateWithError("Bitte wählen Sie das entsprechende Inventar aus dem Drop Down Menü aus", self::ERROR_TYPE_GENERAL); + // Start DB transaction $this->db->trans_begin(); - $result = $this->BetriebsmittelModel->insert( - [ - 'betriebsmitteltyp' => $betriebsmitteltyp, - 'nummer' => $nummer, - 'nummer2' => $nummer2, - 'beschreibung' => $beschreibung, - 'anmerkung' => $anmerkung, - 'insertvon' => $uid_user, - 'insertamum' => date('c') - ] - ); - if($this->db->trans_status() === false || isError($result)) + if(!$inventarData) { - $this->db->trans_rollback(); - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + $result = $this->BetriebsmittelModel->insert( + [ + 'betriebsmitteltyp' => $betriebsmitteltyp, + 'nummer' => $nummer, + 'nummer2' => $nummer2, + 'beschreibung' => $beschreibung, + 'anmerkung' => $anmerkung, + 'insertvon' => $uid_user, + 'insertamum' => date('c') + ] + ); + if($this->db->trans_status() === false || isError($result)) + { + $this->db->trans_rollback(); + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $betriebsmittel_id = $result->retval; } - $betriebsmittel_id = $result->retval; $result = $this->BetriebsmittelpersonModel->insert( [ @@ -147,6 +186,33 @@ class Betriebsmittel extends FHCAPI_Controller $person_id = $this->input->post('person_id'); $uid = $this->input->post('uid'); + $this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [ + 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Kaution']) + ]); + + $this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Typ']) + ]); + + $this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [ + 'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Ausgegeben am']) + ]); + + + if ($this->form_validation->run() == false) + { + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) + { + return $this->terminateWithError("Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz", self::ERROR_TYPE_GENERAL); + } + + if($retouram && $retouram < $ausgegebenam) + return $this->terminateWithError("Retourdatum darf nicht vor Datum der Ausgabe liegen", self::ERROR_TYPE_GENERAL); + + // Start DB transaction $this->db->trans_begin(); @@ -162,8 +228,8 @@ class Betriebsmittel extends FHCAPI_Controller 'anmerkung' => $anmerkung, 'ausgegebenam' => $ausgegebenam, 'retouram ' => $retouram, - 'insertvon' => $uid_user, - 'insertamum' => date('c') + 'updatevon' => $uid_user, + 'updateamum' => date('c') ] ); @@ -199,35 +265,13 @@ class Betriebsmittel extends FHCAPI_Controller } - //TODO(Manu) defaultmässig ersten Eintrag in Edit Modus - public function getFirstBetriebsmittel($uid, $person_id) - { - //uid - //$result = $this->BetriebsmittelpersonModel->getFirstBetriebsmittelByUid($uid); - - //person_id - $result = $this->BetriebsmittelpersonModel->getFirstBetriebsmittelByUid($person_id); - - if (isError($result)) - { - $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - - $this->terminateWithSuccess((getData($result) ?: [])); - } - public function loadBetriebsmittel() { $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id'); - //$this->terminateWithError("id in function api: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL); - - $this->BetriebsmittelpersonModel->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id'); - - $result = $this->BetriebsmittelpersonModel->loadWhere( - array('betriebsmittelperson_id' => $betriebsmittelperson_id)); + $result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id'); if (isError($result)) { @@ -239,23 +283,17 @@ class Betriebsmittel extends FHCAPI_Controller $this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL); } - // var_dump($result); - $this->terminateWithSuccess(current(getData($result))); } public function deleteBetriebsmittel() { - //var_dump($betriebsmittelperson_id); $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id'); - //return $this->terminateWithError("Betriebsmittelperson " . $betriebsmittelperson_id . " wird gelöscht",self::ERROR_TYPE_GENERAL); - - $result = $this->BetriebsmittelpersonModel->delete( array('betriebsmittelperson_id' => $betriebsmittelperson_id, ) @@ -277,7 +315,9 @@ class Betriebsmittel extends FHCAPI_Controller { $this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel'); - $result = $this->BetriebsmitteltypModel->load(); + $this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC'); + $result = $this->BetriebsmitteltypModel->load(); // load All + if (isError($result)) { $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); @@ -285,6 +325,14 @@ class Betriebsmittel extends FHCAPI_Controller return $this->terminateWithSuccess(getData($result) ?: []); } + public function loadInventarliste($searchString) + { + $result = $this->BetriebsmittelModel->loadInventarliste($searchString); + if (isError($result)) { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $this->terminateWithSuccess($result ?: []); + } } diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php index a3a6e252f..69aa962c1 100644 --- a/application/models/ressource/Betriebsmittel_model.php +++ b/application/models/ressource/Betriebsmittel_model.php @@ -13,17 +13,22 @@ class Betriebsmittel_model extends DB_Model } /** - * getBetriebsmittelById + * load Liste Inventarnummern */ -/* public function loadBetriebsmittel($betriebsmittelperson_id){ - $query = " - SELECT * - FROM wawi.tbl_betriebsmittelperson - JOIN wawi.tbl_betriebsmittel ON (wawi.tbl_betriebsmittelperson.betriebsmittel_id = wawi.tbl_betriebsmittel.betriebsmittel_id) - WHERE wawi.tbl_betriebsmittelperson.betriebsmittelperson_id = ? - "; + public function loadInventarliste($filter) + { + $filter = strtoLower($filter); - return $this->execQuery($query, array($betriebsmittelperson_id)); - }*/ + $qry = " + SELECT + bm.inventarnummer, bm.betriebsmitteltyp, bm.betriebsmittel_id, CONCAT(bm.inventarnummer, ' ', bm.beschreibung) as dropdowntext + FROM + wawi.tbl_betriebsmittel bm + WHERE + upper(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%' + OR + lower(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'"; + return $this->execQuery($qry); + } } diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php index 04878a9ad..17aab3bc7 100644 --- a/application/models/ressource/Betriebsmittelperson_model.php +++ b/application/models/ressource/Betriebsmittelperson_model.php @@ -96,4 +96,33 @@ class Betriebsmittelperson_model extends DB_Model return $this->loadWhere($condition); } + + public function getBetriebsmittelData($id, $type_id) + { + switch ($type_id) { + case 'person': + $cond = 'bmp.person_id'; + break; + case 'uid': + $cond = 'bmp.uid'; + break; + case 'betriebsmittelperson_id': + $cond = 'bmp.betriebsmittelperson_id'; + break; + default: + return error("ID nicht gültig"); + } + + $query = " + SELECT + bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, bm.beschreibung, bmp.ausgegebenam, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer --bm.* + FROM + wawi.tbl_betriebsmittelperson bmp + JOIN + wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id) + WHERE + " . $cond . " = ? "; + + return $this->execQuery($query, array($id)); + } } diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js index f7e036425..2dce84e10 100644 --- a/public/js/components/Betriebsmittel/Betriebsmittel.js +++ b/public/js/components/Betriebsmittel/Betriebsmittel.js @@ -1,5 +1,7 @@ import VueDatePicker from '../vueDatepicker.js.php'; import {CoreFilterCmpt} from "../filter/Filter.js"; +import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; + import BsModal from "../Bootstrap/Modal"; import FormForm from '../Form/Form.js'; import FormInput from '../Form/Input.js'; @@ -11,6 +13,7 @@ export default { BsModal, FormForm, FormInput, + PvAutoComplete }, inject: { cisRoot: { @@ -31,13 +34,10 @@ export default { {title: "Nummer", field: "nummer"}, {title: "PersonId", field: "person_id"}, {title: "Typ", field: "betriebsmitteltyp"}, - // {title: "insertVon", field: "insertvon"}, //Test - // {title: "insertAmUm", field: "insertamum"}, //TESt - // {title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"}, + {title: "Anmerkung", field: "anmerkung", visible: false}, {title: "Retourdatum", field: "retouram"}, {title: "Beschreibung", field: "beschreibung"}, {title: "Uid", field: "uid"}, - {title: "Anmerkung", field: "anmerkung", visible: false}, {title: "Kaution", field: "kaution", visible: false}, {title: "Ausgabedatum", field: "ausgegebenam", visible: false}, {title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false}, @@ -97,79 +97,31 @@ export default { selectableRangeMode: 'click', selectable: true }, - //tableData: [], - tabulatorEvents: [ - { -/* //TODO Manu phrases - }*/ - - //TODO(manu)für editieren mit click: conflict with action buttons - -/* event: 'rowSelectionChanged', - handler: this.rowSelectionChanged*/ -/* handler: (e, row.getData().betriebsmittelperson_id) => { -// HandlerFunktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird - //this.rowSelectionChanged(row.getData().betriebsmittelperson_id); - // console.log("Selected Row Data:", row.getData()); - //console.log(cell.getData().betriebsmittelperson_id); -*/ - }, - ], + tabulatorEvents: [], betriebsmittelData: {}, betriebsmittelperson_id : null, listBetriebsmitteltyp: [], formData: { ausgegebenam : this.getDefaultDate(), + betriebsmitteltyp: 'Zutrittskarte' }, statusNew: true, - changesDetected: false - }; - }, - computed: { - deltaLength() { - return Object.keys(this.formData).length; - } - }, - watch: { - formData: { - handler: function(newVal) { - - //console.log('Das Objekt wurde geändert:', newVal); - this.changesDetected = true; - }, - deep: true // Hiermit wird auch die Veränderung von Eigenschaften des Objekts überwacht + filteredInventar: [] } }, methods: { - rowSelectionChanged(data) { - //console.log("Selected Row Data:", data[0].betriebsmittelperson_id); - this.param_id = { - 'betriebsmittelperson_id': data[0].betriebsmittelperson_id}; - - this.loadBetriebsmittel(this.param_id); - }, actionEditBetriebsmittel(betriebsmittelperson_id){ - console.log("action EditBM: id: " + betriebsmittelperson_id); this.statusNew = false; this.loadBetriebsmittel(betriebsmittelperson_id); - this.changesDetected = false; }, actionNewBetriebsmittel(){ - console.log("action newBM: person " + this.person_id); this.resetModal(); this.statusNew = true; this.formData.ausgegebenam = this.getDefaultDate(); - //this.changesDetected = false; this.reload(); }, actionDeleteBetriebsmittel(betriebsmittelperson_id){ - console.log("Löschen von Datensatz mit id: " + betriebsmittelperson_id); - this.loadBetriebsmittel(betriebsmittelperson_id).then(() => { -/* if(this.formData) { - this.$refs.deleteBetriebsmittelModal.show(); - }*/ - console.log("nach load" + betriebsmittelperson_id); this.$refs.deleteBetriebsmittelModal.show(); }); }, @@ -184,17 +136,14 @@ export default { ).then(response => { console.log(response); this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); - // this.hideModal('newBetriebsmittelModal'); this.resetModal(); }).catch(this.$fhcAlert.handleSystemError) .finally(() => { window.scrollTo(0, 0); this.reload(); }); - //this.changesDetected = false; //not working }, deleteBetriebsmittel(betriebsmittelperson_id){ - console.log("Delete mit id: " + betriebsmittelperson_id); this.param = { 'betriebsmittelperson_id': betriebsmittelperson_id }; @@ -221,7 +170,6 @@ export default { this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/updateBetriebsmittel/', this.param ).then(response => { - //console.log(response); this.$fhcAlert.alertSuccess(this.$p.t('ui', 'editSave')); // this.hideModal('newBetriebsmittelModal'); this.resetModal(); @@ -232,7 +180,6 @@ export default { }); }, loadBetriebsmittel(betriebsmittelperson_id){ - console.log("loadBetriebsmittel id:" + betriebsmittelperson_id); this.resetModal(); this.statusNew = false; this.param = { @@ -245,11 +192,16 @@ export default { this.formData = result; }) .catch(this.$fhcAlert.handleSystemError); - // this.changesDetected = false; + }, + searchInventar(event){ + return this.$fhcApi + .get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + event.query) + .then(result => { + this.filteredInventar = result.data.retval; + }); }, reload(){ this.$refs.table.reloadTable(); - //this.changesDetected = false; }, hideModal(modalRef){ this.$refs[modalRef].hide(); @@ -257,10 +209,15 @@ export default { resetModal(){ this.formData = {}; this.formData.ausgegebenam = this.getDefaultDate(); - this.formData.listBetriebsmitteltyp = null; + this.formData.retouram = null; + this.formData.betriebsmitteltyp = null; + this.formData.nummer = null; + this.formData.nummer2 = null; + this.formData.kaution = null; + this.formData.anmerkung = null; + this.formData.beschreibung = null; this.betriebsmittelperson_id = {}; this.statusNew = true; - //this.changesDetected = false; }, getDefaultDate() { const today = new Date(); @@ -323,7 +280,7 @@ export default { @@ -410,7 +392,7 @@ export default { :side-menu="false" reload new-btn-show - new-btn-label="Neu" + new-btn-label="Notiz" @click:new="actionNewNotiz" > @@ -534,7 +516,7 @@ export default {
- +
` From b51ce1302429b1be515150b85994cfa9412e82f8 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 16 Apr 2024 09:18:19 +0200 Subject: [PATCH 190/464] CSS correction --- public/css/Studentenverwaltung.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css index f77988451..d29455097 100644 --- a/public/css/Studentenverwaltung.css +++ b/public/css/Studentenverwaltung.css @@ -24,15 +24,15 @@ html { border-radius: 0!important; } -#main { +.stv { display: flex; flex-direction: column; height: 100vh; } -#main > header { +.stv > header { flex: 0 0 auto; } -#main > div { +.stv > div { flex: 1 1 auto; } From 63d7716a6c157f41e5e49cd634e60202ac2ec8a6 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 16 Apr 2024 09:19:17 +0200 Subject: [PATCH 191/464] Konto Edit: Date config --- .../js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js index 9e65df428..b3d33b116 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js @@ -81,6 +81,8 @@ export default { v-model="data.buchungsdatum" name="buchungsdatum" label="Buchungsdatum" + :enable-time-picker="false" + auto-apply > Date: Tue, 16 Apr 2024 12:56:12 +0200 Subject: [PATCH 192/464] Konto new --- .../controllers/api/frontend/v1/stv/Konto.php | 160 +++++++++++++- application/models/crm/Konto_model.php | 28 +++ public/js/api/stv.js | 5 + public/js/api/stv/konto.js | 31 +++ .../js/components/Stv/Studentenverwaltung.js | 2 +- .../Stv/Studentenverwaltung/Details/Konto.js | 37 ++-- .../Studentenverwaltung/Details/Konto/Edit.js | 4 +- .../Studentenverwaltung/Details/Konto/New.js | 199 ++++++++++++++++++ 8 files changed, 442 insertions(+), 24 deletions(-) create mode 100644 public/js/api/stv.js create mode 100644 public/js/api/stv/konto.js create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php index 782f28d00..12892d2f7 100644 --- a/application/controllers/api/frontend/v1/stv/Konto.php +++ b/application/controllers/api/frontend/v1/stv/Konto.php @@ -37,6 +37,8 @@ class Konto extends FHCAPI_Controller parent::__construct([ 'get' => 'student/stammdaten:r', 'getBuchungstypen' => 'student/stammdaten:r', // alle? + 'checkDoubles' => ['admin:r', 'assistenz:r'], + 'insert' => ['admin:w', 'assistenz:w'], 'update' => ['admin:w', 'assistenz:w'] ]); @@ -61,13 +63,14 @@ class Konto extends FHCAPI_Controller { $this->load->library('form_validation'); - $this->form_validation->set_rules('person_id', 'Person ID', 'required'); - + $person_id = $this->input->post('person_id'); + if (!$person_id || !is_array($person_id)) + $this->form_validation->set_rules('person_id', 'Person ID', 'required'); if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); - $person_id = $this->input->post('person_id'); + $studiengang_kz = $this->input->post('studiengang_kz'); if ($this->input->post('only_open')) { @@ -124,6 +127,146 @@ class Konto extends FHCAPI_Controller $this->terminateWithSuccess($data); } + /** + * Check double Buchungen + * + * @return void + */ + public function checkDoubles() + { + if (!defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') || !FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK) + $this->terminateWithSuccess(false); + + $this->load->library('form_validation'); + + $person_ids = $this->input->post('person_id'); + + if (!$person_ids || !is_array($person_ids)) { + $person_ids = [$person_ids]; + $this->form_validation->set_rules('person_id', 'Person ID', 'required'); + } + $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required'); + $this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required'); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + $buchungstypen = unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK); + $buchung = $this->input->post('buchungstyp_kurzbz'); + + if (!isset($buchungstypen[$buchung])) + $this->terminateWithSuccess(false); + + $result = $this->KontoModel->checkDoubleBuchung($person_ids, $this->input->post('studiensemester_kurzbz'), $buchungstypen[$buchung]); + + #$result = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $result = $result->retval; + + if (!$result) + $this->terminateWithSuccess(false); + + $persons = array_map(function ($row) { + return $row->nachname . ' ' . $row->vorname; + }, $result); + + // TODO(chris): Phrases + $result = $this->p->t('konto', 'buchung_vorhanden') . "\n"; + if (count($persons) > 10) { + $result .= "-" . implode("\n-", array_slice($persons, 0, 10)) . "\n"; + + if (count($persons) == 11) { + $result .= "\n" . $this->p->t('konto', 'and_1_additional_person'); + } else { + $result .= "\n" . $this->p->t('konto', 'and_x_additional_person', [ + 'x' => count($persons) - 10 + ]); + } + } else { + $result .= "-" . implode("\n-", $persons) . "\n"; + } + $result .= $this->p->t('konto', 'proceed'); + + $this->addError($result, 'confirm'); + + $this->terminateWithSuccess(true); + } + + + /** + * Save Buchung + * + * @return void + */ + public function insert() + { + $this->load->library('form_validation'); + + $person_ids = $this->input->post('person_id'); + + if (!$person_ids || !is_array($person_ids)) { + $person_ids = [$person_ids]; + $this->form_validation->set_rules('person_id', 'Person ID', 'required'); + } + $this->form_validation->set_rules('betrag', 'Betrag', 'numeric'); + $this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date'); + $this->form_validation->set_rules('buchungstext', 'Buchungstext', 'max_length[256]'); + $this->form_validation->set_rules('mahnspanne', 'Mahnspanne', 'integer'); + $this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required|max_length[32]'); + $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required|max_length[16]'); + $this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]'); + $this->form_validation->set_rules('credit_points', 'Credit Points', 'numeric'); + + Events::trigger('konto_insert_validation', $this->form_validation); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + $allowed = [ + 'betrag', + 'buchungsdatum', + 'buchungstext', + 'mahnspanne', + 'buchungstyp_kurzbz', + 'studiensemester_kurzbz', + 'studiengang_kz', + 'credit_points', + 'anmerkung' + ]; + $data = [ + 'updateamum' => date('c'), + 'updatevon' => getAuthUID() + ]; + foreach ($allowed as $field) + if ($this->input->post($field) !== null) + $data[$field] = $this->input->post($field); + + if (defined('FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE') && isset(unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']])) { + $data['kostenstelle'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']]; + } + + $result = []; + foreach ($person_ids as $person_id) { + $id = $this->KontoModel->insert(array_merge($data, ['person_id' => $person_id])); + if (isError($id)) + $this->addError(getError($id), self::ERROR_TYPE_GENERAL); + else { + $data = $this->KontoModel->withAdditionalInfo()->load(getData($id)); + if (isError($data)) + $this->addError(getError($data), self::ERROR_TYPE_GENERAL); + else + $result[] = getData($data); + } + } + + if ($result) + $this->terminateWithSuccess($result); + // NOTE(chris): else there should already be error in the return object + } + /** * Save Buchung * @@ -134,14 +277,21 @@ class Konto extends FHCAPI_Controller $this->load->library('form_validation'); $this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required'); - $this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]'); + $this->form_validation->set_rules('betrag', 'Betrag', 'numeric'); $this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date'); - Events::trigger('konto_update_validation', $this->form_validation); + $this->form_validation->set_rules('buchungstext', 'Buchungstext', 'max_length[256]'); + $this->form_validation->set_rules('mahnspanne', 'Mahnspanne', 'integer'); + $this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required|max_length[32]'); + $this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required|max_length[16]'); + $this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]'); + $this->form_validation->set_rules('credit_points', 'Credit Points', 'numeric'); + Events::trigger('konto_update_validation', $this->form_validation); if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); + $id = $this->input->post('buchungsnr'); $allowed = [ 'betrag', diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php index 85ac9234c..77ae04990 100644 --- a/application/models/crm/Konto_model.php +++ b/application/models/crm/Konto_model.php @@ -96,6 +96,34 @@ class Konto_model extends DB_Model return $this->getAlleBuchungen($person_id, $studiengang_kz); } + /** + * Check double Buchungen + * + * @param array $person_ids + * @param string $studiensemester_kurzbz + * @param array $buchungstyp_kurzbzs + * + * @return stdClass + */ + public function checkDoubleBuchung($person_ids, $studiensemester_kurzbz, $buchungstyp_kurzbzs) + { + $this->addSelect('vorname'); + $this->addSelect('nachname'); + + $this->addJoin('public.tbl_person', 'person_id'); + + $this->db->where_in('person_id', $person_ids); + $this->db->where_in('buchungstyp_kurzbz', $buchungstyp_kurzbzs); + + $this->addGroupBy('vorname, nachname'); + $this->addOrder('nachname'); + $this->addOrder('vorname'); + + return $this->loadWhere([ + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ]); + } + /** * Sets a Payment as paid */ diff --git a/public/js/api/stv.js b/public/js/api/stv.js new file mode 100644 index 000000000..2a84ab0b7 --- /dev/null +++ b/public/js/api/stv.js @@ -0,0 +1,5 @@ +import konto from './stv/konto.js'; + +export default { + konto +}; \ No newline at end of file diff --git a/public/js/api/stv/konto.js b/public/js/api/stv/konto.js new file mode 100644 index 000000000..0e4069f2c --- /dev/null +++ b/public/js/api/stv/konto.js @@ -0,0 +1,31 @@ +export default { + tabulatorConfig(config, self) { + config.ajaxURL = 'api/frontend/v1/stv/konto/get'; + config.ajaxParams = () => { + const params = { + person_id: self.modelValue.person_id || self.modelValue.map(e => e.person_id), + only_open: self.filter, + studiengang_kz: self.studiengang_kz_intern ? self.stg_kz : '' + }; + return params; + }; + config.ajaxRequestFunc = (url, config, params) => this.$fhcApi.post(url, params, config); + config.ajaxResponse = (url, params, response) => response.data; + + return config; + }, + checkDoubles(data) { + return this.$fhcApi.post('api/frontend/v1/stv/konto/checkDoubles', data, { + confirmErrorHandler: error => true + }); + }, + insert(data) { + return this.$fhcApi.post('api/frontend/v1/stv/konto/insert', data); + }, + edit(data) { + return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data); + }, + getBuchungstypen() { + return this.$fhcApi.get('api/frontend/v1/stv/konto/getBuchungstypen'); + } +}; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 42e3cd5dd..57cfe998a 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -157,7 +157,7 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); this.$fhcApi - .get('api/frontend/v1/stv/konto/getBuchungstypen') + .factory.stv.konto.getBuchungstypen() .then(result => { this.lists.buchungstypen = result.data; }) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js index b6b71f50b..849754050 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js @@ -1,14 +1,17 @@ import {CoreFilterCmpt} from "../../../filter/Filter.js"; import FormInput from "../../../Form/Input.js"; +import KontoNew from "./Konto/New.js"; import KontoEdit from "./Konto/Edit.js"; +// TODO(chris): Phrasen // TODO(chris): multi pers -// TODO(chris): new header(multi pers), edit/row, gegenb.(date) multi, löschen multi, best. multi(recht) +// TODO(chris): gegenb.(date) multi, löschen multi, best. multi(recht) export default { components: { CoreFilterCmpt, FormInput, + KontoNew, KontoEdit }, props: { @@ -25,6 +28,11 @@ export default { }; }, computed: { + personIds() { + if (this.modelValue.person_id) + return [this.modelValue.person_id]; + return this.modelValue.map(e => e.person_id); + }, stg_kz() { if (this.modelValue.studiengang_kz) return this.modelValue.studiengang_kz; @@ -153,24 +161,13 @@ export default { return columns; }, tabulatorOptions() { - return { - ajaxURL: 'api/frontend/v1/stv/konto/get', - ajaxParams: () => { - const params = { - person_id: this.modelValue.person_id || this.modelValue.map(e => e.person_id), - only_open: this.filter, - studiengang_kz: this.studiengang_kz_intern ? this.stg_kz : '' - }; - return params; - }, - ajaxRequestFunc: (url, config, params) => { - return this.$fhcApi.post(url, params, config); - }, - ajaxResponse: (url, params, response) => response.data, + return this.$fhcApi.factory.stv.konto.tabulatorConfig({ dataTree: true, columns: this.tabulatorColumns, + selectable: true, + selectableRangeMode: 'click', index: 'buchungsnr', - }; + }, this); } }, watch: { @@ -186,6 +183,9 @@ export default { if (!data) return this.reload(); this.$refs.table.tabulator.updateData(data); + }, + actionNew() { + this.$refs.new.open(); } }, created() { @@ -221,8 +221,13 @@ export default { table-only :side-menu="false" :tabulator-options="tabulatorOptions" + new-btn-show + new-btn-label="Buchung" + :new-btn-disabled="stg_kz === ''" + @click:new="actionNew" > +
` }; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js index b3d33b116..d7b2976e3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js @@ -35,14 +35,14 @@ export default { this.loading = true; this.$refs.form - .post('api/frontend/v1/stv/konto/update', this.data) + .factory.stv.konto.edit(this.data) .then(result => { this.$emit('saved', result.data); this.loading = false; this.$refs.modal.hide(); this.$fhcAlert.alertSuccess('Daten wurden gespeichert'); }) - .catch(error => {console.log(error); // TODO(chris): check if working with current fhcApi + .catch(error => { this.$fhcAlert.handleSystemError(error); this.loading = false; }); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js new file mode 100644 index 000000000..b47d03456 --- /dev/null +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js @@ -0,0 +1,199 @@ +import BsModal from "../../../../Bootstrap/Modal.js"; +import BsConfirm from "../../../../Bootstrap/Confirm.js"; +import CoreForm from "../../../../Form/Form.js"; +import FormValidation from "../../../../Form/Validation.js"; +import FormInput from "../../../../Form/Input.js"; + +// TODO(chris): Phrasen + +export default { + components: { + BsModal, + CoreForm, + FormValidation, + FormInput + }, + inject: { + lists: { + from: 'lists' + }, + defaultSemester: { + from: 'defaultSemester' + } + }, + props: { + personIds: { + type: Array, + required: true + }, + stgKz: { + type: Number, + required: true + }, + config: { + type: Object, + default: {} + } + }, + data() { + return { + loading: false, + data: {} + }; + }, + computed: { + reversedSems() { + return this.lists.studiensemester.toReversed(); + }, + activeBuchungstypen() { + return this.lists.buchungstypen.filter(e => e.aktiv); + } + }, + methods: { + save() { + this.$refs.form.clearValidation(); + this.loading = true; + + const data = {...{ + person_id: this.personIds, + studiengang_kz: this.stgKz + }, ...this.data}; + + this.$refs.form + .factory.stv.konto.checkDoubles(data) + .then(result => result.data + ? Promise.all( + result.errors + .filter(e => e.type == 'confirm') + .map(e => BsConfirm.popup(Vue.h('div', {class:'text-preline'}, e.message))) + ) + : Promise.resolve()) + .then(() => data) + .then(this.$refs.form.factory.stv.konto.insert) + .then(result => { + this.$emit('saved', result.data); + this.loading = false; + this.$refs.modal.hide(); + this.$fhcAlert.alertSuccess('Daten wurden gespeichert'); + }) + .catch(error => { + if (error) + this.$fhcAlert.handleSystemError(error); + this.loading = false; + }); + }, + open() { + this.data = { + betrag: '-0.00', + mahnspanne: 30, + buchungsdatum: new Date(), + studiensemester_kurzbz: this.defaultSemester + }; + this.$refs.modal.show(); + }, + preventCloseOnLoading(ev) { + if (this.loading) + ev.returnValue = false; + }, + checkDefaultBetrag(ev) { + const typ = this.lists.buchungstypen.filter(e => e.buchungstyp_kurzbz == ev).pop(); + const amount = typ.standardbetrag || '-0.00'; + const text = typ.standardtext || ''; + const creditpoints = typ.credit_points || ''; + + if (!this.data.betrag || this.data.betrag == '-0.00') + this.data.betrag = amount; + + if (!this.data.buchungstext) + this.data.buchungstext = text; + + if (this.config.showCreditpoints && this.data.credit_points == '0.00') + this.data.credit_points = creditpoints; + } + }, + template: ` + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + ` +}; \ No newline at end of file From 006a763436e63b1d8639274f4b34259e7c7302ed Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 16 Apr 2024 14:34:45 +0200 Subject: [PATCH 193/464] Konto delete --- .../controllers/api/frontend/v1/stv/Konto.php | 62 ++++++++++++++++--- public/js/api/stv/konto.js | 3 + .../Stv/Studentenverwaltung/Details/Konto.js | 16 ++++- system/phrasesupdate.php | 20 ++++++ 4 files changed, 93 insertions(+), 8 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php index 12892d2f7..1f6b963bb 100644 --- a/application/controllers/api/frontend/v1/stv/Konto.php +++ b/application/controllers/api/frontend/v1/stv/Konto.php @@ -39,7 +39,8 @@ class Konto extends FHCAPI_Controller 'getBuchungstypen' => 'student/stammdaten:r', // alle? 'checkDoubles' => ['admin:r', 'assistenz:r'], 'insert' => ['admin:w', 'assistenz:w'], - 'update' => ['admin:w', 'assistenz:w'] + 'update' => ['admin:w', 'assistenz:w'], + 'delete' => ['admin:w', 'assistenz:w'] ]); // Load models @@ -64,11 +65,12 @@ class Konto extends FHCAPI_Controller $this->load->library('form_validation'); $person_id = $this->input->post('person_id'); - if (!$person_id || !is_array($person_id)) + if (!$person_id || !is_array($person_id)) { $this->form_validation->set_rules('person_id', 'Person ID', 'required'); - if (!$this->form_validation->run()) - $this->terminateWithValidationErrors($this->form_validation->error_array()); + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } $studiengang_kz = $this->input->post('studiengang_kz'); @@ -251,14 +253,14 @@ class Konto extends FHCAPI_Controller $result = []; foreach ($person_ids as $person_id) { $id = $this->KontoModel->insert(array_merge($data, ['person_id' => $person_id])); - if (isError($id)) + if (isError($id)) { $this->addError(getError($id), self::ERROR_TYPE_GENERAL); - else { + } else { $data = $this->KontoModel->withAdditionalInfo()->load(getData($id)); if (isError($data)) $this->addError(getError($data), self::ERROR_TYPE_GENERAL); else - $result[] = getData($data); + $result[] = current(getData($data)); } } @@ -327,4 +329,50 @@ class Konto extends FHCAPI_Controller $this->terminateWithSuccess($result); } + + /** + * Delete Buchung + * + * @return void + */ + public function delete() + { + $this->load->library('form_validation'); + + $this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required'); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + $buchungsnr = $this->input->post('buchungsnr'); + + $result = $this->KontoModel->load($buchungsnr); + #$result = $this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $result = $result->retval; + + if (!$result) + $this->terminateWithError('buchung not found', self::ERROR_TYPE_GENERAL); + + $_POST['studiengang_kz'] = current($result)->studiengang_kz; + + $this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'has_permissions_for_stg[admin:rw,assistenz:rw]'); + + Events::trigger('konto_delete_validation', $this->form_validation); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + Events::trigger('konto_delete', $buchungsnr); + + $result = $this->KontoModel->delete($buchungsnr); + #$this->getDataOrTerminateWithError($result); + if (isError($result)) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + + $this->terminateWithSuccess(); + } } diff --git a/public/js/api/stv/konto.js b/public/js/api/stv/konto.js index 0e4069f2c..090bd30e2 100644 --- a/public/js/api/stv/konto.js +++ b/public/js/api/stv/konto.js @@ -25,6 +25,9 @@ export default { edit(data) { return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data); }, + delete(buchungsnr) { + return this.$fhcApi.post('api/frontend/v1/stv/konto/delete', {buchungsnr}); + }, getBuchungstypen() { return this.$fhcApi.get('api/frontend/v1/stv/konto/getBuchungstypen'); } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js index 849754050..155c51ee2 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js @@ -154,6 +154,19 @@ export default { ); container.append(button); + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary'; + button.innerHTML = ''; + button.addEventListener('click', () => + this.$fhcAlert + .confirmDelete() + .then(result => result ? cell.getData().buchungsnr : Promise.reject({handled:true})) + .then(this.$fhcApi.factory.stv.konto.delete) + .then(() => cell.getRow().delete()) + .catch(this.$fhcAlert.handleSystemError) + ); + container.append(button); + return container; }, frozen: true @@ -182,7 +195,7 @@ export default { updateData(data) { if (!data) return this.reload(); - this.$refs.table.tabulator.updateData(data); + this.$refs.table.tabulator.updateOrAddData(data); }, actionNew() { this.$refs.new.open(); @@ -221,6 +234,7 @@ export default { table-only :side-menu="false" :tabulator-options="tabulatorOptions" + reload new-btn-show new-btn-label="Buchung" :new-btn-disabled="stg_kz === ''" diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index abeb972a5..f4dd30a21 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -26573,6 +26573,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'sap', + 'phrase' => 'msg_buchung_deleted', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Buchungszuordnung SAP geloescht: SalesOrder: {sap_sales_order_id}', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Buchungszuordnung SAP deleted: SalesOrder: {sap_sales_order_id}', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From 2f08d1b1c145e843286f311af116850fbe9de958 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 16 Apr 2024 15:42:49 +0200 Subject: [PATCH 194/464] Notizcomponent: add twoColumnsLayout, refactor UX --- .../controllers/api/frontend/v1/stv/Notiz.php | 9 +- public/js/components/Form/Upload/Dms.js | 8 +- public/js/components/Notiz/NotizComponent.js | 866 ++++++++++++++---- .../Studentenverwaltung/Details/Notizen.js | 45 +- 4 files changed, 746 insertions(+), 182 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php index 29a0b576e..cf46f79a6 100644 --- a/application/controllers/api/frontend/v1/stv/Notiz.php +++ b/application/controllers/api/frontend/v1/stv/Notiz.php @@ -127,8 +127,8 @@ class Notiz extends FHCAPI_Controller $verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid; $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null; $type = $this->input->post('typeId'); - $start = $this->input->post('von'); - $ende = $this->input->post('bis'); + $start = $this->input->post('start'); + $ende = $this->input->post('ende'); //Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type $result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid); @@ -222,8 +222,8 @@ class Notiz extends FHCAPI_Controller $verfasser_uid = $this->input->post('verfasser'); $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid; $erledigt = $this->input->post('erledigt'); - $start = $this->input->post('von'); - $ende = $this->input->post('bis'); + $start = $this->input->post('start'); + $ende = $this->input->post('ende'); $result = $this->NotizModel->update( [ @@ -426,6 +426,7 @@ class Notiz extends FHCAPI_Controller public function getMitarbeiter($searchString) { + $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel'); $result = $this->MitarbeiterModel->searchMitarbeiter($searchString); if (isError($result)) { $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js index c531065ff..6ad69848c 100644 --- a/public/js/components/Form/Upload/Dms.js +++ b/public/js/components/Form/Upload/Dms.js @@ -53,8 +53,14 @@ export default { }, watch: { modelValue(n) { - if (n instanceof FileList) + if (!n) + return; + if (n instanceof FileList) { + if (!this.$refs.upload) { + return; + } return this.$refs.upload.files = n; + } const dt = new DataTransfer(); const dms = []; diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js index 3ba8615fe..fe2ecc3e8 100644 --- a/public/js/components/Notiz/NotizComponent.js +++ b/public/js/components/Notiz/NotizComponent.js @@ -3,6 +3,8 @@ import PvAutoComplete from "../../../../index.ci.php/public/js/components/primev import FormUploadDms from '../Form/Upload/Dms.js'; import {CoreFilterCmpt} from "../filter/Filter.js"; import BsModal from "../Bootstrap/Modal"; +import FormForm from '../Form/Form.js'; +import FormInput from '../Form/Input.js'; export default { @@ -11,148 +13,226 @@ export default { VueDatePicker, PvAutoComplete, FormUploadDms, + FormForm, + FormInput, BsModal }, props: [ 'typeId', 'id', + 'notizLayout', 'showErweitert', 'showDocument', - 'showTinyMCE' + 'showTinyMCE', + 'visibleColumns' ], data(){ - return { - tabulatorOptions: { - ajaxURL: 'api/frontend/v1/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId, - ajaxRequestFunc: this.$fhcApi.get, - ajaxResponse: (url, params, response) => response.data, - //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId), - columns: [ - {title: "Titel", field: "titel"}, - {title: "Text", field: "text_stripped", width: 250}, - {title: "VerfasserIn", field: "verfasser_uid"}, - {title: "BearbeiterIn", field: "bearbeiter_uid", visible: false}, - {title: "Start", field: "start_format", visible: false}, - {title: "Ende", field: "ende_format", visible: false}, - {title: "Dokumente", field: "countdoc"}, - {title: "Erledigt", field: "erledigt", visible: false}, - {title: "Notiz_id", field: "notiz_id", visible: false}, - {title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false}, - {title: "letzte Änderung", field: "lastupdate", visible: false}, - {title: 'Aktionen', field: 'actions', - minWidth: 150, // Ensures Action-buttons will be always fully displayed - formatter: (cell, formatterParams, onRendered) => { - let container = document.createElement('div'); - container.className = "d-flex gap-2"; + return { + tabulatorOptions: { + ajaxURL: 'api/frontend/v1/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId, + ajaxRequestFunc: this.$fhcApi.get, + ajaxResponse: (url, params, response) => response.data, + //ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId), + columns: [ + { + title: "Titel", + field: "titel", + width: 100, + visible: true, + tooltip:function(e, cell, onRendered){ + var el = document.createElement("div"); + el.style.backgroundColor = "white"; + el.style.fontWeight = "bold"; + el.style.padding = "5px"; + el.style.border = "1px solid black"; - let button = document.createElement('button'); - button.className = 'btn btn-outline-secondary btn-action'; - button.innerHTML = ''; - button.addEventListener( - 'click', - (event) => - this.actionEditNotiz(cell.getData().notiz_id) - ); - container.append(button); + el.innerText = cell.getColumn().getField() + " - " + cell.getValue(); - button = document.createElement('button'); - button.className = 'btn btn-outline-secondary btn-action'; - button.innerHTML = ''; - button.addEventListener( - 'click', - () => - this.actionDeleteNotiz(cell.getData().notiz_id) - ); - container.append(button); - - return container; + return el; + }, }, - frozen: true - }], - layout: 'fitColumns', - layoutColumnsOnNewData: false, - height: '150', - selectableRangeMode: 'click', - selectable: true, - index: 'notiz_id' - }, - tabulatorEvents: [ - { - event: 'tableBuilt', - handler: async() => { + { + title: "Text", + field: "text_stripped", + width: 250, + visible: true, + tooltip:function(e, cell, onRendered){ + var el = document.createElement("div"); + el.style.backgroundColor = "white"; + el.style.fontWeight = "bold"; + el.style.padding = "5px"; + el.style.border = "1px solid black"; + el.style.borderRadius = "5px"; - await this.$p.loadCategory(['notiz','global']); + el.innerText = cell.getValue(); - let cm = this.$refs.table.tabulator.columnManager; + return el; + }, + }, + {title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false}, + {title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false}, + {title: "Start", field: "start_format", width: 86, visible: false}, + {title: "Ende", field: "ende_format", width: 86, visible: false}, + {title: "Dokumente", field: "countdoc", width: 100, visible: false}, + { + title: "Erledigt", + field: "erledigt", + width: 97, + visible: false, + formatter:"tickCross", + hozAlign:"center", + formatterParams: { + tickElement: '', + crossElement: '' + } + }, + {title: "Notiz_id", field: "notiz_id", width: 92, visible: false}, + {title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: false}, + {title: "letzte Änderung", field: "lastupdate", width: 146, visible: false}, + { + title: 'Aktionen', field: 'actions', + width: 100, + formatter: (cell, formatterParams, onRendered) => { + let container = document.createElement('div'); + container.className = "d-flex gap-2"; - cm.getColumnByField('verfasser_uid').component.updateDefinition({ - title: this.$p.t('notiz', 'verfasser') - }); - cm.getColumnByField('titel').component.updateDefinition({ - title: this.$p.t('global', 'titel') - }); - cm.getColumnByField('text_stripped').component.updateDefinition({ - title: this.$p.t('global', 'text') - }); - cm.getColumnByField('bearbeiter_uid').component.updateDefinition({ - title: this.$p.t('notiz', 'bearbeiter') - }); - cm.getColumnByField('start_format').component.updateDefinition({ - title: this.$p.t('global', 'gueltigVon') - }); - cm.getColumnByField('ende_format').component.updateDefinition({ - title: this.$p.t('global', 'gueltigBis') - }); - cm.getColumnByField('countdoc').component.updateDefinition({ - title: this.$p.t('notiz', 'document') - }); - cm.getColumnByField('erledigt').component.updateDefinition({ - title: this.$p.t('notiz', 'erledigt') - }); - cm.getColumnByField('lastupdate').component.updateDefinition({ - title: this.$p.t('notiz', 'letzte_aenderung') - }); + let button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener( + 'click', + (event) => + this.actionEditNotiz(cell.getData().notiz_id) + ); + container.append(button); + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.addEventListener( + 'click', + () => + this.actionDeleteNotiz(cell.getData().notiz_id) + ); + container.append(button); + + return container; + }, + frozen: true + }], + layout: 'fitColumns', + layoutColumnsOnNewData: false, + height: '250', + selectableRangeMode: 'click', + selectable: true, + index: 'notiz_id' + }, + tabulatorEvents: [ + { + event: 'tableBuilt', + handler: async () => { + + await this.$p.loadCategory(['notiz', 'global']); + + let cm = this.$refs.table.tabulator.columnManager; + + cm.getColumnByField('verfasser_uid').component.updateDefinition({ + title: this.$p.t('notiz', 'verfasser'), + visible: this.showVariables.showVerfasser + }); + cm.getColumnByField('titel').component.updateDefinition({ + title: this.$p.t('global', 'titel'), + visible: this.showVariables.showTitel + }); + cm.getColumnByField('text_stripped').component.updateDefinition({ + title: this.$p.t('global', 'text'), + visible: this.showVariables.showText + }); + cm.getColumnByField('bearbeiter_uid').component.updateDefinition({ + title: this.$p.t('notiz', 'bearbeiter'), + visible: this.showVariables.showBearbeiter + }); + cm.getColumnByField('start_format').component.updateDefinition({ + title: this.$p.t('global', 'gueltigVon'), + visible: this.showVariables.showVon + }); + cm.getColumnByField('ende_format').component.updateDefinition({ + title: this.$p.t('global', 'gueltigBis'), + visible: this.showVariables.showBis + }); + cm.getColumnByField('countdoc').component.updateDefinition({ + title: this.$p.t('notiz', 'document'), + visible: this.showVariables.showDokumente + }); + cm.getColumnByField('erledigt').component.updateDefinition({ + title: this.$p.t('notiz', 'erledigt'), + visible: this.showVariables.showErledigt + }); + cm.getColumnByField('lastupdate').component.updateDefinition({ + title: this.$p.t('notiz', 'letzte_aenderung'), + visible: this.showVariables.showLastupdate + }); + cm.getColumnByField('notiz_id').component.updateDefinition({ + visible: this.showVariables.showNotiz_id + }); + cm.getColumnByField('notizzuordnung_id').component.updateDefinition({ + visible: this.showVariables.showNotizzuordnung_id + }); + + } } - } - ], - notizen: [], - multiupload: true, - mitarbeiter: [], - filteredMitarbeiter: [], - zwischenvar: '', - editorInitialized: false, - editor: null, - notizData: { - typeId: this.typeId, - titel: null, - statusNew: true, - text: null, - lastChange: null, - von: null, - bis: null, - document: null, - erledigt: false, - verfasser: null, - bearbeiter: null, - anhang: [] - }, - }; + ], + notizen: [], + multiupload: true, + mitarbeiter: [], + filteredMitarbeiter: [], + zwischenvar: '', + editorInitialized: false, + editor: null, + notizData: { + typeId: this.typeId, + titel: null, + statusNew: true, + text: null, + lastUpdate: null, + von: null, + bis: null, + document: null, + erledigt: false, + verfasser: null, + bearbeiter: null, + anhang: [] + }, + showVariables: { + showTitel: false, + showText: false, + showVerfasser: false, + showBearbeiter: false, + showVon: false, + showBis: false, + showDokumente: false, + showErledigt: false, + showNotiz_id: false, + showNotizzuordnung_id: false, + showLastupdate: false + }, + } }, methods: { - actionDeleteNotiz(notiz_id){ + actionDeleteNotiz(notiz_id) { this.loadNotiz(notiz_id).then(() => { - this.$refs.deleteNotizModal.show(); + this.$refs.deleteNotizModal.show(); }); }, - actionEditNotiz(notiz_id){ + actionEditNotiz(notiz_id) { this.loadNotiz(notiz_id).then(() => { - if(this.notizen.notiz_id) { + if (this.notizen.notiz_id) { + this.notizData.typeId = this.typeId; this.notizData.titel = this.notizen.titel; this.notizData.statusNew = false; this.notizData.text = this.notizen.text; this.notizData.intText = this.notizen.text; - this.notizData.lastChange = this.notizen.lastupdate; + this.notizData.lastupdate = this.notizen.lastupdate; this.notizData.von = this.notizen.start; this.notizData.bis = this.notizen.ende; this.notizData.document = this.notizen.dms_id; @@ -164,14 +244,13 @@ export default { } }) .then(() => { - if(this.notizData.dms_id){ + if (this.notizData.dms_id) { this.loadDocEntries(this.notizData.notiz_id); - } - else + } else this.notizData.anhang = []; }); }, - actionNewNotiz(){ + actionNewNotiz() { this.resetFormData(); }, addNewNotiz() { @@ -181,82 +260,84 @@ export default { Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v)); this.$fhcApi.post('api/frontend/v1/stv/notiz/addNewNotiz/' + this.id, formData, - { Headers: { "Content-Type": "multipart/form-data" } } + {Headers: {"Content-Type": "multipart/form-data"}} ).then(response => { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); - this.resetFormData(); - this.reload(); + this.resetFormData(); + this.reload(); }) .catch(this.$fhcAlert.handleSystemError) .finally(() => { - window.scrollTo(0, 0); - }); + window.scrollTo(0, 0); + }); }, - deleteNotiz(notiz_id){ + deleteNotiz(notiz_id) { this.param = { - 'notiz_id': notiz_id + 'notiz_id': notiz_id }; return this.$fhcApi.post('api/frontend/v1/stv/notiz/deleteNotiz/', this.param) .then(result => { - this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')); - this.$refs.deleteNotizModal.hide(); - this.reload(); + this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')); + this.$refs.deleteNotizModal.hide(); + this.reload(); + this.resetFormData(); }) .catch(this.$fhcAlert.handleSystemError) - .finally(()=> { + .finally(() => { window.scrollTo(0, 0); }); }, - loadNotiz(notiz_id){ + loadNotiz(notiz_id) { this.param = { - 'notiz_id': notiz_id + 'notiz_id': notiz_id }; return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadNotiz/', this.param) - .then(result => { - this.notizData = result.data; - return result; - }) + .then(result => { + this.notizData = result.data; + this.notizData.typeId = this.typeId; + return result; + }) .catch(this.$fhcAlert.handleSystemError); }, - loadDocEntries(notiz_id){ + loadDocEntries(notiz_id) { this.param = { - 'notiz_id': notiz_id + 'notiz_id': notiz_id }; return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadDokumente/', this.param) .then( result => { - this.notizData.anhang = result.data; + this.notizData.anhang = result.data; return result; }) .catch(this.$fhcAlert.handleSystemError); }, - updateNotiz(notiz_id){ + updateNotiz(notiz_id) { const formData = new FormData(); formData.append('data', JSON.stringify(this.notizData)); Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v)); this.param = { - 'notiz_id': notiz_id + 'notiz_id': notiz_id }; return this.$fhcApi.post( - 'api/frontend/v1/stv/notiz/updateNotiz/' , + 'api/frontend/v1/stv/notiz/updateNotiz/', formData, - { Headers: { "Content-Type": "multipart/form-data" } } + {Headers: {"Content-Type": "multipart/form-data"}} ).then(response => { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); - this.resetFormData(); - this.reload(); + this.resetFormData(); + this.reload(); }) - .catch(this.$fhcAlert.handleSystemError) - .finally(() => { - window.scrollTo(0, 0); - }); + .catch(this.$fhcAlert.handleSystemError) + .finally(() => { + window.scrollTo(0, 0); + }); }, - reload(){ + reload() { this.$refs.table.reloadTable(); }, resetFormData() { @@ -266,7 +347,7 @@ export default { titel: null, statusNew: true, text: null, - lastChange: null, + lastUpdate: null, von: null, bis: null, document: null, @@ -276,11 +357,11 @@ export default { anhang: [] }; }, - getUid(){ + getUid() { this.$fhcApi .get('api/frontend/v1/stv/notiz/getUid') .then(result => { - this.notizData.intVerfasser = result.data; + this.notizData.intVerfasser = result.data; }) .catch(this.$fhcAlert.handleSystemError); }, @@ -301,14 +382,14 @@ export default { //toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify", toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify', style_formats: [ - { title: 'Blocks', block: 'div' }, - { title: 'Paragraph', block: 'p' }, - { title: 'Heading 1', block: 'h1' }, - { title: 'Heading 2', block: 'h2' }, - { title: 'Heading 3', block: 'h3' }, - { title: 'Heading 4', block: 'h4' }, - { title: 'Heading 5', block: 'h5' }, - { title: 'Heading 6', block: 'h6' }, + {title: 'Blocks', block: 'div'}, + {title: 'Paragraph', block: 'p'}, + {title: 'Heading 1', block: 'h1'}, + {title: 'Heading 2', block: 'h2'}, + {title: 'Heading 3', block: 'h3'}, + {title: 'Heading 4', block: 'h4'}, + {title: 'Heading 5', block: 'h5'}, + {title: 'Heading 6', block: 'h6'}, ], autoresize_bottom_margin: 16, @@ -324,9 +405,16 @@ export default { }, updateText(value) { this.notizData.text = value; - } + }, + initializeShowVariables() { + this.visibleColumns.forEach(column => { + const columnToShow = "show" + column.charAt(0).toUpperCase() + column.slice(1); + this.showVariables[columnToShow] = true; + }); + }, }, created(){ + this.initializeShowVariables(); this.getUid(); }, async mounted() { @@ -370,9 +458,9 @@ export default { } }, template: ` -
- +
+ diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js index 31f7d0963..3f59397c3 100644 --- a/public/js/components/Stv/Studentenverwaltung/List.js +++ b/public/js/components/Stv/Studentenverwaltung/List.js @@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../filter/Filter.js"; import {CoreRESTClient} from '../../../RESTClient.js'; import ListNew from './List/New.js'; + export default { components: { CoreFilterCmpt, @@ -205,14 +206,14 @@ export default { :side-menu="false" reload new-btn-show - new-btn-label="InteressentIn" + :new-btn-label="$p.t('stv/action_new')" @click:new="actionNewPrestudent" > + + @@ -1117,19 +1141,80 @@ export default{ > - + - + - + - -
` +
` }; From 69abf1e9e25799deb0ba30ec05d27ffa31bbaf91 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 27 May 2024 11:50:17 +0200 Subject: [PATCH 241/464] Comment --- application/controllers/components/stv/Students.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php index e4ba9befd..59b2c2970 100644 --- a/application/controllers/components/stv/Students.php +++ b/application/controllers/components/stv/Students.php @@ -3,6 +3,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); // TODO(chris): Prestudent status missing +// TODO(chris): Prestudent studiengang missing class Students extends FHC_Controller { From 259a3c218a6ef8e468c018c60a3c862141abe331 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 27 May 2024 14:57:18 +0200 Subject: [PATCH 242/464] Funktionalitaet feature-39602 --- .../controllers/Studentenverwaltung.php | 4 +- .../api/frontend/v1/stv/Status.php | 3 +- application/models/crm/Prestudent_model.php | 4 +- .../js/components/Stv/Studentenverwaltung.js | 1 + .../Details/Prestudent/MultiStatus.js | 27 ++++++++++++- system/phrasesupdate.php | 40 +++++++++++++++++++ 6 files changed, 72 insertions(+), 7 deletions(-) diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php index 0c27f3aba..75faf2cba 100644 --- a/application/controllers/Studentenverwaltung.php +++ b/application/controllers/Studentenverwaltung.php @@ -26,8 +26,8 @@ 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_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung') - + 'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'), + 'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') ], 'variables' => [ 'semester_aktuell' => $this->variablelib->getVar('semester_aktuell') diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 768e8e196..f85780141 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -484,8 +484,9 @@ class Status extends FHCAPI_Controller $isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid'); $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); + $isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == "Abgewiesener"; - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) && !$isBerechtigtToDeleteAbgewiesen) { return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); } diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 0b198bb7d..109abafe3 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -764,9 +764,9 @@ class Prestudent_model extends DB_Model ps.updatevon FROM public.tbl_prestudentstatus ps - JOIN + LEFT JOIN public.tbl_student st USING (prestudent_id) - JOIN + LEFT JOIN public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz) LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id) diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 2fe6c9713..5b4b117c5 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -54,6 +54,7 @@ export default { hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'], hasAdminPermission: this.permissions['admin'], hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'], + hasPermissionRtAufsicht: this.permissions['lehre/reihungstestAufsicht'], lists: this.lists, defaultSemester: this.defaultSemester, $reloadList: () => { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index b1badff91..a0eb81491 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -39,6 +39,10 @@ export default{ from: 'hasSchreibrechtAss', default: false }, + hasPermissionRtAufsicht: { + from: 'hasPermissionRtAufsicht', + default: false + }, $reloadList: { from: '$reloadList', required: true @@ -96,6 +100,10 @@ export default{ }, hasPermissionCurrentStg(){ return this.arrayStg.includes(this.studiengang_kz); + }, + isStatusBeforeStudent(){ + let isStatusStudent = ['Student', 'Absolvent', 'Diplomand']; + return !isStatusStudent.includes(this.statusData.status_kurzbz); } }, props: { @@ -669,6 +677,7 @@ export default{ mounted(){}, template: `
+ @@ -828,11 +837,15 @@ export default{ + -
- {{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}} +
+ {{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}} +
+
+ {{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}
@@ -866,7 +879,9 @@ export default{ type="select" name="studiensemester_kurzbz" v-model="statusData['studiensemester_kurzbz']" + :disabled="statusData.datum < dataMeldestichtag" > +
@@ -879,6 +894,7 @@ export default{ type="select" name="ausbildungssemester" v-model="statusData['ausbildungssemester']" + :disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent" > @@ -897,6 +913,7 @@ export default{ format="dd.MM.yyyy" preview-format="dd.MM.yyyy" :teleport="true" + :disabled="statusData.datum < dataMeldestichtag" >
@@ -912,6 +929,7 @@ export default{ format="dd.MM.yyyy" preview-format="dd.MM.yyyy" :teleport="true" + :disabled="statusData.datum < dataMeldestichtag" >
@@ -927,6 +945,7 @@ export default{ format="dd.MM.yyyy" preview-format="dd.MM.yyyy" :teleport="true" + :disabled="statusData.datum < dataMeldestichtag" >
@@ -937,6 +956,7 @@ export default{ type="select" name="studienplan" v-model="statusData['studienplan_id']" + :disabled="statusData.datum < dataMeldestichtag" > @@ -949,6 +969,7 @@ export default{ type="text" name="anmerkung" v-model="statusData['anmerkung']" + :disabled="statusData.datum < dataMeldestichtag" >
@@ -961,6 +982,7 @@ export default{ type="select" name="aufnahmestufe" v-model="statusData['rt_stufe']" + :disabled="statusData.datum < dataMeldestichtag" > @@ -975,6 +997,7 @@ export default{ name="statusgrund" v-model="statusData['statusgrund_id']" > +
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index b923b649b..c675be789 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -28062,6 +28062,46 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'bismeldestichtag', + 'phrase' => 'info_MeldestichtagStatusgrund', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Meldestichtag erreicht - ausschließlich Bearbeiten Statusgrund möglich', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Reporting deadline reached - only editing status reason possible', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'bismeldestichtag', + 'phrase' => 'info_MeldestichtagStatusgrundSemester', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Meldestichtag erreicht - Bearbeiten Ausbildungssemester und Statusgrund möglich', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit education semester and status reason possible', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From dd138380c997ad2ec0df55922aabf4266557afa3 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 27 May 2024 17:07:09 +0200 Subject: [PATCH 243/464] Adaptierungen Tab Adresse: show Zustelladresse, Heimatadresse Validierung backend, Layout: Ticks, required --- .../api/frontend/v1/stv/Kontakt.php | 17 ++++++- .../Details/Kontakt/Address.js | 46 ++++++++++++------- .../Details/Kontakt/Bankaccount.js | 22 +++++---- .../Details/Kontakt/Contact.js | 17 ++++--- 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php index 517388b39..48a8d7c15 100644 --- a/application/controllers/api/frontend/v1/stv/Kontakt.php +++ b/application/controllers/api/frontend/v1/stv/Kontakt.php @@ -37,7 +37,8 @@ class Kontakt extends FHCAPI_Controller // Load language phrases $this->loadPhrases([ - 'ui' + 'ui', + 'person' ]); } @@ -221,6 +222,18 @@ class Kontakt extends FHCAPI_Controller public function deleteAddress($adresse_id) { $this->load->model('person/Adresse_model', 'AdresseModel'); + $result = $this->AdresseModel->load([ + 'adresse_id'=> $adresse_id, + ]); + if(isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $result = current(getData($result)); + + if($result->heimatadresse) + + $this->terminateWithError($this->p->t('person', 'error_deleteHomeAdress'), self::ERROR_TYPE_GENERAL); $result = $this->AdresseModel->delete( array('adresse_id' => $adresse_id) @@ -234,7 +247,7 @@ class Kontakt extends FHCAPI_Controller { return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL); } - //return $this->outputJsonSuccess(current(getData($result))); + return $this->terminateWithSuccess(current(getData($result)) ? : null); } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index 8f6cd9888..1f727f474 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -27,10 +27,24 @@ export default{ {title:"Ort", field:"ort"}, {title:"Gemeinde", field:"gemeinde"}, {title:"Nation", field:"nation"}, - {title:"Heimatadresse", field:"heimatadresse", - formatter: (cell, formatterParams, onRendered) => { - let output = cell.getValue() ? "ja" : "nein"; - return output; + { + title:"Heimatadresse", + field:"heimatadresse", + formatter:"tickCross", + hozAlign:"center", + formatterParams: { + tickElement: '', + crossElement: '' + } + }, + { + title:"Zustelladresse", + field:"zustelladresse", + formatter:"tickCross", + hozAlign:"center", + formatterParams: { + tickElement: '', + crossElement: '' } }, {title:"Abweich.Empf", field:"co_name"}, @@ -125,7 +139,7 @@ export default{ title: this.$p.t('person', 'rechnungsadresse') }); cm.getColumnByField('anmerkung').component.updateDefinition({ - title: this.$p.t('notiz', 'document') + title: this.$p.t('global', 'anmerkung') }); } } @@ -239,7 +253,7 @@ export default{ this.reload(); }); }, - loadPlaces() { //TODO(manu) Refactor API-controller + loadPlaces() { if (this.abortController.places) this.abortController.places.abort(); if (this.addressData.nation != 'A' || !this.addressData.plz) @@ -254,13 +268,11 @@ export default{ this.places = result.data; }); /* .catch(error => { - if (error.code == 'ERR_BAD_REQUEST') { - return this.$fhcAlert.handleFormValidation(error, this.$refs.form); - } - // NOTE(chris): repeat request - if (error.code != "ERR_CANCELED") - window.setTimeout(this.loadPlaces, 100); - });*/ + if (error.code != "ERR_CANCELED") + window.setTimeout(this.loadPlaces, 100); + else + this.$fhcAlert.handleSystemError(error); + });*/ }, search(event) { return this.$fhcApi @@ -324,7 +336,7 @@ export default{
- +
@@ -336,7 +348,7 @@ export default{ +
@@ -442,7 +454,7 @@ export default{
- +
@@ -472,7 +484,7 @@ export default{
- +
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js index b448529fb..22ea6de70 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js @@ -37,10 +37,16 @@ export default{ } return output;} }, - {title:"Verrechnung", field:"verrechnung", visible:false, - formatter: (cell, formatterParams, onRendered) => { - let output = cell.getValue() ? "ja" : "nein"; - return output;} + { + title:"Verrechnung", + field:"verrechnung", + visible:false, + formatter:"tickCross", + hozAlign:"center", + formatterParams: { + tickElement: '', + crossElement: '' + } }, {title:"Person_id", field:"person_id", visible:false}, {title:"Bankverbindung_id", field:"bankverbindung_id", visible:false}, @@ -214,7 +220,7 @@ export default{
- +
@@ -238,7 +244,7 @@ export default{
- +
@@ -303,7 +309,7 @@ export default{
- +
@@ -269,7 +274,7 @@ export default{
- +
From fb4997b1ac5080821297a08b9eda0374b4aa15a4 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 28 May 2024 14:37:54 +0200 Subject: [PATCH 244/464] DmsUpload Preview --- public/js/components/Form/Upload/Dms.js | 20 +++++++---- public/js/components/Form/Upload/Dms/Item.js | 37 ++++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 public/js/components/Form/Upload/Dms/Item.js diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js index 6ad69848c..47ba168fb 100644 --- a/public/js/components/Form/Upload/Dms.js +++ b/public/js/components/Form/Upload/Dms.js @@ -1,4 +1,9 @@ +import DmsItem from './Dms/Item.js'; + export default { + components: { + DmsItem + }, emits: [ 'update:modelValue' ], @@ -81,13 +86,14 @@ export default {
    -
  • - - {{ file.name }} - -
    • + +
` } diff --git a/public/js/components/Form/Upload/Dms/Item.js b/public/js/components/Form/Upload/Dms/Item.js new file mode 100644 index 000000000..45c60419e --- /dev/null +++ b/public/js/components/Form/Upload/Dms/Item.js @@ -0,0 +1,37 @@ +export default { + emits: [ + 'delete' + ], + props: { + modelValue: { + type: [File, Object], + required: true + } + }, + data() { + return { + preview: '' + }; + }, + watch: { + modelValue(n) { + if (n.type == 'application/x.fhc-dms+json') { + n.text().then(result => { + const obj = JSON.parse(result); + this.preview = obj.preview || ''; + }); + } + } + }, + template: ` +
  • + + {{ modelValue.name }} + + + + +
    • ` +} From dccf845e3b371fcd7bf576fccc9785495d2938fb Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 28 May 2024 14:38:37 +0200 Subject: [PATCH 245/464] Notiz Anhang Preview & CodeQuality --- .../api/frontend/v1/notiz/NotizPerson.php | 15 ++++++++++++--- application/core/Notiz_Controller.php | 1 - 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php index 2cf1f2519..3a0d1163e 100644 --- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php +++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php @@ -17,17 +17,26 @@ class NotizPerson extends Notiz_Controller { if($typeId != "person_id") { - return $this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL); + return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL); } //TODO define permission - if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid')) + if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid')) { - $result = $this->p->t('lehre','error_keineSchreibrechte'); + $result = $this->p->t('lehre', 'error_keineSchreibrechte'); return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); } return $this->outputJsonSuccess(true); } + + public function loadDokumente() + { + $notiz_id = $this->input->post('notiz_id'); + + $this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=' . $notiz_id)) . ' AS preview'); + + return parent::loadDokumente(); + } } \ No newline at end of file diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php index 1b78f15f7..618b6a2ef 100644 --- a/application/core/Notiz_Controller.php +++ b/application/core/Notiz_Controller.php @@ -475,7 +475,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller public function loadDokumente() { - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); $notiz_id = $this->input->post('notiz_id'); $this->NotizModel->addSelect('campus.tbl_dms_version.*'); From f218174ad3269aa8c91447721dc60d533f196bdb Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 28 May 2024 14:39:41 +0200 Subject: [PATCH 246/464] Comments --- application/controllers/api/frontend/v1/notiz/NotizPerson.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php index 3a0d1163e..1c5524800 100644 --- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php +++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php @@ -35,6 +35,7 @@ class NotizPerson extends Notiz_Controller { $notiz_id = $this->input->post('notiz_id'); + // TODO(chris): make CI variant of endpoint $this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=' . $notiz_id)) . ' AS preview'); return parent::loadDokumente(); From 0a4d89543a827a39294e3249794ff43f85df8b74 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 28 May 2024 16:34:34 +0200 Subject: [PATCH 247/464] refactor tab contact: form component, dropwdowns plz, ort, gemeinde --- .../api/frontend/v1/stv/Kontakt.php | 2 +- .../Details/Kontakt/Address.js | 405 +++++++++++++----- .../Details/Kontakt/Bankaccount.js | 174 ++++++-- .../Details/Kontakt/Contact.js | 143 +++++-- 4 files changed, 524 insertions(+), 200 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php index 48a8d7c15..d68540788 100644 --- a/application/controllers/api/frontend/v1/stv/Kontakt.php +++ b/application/controllers/api/frontend/v1/stv/Kontakt.php @@ -524,7 +524,7 @@ class Kontakt extends FHCAPI_Controller $name = $this->input->post('name'); $anschrift = $this->input->post('anschrift'); $bic = $this->input->post('bic'); - $blz = $this->input->post('blz '); + $blz = $this->input->post('blz'); $kontonr = $this->input->post('kontonr'); $result = $this->BankverbindungModel->insert( diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index 1f727f474..ba66b54b2 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -2,13 +2,17 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"; import FhcFormValidation from '../../../../Form/Validation.js'; import BsModal from "../../../../Bootstrap/Modal.js"; +import FormForm from '../../../../Form/Form.js'; +import FormInput from '../../../../Form/Input.js'; export default{ components: { CoreFilterCmpt, PvAutoComplete, FhcFormValidation, - BsModal + BsModal, + FormForm, + FormInput }, props: { uid: Number @@ -50,7 +54,6 @@ export default{ {title:"Abweich.Empf", field:"co_name"}, {title:"Firma", field:"firmenname"}, {title:"Firma_id", field:"firma_id", visible:false}, - {title:"Name", field:"name"}, {title:"Adresse_id", field:"adresse_id", visible:false}, {title:"Person_id", field:"person_id", visible:false}, {title:"Name", field:"name", visible:false}, @@ -184,16 +187,21 @@ export default{ watch: { uid() { this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid); - } + }, }, methods:{ actionNewAdress() { + this.resetModal(); this.$refs.newAdressModal.show(); }, actionEditAdress(adress_id) { this.loadAdress(adress_id).then(() => { if(this.addressData.adresse_id) + { + this.loadPlaces(this.addressData.plz); this.$refs.editAdressModal.show(); + + } }); }, actionDeleteAdress(adress_id) { @@ -303,121 +311,218 @@ export default{ }) .catch(this.$fhcAlert.handleSystemError) }, - // TODO(chris): use Form Component template: `
    -
    + +
    - + + + +
    -
    -
    + +
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - + +
    - +
    - - + + + +
    +
    + +
    + +
    + +
    + +
    + +
    + + + + + + +
    +
    - - + + + +
    - +
    -
    -
    - -
    +
    + +
    - +
    -
    -
    - -
    +
    + +
    - + +
    -
    -
    - -
    +
    + +
    - +
    - + +
    +
    - + +
    - + + +
    -
    +
    -
    - -
    ` From dcb001e0d9b510d2c25bcd702c600b093d988c5f Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 19 Jul 2024 07:52:52 +0200 Subject: [PATCH 336/464] rename addNewStatus to changeStatus --- .../api/frontend/v1/stv/Status.php | 6 +- .../Details/Prestudent/MultiStatus.js | 57 ++++++++++--------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index a55b3f19d..8d7a9df20 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -12,7 +12,7 @@ class Status extends FHCAPI_Controller parent::__construct([ 'getHistoryPrestudent' => ['admin:r', 'assistenz:r'], 'insert' => ['admin:rw', 'assistenz:rw'], - 'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], + 'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], //'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'getStatusgruende' => self::PERM_LOGGED, @@ -201,7 +201,7 @@ class Status extends FHCAPI_Controller return $this->terminateWithSuccess($result); } - public function addNewStatus($prestudent_id) + public function changeStatus($prestudent_id) { //get Studiengang von prestudent_id $this->load->model('crm/Prestudent_model', 'PrestudentModel'); @@ -780,7 +780,7 @@ class Status extends FHCAPI_Controller // } // else - // return $this->terminateWithError("addNewStatus(student)", self::ERROR_TYPE_GENERAL); + // return $this->terminateWithError("changeStatus(student)", self::ERROR_TYPE_GENERAL); // } public function addStudent($prestudent_id) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 09a132809..0b44431a5 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -413,51 +413,55 @@ export default{ }, changeStatusToAbbrecherStgl(prestudentIds){ this.hideModal('confirmStatusAction'); + let def_date = this.getDefaultDate(); let abbruchData = { status_kurzbz: 'Abbrecher', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate(), + datum: def_date, + bestaetigtam: def_date, statusgrund_id: 17 }; console.log(this.updateData); this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData })); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToAbbrecherStud(prestudentIds){ this.hideModal('confirmStatusAction'); + let def_date = this.getDefaultDate(); let deltaData = { status_kurzbz: 'Abbrecher', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate(), + datum: def_date, + bestaetigtam: def_date, statusgrund_id: 18 }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToUnterbrecher(prestudentIds){ this.hideModal('confirmStatusAction'); + let def_date = this.getDefaultDate(); let deltaData = { status_kurzbz: 'Unterbrecher', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate() + datum: def_date, + bestaetigtam: def_date }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToStudent(prestudentIds){ + let def_date = this.getDefaultDate(); //TODO Manu validation if Bewerber already before asking for ausbildungssemester //this.checkIfBewerber(); this.hideModal('askForAusbildungssemester'); let deltaData = { status_kurzbz: 'Student', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate() + datum: def_date, + bestaetigtam: def_date }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); @@ -466,40 +470,41 @@ export default{ }, changeStatusToWiederholer(prestudentIds){ this.hideModal('askForAusbildungssemester'); + let def_date = this.getDefaultDate(); let deltaData = { status_kurzbz: 'Student', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate(), + datum: def_date, + bestaetigtam: def_date, statusgrund_id: 16 }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToDiplomand(prestudentIds){ - + let def_date = this.getDefaultDate(); let deltaData = { status_kurzbz: 'Diplomand', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate(), + datum: def_date, + bestaetigtam: def_date, }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToAbsolvent(prestudentIds){ - + let def_date = this.getDefaultDate(); let deltaData = { status_kurzbz: 'Absolvent', - datum: this.getDefaultDate(), - bestaetigtam: this.getDefaultDate(), + datum: def_date, + bestaetigtam: def_date, }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToBewerber(prestudentIds){ let def_date = this.getDefaultDate(); @@ -514,7 +519,7 @@ export default{ this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeStatusToAufgenommener(prestudentIds){ this.hideModal('confirmStatusAction'); @@ -533,7 +538,7 @@ export default{ //TODO(Manu) change studiensemester_kurzbz in backend //studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id) - this.addNewStatus(prestudentIds); + this.changeStatus(prestudentIds); }, changeInteressentToStudent(prestudentIds){ @@ -631,7 +636,7 @@ export default{ }) .catch(this.$fhcAlert.handleSystemError); }, - addNewStatus(prestudentIds){ + changeStatus(prestudentIds){ //Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds]; let changeData = {}; @@ -646,7 +651,7 @@ export default{ //TODO(manu) besserer check changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId); - return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId, + return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + prestudentId, changeData ).then(response => { countSuccess++; From 4075245dcb7909345c9fccd0ccf58e49f7fbb1a8 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 19 Jul 2024 09:03:40 +0200 Subject: [PATCH 337/464] getSemesterOfBewerber for Aufgenommen --- .../api/frontend/v1/stv/Status.php | 340 +++++------------- .../Details/Prestudent/MultiStatus.js | 2 - 2 files changed, 92 insertions(+), 250 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 8d7a9df20..3dd75bec0 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -201,6 +201,22 @@ class Status extends FHCAPI_Controller return $this->terminateWithSuccess($result); } + public function getStudiensemesterOfStatus($prestudent_id, $status) + { + $result = $this->PrestudentstatusModel->loadWhere([ + "prestudent_id" => $prestudent_id, + "status_kurzbz" => $status + ]); + $this->PrestudentstatusModel->addLimit(1); + if (isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + $studiensem = current(getData($result)); + + return $studiensem->studiensemester_kurzbz; + } + public function changeStatus($prestudent_id) { //get Studiengang von prestudent_id @@ -269,6 +285,11 @@ class Status extends FHCAPI_Controller { $ausbildungssemester = $lastStatusData->ausbildungssemester; } + if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER) + { + $studiensemester_kurzbz = $this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER); + + } //check if Rolle already exists $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( @@ -502,6 +523,76 @@ class Status extends FHCAPI_Controller } break; + case Prestudentstatus_model::STATUS_BEWERBER: + { + $this->load->library('PrestudentLib'); + $result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + else + $this->terminateWithSuccess($prestudent_id); + + } + break; + // case Prestudentstatus_model::STATUS_BEWERBER: + // { + // $this->load->library('PrestudentLib'); + // $result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + + // if (isError($result)) + // { + // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + // } + // else + // $this->terminateWithSuccess($prestudent_id); + + // } + // break; + // case Prestudentstatus_model::STATUS_AUFGENOMMENER: //auch Student... + // { + // $this->load->library('PrestudentLib'); + // $result = $this->prestudentlib->setStudentFromInteressent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + + // if (isError($result)) + // { + // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + // } + // else + // $this->terminateWithSuccess($prestudent_id); + + // } + // break; + // case Prestudentstatus_model::STATUS_AUFGENOMMENER: + // { + // $this->load->library('PrestudentLib'); + // $result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + + // if (isError($result)) + // { + // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + // } + // else + // $this->terminateWithSuccess($prestudent_id); + + // } + // break; + // case Prestudentstatus_model::STATUS_ABGEWIESENER: + // { + // $this->load->library('PrestudentLib'); + // $result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + + // if (isError($result)) + // { + // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + // } + // else + // $this->terminateWithSuccess($prestudent_id); + + // } + // break; default: { /* if ($isStudent) { @@ -536,254 +627,7 @@ class Status extends FHCAPI_Controller } } - //TODO(Manu) DEPRECATED - // public function turnIntoStudent($prestudent_id) - // { - - // //get Studiengang von prestudent_id - // $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - // $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)'); - // $this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)'); - // $result = $this->PrestudentModel->load([ - // 'prestudent_id' => $prestudent_id, - // ]); - // if (isError($result)) { - // return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - // } - // $result = current(getData($result)); - - // $stg = $result->studiengang_kz; - // $stgkzl = $result->kurzbz; - // $person_id = $result->person_id; - - // if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) { - // $result = $this->p->t('lehre', 'error_keineSchreibrechte'); - - // return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - // } - - // $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - // $uid = getAuthUID(); - // $status_kurzbz = $this->input->post('status_kurzbz'); - // $ausbildungssemester = $this->input->post('ausbildungssemester'); - // $bestaetigtam = $this->input->post('bestaetigtam'); - // $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - // $bestaetigtvon = $uid; - - // //Form Validation - // $this->load->library('form_validation'); - - // $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [ - // 'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester']) - // ]); - - // if (!$this->form_validation->run()) - // $this->terminateWithValidationErrors($this->form_validation->error_array()); - - // //GET lastStatus - // $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); - - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } elseif (!hasData($result)) { - // $lastStatusData = []; - // } else - // $lastStatusData = current(getData($result)); - - // //check if studentrolle already exists - // $this->load->model('crm/Student_model', 'StudentModel'); - // $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // if ($result->retval == "0") { - // $isStudent = false; - // } else - // $isStudent = true; - - // return $this->terminateWithError("here: before check: isStudent: " . $isStudent, self::ERROR_TYPE_GENERAL); - - // if (!$isStudent) { - - // //Check ZGV - // if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) { - // $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id); - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // } - - // //Check ZGV-Master - // $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); - // $result = $this->StudiengangModel->load([ - // 'studiengang_kz' => $stg - // ]); - // if (isError($result)) { - // $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - // return $this->outputJson(getError($result)); - // } - // $result = current(getData($result)); - // $typ = $result->typ; - - // if (!defined("ZGV_CHECK") || ZGV_CHECK) { - // if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER && $typ == 'm') { - // $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ); - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // } - // } - - // //check if bewerberstatus exists - // $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - - // //checkIf Kaution bezahlt - // //TODO(Manu) - - // //check if Aufgenommenener Status - // $result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id); - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - - // return $this->terminateWithError("here: after check: new Student", self::ERROR_TYPE_GENERAL); - - - // //generate Personenkennzeichen(matrikelnr) - // //getStudiensemester vom Status aufgenommen - // $resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ); - // if (isError($resultMat)) { - // return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL); - // } - // $matrikelnr = getData($resultMat); - // $jahr = mb_substr($matrikelnr, 0, 2); - - // //generate UID - // $resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr); - // if (isError($resultMat)) { - // return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL); - // } - // $uidStudent = getData($resultUid); - - // //Check for additional logic (config entries, addons) - // //TODO(Manu) check include/tw/generatematrikelnr.inc.php - // //(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert - // //Default: keine Matrikelnummer wird generiert - - // //(2) personenkz = uid - // if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) { - // $matrikelnr = $uidStudent; - // } - - // //(3) Matrikelnummer = uid - // if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) { - // //update person - // $result = $this->PersonModel->update( - // [ - // 'person_id' => $person_id, - // ], - // [ - // 'matr_nr' => $uidStudent, - // ] - // ); - // if (isError($result)) { - // return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL); - // } - // } - - // //TODO(Manu) check if benutzer already exists to avoid conflicts.. - // //person kann mehrere Benutzer haben... student_uid? - // //add benutzerdatensatz mit Aktierungscode - // $this->load->model('person/Benutzer_model', 'BenutzerModel'); - // $result = $this->BenutzerModel->checkIfExistingBenutzer($person_id); - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // if ($result->retval == "0") { - - // //activation key - // $aktivierungscode = null; - // $result = $this->BenutzerModel->generateActivationKey(); - // if (isError($result)) { - // return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL); - // } - // $aktivierungscode = getData($result); - - - // //Alias generieren - // $result = $this->PersonModel->generateAliasByPersonId($person_id); - // if (isError($result)) { - // return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL); - // } - // $alias = getData($result) ?: null; - // $alias = $alias->retval[0]; - - // $sanitizedVorname = $this->_sanitizeAliasName($alias->vorname); - // $sanitizedNachname = $this->_sanitizeAliasName($alias->nachname); - - // // Erstelle den Alias - // $alias = $sanitizedVorname . '.' . $sanitizedNachname; - - // if (isError($result)) { - // return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - // } - - // $result = $this->BenutzerModel->insert( - // [ - // 'person_id' => $person_id, - // 'uid' => $uidStudent, - // 'aktiv' => true, - // 'aktivierungscode' => $aktivierungscode, - // 'alias' => $alias, - // 'insertvon' => $uid, - // 'insertamum' => date('c'), - // ] - // ); - - // if (isError($result)) { - // return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - // } - - // } else - // return $this->terminateWithError("Benutzer already existing" . $person_id, self::ERROR_TYPE_GENERAL); - - // //Student anlegen - // $result = $this->StudentModel->insert( - // [ - // 'student_uid' => $uidStudent, - // 'prestudent_id' => $prestudent_id, - // 'matrikelnr' => $matrikelnr, - // 'studiengang_kz' => $stg, - // 'semester' => $ausbildungssemester, - // 'verband' => '', - // 'gruppe' => '', - // 'insertvon' => $uid, - // 'insertamum' => date('c') - // ] - // ); - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - - // $this->load->library('PrestudentLib'); - // $result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent); - - // if (isError($result)) { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } else - // $this->terminateWithSuccess($prestudent_id); - - // } - // else - // return $this->terminateWithError("changeStatus(student)", self::ERROR_TYPE_GENERAL); - // } - - public function addStudent($prestudent_id) + public function addStudent($prestudent_id) { //get Studiengang von prestudent_id $this->load->model('crm/Prestudent_model', 'PrestudentModel'); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 0b44431a5..c8d569020 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -689,8 +689,6 @@ export default{ } //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working - // this.reload(); - // this.reloadList(); if (this.modelValue.prestudent_id) { this.reload(); From 31abd39ba8b40306438b29d0a925a2eeed231176 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Fri, 19 Jul 2024 13:34:56 +0200 Subject: [PATCH 338/464] PrestudentstatusCheckLib: status history --- .../libraries/PrestudentstatusCheckLib.php | 322 +++++++++++++++++- .../models/crm/Prestudentstatus_model.php | 69 ++++ 2 files changed, 388 insertions(+), 3 deletions(-) diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index c458bf907..c7ecad0bf 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -17,6 +17,8 @@ class PrestudentstatusCheckLib private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS]; private $_endStatusArr = [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS]; + private $_cache_history = []; + /** * Object initialization */ @@ -140,7 +142,7 @@ class PrestudentstatusCheckLib * * @param integer $prestudent_id * - * @return boolean + * @return stdClass */ public function checkIfExistingStudentRolle($prestudent_id) { @@ -265,9 +267,10 @@ class PrestudentstatusCheckLib /** * Check if Bismeldestichtag erreicht * - * @param DateTime $datum + * @param DateTime $statusDatum + * @param string $studiensemester_kurzbz * - * @return boolean + * @return stdClass */ public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz = null) { @@ -279,6 +282,319 @@ class PrestudentstatusCheckLib return success(getData($result) == "1"); } + /** + * Runs all checks on Status History and saves it in cache. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + protected function prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + // Generate key for caching + $primary = implode('|', [ + $prestudent_id, + $status_kurzbz, + $new_date->format('Y-m-d'), + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ]); + + if (isset($this->_cache_history[$primary])) + return $this->_cache_history[$primary]; + + $this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + + // Get the history + $result = $this->_ci->PrestudentstatusModel->getHistoryWithNewOrEditedState( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + if (!hasData($result)) + return error('This is impossible'); + + $history = getData($result); + $historyCount = count($history); + + // Run checks + $checks = [ + 'timesequence' => true, + 'laststatus' => true, + 'unterbrechersemester' => true, + 'abbrechersemester' => true, + 'diplomant' => true + ]; + + for ($n = 0, $c = 1; $c < $historyCount; $n++, $c++) { + if (!$checks['timesequence'] + && !$checks['laststatus'] + && !$checks['unterbrechersemester'] + && !$checks['abbrechersemester'] + && !$checks['diplomant'] + ) + break; // early out + + $next = $history[$n]; + $current = $history[$c]; + + // Zeitabfolge ungültig? + if ($checks['timesequence'] + && $next->start < $current->start + ) + $checks['timesequence'] = false; + + // Abbrecher- oder Absolventenstatus muss Endstatus sein + if ($checks['laststatus'] + && in_array($current->status_kurzbz, ['Absolvent', 'Abbrecher']) + ) + $checks['laststatus'] = false; + + // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein + if ($checks['unterbrechersemester'] + && $current->status_kurzbz == 'Unterbrecher' + && $next->status_kurzbz == 'Unterbrecher' + && $current->ausbildungssemester != $next->ausbildungssemester + ) + $checks['unterbrechersemester'] = false; + + // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein + if ($checks['abbrechersemester'] + && $current->status_kurzbz == 'Unterbrecher' + && $next->status_kurzbz == 'Abbrecher' + && $current->ausbildungssemester != $next->ausbildungssemester + ) + $checks['abbrechersemester'] = false; + + // keine Studenten nach Diplomand Status + if ($checks['diplomant'] + && $current->status_kurzbz == 'Diplomand' + && $next->status_kurzbz == 'Student' + ) + $checks['diplomant'] = false; + } + + $this->_cache_history[$primary] = success($checks); + + return success($checks); + } + + /** + * Checks if the time sequence of the status history is valid. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function checkStatusHistoryTimesequence( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $result = $this->prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + return success(getData($result)['timesequence']); + } + + /** + * Checks if the last status of the status history is not Abbrecher or + * Absolvent. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function checkStatusHistoryLaststatus( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $result = $this->prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + return success(getData($result)['laststatus']); + } + + /** + * Checks if two consecutively Unterbrecher have the same + * ausbildungssemester in the status history. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function checkStatusHistoryUnterbrechersemester( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $result = $this->prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + return success(getData($result)['unterbrechersemester']); + } + + /** + * Checks if an Unterbrecher followed by an Abbrecher have the same + * ausbildungssemester in the status history. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function checkStatusHistoryAbbrechersemester( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $result = $this->prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + return success(getData($result)['abbrechersemester']); + } + + /** + * Checks if no Diplomant is followed by a Student in the status history. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function checkStatusHistoryDiplomant( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $result = $this->prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + return success(getData($result)['diplomant']); + } + /** * Check if History of StatusData is valid * @param integer $prestudent_id diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index 2600ae64a..a19c465ec 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -629,4 +629,73 @@ class Prestudentstatus_model extends DB_Model 'tbl_prestudentstatus.prestudent_id' => $prestudent_id ]); } + + /** + * Gets status history of a prestudent for checking purposes. + * This function adds the new state or replaces the edited. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function getHistoryWithNewOrEditedState( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $new_date = $new_date->format('Y-m-d'); + + $this->addSelect('status_kurzbz'); + $this->addSelect('studiensemester_kurzbz'); + $this->addSelect('ausbildungssemester'); + $this->addSelect('datum'); + $this->addSelect('insertamum'); + $this->addSelect('ext_id'); + + if ($old_studiensemester_kurzbz || $old_ausbildungssemester) { + $this->db->not_group_start(); + $this->db->where('status_kurzbz', $status_kurzbz); + $this->db->where('studiensemester_kurzbz', $old_studiensemester_kurzbz); + $this->db->where('ausbildungssemester', $old_ausbildungssemester); + $this->db->group_end(); + } + + $this->db->where('prestudent_id', $prestudent_id); + + $tmpTable = $this->db->get_compiled_select($this->dbTable); + + $tmpTable .= "UNION + SELECT " . + $this->escape($status_kurzbz) . " AS status_kurzbz, " . + $this->escape($new_studiensemester_kurzbz) . " AS studiensemester_kurzbz, " . + $this->escape($new_ausbildungssemester) . " AS ausbildungssemester, " . + $this->escape($new_date) . "::date AS datum," . + $this->escape(date('c')) . "::date AS insertamum," . + "NULL AS ext_id"; + + $this->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz'); + + $this->addOrder('s.datum', 'DESC'); + $this->addOrder('s.insertamum', 'DESC'); + $this->addOrder('s.ext_id', 'DESC'); + + $dbTable = $this->dbTable; + $this->dbTable = "(" . $tmpTable . ") s"; + + $result = $this->load(); + + $this->dbTable = $dbTable; + + return $result; + } } From fe4b5bf5824fa7c6184daae1af096f8ac2efa93f Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Fri, 19 Jul 2024 13:35:21 +0200 Subject: [PATCH 339/464] Status insert checks --- .../api/frontend/v1/stv/Status.php | 149 +++++++++++++++++- 1 file changed, 146 insertions(+), 3 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 3dd75bec0..a524a3c6a 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -76,7 +76,12 @@ class Status extends FHCAPI_Controller [ 'required', // In FAS empty datum results in todays 'is_valid_date', - // TODO(chris): before today + ['is_date_not_before_today', function ($value) { + if (!is_valid_date($value)) + return true; // Error will be handled by the is_valid_date statement above + $today = new DateTime('today'); + return (new DateTime($value) >= $today); + }], ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) { if ($isBerechtigtNoStudstatusCheck) return true; // Skip if access right says so @@ -89,7 +94,8 @@ class Status extends FHCAPI_Controller }] ], [ - 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag') + 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'), + 'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast') ] ); @@ -118,6 +124,10 @@ class Status extends FHCAPI_Controller $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date'); + // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules + if (!is_valid_date($datum)) + $datum = null; + $this->form_validation->set_rules('_default', '', [ ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester) @@ -126,9 +136,142 @@ class Status extends FHCAPI_Controller $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]); return !$this->getDataOrTerminateWithError($result); + }], + ['history_timesequence', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_laststatus', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_unterbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_abbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_diplomant', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); }] + // TODO(chris): check status history error_wrongStatusOrderBeforeStudent + // TODO(chris): check status history error_personenkennzeichenPasstNichtZuStudiensemester + // TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform ], [ - 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') + 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), + 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), + 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), + 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'), + 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'), + 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent') ]); if (!$this->form_validation->run()) From 0ee57e488d6065dccaed53b4d02c0799e037fb55 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 22 Jul 2024 13:42:13 +0200 Subject: [PATCH 340/464] PrestudentstatusCheckLib: checkIfExistingPrestudentRolle --- .../api/frontend/v1/stv/Status.php | 137 ++++++++++++------ .../libraries/PrestudentstatusCheckLib.php | 35 ++--- 2 files changed, 102 insertions(+), 70 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index a524a3c6a..43c51be91 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -406,6 +406,26 @@ class Status extends FHCAPI_Controller 'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester']) ]); + $this->form_validation->set_rules('_global', '', [ + //check if Rolle already exists + ['checkIfExistingPrestudentRolle', function () use ( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') + ]); + if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); @@ -434,19 +454,6 @@ class Status extends FHCAPI_Controller } - //check if Rolle already exists - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - //Check Reihungstest if(REIHUNGSTEST_CHECK) { @@ -520,7 +527,7 @@ class Status extends FHCAPI_Controller { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } - $isStudent = true; + $isStudent = getData($result); } $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); @@ -770,7 +777,7 @@ class Status extends FHCAPI_Controller } } - public function addStudent($prestudent_id) + public function addStudent($prestudent_id) { //get Studiengang von prestudent_id $this->load->model('crm/Prestudent_model', 'PrestudentModel'); @@ -1611,21 +1618,37 @@ class Status extends FHCAPI_Controller } } - //check if Rolle already exists - if(($key_studiensemester_kurzbz != $studiensemester_kurzbz) - || ($key_ausbildungssemester != $ausbildungssemester)) - { - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + //Form Validation + $this->load->library('form_validation'); + + $this->form_validation->set_rules('_global', '', [ + //check if Rolle already exists + ['checkIfExistingPrestudentRolle', function () use ( $prestudent_id, $status_kurzbz, $studiensemester_kurzbz, - $ausbildungssemester - ); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ) { + if ($key_studiensemester_kurzbz == $studiensemester_kurzbz + && $key_ausbildungssemester == $ausbildungssemester + ) + return true; + $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') + ]); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); //check if studentrolle already exists if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND ) @@ -1638,7 +1661,7 @@ class Status extends FHCAPI_Controller { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } - $isStudent = true; + $isStudent = getData($result); } @@ -1806,17 +1829,45 @@ class Status extends FHCAPI_Controller $ausbildungssem_next = $key_ausbildungssemester+1; - //check if Rolle already exists - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( - $key_prestudent_id, - $key_status_kurzbz, - $studiensem_next, - $ausbildungssem_next - ); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } + //Form Validation + $this->load->library('form_validation'); + + $last_status_kurzbz = $lastStatusData->status_kurzbz; // TODO(chris): copy pasta! + + $this->form_validation->set_rules('_global', '', [ + //check if Rolle already exists + ['checkIfExistingPrestudentRolle', function () use ( + $key_prestudent_id, + $key_status_kurzbz, + $studiensem_next, + $ausbildungssem_next + ) { + $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + $key_prestudent_id, + $key_status_kurzbz, + $studiensem_next, + $ausbildungssem_next + ); + return $this->getDataOrTerminateWithError($result); + }], + ['status_stud_exists', function () use ($key_prestudent_id, $key_status_kurzbz, $last_status_kurzbz) { + if ($key_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT + && $key_status_kurzbz != Prestudentstatus_model::STATUS_DIPLOMAND + && $last_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT + ) + return true; + + $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id); + + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), + 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') + ]); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); //check if studentrolle already exists // if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) @@ -1832,14 +1883,6 @@ class Status extends FHCAPI_Controller // return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL); // } // } - if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $key_status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) - { - $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } // Start DB transaction $this->db->trans_begin(); diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index c7ecad0bf..62d5b69e0 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -98,43 +98,32 @@ class PrestudentstatusCheckLib ); } - /** + /** * Checks if a prestudent role already exists. - * @return error if invalid - * @return 1 if role already exists, 0 if it does not + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $studiensemester_kurzbz + * @param integer $ausbildungssemester + * + * @return stdClass */ public function checkIfExistingPrestudentRolle( $prestudent_id, $status_kurzbz, $tudiensemester_kurzbz, $ausbildungssemester - ) - { - $resultApp = $this->_getApplicationData($prestudent_id); - if(isError($resultApp)) - { - return getData($resultApp); - } - $resultApp = current(getData($resultApp)); - $studentName = trim ($resultApp->vorname.' '.$resultApp->nachname); - + ) { $result = $this->_ci->PrestudentstatusModel->checkIfExistingPrestudentRolle( $prestudent_id, $status_kurzbz, $tudiensemester_kurzbz, $ausbildungssemester ); - if(isError($result)) - { - return getData($result); - } - $result = getData($result); + if (isError($result)) + return $result; - if($result == '1') - { - return error($studentName . ": " . $this->_ci->p->t('lehre', 'error_rolleBereitsVorhanden')); - } - return success($result); + return success(getData($result) != '1'); } /** From 4b97e33e203aca3a9695c51fcd4be01de08d925c Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 23 Jul 2024 08:58:33 +0200 Subject: [PATCH 341/464] comment --- application/controllers/api/frontend/v1/stv/Status.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 43c51be91..a50c3e138 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -1099,7 +1099,7 @@ class Status extends FHCAPI_Controller { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } - } + } // NOTE(chris): this does not do anything since $isStudent did the same thing and returned positive success $this->load->library('PrestudentLib'); $result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon); From 7a5bec077ff9c1eb016e323f685ed1a92c4dc462 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 23 Jul 2024 14:47:23 +0200 Subject: [PATCH 342/464] Check Personenkennzeichen --- .../libraries/PrestudentstatusCheckLib.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index 62d5b69e0..3e5563d62 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -584,6 +584,46 @@ class PrestudentstatusCheckLib return success(getData($result)['diplomant']); } + /** + * Checks if Personenkennzeichen is set correctly. + * + * @param integer $prestudent_id + * + * @return stdClass + */ + public function checkPersonenkennzeichen($prestudent_id) + { + $this->_ci->PrestudentstatusModel->addSelect('tbl_prestudentstatus.prestudent_id'); + $this->_ci->PrestudentstatusModel->addSelect('tbl_student.matrikelnr'); + + $this->_ci->PrestudentstatusModel->addJoin('public.tbl_student', 'prestudent_id'); + + $this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.datum', 'DESC'); + $this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.insertamum', 'DESC'); + $this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.ext_id', 'DESC'); + + $this->_ci->PrestudentstatusModel->addLimit(1); + + $result = $this->_ci->PrestudentstatusModel->loadWhere([ + 'tbl_prestudentstatus.status_kurzbz' => self::STATUS_STUDENT + ]); + + if (isError($result)) + return $result; + + if (!hasData($result)) + return success(true); // Not a student yet so no wrong personenkennzeichen + + $data = current(getData($result)); + + $jahr = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($data->studiensemester_kurzbz); + + + return success($jahr == mb_substr($data->matrikelnr, 0, 2)); + } + + // TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform + /** * Check if History of StatusData is valid * @param integer $prestudent_id From d12f3dd8461639f2bc21fdb4693aa89e13c81073 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 23 Jul 2024 14:51:42 +0200 Subject: [PATCH 343/464] Check History for Student status --- .../api/frontend/v1/stv/Status.php | 3 - .../libraries/PrestudentstatusCheckLib.php | 77 ++++++++++++++++--- 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index a50c3e138..459b22927 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -262,9 +262,6 @@ class Status extends FHCAPI_Controller return $this->getDataOrTerminateWithError($result); }] - // TODO(chris): check status history error_wrongStatusOrderBeforeStudent - // TODO(chris): check status history error_personenkennzeichenPasstNichtZuStudiensemester - // TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform ], [ 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index 3e5563d62..86066fdda 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -335,7 +335,8 @@ class PrestudentstatusCheckLib 'laststatus' => true, 'unterbrechersemester' => true, 'abbrechersemester' => true, - 'diplomant' => true + 'diplomant' => true, + 'student' => true ]; for ($n = 0, $c = 1; $c < $historyCount; $n++, $c++) { @@ -344,6 +345,7 @@ class PrestudentstatusCheckLib && !$checks['unterbrechersemester'] && !$checks['abbrechersemester'] && !$checks['diplomant'] + && !$checks['student'] ) break; // early out @@ -358,32 +360,44 @@ class PrestudentstatusCheckLib // Abbrecher- oder Absolventenstatus muss Endstatus sein if ($checks['laststatus'] - && in_array($current->status_kurzbz, ['Absolvent', 'Abbrecher']) + && in_array($current->status_kurzbz, [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS]) ) $checks['laststatus'] = false; // wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein if ($checks['unterbrechersemester'] - && $current->status_kurzbz == 'Unterbrecher' - && $next->status_kurzbz == 'Unterbrecher' + && $current->status_kurzbz == self::UNTERBRECHER_STATUS + && $next->status_kurzbz == self::UNTERBRECHER_STATUS && $current->ausbildungssemester != $next->ausbildungssemester ) $checks['unterbrechersemester'] = false; // wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein if ($checks['abbrechersemester'] - && $current->status_kurzbz == 'Unterbrecher' - && $next->status_kurzbz == 'Abbrecher' + && $current->status_kurzbz == self::UNTERBRECHER_STATUS + && $next->status_kurzbz == self::ABBRECHER_STATUS && $current->ausbildungssemester != $next->ausbildungssemester ) $checks['abbrechersemester'] = false; - // keine Studenten nach Diplomand Status - if ($checks['diplomant'] - && $current->status_kurzbz == 'Diplomand' - && $next->status_kurzbz == 'Student' - ) - $checks['diplomant'] = false; + if (($checks['diplomant'] + || $checks['student']) + && $next->status_kurzbz == self::STUDENT_STATUS + ) { + $restl_stati = array_unique(array_column(array_slice($history, $c), 'status_kurzbz')); + + // keine Studenten nach Diplomand Status + if ($checks['diplomant'] + && in_array(self::DIPLOMAND_STATUS, $restl_stati) + ) + $checks['diplomant'] = false; + + // vor Studentenstatus müssen bestimmte Status vorhanden sein + if ($checks['student'] + && array_values(array_intersect($restl_stati, $this->_statusAbfolgeVorStudent)) != array_values($this->_statusAbfolgeVorStudent) + ) + $checks['student'] = false; + } } $this->_cache_history[$primary] = success($checks); @@ -584,6 +598,44 @@ class PrestudentstatusCheckLib return success(getData($result)['diplomant']); } + /** + * Checks if a Student precedes given stati in the status history. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param DateTime $new_date + * @param string $new_studiensemester_kurzbz + * @param integer $new_ausbildungssemester + * @param string $old_studiensemester_kurzbz + * @param integer $old_ausbildungssemester + * + * @return stdClass + */ + public function checkStatusHistoryStudent( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ) { + $result = $this->prepareStatusHistory( + $prestudent_id, + $status_kurzbz, + $new_date, + $new_studiensemester_kurzbz, + $new_ausbildungssemester, + $old_studiensemester_kurzbz, + $old_ausbildungssemester + ); + + if (isError($result)) + return $result; + + return success(getData($result)['student']); + } + /** * Checks if Personenkennzeichen is set correctly. * @@ -605,6 +657,7 @@ class PrestudentstatusCheckLib $this->_ci->PrestudentstatusModel->addLimit(1); $result = $this->_ci->PrestudentstatusModel->loadWhere([ + 'tbl_prestudentstatus.prestudent_id' => $prestudent_id, 'tbl_prestudentstatus.status_kurzbz' => self::STATUS_STUDENT ]); From 7498b327d48f546557251b4e95affc2e42717d4e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 24 Jul 2024 08:42:19 +0200 Subject: [PATCH 344/464] dynamic Toolbars Interessent, Student, update actions interessent --- .../api/frontend/v1/stv/Status.php | 64 ++-- application/models/crm/Status_model.php | 18 + .../Details/Prestudent/MultiStatus.js | 316 ++++++++++++++---- 3 files changed, 306 insertions(+), 92 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 459b22927..fa3fab1df 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -13,13 +13,13 @@ class Status extends FHCAPI_Controller 'getHistoryPrestudent' => ['admin:r', 'assistenz:r'], 'insert' => ['admin:rw', 'assistenz:rw'], 'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], - //'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'getStatusgruende' => self::PERM_LOGGED, 'getLastBismeldestichtag' => self::PERM_LOGGED, 'isLastStatus' => self::PERM_LOGGED, 'isErsterStudent' => self::PERM_LOGGED, 'hasStatusBewerber' => self::PERM_LOGGED, + 'getStatusarray' => self::PERM_LOGGED, 'deleteStatus' => ['admin:r','assistenz:r'], 'loadStatus' => ['admin:r', 'assistenz:r'], 'updateStatus' => ['admin:rw', 'assistenz:rw'], @@ -357,6 +357,22 @@ class Status extends FHCAPI_Controller return $studiensem->studiensemester_kurzbz; } + public function getStatusarray() + { + $this->load->model('crm/Status_model', 'StatusModel'); + $result = $this->StatusModel->getAllStatiWithStatusgruende(); + + if(isError($result)) + { + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + $data = $this->getDataOrTerminateWithError($result); + + $this->terminateWithSuccess($data); + + } + public function changeStatus($prestudent_id) { //get Studiengang von prestudent_id @@ -445,7 +461,11 @@ class Status extends FHCAPI_Controller { $ausbildungssemester = $lastStatusData->ausbildungssemester; } - if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER) + if( + $status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || + $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER || + $status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER + ) { $studiensemester_kurzbz = $this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER); @@ -560,36 +580,6 @@ class Status extends FHCAPI_Controller } } - //TODO(Manu) DELETE - // $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); - - // $result = $this->prestudentstatuschecklib->checkStatusAdd( - // $prestudent_id, - // $status_kurzbz, - // $studiensemester_kurzbz, - // $new_status_datum, - // $ausbildungssemester, - // $studienplan_id - // ); - - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - - // $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel'); - // $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz); - // return $this->terminateWithError("retval: " . $result->retval, self::ERROR_TYPE_GENERAL); - - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // if ($result->retval == "1") - // { - // return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL); - // } - switch($status_kurzbz){ case Prestudentstatus_model::STATUS_ABBRECHER: { @@ -670,7 +660,7 @@ class Status extends FHCAPI_Controller } break; - case Prestudentstatus_model::STATUS_BEWERBER: +/* case Prestudentstatus_model::STATUS_BEWERBER: { $this->load->library('PrestudentLib'); $result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); @@ -683,7 +673,7 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($prestudent_id); } - break; + break;*/ // case Prestudentstatus_model::STATUS_BEWERBER: // { // $this->load->library('PrestudentLib'); @@ -956,6 +946,8 @@ class Status extends FHCAPI_Controller return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } $semesterAufgenommen = current(getData($result)); + $semesterAufgenommen = $semesterAufgenommen->studiensemester_kurzbz; + //generate Personenkennzeichen(matrikelnr) $matrikelnr = false; @@ -963,7 +955,7 @@ class Status extends FHCAPI_Controller $matrikelnr = $value; }); if ($matrikelnr === false) { - $resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ); + $resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen, $typ); if (isError($resultMat)) { return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL); } @@ -1023,6 +1015,8 @@ class Status extends FHCAPI_Controller $aktivierungscode = getData($result); //generate Alias + //TODO(Manu) check if alias already exists + $result = $this->PersonModel->generateAliasByPersonId($person_id); if (isError($result)) diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php index 7b1b38ecb..6133b64e2 100644 --- a/application/models/crm/Status_model.php +++ b/application/models/crm/Status_model.php @@ -11,4 +11,22 @@ class Status_model extends DB_Model $this->dbTable = 'public.tbl_status'; $this->pk = 'status_kurzbz'; } + + public function getAllStatiWithStatusgruende() + { + $lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]'; + + $this->addSelect('sg.status_kurzbz'); + + $this->addSelect('statusgrund_id'); + $this->addSelect('sg.bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung'); + $this->addSelect('sg.beschreibung' . $lang . ' AS beschreibung'); + + $this->addJoin('public.tbl_status_grund sg', 'ON (sg.status_kurzbz = public.tbl_status.status_kurzbz)', 'LEFT'); + + return $this->loadWhere([ + 'aktiv'=> true, + ]); + + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index c8d569020..67bcde30f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -126,6 +126,74 @@ export default{ return !this.modelValue.some(item => item.uid); } return !this.modelValue.uid; + }, + toolbarInteressent() { + return this.listDataToolbar.filter(item => this.statiInteressent.includes(item.status_kurzbz)); + }, + toolbarStudent() { + return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz)); + }, + resultInteressentArray() { + const result = []; + this.statiInteressent.forEach(status => { + const defaultObject = { + status_kurzbz: status, + statusgrund_id: null, + link: `changeStatusTo${status}`, + dropEntry: null + }; + + if (status === "Student") { + defaultObject.link = 'changeInteressentToStudent'; + } + + result.push(defaultObject); + + this.toolbarInteressent.forEach(item => { + if (item.status_kurzbz === status) { + + const itemObject = { + status_kurzbz: item.status_kurzbz, + statusgrund_id: item.statusgrund_id, + beschreibung: item.beschreibung, + link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, + dropEntry: `[${item.beschreibung}]` + }; + + if (item.status_kurzbz === "Student") { + itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`; + } + + result.push(itemObject); + + } + }); + }); + return result; + }, + resultStudentArray() { + const result = []; + this.statiStudent.forEach(status => { + result.push({ + status_kurzbz: status, + statusgrund_id: null, + link: `changeStatusTo${status}`, + dropEntry: null + }); + + this.toolbarStudent.forEach(item => { + if (item.status_kurzbz === status) { + result.push({ + status_kurzbz: item.status_kurzbz, + statusgrund_id: item.statusgrund_id, + beschreibung: item.beschreibung, + link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, + dropEntry: `[${item.beschreibung}]`, + }); + } + }); + }); + return result; } }, props: { @@ -301,7 +369,12 @@ export default{ newStatus: '', statusNew: true, isErsterStudent: false, - isBewerber: true + isBewerber: true, + listDataToolbar: [], + //TODO(Manu) get from config + statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"], + statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"], + selectedStatus: 'default' } }, watch: { @@ -452,7 +525,8 @@ export default{ this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); this.changeStatus(prestudentIds); }, - changeStatusToStudent(prestudentIds){ + changeStatusToStudent(statusgrund_id){ + console.log("in function changeStatusToStudent: ", statusgrund_id); let def_date = this.getDefaultDate(); //TODO Manu validation if Bewerber already before asking for ausbildungssemester //this.checkIfBewerber(); @@ -461,12 +535,14 @@ export default{ { status_kurzbz: 'Student', datum: def_date, - bestaetigtam: def_date + bestaetigtam: def_date, + statusgrund_id: statusgrund_id }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); - //BewerberZuStudent - this.addStudent(prestudentIds); + + //TODO(Manu) get bezeichnung von statusgrund_kurzbz + this.actionConfirmDialogue(this.updateData, 'student','Studenten'); }, changeStatusToWiederholer(prestudentIds){ this.hideModal('askForAusbildungssemester'); @@ -506,7 +582,7 @@ export default{ this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); this.changeStatus(prestudentIds); }, - changeStatusToBewerber(prestudentIds){ + changeStatusToBewerber(){ let def_date = this.getDefaultDate(); let deltaData = { @@ -519,10 +595,9 @@ export default{ this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.changeStatus(prestudentIds); + this.changeStatus(this.prestudentIds); }, - changeStatusToAufgenommener(prestudentIds){ - this.hideModal('confirmStatusAction'); + changeStatusToAufgenommener(){ let def_date = this.getDefaultDate(); let deltaData = { @@ -534,39 +609,62 @@ export default{ this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, - })); + })); - //TODO(Manu) change studiensemester_kurzbz in backend - //studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id) - this.changeStatus(prestudentIds); + this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen'); }, - changeInteressentToStudent(prestudentIds){ - - console.log("in function changeInteressentToStudent") + changeInteressentToStudent(statusgrund_id){ + //TODO(Manu) test statusgrund_id + console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id); let def_date = this.getDefaultDate(); let deltaData = { status_kurzbz: 'Student', datum: def_date, - bestaetigtam: def_date + bestaetigtam: def_date, + statusgrund_id: statusgrund_id }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, - })); + })); - //TODO(Manu) change studiensemester_kurzbz in backend - //studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id) - //this.addStudent(prestudentIds); + this.addStudent(this.prestudentIds); }, - changeStatusToAbgewiesen(prestudentIds){ - console.log("in function changeStatusToAbgewiesen"); + changeStatusToAbgewiesener(statusgrund_id){ + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Abgewiesener', + datum: def_date, + bestaetigtam: def_date, + statusgrund_id: statusgrund_id + }; + + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData, + })); + + this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen'); }, - changeStatusToWartend(prestudentIds){ - console.log("in function changeStatusToWartend"); + changeStatusToWartender(){ + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Wartender', + datum: def_date, + bestaetigtam: def_date + }; + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData, + })); + + this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden'); }, addStudent(prestudentIds){ @@ -637,6 +735,7 @@ export default{ .catch(this.$fhcAlert.handleSystemError); }, changeStatus(prestudentIds){ + this.hideModal('confirmStatusAction'); //Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds]; let changeData = {}; @@ -868,6 +967,17 @@ export default{ getDefaultDate() { const today = new Date(); return today; + }, + handleSelectionChange(event) { + const selectedValue = event.target.value; + const selectedItem = this.resultInteressentArray.find(item => + item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '') === selectedValue + ); + if (selectedItem && typeof this[selectedItem.link] === 'function') { + this[selectedItem.link](); + } else { + console.warn(`No method found for ${selectedItem.link}`); + } } }, created(){ @@ -893,9 +1003,37 @@ export default{ this.$refs.table.tabulator.redraw(true); }) .catch(this.$fhcAlert.handleSystemError); + this.$fhcApi + .get('api/frontend/v1/stv/status/getStatusarray/') + .then(result => result.data) + .then(result => { + this.listDataToolbar = result; + }) + .catch(this.$fhcAlert.handleSystemError); }, template: `
    + + @@ -930,6 +1068,7 @@ export default{ + OK
    - +
    - +
    - +
    @@ -1150,7 +1289,7 @@ export default{ Bewerber
  • - Aufgenommener + Aufgenommener
  • Student @@ -1159,40 +1298,57 @@ export default{ Student
  • - Pre-Abbrecher + Pre-Abbrecher
  • - Pre-Wiederholer + Pre-Wiederholer
  • - Wiederholer + Wiederholer
  • - Wartender -
    • -
  • - Absolvent + Wartender
  • Absage
    • + + +
    + +
      @@ -1219,6 +1375,21 @@ export default{
    + + +
    + +
    + @@ -1239,49 +1410,66 @@ export default{ Bewerber
  • - Aufgenommener + Aufgenommener
  • Student
  • - Wartender -
    • -
  • - Absolvent + Wartender
  • Absage
    • + + +
    + +
      @@ -1308,6 +1496,20 @@ export default{
    + + +
    + +
    ` From d9cba6bf5c5bf6e5a9bd2f19244192340c9f6783 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 24 Jul 2024 08:45:48 +0200 Subject: [PATCH 345/464] Check orgform student/bewerber --- .../libraries/PrestudentstatusCheckLib.php | 20 ++++++++++- .../models/crm/Prestudentstatus_model.php | 35 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index 86066fdda..20b42b46a 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -620,6 +620,7 @@ class PrestudentstatusCheckLib $old_studiensemester_kurzbz, $old_ausbildungssemester ) { + // TODO(chris): TEST $result = $this->prepareStatusHistory( $prestudent_id, $status_kurzbz, @@ -645,6 +646,7 @@ class PrestudentstatusCheckLib */ public function checkPersonenkennzeichen($prestudent_id) { + // TODO(chris): TEST $this->_ci->PrestudentstatusModel->addSelect('tbl_prestudentstatus.prestudent_id'); $this->_ci->PrestudentstatusModel->addSelect('tbl_student.matrikelnr'); @@ -675,7 +677,23 @@ class PrestudentstatusCheckLib return success($jahr == mb_substr($data->matrikelnr, 0, 2)); } - // TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform + /** + * Checks if Orgform of Student status and Bewerber status match. + * + * @param integer $prestudent_id + * + * @return stdClass + */ + public function checkStudentOrgform($prestudent_id) + { + // TODO(chris): TEST + $result = $this->_ci->PrestudentstatusModel->getBewerberWhereOrgformNotStudent($prestudent_id); + + if (isError($result)) + return $result; + + return success(!hasData($result)); + } /** * Check if History of StatusData is valid diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index a19c465ec..e52bbf577 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -698,4 +698,39 @@ class Prestudentstatus_model extends DB_Model return $result; } + + /** + * For checks if Orgform of Student status and Bewerber status match. + * Returns any Bewerber status that does not match the first Student + * status' Orgform. + * + * @param integer $prestudent_id + * + * @return stdClass + */ + public function getBewerberWhereOrgformNotStudent($prestudent_id) + { + $this->addSelect('plan.orgform_kurzbz'); + + $this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT'); + + $this->addOrder('tbl_prestudentstatus.datum', 'DESC'); + $this->addOrder('tbl_prestudentstatus.insertamum', 'DESC'); + $this->addOrder('tbl_prestudentstatus.ext_id', 'DESC'); + + $this->addLimit(1); + + $this->db->where('prestudent_id', $prestudent_id); + $this->db->where('status_kurzbz', self::STATUS_STUDENT); + + $sql = $this->db->get_compiled_select($this->dbTable); + + $this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT'); + + $this->db->where('plan.orgform_kurzbz !=', '(' . $sql . ')', false); + return $this->loadWhere([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => self::STATUS_BEWERBER + ]); + } } From 93b301ee084f8a5462354d63aeac06cf1121d2ca Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 24 Jul 2024 13:24:15 +0200 Subject: [PATCH 346/464] Finish Status insert function --- .../api/frontend/v1/stv/Status.php | 99 ++++++++++++++++++- .../models/crm/Prestudentstatus_model.php | 1 + 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index fa3fab1df..581d18bad 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -57,15 +57,30 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($data); } + /** + * Inserts a status with less validations and extra logic for manual + * manipulation + * + * @param integer $prestudent_id + * + * @return void + */ public function insert($prestudent_id) { $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - $isBerechtigtNoStudstatusCheck = false; // TODO(chris): DEBUG + $status_kurzbz = $this->input->post('status_kurzbz'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $orgform_kurzbz = $this->input->post('orgform_kurzbz'); + $anmerkung = $this->input->post('anmerkung'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studienplan_id = $this->input->post('studienplan_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $statusgrund_id = $this->input->post('statusgrund_id'); $this->load->library('form_validation'); @@ -125,7 +140,7 @@ class Status extends FHCAPI_Controller $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date'); // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules - if (!is_valid_date($datum)) + if (!$datum || !is_valid_date($datum)) $datum = null; $this->form_validation->set_rules('_default', '', [ @@ -273,7 +288,85 @@ class Status extends FHCAPI_Controller if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); - // TODO(chris): IMPLEMENT! + + + $this->db->trans_start(); + + if (in_array($status_kurzbz, [ + Prestudentstatus_model::STATUS_STUDENT, + Prestudentstatus_model::STATUS_DIPLOMAND, + Prestudentstatus_model::STATUS_ABSOLVENT, + Prestudentstatus_model::STATUS_INCOMING, + Prestudentstatus_model::STATUS_ABBRECHER, + Prestudentstatus_model::STATUS_UNTERBRECHER + ])) { + $result = $this->StudentModel->loadWhere([ + 'prestudent_id' => $prestudent_id + ]); + + $student = $this->getDataOrTerminateWithError($result); + + if ($student) { + $student = current($student); + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->loadWhere([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ]); + + $studentlvb = $this->getDataOrTerminateWithError($result); + + // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing. + // TODO(chris): check if that is correct (in FAS)? + if (!$studentlvb) { + $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); + + $this->LehrverbandModel->addLimit(1); + $result = $this->LehrverbandModel->loadWhere([ + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $ausbildungssemester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe + ]); + $lv = $this->getDataOrTerminateWithError($result); + + $this->StudentlehrverbandModel->insert([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $lv ? $ausbildungssemester : $student->semester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe, + 'insertamum' => date('c'), + 'insertvon' => getAuthUID() + ]); + } + } + } + + $result = $this->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => $datum, + 'insertamum' => date('c'), + 'insertvon' => getAuthUID(), + 'orgform_kurzbz' => $orgform_kurzbz, + 'bestaetigtam' => $bestaetigtam, + 'bestaetigtvon' => $bestaetigtam ? getAuthUID() : null, + 'anmerkung' => $anmerkung, + 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, + 'studienplan_id' => $studienplan_id, + 'rt_stufe' => $rt_stufe, + 'statusgrund_id' => $statusgrund_id + ]); + + $this->getDataOrTerminateWithError($result); + + $this->db->trans_complete(); + $this->terminateWithSuccess($prestudent_id); } diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index e52bbf577..bb88c0f8c 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -13,6 +13,7 @@ class Prestudentstatus_model extends DB_Model const STATUS_WARTENDER = 'Wartender'; const STATUS_ABGEWIESENER = 'Abgewiesener'; const STATUS_INTERESSENT = 'Interessent'; + const STATUS_INCOMING = 'Incoming'; /** * Constructor From e42e0154104696bb4f88da5ab022abc90eea8e4a Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 24 Jul 2024 15:04:19 +0200 Subject: [PATCH 347/464] Status update function --- .../api/frontend/v1/stv/Status.php | 427 ++++++++++++------ 1 file changed, 282 insertions(+), 145 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 581d18bad..8631abaa1 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -70,6 +70,7 @@ class Status extends FHCAPI_Controller $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); + $authUID = getAuthUID(); $status_kurzbz = $this->input->post('status_kurzbz'); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); $ausbildungssemester = $this->input->post('ausbildungssemester'); @@ -288,8 +289,9 @@ class Status extends FHCAPI_Controller if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); - + + // Start DB transaction $this->db->trans_start(); if (in_array($status_kurzbz, [ @@ -339,12 +341,13 @@ class Status extends FHCAPI_Controller 'verband' => $student->verband, 'gruppe' => $student->gruppe, 'insertamum' => date('c'), - 'insertvon' => getAuthUID() + 'insertvon' => $authUID ]); } } } + //insert status $result = $this->PrestudentstatusModel->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => $status_kurzbz, @@ -352,10 +355,10 @@ class Status extends FHCAPI_Controller 'ausbildungssemester' => $ausbildungssemester, 'datum' => $datum, 'insertamum' => date('c'), - 'insertvon' => getAuthUID(), + 'insertvon' => $authUID, 'orgform_kurzbz' => $orgform_kurzbz, 'bestaetigtam' => $bestaetigtam, - 'bestaetigtvon' => $bestaetigtam ? getAuthUID() : null, + 'bestaetigtvon' => $bestaetigtam ? $authUID : null, 'anmerkung' => $anmerkung, 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, 'studienplan_id' => $studienplan_id, @@ -367,7 +370,7 @@ class Status extends FHCAPI_Controller $this->db->trans_complete(); - $this->terminateWithSuccess($prestudent_id); + $this->terminateWithSuccess(true); } public function getStatusgruende() @@ -1671,43 +1674,63 @@ class Status extends FHCAPI_Controller return $this->terminateWithSuccess(true); } - public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) { - $isStudent = false; + $result = $this->PrestudentstatusModel->load([ + $key_ausbildungssemester, + $key_studiensemester_kurzbz, + $status_kurzbz, + $prestudent_id + ]); + $oldstatus = $this->getDataOrTerminateWithError($result); + if (!$oldstatus) + show_404(); // Status that should be updated does not exist + + $oldstatus = current($oldstatus); + + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - $uid = getAuthUID(); - $prestudent_id = $this->input->post('prestudent_id'); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $datum = $this->input->post('datum'); - $bestaetigtam = $this->input->post('bestaetigtam'); - $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $studienplan_id = $this->input->post('studienplan_id'); - $anmerkung = $this->input->post('anmerkung'); - $statusgrund_id = $this->input->post('statusgrund_id'); - $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $uid; + $authUID = getAuthUID(); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz') ?: $oldstatus->studiensemester_kurzbz; + $ausbildungssemester = $this->input->post('ausbildungssemester') ?: $oldstatus->ausbildungssemester; + $datum = $this->input->post('datum') ?: $oldstatus->datum; - //check if Bismeldestichtag erreicht - if(!$isBerechtigtNoStudstatusCheck) - { - $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } //Form Validation $this->load->library('form_validation'); - $this->form_validation->set_rules('_global', '', [ + $this->form_validation->set_rules( + 'datum', + $this->p->t('global', 'datum'), + [ + 'is_valid_date', + ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$value) + return true; // Error will be handled by the required statement above + + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); + + return !$this->getDataOrTerminateWithError($result); + }] + ], + [ + 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag') + ] + ); + + $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date'); + + if (!is_valid_date($datum)) + $datum = null; + + // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules + $this->form_validation->set_rules('_default', '', [ //check if Rolle already exists - ['checkIfExistingPrestudentRolle', function () use ( + ['new_rolle_doesnt_exist', function () use ( $prestudent_id, $status_kurzbz, $studiensemester_kurzbz, @@ -1716,143 +1739,257 @@ class Status extends FHCAPI_Controller $key_ausbildungssemester ) { if ($key_studiensemester_kurzbz == $studiensemester_kurzbz - && $key_ausbildungssemester == $ausbildungssemester + && $key_ausbildungssemester == $ausbildungssemester ) - return true; - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + return true; // Primary key has not change we update in place + + $result = $this->PrestudentstatusModel->load([ + $ausbildungssemester, + $studiensemester_kurzbz, + $status_kurzbz, + $prestudent_id + ]); + return !$this->getDataOrTerminateWithError($result); + }], + ['history_timesequence', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$datum) + return true; // Error will be handled by the is_valid_date statement above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence( $prestudent_id, $status_kurzbz, + new DateTime($datum), $studiensemester_kurzbz, - $ausbildungssemester + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_laststatus', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$datum) + return true; // Error will be handled by the is_valid_date statement above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_unterbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$datum) + return true; // Error will be handled by the is_valid_date statement above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_abbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$datum) + return true; // Error will be handled by the is_valid_date statement above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_diplomant', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$datum) + return true; // Error will be handled by the is_valid_date statement above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + $key_studiensemester_kurzbz, + $key_ausbildungssemester + ); + return $this->getDataOrTerminateWithError($result); }] ], [ - 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') + 'new_rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), + 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), + 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), + 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'), + 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'), + 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent') ]); if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); - //check if studentrolle already exists - if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND ) - - //TODO(manu): check why $lastStatusDAta - // if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) - { - $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - $isStudent = getData($result); - } - - - if(!$isBerechtigtNoStudstatusCheck) - { - //Block STATUSCHECKS - - $result = $this->prestudentstatuschecklib->checkStatusUpdate( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $datum, - $ausbildungssemester, - $studienplan_id, - $key_studiensemester_kurzbz, - $key_ausbildungssemester - ); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } - // Start DB transaction - $this->db->trans_begin(); + $this->db->trans_start(); - //update status - $result = $this->PrestudentstatusModel->update( - [ - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - ], - [ - 'status_kurzbz' => $status_kurzbz, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, - 'studienplan_id' => $studienplan_id, - 'anmerkung' => $anmerkung, - 'statusgrund_id' => $statusgrund_id, - 'updatevon' => $uid, - 'updateamum' => date('c'), - 'bestaetigtam' => $bestaetigtam, - 'bestaetigtvon' => $bestaetigtvon, - 'datum' => $datum, - 'rt_stufe' => $rt_stufe - ] - ); - if (isError($result)) - { - $this->db->trans_rollback(); - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } + if (in_array($status_kurzbz, [ + Prestudentstatus_model::STATUS_STUDENT, + Prestudentstatus_model::STATUS_DIPLOMAND, + Prestudentstatus_model::STATUS_ABSOLVENT, + Prestudentstatus_model::STATUS_INCOMING, + Prestudentstatus_model::STATUS_ABBRECHER, + Prestudentstatus_model::STATUS_UNTERBRECHER + ])) { + $result = $this->StudentModel->loadWhere([ + 'prestudent_id' => $prestudent_id + ]); + $student = $this->getDataOrTerminateWithError($result); - if($isStudent) - { - //check Studentlehrverband - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - if (!hasData($result)) - { - $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL); - } - $student_uid = $result->retval; - - //process studentlehrverband - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->loadWhere( - array( - 'student_uid' => $student_uid, + if ($student) { + $student = current($student); + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->loadWhere([ + 'student_uid' => $student->student_uid, 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - if (isError($result)) - { - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } + ]); - //Data of current Semester - $studentlvbData = current(getData($result) ? : []); + $studentlvb = $this->getDataOrTerminateWithError($result); - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband( - $student_uid, - $studentlvbData->studiengang_kz, - $ausbildungssemester, - $studentlvbData->verband, - $studentlvbData->gruppe, - $studiensemester_kurzbz - ); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL); + // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing. + // TODO(chris): check if that is correct (in FAS)? + if (!$studentlvb) { + $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); + + $this->LehrverbandModel->addLimit(1); + $result = $this->LehrverbandModel->loadWhere([ + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $ausbildungssemester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe + ]); + $lv = $this->getDataOrTerminateWithError($result); + + $this->StudentlehrverbandModel->insert([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $lv ? $ausbildungssemester : $student->semester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe, + 'insertamum' => date('c'), + 'insertvon' => $authUID + ]); + } } } + + //update status + $updateData = [ + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => $datum, + 'updateamum' => date('c'), + 'updatevon' => $authUID + ]; + foreach ([ + 'orgform_kurzbz', + 'anmerkung', + 'bewerbung_abgeschicktamum', + 'studienplan_id', + 'rt_stufe', + 'statusgrund_id' + ] as $key) + if ($this->input->post($key)) + $updateData[$key] = $this->input->post($key); + + if ($this->input->post('bestaetigtam')) { + $updateData['bestaetigtam'] = $this->input->post('bestaetigtam'); + $updateData['bestaetigtvon'] = $authUID; + } + + $result = $this->PrestudentstatusModel->update([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'studiensemester_kurzbz' => $key_studiensemester_kurzbz, + 'ausbildungssemester' => $key_ausbildungssemester, + ], $updateData); + + $this->getDataOrTerminateWithError($result); + $this->db->trans_commit(); + return $this->outputJsonSuccess(true); } From 70dff47f26b60979e79d55237ed08332177589c1 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 24 Jul 2024 15:18:16 +0200 Subject: [PATCH 348/464] Rearrange/Rename functions & outsource shared code into a subfunction --- .../api/frontend/v1/stv/Status.php | 718 +++++++++--------- .../Details/Prestudent/MultiStatus.js | 2 +- 2 files changed, 349 insertions(+), 371 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 8631abaa1..bb1b512c6 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -11,7 +11,6 @@ class Status extends FHCAPI_Controller { parent::__construct([ 'getHistoryPrestudent' => ['admin:r', 'assistenz:r'], - 'insert' => ['admin:rw', 'assistenz:rw'], 'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'getStatusgruende' => self::PERM_LOGGED, @@ -22,6 +21,7 @@ class Status extends FHCAPI_Controller 'getStatusarray' => self::PERM_LOGGED, 'deleteStatus' => ['admin:r','assistenz:r'], 'loadStatus' => ['admin:r', 'assistenz:r'], + 'insertStatus' => ['admin:rw', 'assistenz:rw'], 'updateStatus' => ['admin:rw', 'assistenz:rw'], 'advanceStatus' => ['admin:r', 'assistenz:r'], 'confirmStatus' => ['admin:r', 'assistenz:r'], @@ -37,7 +37,7 @@ class Status extends FHCAPI_Controller $this->load->library('PrestudentstatusCheckLib'); // Additional Permission Checks - if ($this->router->method == 'insert' || $this->router->method == 'updateStatus') { + if ($this->router->method == 'insertStatus' || $this->router->method == 'updateStatus') { $prestudent_id = current(array_slice($this->uri->rsegments, 2)); $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']); } @@ -57,322 +57,6 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($data); } - /** - * Inserts a status with less validations and extra logic for manual - * manipulation - * - * @param integer $prestudent_id - * - * @return void - */ - public function insert($prestudent_id) - { - $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - - - $authUID = getAuthUID(); - $status_kurzbz = $this->input->post('status_kurzbz'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $datum = $this->input->post('datum'); - $bestaetigtam = $this->input->post('bestaetigtam'); - $orgform_kurzbz = $this->input->post('orgform_kurzbz'); - $anmerkung = $this->input->post('anmerkung'); - $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); - $studienplan_id = $this->input->post('studienplan_id'); - $rt_stufe = $this->input->post('rt_stufe'); - $statusgrund_id = $this->input->post('statusgrund_id'); - - - $this->load->library('form_validation'); - - $this->form_validation->set_rules( - 'datum', - $this->p->t('global', 'datum'), - [ - 'required', // In FAS empty datum results in todays - 'is_valid_date', - ['is_date_not_before_today', function ($value) { - if (!is_valid_date($value)) - return true; // Error will be handled by the is_valid_date statement above - $today = new DateTime('today'); - return (new DateTime($value) >= $today); - }], - ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$value) - return true; // Error will be handled by the required statement above - - $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); - - return !$this->getDataOrTerminateWithError($result); - }] - ], - [ - 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'), - 'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast') - ] - ); - - $this->form_validation->set_rules( - 'status_kurzbz', - $this->p->t('lehre', 'status_rolle'), - [ - 'required', - ['status_stud_exists', function ($value) use ($prestudent_id) { - if ($value != 'Student') - return true; // Only test if new status is Student - - $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); - - return $this->getDataOrTerminateWithError($result); - }] - ], - [ - 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') - ] - ); - - $this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required'); - - $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required'); - - $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date'); - - // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules - if (!$datum || !is_valid_date($datum)) - $datum = null; - - $this->form_validation->set_rules('_default', '', [ - ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { - if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above - - $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]); - - return !$this->getDataOrTerminateWithError($result); - }], - ['history_timesequence', function () use ( - $isBerechtigtNoStudstatusCheck, - $prestudent_id, - $status_kurzbz, - $datum, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above - - $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence( - $prestudent_id, - $status_kurzbz, - new DateTime($datum), - $studiensemester_kurzbz, - $ausbildungssemester, - '', - '' - ); - - return $this->getDataOrTerminateWithError($result); - }], - ['history_laststatus', function () use ( - $isBerechtigtNoStudstatusCheck, - $prestudent_id, - $status_kurzbz, - $datum, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above - - $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus( - $prestudent_id, - $status_kurzbz, - new DateTime($datum), - $studiensemester_kurzbz, - $ausbildungssemester, - '', - '' - ); - - return $this->getDataOrTerminateWithError($result); - }], - ['history_unterbrecher', function () use ( - $isBerechtigtNoStudstatusCheck, - $prestudent_id, - $status_kurzbz, - $datum, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above - - $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester( - $prestudent_id, - $status_kurzbz, - new DateTime($datum), - $studiensemester_kurzbz, - $ausbildungssemester, - '', - '' - ); - - return $this->getDataOrTerminateWithError($result); - }], - ['history_abbrecher', function () use ( - $isBerechtigtNoStudstatusCheck, - $prestudent_id, - $status_kurzbz, - $datum, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above - - $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester( - $prestudent_id, - $status_kurzbz, - new DateTime($datum), - $studiensemester_kurzbz, - $ausbildungssemester, - '', - '' - ); - - return $this->getDataOrTerminateWithError($result); - }], - ['history_diplomant', function () use ( - $isBerechtigtNoStudstatusCheck, - $prestudent_id, - $status_kurzbz, - $datum, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above - - $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant( - $prestudent_id, - $status_kurzbz, - new DateTime($datum), - $studiensemester_kurzbz, - $ausbildungssemester, - '', - '' - ); - - return $this->getDataOrTerminateWithError($result); - }] - ], [ - 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), - 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), - 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), - 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'), - 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'), - 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent') - ]); - - if (!$this->form_validation->run()) - $this->terminateWithValidationErrors($this->form_validation->error_array()); - - - // Start DB transaction - $this->db->trans_start(); - - if (in_array($status_kurzbz, [ - Prestudentstatus_model::STATUS_STUDENT, - Prestudentstatus_model::STATUS_DIPLOMAND, - Prestudentstatus_model::STATUS_ABSOLVENT, - Prestudentstatus_model::STATUS_INCOMING, - Prestudentstatus_model::STATUS_ABBRECHER, - Prestudentstatus_model::STATUS_UNTERBRECHER - ])) { - $result = $this->StudentModel->loadWhere([ - 'prestudent_id' => $prestudent_id - ]); - - $student = $this->getDataOrTerminateWithError($result); - - if ($student) { - $student = current($student); - - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->loadWhere([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ]); - - $studentlvb = $this->getDataOrTerminateWithError($result); - - // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing. - // TODO(chris): check if that is correct (in FAS)? - if (!$studentlvb) { - $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); - - $this->LehrverbandModel->addLimit(1); - $result = $this->LehrverbandModel->loadWhere([ - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $ausbildungssemester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe - ]); - $lv = $this->getDataOrTerminateWithError($result); - - $this->StudentlehrverbandModel->insert([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $lv ? $ausbildungssemester : $student->semester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe, - 'insertamum' => date('c'), - 'insertvon' => $authUID - ]); - } - } - } - - //insert status - $result = $this->PrestudentstatusModel->insert([ - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'datum' => $datum, - 'insertamum' => date('c'), - 'insertvon' => $authUID, - 'orgform_kurzbz' => $orgform_kurzbz, - 'bestaetigtam' => $bestaetigtam, - 'bestaetigtvon' => $bestaetigtam ? $authUID : null, - 'anmerkung' => $anmerkung, - 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, - 'studienplan_id' => $studienplan_id, - 'rt_stufe' => $rt_stufe, - 'statusgrund_id' => $statusgrund_id - ]); - - $this->getDataOrTerminateWithError($result); - - $this->db->trans_complete(); - - $this->terminateWithSuccess(true); - } - public function getStatusgruende() { $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); @@ -1674,6 +1358,281 @@ class Status extends FHCAPI_Controller return $this->terminateWithSuccess(true); } + /** + * Inserts a status with less validations and extra logic for manual + * manipulation + * + * @param integer $prestudent_id + * + * @return void + */ + public function insertStatus($prestudent_id) + { + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); + + + $authUID = getAuthUID(); + $status_kurzbz = $this->input->post('status_kurzbz'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester'); + $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $orgform_kurzbz = $this->input->post('orgform_kurzbz'); + $anmerkung = $this->input->post('anmerkung'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studienplan_id = $this->input->post('studienplan_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $statusgrund_id = $this->input->post('statusgrund_id'); + + + $this->load->library('form_validation'); + + $this->form_validation->set_rules( + 'datum', + $this->p->t('global', 'datum'), + [ + 'required', // In FAS empty datum results in todays + 'is_valid_date', + ['is_date_not_before_today', function ($value) { + if (!is_valid_date($value)) + return true; // Error will be handled by the is_valid_date statement above + $today = new DateTime('today'); + return (new DateTime($value) >= $today); + }], + ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$value) + return true; // Error will be handled by the required statement above + + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); + + return !$this->getDataOrTerminateWithError($result); + }] + ], + [ + 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'), + 'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast') + ] + ); + + $this->form_validation->set_rules( + 'status_kurzbz', + $this->p->t('lehre', 'status_rolle'), + [ + 'required', + ['status_stud_exists', function ($value) use ($prestudent_id) { + if ($value != 'Student') + return true; // Only test if new status is Student + + $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); + + return $this->getDataOrTerminateWithError($result); + }] + ], + [ + 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') + ] + ); + + $this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required'); + + $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required'); + + $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date'); + + // Set Datum to null to prevent multiple is_valid_date checks in the following validation rules + if (!$datum || !is_valid_date($datum)) + $datum = null; + + $this->form_validation->set_rules('_default', '', [ + ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { + if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]); + + return !$this->getDataOrTerminateWithError($result); + }], + ['history_timesequence', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_laststatus', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_unterbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_abbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_diplomant', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), + 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), + 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), + 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'), + 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'), + 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent') + ]); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + // Start DB transaction + $this->db->trans_start(); + + $this->updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID); + + //insert status + $result = $this->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => $datum, + 'insertamum' => date('c'), + 'insertvon' => $authUID, + 'orgform_kurzbz' => $orgform_kurzbz, + 'bestaetigtam' => $bestaetigtam, + 'bestaetigtvon' => $bestaetigtam ? $authUID : null, + 'anmerkung' => $anmerkung, + 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, + 'studienplan_id' => $studienplan_id, + 'rt_stufe' => $rt_stufe, + 'statusgrund_id' => $statusgrund_id + ]); + + $this->getDataOrTerminateWithError($result); + + $this->db->trans_complete(); + + $this->terminateWithSuccess(true); + } + + /** + * Updates a status entry + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $key_studiensemester_kurzbz + * @param integer $key_ausbildungssemester + * + * @return void + */ public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) { $result = $this->PrestudentstatusModel->load([ @@ -1902,59 +1861,8 @@ class Status extends FHCAPI_Controller // Start DB transaction $this->db->trans_start(); - if (in_array($status_kurzbz, [ - Prestudentstatus_model::STATUS_STUDENT, - Prestudentstatus_model::STATUS_DIPLOMAND, - Prestudentstatus_model::STATUS_ABSOLVENT, - Prestudentstatus_model::STATUS_INCOMING, - Prestudentstatus_model::STATUS_ABBRECHER, - Prestudentstatus_model::STATUS_UNTERBRECHER - ])) { - $result = $this->StudentModel->loadWhere([ - 'prestudent_id' => $prestudent_id - ]); + $this->updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID); - $student = $this->getDataOrTerminateWithError($result); - - if ($student) { - $student = current($student); - - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->loadWhere([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ]); - - $studentlvb = $this->getDataOrTerminateWithError($result); - - // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing. - // TODO(chris): check if that is correct (in FAS)? - if (!$studentlvb) { - $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); - - $this->LehrverbandModel->addLimit(1); - $result = $this->LehrverbandModel->loadWhere([ - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $ausbildungssemester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe - ]); - $lv = $this->getDataOrTerminateWithError($result); - - $this->StudentlehrverbandModel->insert([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $lv ? $ausbildungssemester : $student->semester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe, - 'insertamum' => date('c'), - 'insertvon' => $authUID - ]); - } - } - } - //update status $updateData = [ 'studiensemester_kurzbz' => $studiensemester_kurzbz, @@ -2262,6 +2170,76 @@ class Status extends FHCAPI_Controller return $this->outputJsonSuccess(true); } + /** + * Helper function for insertStatus and updateStatus. + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $studiensemester_kurzbz + * @param integer $ausbildungssemester + * @param string $authUID + * + * @return void + */ + private function updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID) + { + if (!in_array($status_kurzbz, [ + Prestudentstatus_model::STATUS_STUDENT, + Prestudentstatus_model::STATUS_DIPLOMAND, + Prestudentstatus_model::STATUS_ABSOLVENT, + Prestudentstatus_model::STATUS_INCOMING, + Prestudentstatus_model::STATUS_ABBRECHER, + Prestudentstatus_model::STATUS_UNTERBRECHER + ])) + return; // No Update necessary + + $result = $this->StudentModel->loadWhere([ + 'prestudent_id' => $prestudent_id + ]); + + $student = $this->getDataOrTerminateWithError($result); + + if (!$student) + return; // No Update necessary + + $student = current($student); + + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->loadWhere([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ]); + + $studentlvb = $this->getDataOrTerminateWithError($result); + + // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing? + // TODO(chris): check if that is correct (in FAS)? + if ($studentlvb) + return; // No Update necessary + + $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); + + $this->LehrverbandModel->addLimit(1); + $result = $this->LehrverbandModel->loadWhere([ + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $ausbildungssemester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe + ]); + $lv = $this->getDataOrTerminateWithError($result); + + $this->StudentlehrverbandModel->insert([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $lv ? $ausbildungssemester : $student->semester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe, + 'insertamum' => date('c'), + 'insertvon' => $authUID + ]); + } + private function _sanitizeAliasName($str) { $str = sanitizeProblemChars($str); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 67bcde30f..41b3c93bc 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -724,7 +724,7 @@ export default{ insertStatus() { this.$refs.statusData .post( - 'api/frontend/v1/stv/status/insert/' + this.modelValue.prestudent_id, + 'api/frontend/v1/stv/status/insertStatus/' + this.modelValue.prestudent_id, this.statusData ) .then(result => { From df3927254430e56d3e75c5dc102ce01fe259f5cd Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 24 Jul 2024 15:38:26 +0200 Subject: [PATCH 349/464] update dynamic Toolbar Interessent with bootstrap dropdown-menu-right --- .../api/frontend/v1/stv/Status.php | 2 +- application/libraries/PrestudentLib.php | 1 + .../Details/Prestudent/MultiStatus.js | 266 ++++++------------ 3 files changed, 91 insertions(+), 178 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index bb1b512c6..af9effa99 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -851,7 +851,7 @@ class Status extends FHCAPI_Controller } $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent); + $result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent); if (isError($result)) { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index 693f328f5..38ae487d3 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -568,6 +568,7 @@ class PrestudentLib 'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT, 'studiensemester_kurzbz' => $studiensemester_kurzbz, 'ausbildungssemester' => $ausbildungssemester, + 'statusgrund_id' => $statusgrund_id, 'datum' => date('c'), 'insertvon' => $insertvon, 'insertamum' => date('c'), diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 41b3c93bc..306c940c6 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -133,6 +133,14 @@ export default{ toolbarStudent() { return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz)); }, + sortedGruende() { + return this.listDataToolbar.reduce((result,current) => { + if (!result[current.status_kurzbz]) + result[current.status_kurzbz] = []; + result[current.status_kurzbz].push(current); + return result; + }, {}); + }, resultInteressentArray() { const result = []; this.statiInteressent.forEach(status => { @@ -140,18 +148,16 @@ export default{ status_kurzbz: status, statusgrund_id: null, link: `changeStatusTo${status}`, - dropEntry: null + dropEntry: null, + children: [] }; if (status === "Student") { defaultObject.link = 'changeInteressentToStudent'; } - result.push(defaultObject); - - this.toolbarInteressent.forEach(item => { - if (item.status_kurzbz === status) { - + if(this.sortedGruende[status]) { + this.sortedGruende[status].forEach(item => { const itemObject = { status_kurzbz: item.status_kurzbz, statusgrund_id: item.statusgrund_id, @@ -164,10 +170,9 @@ export default{ itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`; } - result.push(itemObject); - - } - }); + defaultObject.children.push(itemObject); + }); + } }); return result; }, @@ -667,7 +672,7 @@ export default{ this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden'); }, addStudent(prestudentIds){ - + //this.hideModal('confirmStatusAction'); let changeData = {}; //for Feedback Sucess, Error @@ -968,17 +973,18 @@ export default{ const today = new Date(); return today; }, - handleSelectionChange(event) { - const selectedValue = event.target.value; - const selectedItem = this.resultInteressentArray.find(item => - item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '') === selectedValue - ); - if (selectedItem && typeof this[selectedItem.link] === 'function') { - this[selectedItem.link](); + executeLink(link) { + // Split the link string to extract the function name and arguments + const match = link.match(/(\w+)\(([^)]*)\)/); + const functionName = match ? match[1] : link; + const args = match ? match[2].split(',').map(arg => arg.trim()) : []; + + if (typeof this[functionName] === 'function') { + this[functionName](...args); } else { - console.warn(`No method found for ${selectedItem.link}`); + console.error(`Method ${functionName} not found`); } - } + }, }, created(){ this.$fhcApi @@ -1014,27 +1020,7 @@ export default{ template: `
    - - + - @@ -1426,7 +1548,6 @@ export default{
    - -
    ` - +
    +
    ` }; \ No newline at end of file From df6f4a07d6cdff885b9bcf5f4126264e80662dd4 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 25 Jul 2024 13:18:13 +0200 Subject: [PATCH 352/464] dynamic toolbarStudent --- .../api/frontend/v1/stv/Status.php | 4 +- .../Details/Prestudent/MultiStatus.js | 298 ++++++------------ 2 files changed, 95 insertions(+), 207 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index bfac248d1..ef0806c4d 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -399,7 +399,7 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($prestudent_id); } break; - case Prestudentstatus_model::STATUS_STUDENT: +/* case Prestudentstatus_model::STATUS_STUDENT: { $this->load->library('PrestudentLib'); $result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon); @@ -412,7 +412,7 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($prestudent_id); } - break; + break;*/ case Prestudentstatus_model::STATUS_DIPLOMAND: { $this->load->library('PrestudentLib'); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 6cb9714ec..915594473 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -152,7 +152,6 @@ export default{ status_kurzbz: status, statusgrund_id: null, link: `changeStatusTo${status}`, - // dropEntry: null, children: [] }; @@ -168,7 +167,6 @@ export default{ statusgrund_id: item.statusgrund_id, beschreibung: item.beschreibung, link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, - //dropEntry: `[${item.beschreibung}]` }; if (item.status_kurzbz === "Student") { @@ -505,22 +503,10 @@ export default{ actionConfirmDialogue(data, statusgrund, statusText){ this.actionButton = statusgrund; this.actionStatusText = statusText; - - if(this.actionStatusText != "Student" && this.actionStatusText != "Wiederholer") - this.$refs.confirmStatusAction.show(); - else { - //haut einzeln hin -/* console.log("check if Bewerberstatus"); - this.checkIfBewerber(this.prestudentIds); - console.log(this.isBewerber);*/ - - this.$refs.askForAusbildungssemester.show(); - } + this.$refs.confirmStatusAction.show(); }, changeStatusToAbbrecher(statusgrund_id){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); - console.log("in function changeStatusToAbbrecher: ", statusgrund_id); + this.resetChangeModals(); let def_date = this.getDefaultDate(); let abbruchData = { @@ -535,8 +521,7 @@ export default{ //this.changeStatus(prestudentIds); }, changeStatusToUnterbrecher(){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); let def_date = this.getDefaultDate(); let deltaData = { @@ -549,8 +534,7 @@ export default{ this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher'); }, changeStatusToStudent(statusgrund_id){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); console.log("in function changeStatusToStudent: ", statusgrund_id); let def_date = this.getDefaultDate(); //TODO Manu validation if Bewerber already before asking for ausbildungssemester @@ -561,7 +545,7 @@ export default{ if(statusgrund_id == 19){ this.actionStatusText = 'Pre-Abbrecher'; } - if(statusgrund_id == 11){ + if(statusgrund_id == 15){ this.actionStatusText = 'Pre-Wiederholer'; } if(statusgrund_id == 16){ @@ -570,8 +554,6 @@ export default{ if(!statusgrund_id){ this.actionStatusText = 'Student'; } - - let deltaData = { status_kurzbz: 'Student', @@ -579,15 +561,17 @@ export default{ bestaetigtam: def_date, statusgrund_id: statusgrund_id }; - - // this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); - - //now actionSem is asked later this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText); + if(statusgrund_id == 16 || !statusgrund_id){ + this.$refs.askForAusbildungssemester.show(); + } + else + { + this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText); + } }, - changeStatusToDiplomand(prestudentIds){ + changeStatusToDiplomand(){ let def_date = this.getDefaultDate(); let deltaData = { @@ -597,9 +581,9 @@ export default{ }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.changeStatus(prestudentIds); + this.changeStatus(this.prestudentIds); }, - changeStatusToAbsolvent(prestudentIds){ + changeStatusToAbsolvent(){ let def_date = this.getDefaultDate(); let deltaData = { @@ -609,11 +593,14 @@ export default{ }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.changeStatus(prestudentIds); + this.changeStatus(this.prestudentIds); + }, + saveNewAusbildungssemester(){ + this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem})); + this.changeStatus(this.prestudentIds); }, changeStatusToBewerber(){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); let def_date = this.getDefaultDate(); let deltaData = { @@ -629,8 +616,7 @@ export default{ this.changeStatus(this.prestudentIds); }, changeStatusToAufgenommener(){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); let def_date = this.getDefaultDate(); let deltaData = { @@ -648,8 +634,7 @@ export default{ }, changeInteressentToStudent(statusgrund_id){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); //TODO(Manu) test statusgrund_id console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id); let def_date = this.getDefaultDate(); @@ -670,8 +655,7 @@ export default{ }, changeStatusToAbgewiesener(statusgrund_id){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); let def_date = this.getDefaultDate(); let deltaData = { @@ -689,8 +673,7 @@ export default{ this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen'); }, changeStatusToWartender(){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); let def_date = this.getDefaultDate(); let deltaData = { @@ -774,8 +757,7 @@ export default{ .catch(this.$fhcAlert.handleSystemError); }, changeStatus(prestudentIds){ - this.hideModal('confirmStatusAction'); - this.hideModal('askForAusbildungssemester'); + this.resetChangeModals(); //Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds]; let changeData = {}; @@ -796,8 +778,6 @@ export default{ this.newArray.push({ ausbildungssemester: this.actionSem }); } - console.log(this.actionSem + ' ' + this.newArray['ausbildungssemester']); - const promises = prestudentIds.map(prestudentId => { //TODO(manu) besserer check changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId); @@ -1016,6 +996,10 @@ export default{ this.actionStatusText = {}; this.actionSem = null; }, + resetChangeModals(){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); + }, getDefaultDate() { const today = new Date(); return today; @@ -1066,72 +1050,7 @@ export default{ }, template: `
    - - - - - - - - - - - - - - - - - - - - - - - - -
    Status KurzbezBezeichnungStatus Grund IDLinkLink statusgrund_id
    {{item.status_kurzbz}} -
    - {{child.beschreibung}} -
    -     		{{ item.beschreibung }}{{ item.children[0] }}{{ item.link }} -
    - {{child.link}} -
    -
    - - @@ -1420,50 +1330,36 @@ export default{ - - -
    - - -
    - + +
    @@ -1510,44 +1406,36 @@ export default{ - -
    - - -
    - -
    + +
    ` }; \ No newline at end of file From 725015474882d7cf82d230f0358e623a9c74bc39 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 25 Jul 2024 13:35:47 +0200 Subject: [PATCH 353/464] Multistatus Modal as own Component --- .../Details/MultiStatus.js | 7 +- .../Details/Prestudent/MultiStatus.js | 15 +- .../Details/Status/Modal.js | 334 ++++++++++++++++++ 3 files changed, 346 insertions(+), 10 deletions(-) create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js diff --git a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js index dfbfa17b3..83788f611 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js @@ -8,11 +8,8 @@ export default { modelValue: Object, }, template: ` -
    -
    - Status - -
    +
    +
    ` } \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 915594473..0c1cb6e60 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -3,6 +3,7 @@ import BsModal from "../../../../Bootstrap/Modal.js"; import FormForm from '../../../../Form/Form.js'; import FormInput from '../../../../Form/Input.js'; import FormValidation from '../../../../Form/Validation.js'; +import StatusModal from '../Status/Modal.js'; export default{ components: { @@ -11,6 +12,7 @@ export default{ FormForm, FormInput, FormValidation, + StatusModal }, inject: { defaultSemester: { @@ -426,7 +428,8 @@ export default{ }, methods: { actionNewStatus() { - this.statusNew = true; + this.$refs.test.open(this.modelValue); + /*this.statusNew = true; this.resetModal(); this.statusData.status_kurzbz = 'Interessent'; this.statusData.studiensemester_kurzbz = this.defaultSemester; @@ -435,10 +438,11 @@ export default{ this.statusData.bestaetigtam = this.getDefaultDate(); this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname; this.$refs.statusData.clearValidation(); - this.$refs.statusModal.show(); + this.$refs.statusModal.show();*/ }, - actionEditStatus(status, stdsem, ausbildungssemester){ - this.statusNew = false; + actionEditStatus(status, stdsem, ausbildungssemester) { + this.$refs.test.open(this.modelValue, status, stdsem, ausbildungssemester); + /*this.statusNew = false; this.statusId = { 'prestudent_id': this.modelValue.prestudent_id, 'status_kurzbz': status, @@ -450,7 +454,7 @@ export default{ this.$refs.statusData.clearValidation(); this.$refs.statusModal.show(); } - }); + });*/ }, actionDeleteStatus(status, stdsem, ausbildungssemester){ this.statusId = { @@ -1051,6 +1055,7 @@ export default{ template: `
    + + + + - +
    - -
    - - - - - - -
    ` }; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js new file mode 100644 index 000000000..a6d120b60 --- /dev/null +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js @@ -0,0 +1,725 @@ +import BsModal from "../../../../Bootstrap/Modal.js"; +import CoreForm from '../../../../Form/Form.js'; +import FormValidation from '../../../../Form/Validation.js'; +import FormInput from '../../../../Form/Input.js'; + +export default { + components: { + BsModal, + CoreForm, + FormValidation, + FormInput + }, + inject: { + $reloadList: { + from: '$reloadList', + required: true + } + }, + props: { + showToolbar: { + type: Boolean, + required: true + }, + showToolbarStudent: { + type: Boolean, + required: true + }, + showToolbarInteressent: { + type: Boolean, + required: true + }, + prestudentIds: { + type: Array, + required: true, + default: () => [] + }, + updateData: { + type: Array, + required: true, + default: () => [] + } + }, + data() { + return { + listDataToolbar: [], + //TODO(Manu) get from config + statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"], + statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"], + selectedStatus: 'default', + actionButton: {}, + actionStatusText: {}, + actionSem: null + }; + }, + computed: { + toolbarInteressent() { + return this.listDataToolbar.filter(item => this.statiInteressent.includes(item.status_kurzbz)); + }, + toolbarStudent() { + return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz)); + }, + sortedGruende() { + return this.listDataToolbar.reduce((result,current) => { + if (!result[current.status_kurzbz]) + result[current.status_kurzbz] = []; + result[current.status_kurzbz].push(current); + return result; + }, {}); + }, + resultInteressentArray() { + const result = []; + this.statiInteressent.forEach(status => { + const defaultObject = { + status_kurzbz: status, + statusgrund_id: null, + link: `changeStatusTo${status}`, + children: [] + }; + + if (status === "Student") { + defaultObject.link = 'changeInteressentToStudent'; + + } + result.push(defaultObject); + if(this.sortedGruende[status]) { + this.sortedGruende[status].forEach(item => { + const itemObject = { + status_kurzbz: item.status_kurzbz, + statusgrund_id: item.statusgrund_id, + beschreibung: item.beschreibung, + link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, + }; + + if (item.status_kurzbz === "Student") { + itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`; + } + defaultObject.children.push(itemObject); + }); + //push one item object if student is in the array + const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student"); + + if (hasStudentChild) { + defaultObject.children.push({ + status_kurzbz: 'Student', + statusgrund_id: null, + beschreibung: 'Student', + link: 'changeInteressentToStudent' + }); + } + } + }); + return result; + }, + resultStudentArray() { + const result = []; + this.statiStudent.forEach(status => { + const defaultObject = { + status_kurzbz: status, + statusgrund_id: null, + link: `changeStatusTo${status}`, + dropEntry: null, + children: [] + }; + result.push(defaultObject); + if(this.sortedGruende[status]) { + this.sortedGruende[status].forEach(item => { + const itemObject = { + status_kurzbz: item.status_kurzbz, + statusgrund_id: item.statusgrund_id, + beschreibung: item.beschreibung, + link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, + dropEntry: `[${item.beschreibung}]`, + }; + defaultObject.children.push(itemObject); + }); + } + //push one item object if student is in the array + const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student"); + + if (hasStudentChild) { + defaultObject.children.push({ + status_kurzbz: 'Student', + statusgrund_id: null, + beschreibung: 'Student', + link: 'changeStatusToStudent' + }); + } + }); + return result; + }, + gruende() { + return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz); + } + }, + methods: { + executeLink(link) { + // Split the link string to extract the function name and arguments + const match = link.match(/(\w+)\(([^)]*)\)/); + const functionName = match ? match[1] : link; + const args = match ? match[2].split(',').map(arg => arg.trim()) : []; + + if (typeof this[functionName] === 'function') { + this[functionName](...args); + } else { + console.error(`Method ${functionName} not found`); + } + }, + actionConfirmDialogue(data, statusgrund, statusText){ + this.actionButton = statusgrund; + this.actionStatusText = statusText; + this.$refs.confirmStatusAction.show(); + }, + addStudent(prestudentIds){ + console.log("function addStudent "); + //this.hideModal('confirmStatusAction'); + let changeData = {}; + + //for Feedback Sucess, Error + let countSuccess = 0; + let countError = 0; + + //if(!prestudentIds) + // prestudentIds = [this.modelValue.prestudent_id]; + + const promises = prestudentIds.map(prestudentId => { + + changeData = this.newArray.find(item => item.prestudent_id === prestudentId); + + //changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId); + + return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId, + changeData + ).then(response => { + countSuccess++; + return response; + }) + //.catch(this.$fhcAlert.handleSystemError) + .catch(error => { + countError++; + //For each Prestudent show Error in Alert + this.$fhcAlert.handleSystemError(error); + }); + }); + + Promise + .allSettled(promises) + .then(values => { + + this.newStatus = 'Student'; + + //Feedback Success als infoalert + if (countSuccess > 0) { + this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', { + 'countSuccess': countSuccess, + 'status': this.newStatus, + 'countError': countError + })); + } + + if(this.prestudentIds.length == 1){ + this.reload(); + this.$reloadList(); + } + else { + this.$reloadList(); + } + this.resetModal(); + }); + }, + changeStatusToAbbrecher(statusgrund_id){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + let abbruchData = + { + status_kurzbz: 'Abbrecher', + datum: def_date, + bestaetigtam: def_date, + statusgrund_id: statusgrund_id + }; + this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData })); + + this.actionConfirmDialogue(this.updateData, 'studenten','Abbrecher'); + //this.changeStatus(prestudentIds); + }, + changeStatusToUnterbrecher(){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Unterbrecher', + datum: def_date, + bestaetigtam: def_date + }; + + this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); + this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher'); + }, + changeStatusToStudent(statusgrund_id){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + //TODO Manu validation if Bewerber already before asking for ausbildungssemester + //this.checkIfBewerber(); + + this.actionButton = 'student'; + + if(statusgrund_id == 19){ + this.actionStatusText = 'Pre-Abbrecher'; + } + if(statusgrund_id == 15){ + this.actionStatusText = 'Pre-Wiederholer'; + } + if(statusgrund_id == 16){ + this.actionStatusText = 'Wiederholer'; + } + if(!statusgrund_id){ + this.actionStatusText = 'Student'; + } + let deltaData = + { + status_kurzbz: 'Student', + datum: def_date, + bestaetigtam: def_date, + statusgrund_id: statusgrund_id + }; + this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); + + if(statusgrund_id == 16 || !statusgrund_id){ + this.$refs.askForAusbildungssemester.show(); + } + else + { + this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText); + } + }, + changeStatusToDiplomand(){ + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Diplomand', + datum: def_date, + bestaetigtam: def_date, + }; + + this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); + this.changeStatus(this.prestudentIds); + }, + changeStatusToAbsolvent(){ + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Absolvent', + datum: def_date, + bestaetigtam: def_date, + }; + + this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); + this.changeStatus(this.prestudentIds); + }, + changeStatusToBewerber(){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Bewerber', + datum: def_date, + bestaetigtam: def_date, + ausbildungssemester: 1 + }; + + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData})); + this.changeStatus(this.prestudentIds); + }, + changeStatusToAufgenommener(){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Aufgenommener', + datum: def_date, + bestaetigtam: def_date + }; + + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData, + })); + + this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen'); + + }, + changeInteressentToStudent(statusgrund_id){ + this.resetChangeModals(); + //TODO(Manu) test statusgrund_id + console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id); + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Student', + datum: def_date, + bestaetigtam: def_date, + statusgrund_id: statusgrund_id + }; + + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData, + })); + + this.addStudent(this.prestudentIds); + + }, + changeStatusToAbgewiesener(statusgrund_id){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Abgewiesener', + datum: def_date, + bestaetigtam: def_date, + statusgrund_id: statusgrund_id + }; + + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData, + })); + + this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen'); + }, + changeStatusToWartender(){ + this.resetChangeModals(); + let def_date = this.getDefaultDate(); + let deltaData = + { + status_kurzbz: 'Wartender', + datum: def_date, + bestaetigtam: def_date + }; + this.newArray = this.updateData.map(objekt => ({ + ...objekt, + ...deltaData, + })); + + this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden'); + }, + changeStatus(prestudentIds){ + console.log("function changeStatus "); + this.resetChangeModals(); + //Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds]; + let changeData = {}; + + //for Feedback Sucess, Error + let countSuccess = 0; + let countError = 0; + + // Check if ausbildungssemester is already in this.newArray + const existingEntry = this.newArray.find( + (entry) => entry.ausbildungssemester === this.actionSem + ); + + // If the entry doesn't exist, add a new object with ausbildungssemester + if (!existingEntry) { + this.newArray.push({ ausbildungssemester: this.actionSem }); + } + + console.log("ausbildungssem: " + this.actionSem); + + const promises = prestudentIds.map(prestudentId => { + + changeData = this.newArray.find(item => item.prestudent_id === prestudentId); + + return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + prestudentId, + changeData + ).then(response => { + countSuccess++; + return response; + }) + //.catch(this.$fhcAlert.handleSystemError) + .catch(error => { + countError++; + //For each Prestudent show Error in Alert + this.$fhcAlert.handleSystemError(error); + }); + }); + + Promise + .allSettled(promises) + .then(values => { + /* if (this.abbruchData.length < 1) { + } + else{*/ + if(this.newArray.length > 0) { + this.newStatus = this.newArray[0].status_kurzbz; + } + else { + this.newStatus = this.statusData.status_kurzbz; + } + // } + + //Feedback Success als infoalert + if (countSuccess > 0) { + this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', { + 'countSuccess': countSuccess, + 'status': this.newStatus, + 'countError': countError + })); + } + + //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working + + if(this.prestudentIds.length == 1){ + this.reload(); + + //necessary to see new status in List + this.$reloadList(); + //to change ToolbarInteressent to ToolbarStudent + + + } + else { + this.$reloadList(); + } + this.resetModal(); + }); + }, + checkIfErsterStudent(prestudent_id){ + return this.$fhcApi + .get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id) + .then( + result => { + this.isErsterStudent = result.data.retval == 0 ? 1 : 0; + return result; + }) + .catch(this.$fhcAlert.handleSystemError); + }, + /*checkIfBewerber(prestudentIds){ + + if(!prestudentIds) + prestudentIds = [this.modelValue.prestudent_id]; + + const promises = prestudentIds.map(prestudentId => { + + return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId, + ).then(response => { + countSuccess++; + return response; + }) + //.catch(this.$fhcAlert.handleSystemError) + .catch(error => { + countError++; + //For each Prestudent show Error in Alert + this.$fhcAlert.handleSystemError(error); + }); + }); + + Promise + .allSettled(promises) + .then(values => { + + //Feedback Success als infoalert + if (countSuccess > 0) { + this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', { + 'countSuccess': countSuccess, + 'status': this.newStatus, + 'countError': countError + })); + } + + if (this.modelValue.prestudent_id) { + this.reload(); + //TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe + } + else { + this.$reloadList(); + } + + /!*return this.$fhcApi + .get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id) + .then( + result => { + this.isBewerber = result.data; + console.log(result); + return result; + }) + .catch(this.$fhcAlert.handleSystemError);*!/ + //} + },*/ + getDefaultDate() { + const today = new Date(); + return today; + }, + hideModal(modalRef){ + this.$refs[modalRef].hide(); + this.statusNew = true; + }, + reload() { + this.$emit('reload-table'); + }, + reloadList() { + this.$emit('reload-list'); + }, + resetChangeModals(){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); + }, + resetModal() { + this.statusData = {}; + this.statusId = {}; + this.actionButton = {}; + this.actionStatusText = {}; + this.actionSem = null; + }, + saveNewAusbildungssemester(){ + this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem})); + console.log("ausbildungssem" + this.actionSem); + this.changeStatus(this.prestudentIds); + }, + + }, + created() { + this.$fhcApi + .get('api/frontend/v1/stv/status/getStatusarray/') + .then(result => result.data) + .then(result => { + this.listDataToolbar = result; + }) + .catch(this.$fhcAlert.handleSystemError); + //TODO(manu) check if necessary + this.$fhcApi + .get('api/frontend/v1/stv/status/getStatusgruende/') + .then(result => result.data) + .then(result => { + this.listStatusgruende = result; + }) + .catch(this.$fhcAlert.handleSystemError); + }, + template: ` +
    + + + + + + + + + + + + + + + + +
    + + + + + + +
    +
    ` +}; \ No newline at end of file From d4db49e09e36e33072c0799c0d25c09e3ca0cc71 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Fri, 26 Jul 2024 12:04:20 +0200 Subject: [PATCH 364/464] Status->isLastStatus corrected --- .../api/frontend/v1/stv/Status.php | 15 ++--- .../models/crm/Prestudentstatus_model.php | 64 +++++++++---------- 2 files changed, 34 insertions(+), 45 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 11db9f73d..158ad8a22 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -85,15 +85,8 @@ class Status extends FHCAPI_Controller { $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); + $result = $this->getDataOrTerminateWithError($result); - if (isError($result)) - { - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if($result->retval == "1") - { - $this->terminateWithError($this->p->t('lehre','error_lastRole'), self::ERROR_TYPE_GENERAL); - } return $this->terminateWithSuccess($result); } @@ -963,7 +956,7 @@ class Status extends FHCAPI_Controller { return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); } - if($result->retval == "1") + if($result->retval) { //Berechtigungen nach Check prüfen! if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) @@ -1098,13 +1091,13 @@ class Status extends FHCAPI_Controller $logId = $result->retval; //Delete Studentlehrverband if no Status left - $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, true); + $result = $this->PrestudentstatusModel->checkIfLastStudentStatusEntry($prestudent_id); if (isError($result)) { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } - if ($result->retval == "1") + if ($result->retval) { //get student_uid $this->load->model('crm/Student_model', 'StudentModel'); diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index bb88c0f8c..f99a8e73f 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -484,48 +484,44 @@ class Prestudentstatus_model extends DB_Model /** * Check if there is only one prestudentstatus left - * @param integer $prestudent_id - * @return success("1") if last prestudentstatusentry, else success("0") + * + * @param integer $prestudent_id + * + * @return stdClass */ - public function checkIfLastStatusEntry($prestudent_id, $isStudent=false ) + public function checkIfLastStatusEntry($prestudent_id) { - $qry = "SELECT - COUNT(*) as anzahl - FROM - public.tbl_prestudentstatus - WHERE - prestudent_id = ? - "; + $this->addSelect('COUNT(*) AS anzahl', false); - if($isStudent) - { - $qry .= "AND status_kurzbz = 'Student'"; - } - - $result = $this->execQuery($qry, array($prestudent_id)); + $result = $this->loadWhere([ + 'prestudent_id' => $prestudent_id + ]); if (isError($result)) - { - return error($result); - } + return $result; - $resultObject = current(getData($result)); + $resultObject = current($result->retval); - if (property_exists($resultObject, 'anzahl')) - { - $anzahl = (int) $resultObject->anzahl; - if ($anzahl <= 1 ) - { - return success("1", $this->p->t('lehre','error_lastRole')); - } - else - return success("0", $this->p->t('lehre','anzahl_existingRoles', ['anzahl' => $anzahl])); + $anzahl = (int)$resultObject->anzahl; - } - else - { - return error($result); - } + if ($anzahl <= 1) + return success(true, $this->p->t('lehre', 'error_lastRole')); + + return success(false, $this->p->t('lehre', 'anzahl_existingRoles', ['anzahl' => $anzahl])); + } + + /** + * Check if there is only one "Student" prestudentstatus left + * + * @param integer $prestudent_id + * + * @return stdClass + */ + public function checkIfLastStudentStatusEntry($prestudent_id) + { + $this->db->where('status_kurzbz', self::STATUS_STUDENT); + + return $this->checkIfLastStatusEntry($prestudent_id); } public function getAllPrestudentstatiWithStudiensemester($prestudent_id) From fbcd1bd7dee103c17cf0523204c18f2ff902bb13 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 26 Jul 2024 15:01:21 +0200 Subject: [PATCH 365/464] update prestudentlib --- .../api/frontend/v1/stv/Status.php | 84 ++++------ application/libraries/PrestudentLib.php | 153 ++++++++++++------ 2 files changed, 135 insertions(+), 102 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 158ad8a22..e1f713e1e 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -436,7 +436,7 @@ class Status extends FHCAPI_Controller } break; -/* case Prestudentstatus_model::STATUS_BEWERBER: + case Prestudentstatus_model::STATUS_BEWERBER: { $this->load->library('PrestudentLib'); $result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); @@ -449,68 +449,38 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($prestudent_id); } - break;*/ - // case Prestudentstatus_model::STATUS_BEWERBER: - // { - // $this->load->library('PrestudentLib'); - // $result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + break; + case Prestudentstatus_model::STATUS_AUFGENOMMENER: + { + $this->load->library('PrestudentLib'); + $result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // else - // $this->terminateWithSuccess($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + else + $this->terminateWithSuccess($prestudent_id); - // } - // break; - // case Prestudentstatus_model::STATUS_AUFGENOMMENER: //auch Student... - // { - // $this->load->library('PrestudentLib'); - // $result = $this->prestudentlib->setStudentFromInteressent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + } + break; + case Prestudentstatus_model::STATUS_ABGEWIESENER: + { + $this->load->library('PrestudentLib'); + $result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // else - // $this->terminateWithSuccess($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + else + $this->terminateWithSuccess($prestudent_id); - // } - // break; - // case Prestudentstatus_model::STATUS_AUFGENOMMENER: - // { - // $this->load->library('PrestudentLib'); - // $result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); - - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // else - // $this->terminateWithSuccess($prestudent_id); - - // } - // break; - // case Prestudentstatus_model::STATUS_ABGEWIESENER: - // { - // $this->load->library('PrestudentLib'); - // $result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); - - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // else - // $this->terminateWithSuccess($prestudent_id); - - // } - // break; + } + break; default: { -/* if ($isStudent) { - return $this->terminateWithError("LehrverbandData needs no handling", self::ERROR_TYPE_GENERAL); - }*/ + $this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL); $result = $this->PrestudentstatusModel->insert( [ 'prestudent_id' => $prestudent_id, diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index 38ae487d3..09da501d3 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -523,27 +523,10 @@ class PrestudentLib public function setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon, $stg_kz, $uidStudent) { - $insertvon = getAuthUID(); - $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); if (isError($result)) return $result; - $resultStatus = getData($result); - - //check if ausbildungssemester is last - $this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz'); - $resultStg = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]); - if(isError($resultStg)) - return $resultStg; -/* if(!hasData($resultStg)) - return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [ - 'prestudent_id' => $prestudent_id - ]));*/ - - - $studiengang = current(getData($resultStg)) ?: null; - - $prestudent_status = ($resultStatus[0]); + $prestudent_status = current(getData($result)); if(!$prestudent_status) { return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [ @@ -552,15 +535,13 @@ class PrestudentLib ])); } -/* $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + //check studiensemester_kurzbz is last + $studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ? + $prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz; - if (isError($result)) - return $result; - $result = getData($result); - if (!$result) - return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); - - $student = current($result);*/ + //check if ausbildungssemester is last + $ausbildungssemester = $prestudent_status->ausbildungssemester != $ausbildungssemester ? + $prestudent_status->ausbildungssemester : $ausbildungssemester; //Status updaten $result = $this->_ci->PrestudentstatusModel->insert([ @@ -570,7 +551,7 @@ class PrestudentLib 'ausbildungssemester' => $ausbildungssemester, 'statusgrund_id' => $statusgrund_id, 'datum' => date('c'), - 'insertvon' => $insertvon, + 'insertvon' => getAuthUID(), 'insertamum' => date('c'), 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, 'studienplan_id'=> $prestudent_status->studienplan_id, @@ -581,24 +562,6 @@ class PrestudentLib if (isError($result)) return $result; -/* $result = $this->_ci->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) { - return $result; - } - $student_uid = $result->retval;*/ - - //load student -/* $result = $this->_ci->StudentModel->loadWhere( - array( - 'student_uid' => $uidStudent - ) - ); - if (isError($result)) - { - return $result; - } - - $studentData = current(getData($result) ? : []);*/ $verband = ''; $gruppe = ''; $studiengang_kz = $stg_kz; @@ -785,4 +748,104 @@ class PrestudentLib return success(); } + public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester) + { + $resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); + if (isError($resultLastStatus)) + return $resultLastStatus; + $resultLastStatus = getData($resultLastStatus); + + $prestudent_status = current($resultLastStatus); + + //check studiensemester_kurzbz: + $studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ? + $prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz; + + //Status updaten + $result = $this->_ci->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => date('c'), + 'insertvon' => getAuthUID(), + 'insertamum' => date('c'), + 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, + 'studienplan_id'=> $prestudent_status->studienplan_id, + 'bestaetigtvon' => getAuthUID(), + 'bestaetigtam' => date('c') + ]); + + if (isError($result)) + { + return $result; + } + else + return success(); + } + + public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){ + + $resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); + if (isError($resultLastStatus)) + return $resultLastStatus; + $resultLastStatus = getData($resultLastStatus); + + $prestudent_status = current($resultLastStatus); + + + //Status updaten + $result = $this->_ci->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => date('c'), + 'insertvon' => getAuthUID(), + 'insertamum' => date('c'), + 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, + 'studienplan_id'=> $prestudent_status->studienplan_id, + 'bestaetigtvon' => getAuthUID(), + 'bestaetigtam' => date('c') + ]); + + if (isError($result)) + { + return $result; + } + else + return success(); + } + + public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){ + + $resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); + if (isError($resultLastStatus)) + return $resultLastStatus; + $resultLastStatus = getData($resultLastStatus); + + $prestudent_status = current($resultLastStatus); + + //Status updaten + $result = $this->_ci->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => Prestudentstatus_model::STATUS_ABGEWIESENER, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => date('c'), + 'insertvon' => getAuthUID(), + 'insertamum' => date('c'), + 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, + 'studienplan_id'=> $prestudent_status->studienplan_id, + 'bestaetigtvon' => getAuthUID(), + 'bestaetigtam' => date('c') + ]); + + if (isError($result)) + { + return $result; + } + else + return success(); + } } From e81856afb9d6c5aa0561839a1f1a0f8d297b1821 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 29 Jul 2024 11:58:42 +0200 Subject: [PATCH 366/464] Phrases confirmChangeStatus --- .../Details/Status/Dropdown.js | 6 ++- system/phrasesupdate.php | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js index a6d120b60..a8bd7782a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js @@ -604,10 +604,12 @@ export default { diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index cdc277e62..b0259bfb3 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -30006,6 +30006,46 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'modal_StatusactionSingle', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Den Status dieser Person wirklich auf {status} setzen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Really set this person\'s status to {status}?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'modal_StatusactionPlural', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Den Status dieser {count} Personen wirklich auf {status} setzen?', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Really set the status of these {count} people to {status}?', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From f2b81ea68c99eb72c5a8ef1bb338168a041e94f9 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 29 Jul 2024 13:58:20 +0200 Subject: [PATCH 367/464] Bug: Anzeige Statusgrund --- .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 585dd2977..c49558438 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -101,7 +101,7 @@ export default{ {title: "Studienplan", field: "bezeichnung"}, {title: "BestätigtAm", field: "format_bestaetigtam"}, {title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum", visible:false}, - {title: "Statusgrund", field: "statusgrund_beschreibung"}, + {title: "Statusgrund", field: "statusgrund_bezeichnung"}, {title: "Organisationsform", field: "orgform_kurzbz", visible: false}, {title: "PrestudentInId", field: "prestudent_id", visible: false}, {title: "StudienplanId", field: "studienplan_id", visible: false}, From 8a637f3fa92b41daa29f6b6a76e2cf2e4c83d138 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 09:54:46 +0200 Subject: [PATCH 368/464] Fix List Reload Bug --- public/js/components/Stv/Studentenverwaltung/List.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js index 7248bb113..8eaf7847c 100644 --- a/public/js/components/Stv/Studentenverwaltung/List.js +++ b/public/js/components/Stv/Studentenverwaltung/List.js @@ -119,6 +119,7 @@ export default { this.$refs.new.open(); }, rowSelectionChanged(data) { + this.lastSelected = this.selected; this.$emit('update:selected', data); }, autoSelectRows(data) { @@ -129,8 +130,6 @@ export default { // or maybe reselect only the last one? selected = selected.filter(el => el); - this.lastSelected = null; - if (selected.length) this.$refs.table.tabulator.selectRow(selected); } else if(this.lastSelected === undefined) { From dd23bc26a21e9209690b56390512b574cd22bfc8 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 09:57:37 +0200 Subject: [PATCH 369/464] Improvements: Status delete --- .../api/frontend/v1/stv/Status.php | 501 ++++-------------- .../models/crm/Prestudentstatus_model.php | 6 +- .../Details/Prestudent/MultiStatus.js | 47 +- 3 files changed, 134 insertions(+), 420 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index e1f713e1e..cbf6befa5 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -19,7 +19,7 @@ class Status extends FHCAPI_Controller 'isErsterStudent' => self::PERM_LOGGED, 'hasStatusBewerber' => self::PERM_LOGGED, 'getStatusarray' => self::PERM_LOGGED, - 'deleteStatus' => ['admin:r','assistenz:r'], + 'deleteStatus' => ['admin:rw','assistenz:rw'], 'loadStatus' => ['admin:r', 'assistenz:r'], 'insertStatus' => ['admin:rw', 'assistenz:rw'], 'updateStatus' => ['admin:rw', 'assistenz:rw'], @@ -40,6 +40,7 @@ class Status extends FHCAPI_Controller if ($this->router->method == 'insertStatus' || $this->router->method == 'updateStatus' || $this->router->method == 'confirmStatus' + || $this->router->method == 'deleteStatus' ) { $prestudent_id = current(array_slice($this->uri->rsegments, 2)); $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']); @@ -882,140 +883,61 @@ class Status extends FHCAPI_Controller } } - public function deleteStatus() + public function deleteStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - $prestudent_id = $this->input->post('prestudent_id'); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $deletePrestudent = false; - - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $prestudent_id, + $result = $this->PrestudentstatusModel->load([ + $ausbildungssemester, + $studiensemester_kurzbz, + $status_kurzbz, + $prestudent_id ]); - if(isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - $result = current(getData($result)); + $oldstatus = $this->getDataOrTerminateWithError($result); + if (!$oldstatus) + show_404(); // Status that should be updated does not exist - $stg = $result->studiengang_kz; + $oldstatus = current($oldstatus); - $isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid'); - $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); - $isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER; - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) && !$isBerechtigtToDeleteAbgewiesen) - { - return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); - } + $erweiterteBerechtigung = $this->permissionlib->isBerechtigt('admin', null, 'suid') || $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); - if($status_kurzbz==Prestudentstatus_model::STATUS_STUDENT && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) - { - return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteRolleStudent'), self::ERROR_TYPE_GENERAL); - } //check if last status $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if($result->retval) - { - //Berechtigungen nach Check prüfen! - if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck) - { - return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteLastStatus'), self::ERROR_TYPE_GENERAL); - } - else - { - $deletePrestudent = true; - } + $result = $this->getDataOrTerminateWithError($result); + + $deletePrestudent = $result; + + + //Berechtigungen nach Check prüfen! + if (!$erweiterteBerechtigung) { + if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) + $this->terminateWithError( + $this->p->t('lehre', 'error_onlyAdminDeleteRolleStudent'), + self::ERROR_TYPE_GENERAL, + REST_Controller::HTTP_FORBIDDEN + ); + + if ($deletePrestudent) + $this->terminateWithError( + $this->p->t('lehre', 'error_onlyAdminDeleteLastStatus'), + self::ERROR_TYPE_GENERAL, + REST_Controller::HTTP_FORBIDDEN + ); + + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum); + + if (!$this->getDataOrTerminateWithError($result)) + $this->terminateWithError( + $this->p->t('lehre', 'error_dataVorMeldestichtag'), + self::ERROR_TYPE_GENERAL, + REST_Controller::HTTP_FORBIDDEN + ); } // Start DB transaction $this->db->trans_begin(); - //load rolle für LOG sqlundo - $result = $this->PrestudentstatusModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'ausbildungssemester' => $ausbildungssemester, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - - if (isError($result)) - { - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if (!hasData($result)) { - return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); - - } - - //Data of current Rolle - $statusData = current(getData($result)); - - $datum = $statusData->datum == '' ? 'null' : $statusData->datum; - $insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum; - $insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon; - $updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum; - $updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon; - $ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id; - $orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz; - $bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam; - $bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon; - $anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung; - $bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum; - $studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id; - $rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe; - $statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id; - - $quotes_datum = $datum == "null" ? " " : "'"; - $quotes_insertamum = $insertamum == "null" ? " " : "'"; - $quotes_insertvon = $insertvon == "null" ? " " : "'"; - $quotes_updateamum = $updateamum == "null" ? " " : "'"; - $quotes_updatevon = $updatevon == "null" ? " " : "'"; - $quotes_ext_id = $ext_id == "null" ? " " : "'"; - $quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'"; - $quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'"; - $quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'"; - $quotes_anmerkung = $anmerkung == "null" ? " " : "'"; - $quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'"; - $quotes_studienplan_id = $studienplan_id == "null" ? " " : "'"; - $quotes_rt_stufe = $rt_stufe == "null" ? " " : "'"; - $quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'"; - - $sqlundo = - " - INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, - datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, - anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id) - VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "'," - . $quotes_datum . $datum . $quotes_datum . "," - . $quotes_insertamum . $insertamum . $quotes_insertamum . "," - . $quotes_insertvon . $insertvon . $quotes_insertvon . "," - . $quotes_updateamum . $updateamum . $quotes_updateamum . "," - . $quotes_updatevon . $updatevon . $quotes_updatevon . "," - . $quotes_ext_id . $ext_id . $quotes_ext_id . "," - . $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . "," - . $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . "," - . $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . "," - . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," - . $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . "," - . $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . "," - . $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . "," - . $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . "); - "; - //Delete Status $result = $this->PrestudentstatusModel->delete( [ @@ -1026,300 +948,83 @@ class Status extends FHCAPI_Controller ] ); - if($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if(!hasData($result)) - { - return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); + $this->getDataOrTerminateWithError($result); - } + //Delete Studentlehrverband if no Status left in this semester + $result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz); - //save log delete prestudentstatus - $uid = getAuthUID(); - $beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id; - $sql = "DELETE FROM public.tbl_prestudentstatus - WHERE prestudent_id = " . $prestudent_id . " - AND status_kurzbz = '" . $status_kurzbz . "' - AND ausbildungssemester ='" . $ausbildungssemester . "' - AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'"; - - $this->load->model('system/Log_model', 'LogModel'); - $result = $this->LogModel->insert([ - 'mitarbeiter_uid' => $uid, - 'beschreibung' => $beschreibung, - 'sql' => $sql, - 'sqlundo' => $sqlundo - ]); - if (isError($result) || !hasData($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - - $logId = $result->retval; - - //Delete Studentlehrverband if no Status left - $result = $this->PrestudentstatusModel->checkIfLastStudentStatusEntry($prestudent_id); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - if ($result->retval) + $result = $this->getDataOrTerminateWithError($result); + if ($result) { //get student_uid $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) + $result = $this->StudentModel->loadWhere([ + 'prestudent_id' => $prestudent_id + ]); + + $student = $this->getDataOrTerminateWithError($result); + if ($student) { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + // TODO(chris): what if no student? + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); + $result = $this->StudentlehrverbandModel->delete( + array( + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ) + ); + + $this->getDataOrTerminateWithError($result); } - if (!hasData($result)) - { - return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL); - } - $student_uid = $result->retval; - - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->delete( - array( - 'student_uid' => $student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ) - ); - - if ($this->db->trans_status() === false || isError($result) || !hasData($result)) - { - $this->db->trans_rollback(); - - return $this->terminateWithError($this->p->t('lehre','error_duringDeleteLehrverband'), self::ERROR_TYPE_GENERAL); - } - } //Delete Prestudent if no data is left - if($deletePrestudent && $isBerechtigtAdmin) + if ($deletePrestudent) { - //TODO(manu) check all connected tables, Handling of Deletion - //check if existing dokumentprestudent - $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); - $result = $this->DokumentprestudentModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) - { - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + /* + //TODO(manu) check all connected tables, Handling of Deletion + //check if existing dokumentprestudent + $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); + $result = $this->DokumentprestudentModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if (hasData($result)) - { - return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL); - } - - //check if Anrechnungen tbl_anrechnung - $output_anrechnungen = ''; - $this->load->model('education/Anrechnung_model', 'AnrechnungModel'); - $result = $this->AnrechnungModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) - { - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if (hasData($result)) - { - return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL); - } + } + if (hasData($result)) + { + return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL); + } + //check if Anrechnungen tbl_anrechnung + $output_anrechnungen = ''; + $this->load->model('education/Anrechnung_model', 'AnrechnungModel'); + $result = $this->AnrechnungModel->loadWhere( + array( + 'prestudent_id' => $prestudent_id + ) + ); + if (isError($result)) + { + $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + if (hasData($result)) + { + return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL); + } + */ //DELETE Prestudent - - //save log delete prestudent - $uid = getAuthUID(); - $beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id; - $sql = "DELETE FROM public.tbl_prestudent - WHERE prestudent_id = " . $prestudent_id; - - //load prestudent für LOG sqlundo $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result) || !hasData($result)) - { - //TODO(Manu) in this case: löschen status erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } + $result = $this->PrestudentModel->delete($prestudent_id); - //Data of current Prestudent - $prestudentData = current(getData($result)); - - $aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz; - $studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz; - $berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code; - $ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode; - $zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code; - $zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort; - $zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum; - $zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation; - $zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt; - $zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code; - $zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort; - $zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum; - $zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation; - $zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt; - $aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel; - $facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf; - $anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest; - $reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false'; - $reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id; - $rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte; - $rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1; - $rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2; - $rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3; - $bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false'; - $person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id; - $anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung; - $mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor; - $ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id; - $dual = $prestudentData->dual == 1 ? 'true' : 'false'; - $ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat; - $zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code; - $zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort; - $zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum; - $zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation; - $gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz; - $aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz; - $priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung; - $zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt; - - $quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'"; - $quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'"; - $quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'"; - $quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'"; - $quotes_zgv_code = $zgv_code == "null" ? " " : "'"; - $quotes_zgvort = $zgvort == "null" ? " " : "'"; - $quotes_zgvdatum = $zgvdatum == "null" ? " " : "'"; - $quotes_zgvnation = $zgvnation == "null" ? " " : "'"; - $quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'"; - $quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'"; - $quotes_zgvmaort = $zgvmaort == "null" ? " " : "'"; - $quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'"; - $quotes_zgvmanation = $zgvmanation == "null" ? " " : "'"; - $quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'"; - $quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'"; - $quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'"; - $quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'"; - $quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'"; - $quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'"; - $quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'"; - $quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'"; - $quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'"; - $quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'"; - $quotes_bismelden = $bismelden == "null" ? " " : "'"; - $quotes_person_id = $person_id == "null" ? " " : "'"; - $quotes_anmerkung = $anmerkung == "null" ? " " : "'"; - $quotes_mentor = $mentor == "null" ? " " : "'"; - $quotes_ext_id = $ext_id == "null" ? " " : "'"; - $quotes_dual = $dual == "null" ? " " : "'"; - $quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'"; - $quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'"; - $quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'"; - $quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'"; - $quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'"; - $quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'"; - $quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'"; - $quotes_priorisierung = $priorisierung == "null" ? " " : "'"; - $quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'"; - - - $sqlundo = - " - INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode, - zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt, - aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id, - rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id, - dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation, - gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) - VALUES('" . $prestudent_id . "'," - . $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . "," - . $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . "," - . $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . "," - . $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . "," - . $quotes_zgv_code . $zgv_code . $quotes_zgv_code . "," - . $quotes_zgvort . $zgvort . $quotes_zgvort . "," - . $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . "," - . $quotes_zgvnation . $zgvnation . $quotes_zgvnation . "," - . $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . "," - . $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . "," - . $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . "," - . $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . "," - . $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . "," - . $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . "," - . $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . "," - . $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . "," - . $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . "," - . $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . "," - . $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . "," - . $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . "," - . $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . "," - . $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . "," - . $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . "," - . $quotes_bismelden . $bismelden . $quotes_bismelden . "," - . $quotes_person_id . $person_id . $quotes_person_id . "," - . $quotes_anmerkung . $anmerkung . $quotes_anmerkung . "," - . $quotes_mentor . $mentor . $quotes_mentor . "," - . $quotes_ext_id . $ext_id . $quotes_ext_id . "," - . $quotes_dual . $dual . $quotes_dual . "," - . $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . "," - . $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . "," - . $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . "," - . $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . "," - . $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . "," - . $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . "," - . $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . "," - . $quotes_priorisierung . $priorisierung . $quotes_priorisierung . "," - . $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . "); - "; - - $this->load->model('system/Log_model', 'LogModel'); - $result = $this->LogModel->insert([ - 'mitarbeiter_uid' => $uid, - 'beschreibung' => $beschreibung, - 'sql' => $sql, - 'sqlundo' => $sqlundo - ]); - if (isError($result) || !hasData($result)) - { - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - - //$logId = $result->retval; - - //independent transaction - $this->db->trans_start(); - - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->delete( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if ($this->db->trans_status() === false) - { - $this->db->trans_rollback(); - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - $this->db->trans_commit(); - $this->terminateWithSuccess($result); + $this->getDataOrTerminateWithError($result); } - $this->db->trans_commit(); + + $this->db->trans_rollback(); // TODO(chris): DEBUG! + #$this->db->trans_commit(); return $this->terminateWithSuccess(true); } diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index f99a8e73f..8ba52ba2d 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -486,13 +486,17 @@ class Prestudentstatus_model extends DB_Model * Check if there is only one prestudentstatus left * * @param integer $prestudent_id + * @param string $studiensemester_kurzbz * * @return stdClass */ - public function checkIfLastStatusEntry($prestudent_id) + public function checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz = null) { $this->addSelect('COUNT(*) AS anzahl', false); + if ($studiensemester_kurzbz) + $this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz); + $result = $this->loadWhere([ 'prestudent_id' => $prestudent_id ]); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index c49558438..5148b95b3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -273,29 +273,34 @@ export default{ actionEditStatus(status, stdsem, ausbildungssemester) { this.$refs.test.open(this.modelValue, status, stdsem, ausbildungssemester); }, - actionDeleteStatus(status, stdsem, ausbildungssemester){ - this.statusId = { - 'prestudent_id': this.modelValue.prestudent_id, - 'status_kurzbz': status, - 'studiensemester_kurzbz': stdsem, - 'ausbildungssemester': ausbildungssemester + actionDeleteStatus(status, stdsem, ausbildungssemester) { + const statusId = { + prestudent_id: this.modelValue.prestudent_id, + status_kurzbz: status, + studiensemester_kurzbz: stdsem, + ausbildungssemester: ausbildungssemester }; - this.checkIfLastStatus(); - - this.loadStatus(this.statusId).then(() => { - if(this.statusData) - { - this.$fhcAlert - .confirmDelete() - .then(result => result - ? this.statusId - : Promise.reject({handled: true})) - .then(this.deleteStatus) - .catch(this.$fhcAlert.handleSystemError); - } - }); - + this.$fhcAlert + .confirmDelete() + .then(result => result + ? 'api/frontend/v1/stv/status/isLastStatus/' + statusId.prestudent_id + : Promise.reject({handled: true}) + ) + .then(this.$fhcApi.get) + .then(result => result.data + ? new Promise((resolve, reject) => { BsConfirm.popup('TEST').then(resolve).catch(() => reject({handled:true})) }) + : true + ) // TODO(chris): correct confirm + .then(result => result + ? 'api/frontend/v1/stv/status/deleteStatus/' + Object.values(statusId).join('/') + : Promise.reject({handled: true}) + ) + .then(this.$fhcApi.post) + .then(() => this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'))) + .then(this.reload) + .then(this.$reloadList) + .catch(this.$fhcAlert.handleSystemError); }, actionAdvanceStatus(status, stdsem, ausbildungssemester){ this.statusId = { From 1a4f04cb8109703f31ab691f6352c79b05fab56f Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 11:16:32 +0200 Subject: [PATCH 370/464] Dropdown close & style improvements --- public/css/Studentenverwaltung.css | 16 +- .../Details/Status/Dropdown.js | 250 +++++++++--------- 2 files changed, 131 insertions(+), 135 deletions(-) diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css index ff7fbb09f..efa4dbb1a 100644 --- a/public/css/Studentenverwaltung.css +++ b/public/css/Studentenverwaltung.css @@ -48,20 +48,8 @@ html { } /* Dropdown Toolbar Interessent, submenu */ -.dropdown-menu-right { - left: 100%; - top: 5; - margin-left: 0.1rem; - margin-top: -1rem; -} - -.dropdown-submenu:hover>.dropdown-menu-right { - display: block; -} - -.dropdown-submenu>.dropdown-menu-right { - display: none; - position: absolute; +.dropend .dropdown-toggle.d-flex::after { + height: 0; } @media (min-width: 768px) { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js index a8bd7782a..5f10b2454 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js @@ -154,6 +154,7 @@ export default { }, methods: { executeLink(link) { + bootstrap.Dropdown.getInstance(this.$refs.toolbarButton).hide(); // Split the link string to extract the function name and arguments const match = link.match(/(\w+)\(([^)]*)\)/); const functionName = match ? match[1] : link; @@ -597,131 +598,138 @@ export default { .catch(this.$fhcAlert.handleSystemError); }, template: ` -
    - - - - - - - - - - - - + + + + + + + + + + + +
    + + +
      + + + + + + + +
    +
    +
    ` }; \ No newline at end of file From 25d6d9b59ed6ba39cf31d75694a692bef72108fc Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 11:36:43 +0200 Subject: [PATCH 371/464] Finish Status delete & correct updateLehrverbandForInsertAndUpdate --- .../api/frontend/v1/stv/Status.php | 98 ++++++++----------- 1 file changed, 43 insertions(+), 55 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index cbf6befa5..f5e77b258 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -883,6 +883,16 @@ class Status extends FHCAPI_Controller } } + /** + * Delete a status entry + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $studiensemester_kurzbz + * @param integer $ausbildungssemester + * + * @return void + */ public function deleteStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { $result = $this->PrestudentstatusModel->load([ @@ -898,7 +908,9 @@ class Status extends FHCAPI_Controller $oldstatus = current($oldstatus); - $erweiterteBerechtigung = $this->permissionlib->isBerechtigt('admin', null, 'suid') || $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); + $erweiterteBerechtigung = + $this->permissionlib->isBerechtigt('admin', null, 'suid') + || $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'); //check if last status @@ -965,7 +977,6 @@ class Status extends FHCAPI_Controller $student = $this->getDataOrTerminateWithError($result); if ($student) { - // TODO(chris): what if no student? $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); $result = $this->StudentlehrverbandModel->delete( array( @@ -977,54 +988,17 @@ class Status extends FHCAPI_Controller $this->getDataOrTerminateWithError($result); } } + //Delete Prestudent if no data is left if ($deletePrestudent) { - /* - //TODO(manu) check all connected tables, Handling of Deletion - //check if existing dokumentprestudent - $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); - $result = $this->DokumentprestudentModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) - { - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - - } - if (hasData($result)) - { - return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL); - } - - //check if Anrechnungen tbl_anrechnung - $output_anrechnungen = ''; - $this->load->model('education/Anrechnung_model', 'AnrechnungModel'); - $result = $this->AnrechnungModel->loadWhere( - array( - 'prestudent_id' => $prestudent_id - ) - ); - if (isError($result)) - { - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - if (hasData($result)) - { - return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL); - } - */ - //DELETE Prestudent $this->load->model('crm/Prestudent_model', 'PrestudentModel'); $result = $this->PrestudentModel->delete($prestudent_id); $this->getDataOrTerminateWithError($result); } - $this->db->trans_rollback(); // TODO(chris): DEBUG! - #$this->db->trans_commit(); + $this->db->trans_commit(); return $this->terminateWithSuccess(true); } @@ -1881,6 +1855,7 @@ class Status extends FHCAPI_Controller $student = current($student); + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); $result = $this->StudentlehrverbandModel->loadWhere([ 'student_uid' => $student->student_uid, @@ -1889,10 +1864,6 @@ class Status extends FHCAPI_Controller $studentlvb = $this->getDataOrTerminateWithError($result); - // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing? - // TODO(chris): check if that is correct (in FAS)? - if ($studentlvb) - return; // No Update necessary $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); @@ -1905,16 +1876,33 @@ class Status extends FHCAPI_Controller ]); $lv = $this->getDataOrTerminateWithError($result); - $this->StudentlehrverbandModel->insert([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $lv ? $ausbildungssemester : $student->semester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe, - 'insertamum' => date('c'), - 'insertvon' => $authUID - ]); + + if ($studentlvb && !$lv) + return; // No Update necessary + + if ($studentlvb) // Update current Student-Lehrverband entry + $this->StudentlehrverbandModel->update([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ], [ + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $ausbildungssemester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe, + 'updateamum' => date('c'), + 'updatevon' => $authUID + ]); + else // Add new Student-Lehrverband entry + $this->StudentlehrverbandModel->insert([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $lv ? $ausbildungssemester : $student->semester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe, + 'insertamum' => date('c'), + 'insertvon' => $authUID + ]); } private function _sanitizeAliasName($str) From 96b9571ee1bab541a4f2d7d6a149f99b715d0009 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 11:40:57 +0200 Subject: [PATCH 372/464] Delete Status: correct confirm --- .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 5148b95b3..5e183badc 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -289,9 +289,9 @@ export default{ ) .then(this.$fhcApi.get) .then(result => result.data - ? new Promise((resolve, reject) => { BsConfirm.popup('TEST').then(resolve).catch(() => reject({handled:true})) }) + ? new Promise((resolve, reject) => { BsConfirm.popup(this.$p.t('lehre', 'last_status_confirm_delete')).then(resolve).catch(() => reject({handled:true})) }) : true - ) // TODO(chris): correct confirm + ) .then(result => result ? 'api/frontend/v1/stv/status/deleteStatus/' + Object.values(statusId).join('/') : Promise.reject({handled: true}) From b423fff07488e0d5496609df550613f5f1eaa346 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 11:49:00 +0200 Subject: [PATCH 373/464] Status Delete: cleanup --- .../Details/Prestudent/MultiStatus.js | 128 +----------------- 1 file changed, 7 insertions(+), 121 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 5e183badc..6658e541e 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -84,7 +84,7 @@ export default{ } }, props: { - modelValue: Object, + modelValue: Object }, data() { return { @@ -241,22 +241,10 @@ export default{ statusData: {}, statusId: {}, dataMeldestichtag: null, - isLastStatus: {}, - //newArray: {}, - abbruchData: {}, - newStatus: '', - statusNew: true, - isErsterStudent: false, - isBewerber: true, - } + statusNew: true + }; }, watch: { - data: { - handler(n) { - const start = this.status_kurzbz; - }, - deep: true - }, modelValue() { if (this.$refs.table) { if (this.$refs.table.tableBuilt) @@ -302,7 +290,7 @@ export default{ .then(this.$reloadList) .catch(this.$fhcAlert.handleSystemError); }, - actionAdvanceStatus(status, stdsem, ausbildungssemester){ + actionAdvanceStatus(status, stdsem, ausbildungssemester) { this.statusId = { 'prestudent_id': this.modelValue.prestudent_id, 'status_kurzbz': status, @@ -328,7 +316,7 @@ export default{ .then(this.reload) .catch(this.$fhcAlert.handleSystemError); }, - advanceStatus(statusId){ + advanceStatus(statusId) { return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' + this.statusId.prestudent_id + '/' + this.statusId.status_kurzbz + '/' + @@ -344,98 +332,7 @@ export default{ this.reload(); }); }, - deleteStatus(status_id){ - return this.$fhcApi.post('api/frontend/v1/stv/status/deleteStatus/', - status_id) - .then( - result => { - this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')); - this.resetModal(); - }) - .catch(this.$fhcAlert.handleSystemError) - .finally(() => { - window.scrollTo(0, 0); - this.reload(); - this.$reloadList(); - }); - }, - checkIfLastStatus(){ - return this.$fhcApi - .get('api/frontend/v1/stv/status/isLastStatus/' + this.modelValue.prestudent_id) - .then( - result => { - if(result.data){ - this.isLastStatus = result.data; - } else { - this.isLastStatus = {}; - } - return result; - }) - .catch(this.$fhcAlert.handleSystemError); - }, - // checkIfErsterStudent(prestudent_id){ - // return this.$fhcApi - // .get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id) - // .then( - // result => { - // this.isErsterStudent = result.data.retval == 0 ? 1 : 0; - // return result; - // }) - // .catch(this.$fhcAlert.handleSystemError); - // }, - /*checkIfBewerber(prestudentIds){ - - if(!prestudentIds) - prestudentIds = [this.modelValue.prestudent_id]; - - const promises = prestudentIds.map(prestudentId => { - - return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId, - ).then(response => { - countSuccess++; - return response; - }) - //.catch(this.$fhcAlert.handleSystemError) - .catch(error => { - countError++; - //For each Prestudent show Error in Alert - this.$fhcAlert.handleSystemError(error); - }); - }); - - Promise - .allSettled(promises) - .then(values => { - - //Feedback Success als infoalert - if (countSuccess > 0) { - this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', { - 'countSuccess': countSuccess, - 'status': this.newStatus, - 'countError': countError - })); - } - - if (this.modelValue.prestudent_id) { - this.reload(); - //TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe - } - else { - this.$reloadList(); - } - - /!*return this.$fhcApi - .get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id) - .then( - result => { - this.isBewerber = result.data; - console.log(result); - return result; - }) - .catch(this.$fhcAlert.handleSystemError);*!/ - //} - },*/ - loadStatus(status_id){ + loadStatus(status_id) { this.statusNew = false; return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/', status_id) @@ -448,20 +345,9 @@ export default{ reload() { if (this.$refs.table) this.$refs.table.reloadTable(); - }, - hideModal(modalRef){ - this.$refs[modalRef].hide(); - this.statusNew = true; - }, - resetModal() { - this.statusData = {}; - this.statusId = {}; - this.actionButton = {}; - this.actionStatusText = {}; - this.actionSem = null; } }, - created(){ + created() { this.$fhcApi .get('api/frontend/v1/stv/status/getLastBismeldestichtag/') .then(result => { From 8492a0aa13b2a0c9155804d8a9530de02819798c Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 16:37:39 +0200 Subject: [PATCH 374/464] Advance Status --- .../api/frontend/v1/stv/Status.php | 279 ++++++++---------- .../Details/Prestudent/MultiStatus.js | 107 +++---- 2 files changed, 165 insertions(+), 221 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index f5e77b258..6bfd2b020 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -23,14 +23,14 @@ class Status extends FHCAPI_Controller 'loadStatus' => ['admin:r', 'assistenz:r'], 'insertStatus' => ['admin:rw', 'assistenz:rw'], 'updateStatus' => ['admin:rw', 'assistenz:rw'], - 'advanceStatus' => ['admin:r', 'assistenz:r'], + 'advanceStatus' => ['admin:rw', 'assistenz:rw'], 'confirmStatus' => ['admin:rw', 'assistenz:rw'], ]); //Load Models - $this->load->model('crm/Prestudentstatus_model','PrestudentstatusModel'); - $this->load->model('person/Person_model','PersonModel'); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + $this->load->model('person/Person_model', 'PersonModel'); // Load Libraries $this->load->library('VariableLib', ['uid' => getAuthUID()]); @@ -41,6 +41,7 @@ class Status extends FHCAPI_Controller || $this->router->method == 'updateStatus' || $this->router->method == 'confirmStatus' || $this->router->method == 'deleteStatus' + || $this->router->method == 'advanceStatus' ) { $prestudent_id = current(array_slice($this->uri->rsegments, 2)); $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']); @@ -1078,7 +1079,7 @@ class Status extends FHCAPI_Controller [ 'required', ['status_stud_exists', function ($value) use ($prestudent_id) { - if ($value != 'Student') + if ($value != Prestudentstatus_model::STATUS_STUDENT) return true; // Only test if new status is Student $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); @@ -1568,189 +1569,163 @@ class Status extends FHCAPI_Controller return $this->outputJsonSuccess(true); } - public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) + public function advanceStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) { - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $key_prestudent_id, + $result = $this->PrestudentstatusModel->load([ + $key_ausbildungssemester, + $key_studiensemester_kurzbz, + $status_kurzbz, + $prestudent_id ]); - if(isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - $result = current(getData($result)); + $oldstatus = $this->getDataOrTerminateWithError($result); + if (!$oldstatus) + show_404(); // Status that should be updated does not exist - $stg = $result->studiengang_kz; + $oldstatus = current($oldstatus); - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); - } - - //Data Vorrücken - $result = $this->PrestudentstatusModel->loadWhere( - array( - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'ausbildungssemester' => $key_ausbildungssemester, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz - ) - ); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - - elseif (!hasData($result)) - { - return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL); - } - else - { - $statusData = current(getData($result)); - } + //Target studiensemester_kurzbz $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); $result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz); - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $studiensem_next = current(getData($result)); - $studiensem_next = $studiensem_next->studiensemester_kurzbz; + $studiensemester_kurzbz = $this->getDataOrTerminateWithError($result); + $studiensemester_kurzbz = current($studiensemester_kurzbz)->studiensemester_kurzbz; + + + //Target ausbildungssemester + $ausbildungssemester = $key_ausbildungssemester + 1; - $ausbildungssem_next = $key_ausbildungssemester+1; //Form Validation $this->load->library('form_validation'); + + $this->form_validation->set_data([ + 'status_kurzbz' => $status_kurzbz + ]); - $last_status_kurzbz = $lastStatusData->status_kurzbz; // TODO(chris): copy pasta! - - $this->form_validation->set_rules('_global', '', [ - //check if Rolle already exists - ['checkIfExistingPrestudentRolle', function () use ( - $key_prestudent_id, - $key_status_kurzbz, - $studiensem_next, - $ausbildungssem_next - ) { - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( - $key_prestudent_id, - $key_status_kurzbz, - $studiensem_next, - $ausbildungssem_next - ); - return $this->getDataOrTerminateWithError($result); - }], - ['status_stud_exists', function () use ($key_prestudent_id, $key_status_kurzbz, $last_status_kurzbz) { - if ($key_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT - && $key_status_kurzbz != Prestudentstatus_model::STATUS_DIPLOMAND - && $last_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT - ) + $this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_rolle'), [ + 'in_list[' . + Prestudentstatus_model::STATUS_STUDENT . ',' . + Prestudentstatus_model::STATUS_DIPLOMAND . ',' . + Prestudentstatus_model::STATUS_UNTERBRECHER . ']', + ['status_stud_exists', function ($value) use ($prestudent_id) { + if ($value != Prestudentstatus_model::STATUS_STUDENT) return true; - $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id); + $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); return $this->getDataOrTerminateWithError($result); }] ], [ - 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') ]); + $this->form_validation->set_rules('_default', '', [ + //check if Rolle already exists + ['rolle_doesnt_exist', function () use ( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]); + + return !$this->getDataOrTerminateWithError($result); + }] + ], [ + 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') + ]); + if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); - //check if studentrolle already exists - // if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) - // { - // $this->load->model('crm/Student_model', 'StudentModel'); - // $result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id); - // if (isError($result)) - // { - // return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - // } - // if ($result->retval == "0") - // { - // return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL); - // } - // } // Start DB transaction $this->db->trans_begin(); + $authUID = getAuthUID(); + $now = date('c'); + //insert prestudentstatus - $uid = getAuthUID(); - $result = $this->PrestudentstatusModel->insert( - [ - 'prestudent_id' => $key_prestudent_id, - 'status_kurzbz' => $key_status_kurzbz, - 'studiensemester_kurzbz' => $studiensem_next, - 'ausbildungssemester' => $ausbildungssem_next, - 'insertamum' => date('c'), - 'insertvon' => $uid, - 'bestaetigtam' => date('c'), - 'bestaetigtvon' => $uid, - 'studienplan_id' => $statusData->studienplan_id, - 'datum' => date('c'), - 'anmerkung' => $statusData->anmerkung - ] - ); + $result = $this->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => $status_kurzbz, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => $now, + 'insertamum' => $now, + 'insertvon' => $authUID, + 'orgform_kurzbz' => $oldstatus->orgform_kurzbz, + 'studienplan_id' => $oldstatus->studienplan_id, + 'bestaetigtam' => $now, + 'bestaetigtvon' => $authUID, + 'anmerkung' => $oldstatus->anmerkung + ]); - if (isError($result)) - { - $this->db->trans_rollback(); - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } + $this->getDataOrTerminateWithError($result); + + //get student_uid $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfUid($key_prestudent_id); - if(isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - if (!hasData($result)) - { - $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL); - } - $student_uid = $result->retval; + $result = $this->StudentModel->loadWhere([ + 'prestudent_id' => $prestudent_id + ]); + $student = $this->getDataOrTerminateWithError($result); + + if (!$student) + $this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); + + //process studentlehrverband $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->loadWhere( - array( - 'student_uid' => $student_uid, - 'studiensemester_kurzbz' => $key_studiensemester_kurzbz - ) - ); - if (isError($result)) - { - $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } + $result = $this->StudentlehrverbandModel->load([ + $key_studiensemester_kurzbz, + $student->student_uid + ]); + + $studentlvb = $this->getDataOrTerminateWithError($result); + if (!$studentlvb) + $this->terminateWithError($this->p->t('lehre', 'error_noStudentlehrverband')); //Data of current Semester - $result = getData($result) ? : []; - $studentlvbData = current($result); + $studentlvb = current($studentlvb); - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->StudentlehrverbandModel->processStudentlehrverband( - $student_uid, - $studentlvbData->studiengang_kz, - $ausbildungssem_next, - $studentlvbData->verband, - $studentlvbData->gruppe, - $studiensem_next - ); - if ($this->db->trans_status() === false || isError($result)) - { - $this->db->trans_rollback(); - return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL); - } + $newStudentlvb = [ + 'student_uid' => $studentlvb->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiengang_kz' => $studentlvb->studiengang_kz, + 'semester' => $studentlvb->semester, + 'verband' => $studentlvb->verband, + 'gruppe' => $studentlvb->gruppe, + 'insertamum' => $now, + 'insertvon' => $authUID, + 'ext_id' => $studentlvb->ext_id + + ]; + + + $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); + + $result = $this->LehrverbandModel->load([ + $student->gruppe, + $student->verband, + $ausbildungssemester, + $student->studiengang_kz + ]); + + $lv = $this->getDataOrTerminateWithError($result); + if ($lv) { + $newStudentlvb['semester'] = $ausbildungssemester; + } // If there is no lehrverband just use the same as in the previous studiensemester + + + //add studentlehrverband + $result = $this->StudentlehrverbandModel->insert($newStudentlvb); + + $this->getDataOrTerminateWithError($result); + $this->db->trans_commit(); return $this->outputJsonSuccess(true); @@ -1868,11 +1843,11 @@ class Status extends FHCAPI_Controller $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); $this->LehrverbandModel->addLimit(1); - $result = $this->LehrverbandModel->loadWhere([ - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $ausbildungssemester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe + $result = $this->LehrverbandModel->load([ + $student->gruppe, + $student->verband, + $ausbildungssemester, + $student->studiengang_kz ]); $lv = $this->getDataOrTerminateWithError($result); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 6658e541e..146450341 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -116,59 +116,53 @@ export default{ minWidth: 150, // Ensures Action-buttons will be always fully displayed formatter: (cell, formatterParams, onRendered) => { - let container = document.createElement('div'); + const container = document.createElement('div'); container.className = "d-flex gap-2"; + const data = cell.getData(); + let button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) - button.className = 'btn btn-outline-secondary btn-action'; - else - button.className = 'btn btn-outline-secondary btn-action'; + button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; button.title = 'Status vorrücken'; - button.addEventListener( - 'click', - () => - this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) - ); - container.append(button); - - button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) - button.className = 'btn btn-outline-secondary btn-action'; - else - button.className = 'btn btn-outline-secondary btn-action'; - button.innerHTML = ''; - button.title = 'Status bestätigen'; button.addEventListener('click', () => - this.actionConfirmStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); - if (cell.getData().bestaetigtam || !cell.getData().bewerbung_abgeschicktamum) + if (!['Student', 'Diplomand', 'Unterbrecher'].includes(data.status_kurzbz)) button.disabled = true; container.append(button); button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) - button.className = 'btn btn-outline-secondary btn-action'; - else - button.className = 'btn btn-outline-secondary btn-action'; - button.innerHTML = ''; - button.title = 'Status bearbeiten'; - button.addEventListener('click', (event) => - this.actionEditStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.title = 'Status bestätigen'; + button.addEventListener('click', () => + this.actionConfirmStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); + if (data.bestaetigtam || !data.bewerbung_abgeschicktamum) + button.disabled = true; container.append(button); button = document.createElement('button'); - if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck) - button.className = 'btn btn-outline-secondary btn-action'; - else - button.className = 'btn btn-outline-secondary btn-action'; + button.className = 'btn btn-outline-secondary btn-action'; + button.innerHTML = ''; + button.title = 'Status bearbeiten'; + button.addEventListener('click', () => + this.actionEditStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) + ); + if (this.dataMeldestichtag && this.dataMeldestichtag > data.datum && !this.hasPermissionToSkipStatusCheck) + button.disabled = true; + container.append(button); + + button = document.createElement('button'); + button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; button.title = 'Status löschen'; button.addEventListener('click', () => - this.actionDeleteStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester) + this.actionDeleteStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); + if (this.dataMeldestichtag && this.dataMeldestichtag > data.datum && !this.hasPermissionToSkipStatusCheck) + button.disabled = true; container.append(button); return container; @@ -291,16 +285,17 @@ export default{ .catch(this.$fhcAlert.handleSystemError); }, actionAdvanceStatus(status, stdsem, ausbildungssemester) { - this.statusId = { - 'prestudent_id': this.modelValue.prestudent_id, - 'status_kurzbz': status, - 'studiensemester_kurzbz': stdsem, - 'ausbildungssemester': ausbildungssemester + const statusId = { + prestudent_id: this.modelValue.prestudent_id, + status_kurzbz: status, + studiensemester_kurzbz: stdsem, + ausbildungssemester: ausbildungssemester }; - this.loadStatus(this.statusId).then(() => { - if(this.statusData) - this.advanceStatus(this.statusId); - }); + this.$fhcApi + .post('api/frontend/v1/stv/status/advanceStatus/' + Object.values(statusId).join('/')) + .then(() => this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successAdvance'))) + .then(this.reload) + .catch(this.$fhcAlert.handleSystemError); }, actionConfirmStatus(status, stdsem, ausbildungssemester) { BsConfirm @@ -316,32 +311,6 @@ export default{ .then(this.reload) .catch(this.$fhcAlert.handleSystemError); }, - advanceStatus(statusId) { - return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' + - this.statusId.prestudent_id + '/' + - this.statusId.status_kurzbz + '/' + - this.statusId.studiensemester_kurzbz + '/' + - this.statusId.ausbildungssemester) - .then( - result => { - this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successAdvance')); - }) - .catch(this.$fhcAlert.handleSystemError) - .finally(() => { - window.scrollTo(0, 0); - this.reload(); - }); - }, - loadStatus(status_id) { - this.statusNew = false; - return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/', - status_id) - .then(result => { - this.statusData = result.data; - return result; - }) - .catch(this.$fhcAlert.handleSystemError); - }, reload() { if (this.$refs.table) this.$refs.table.reloadTable(); From 10444e31cec38280ea49c64059e1ae9aab38e0c0 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 30 Jul 2024 16:39:59 +0200 Subject: [PATCH 375/464] Add Comment --- .../controllers/api/frontend/v1/stv/Status.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 6bfd2b020..e4f28f236 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -1569,6 +1569,17 @@ class Status extends FHCAPI_Controller return $this->outputJsonSuccess(true); } + /** + * Advances a status entry + * must be of type Student, Diplomand or Unterbrecher + * + * @param integer $prestudent_id + * @param string $status_kurzbz + * @param string $key_studiensemester_kurzbz + * @param integer $key_ausbildungssemester + * + * @return void + */ public function advanceStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester) { $result = $this->PrestudentstatusModel->load([ From 3d27c68deea22515c3d4dd9f0ec64ae9234264c1 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 31 Jul 2024 09:06:42 +0200 Subject: [PATCH 376/464] adapt functions toolbarInteressent, Phrases --- .../api/frontend/v1/stv/Status.php | 266 ++++++++++-------- application/libraries/PrestudentLib.php | 46 ++- .../libraries/PrestudentstatusCheckLib.php | 4 +- .../models/crm/Prestudentstatus_model.php | 12 +- .../Details/Status/Dropdown.js | 90 +----- system/phrasesupdate.php | 20 ++ 6 files changed, 229 insertions(+), 209 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index e4f28f236..647de1e98 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -69,7 +69,7 @@ class Status extends FHCAPI_Controller $result = $this->StatusgrundModel->getAktiveGruende(); $data = $this->getDataOrTerminateWithError($result); - + $this->terminateWithSuccess($data); } @@ -168,58 +168,6 @@ class Status extends FHCAPI_Controller $stg = $result->studiengang_kz; $isStudent = false; - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = $this->p->t('lehre','error_keineSchreibrechte'); - - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - $uid = getAuthUID(); - $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester'); - $datum = $this->input->post('datum'); - $bestaetigtam = $this->input->post('bestaetigtam'); - $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); - $studienplan_id = $this->input->post('studienplan_id'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $anmerkung = $this->input->post('anmerkung'); - $statusgrund_id = $this->input->post('statusgrund_id'); - $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $uid; - - //Form Validation - $this->load->library('form_validation'); - - $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [ - 'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester']) - ]); - - $this->form_validation->set_rules('_global', '', [ - //check if Rolle already exists - ['checkIfExistingPrestudentRolle', function () use ( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ); - return $this->getDataOrTerminateWithError($result); - }] - ], [ - 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') - ]); - - if (!$this->form_validation->run()) - $this->terminateWithValidationErrors($this->form_validation->error_array()); - //GET lastStatus $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); @@ -234,19 +182,101 @@ class Status extends FHCAPI_Controller else $lastStatusData = current(getData($result)); + + if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) + { + $result = $this->p->t('lehre','error_keineSchreibrechte'); + + return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); + } + + $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); + + $uid = getAuthUID(); + $status_kurzbz = $this->input->post('status_kurzbz'); + $ausbildungssemester = $this->input->post('ausbildungssemester') ? $this->input->post('ausbildungssemester') : $lastStatusData->ausbildungssemester; + $datum = $this->input->post('datum'); + $bestaetigtam = $this->input->post('bestaetigtam'); + $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); + $studienplan_id = $this->input->post('studienplan_id'); + $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); + $anmerkung = $this->input->post('anmerkung'); + $statusgrund_id = $this->input->post('statusgrund_id'); + $rt_stufe = $this->input->post('rt_stufe'); + $bestaetigtvon = $uid; + $name = $this->input->post('name'); + //Different handling depending on newStatus if($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND) { $ausbildungssemester = $lastStatusData->ausbildungssemester; } + + if($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER){ + //check studiensemester_kurzbz: + $studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz != $studiensemester_kurzbz ? + $lastStatusData->studiensemester_kurzbz : $studiensemester_kurzbz; + } + //Check if Bewerberstatus exists if( $status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER || $status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER ) { - $studiensemester_kurzbz = $this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER); + $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + $studiensemester_kurzbz = $this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER); + } + + //Form Validation + $this->load->library('form_validation'); + + $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [ + 'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester']) + ]); + + //TODO(Manu) how to work with name: with $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])); + /* $this->form_validation->set_rules('_global', '', [ + //check if Rolle already exists + ['checkIfExistingPrestudentRolle', function () use ( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') + ]);*/ + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + + + //check if prestudent_rolle exists + $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + // return $this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL); + + if($result->retval == '1') + { + return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $name]), self::ERROR_TYPE_GENERAL); } //Check Reihungstest @@ -302,16 +332,14 @@ class Status extends FHCAPI_Controller } } - //check if bewerberstatus exists + //check if bewerberstatus exists TODO(Manu) necessary? if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER) { - - $result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); + $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); if (isError($result)) { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } - } //check if studentrolle already exists @@ -350,8 +378,6 @@ class Status extends FHCAPI_Controller //check if Bismeldestichtag erreicht ADDNEW status $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz); - //just testing - //return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL); if (isError($result)) { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); @@ -371,7 +397,7 @@ class Status extends FHCAPI_Controller } $result = current(getData($result)); $statusgrund_kurzbz = $result->statusgrund_kurzbz; - + $this->load->library('PrestudentLib'); $result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon); if (isError($result)) @@ -469,7 +495,21 @@ class Status extends FHCAPI_Controller case Prestudentstatus_model::STATUS_ABGEWIESENER: { $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); + $result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id); + + if (isError($result)) + { + return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + } + else + $this->terminateWithSuccess($prestudent_id); + + } + break; + case Prestudentstatus_model::STATUS_WARTENDER: + { + $this->load->library('PrestudentLib'); + $result = $this->prestudentlib->setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); if (isError($result)) { @@ -686,10 +726,10 @@ class Status extends FHCAPI_Controller $result = $this->PrestudentstatusModel->loadWhere([ "prestudent_id" => $prestudent_id, "status_kurzbz" => Prestudentstatus_model::STATUS_AUFGENOMMENER - ]); - //$this->PrestudentstatusModel->addOrder('ausbildungssemester', 'DESC'); - $this->PrestudentstatusModel->addLimit(1); - if (isError($result)) + ]); + //$this->PrestudentstatusModel->addOrder('ausbildungssemester', 'DESC'); + $this->PrestudentstatusModel->addLimit(1); + if (isError($result)) { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); } @@ -1061,9 +1101,9 @@ class Status extends FHCAPI_Controller return true; // Skip if access right says so if (!$value) return true; // Error will be handled by the required statement above - + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); - + return !$this->getDataOrTerminateWithError($result); }] ], @@ -1081,7 +1121,7 @@ class Status extends FHCAPI_Controller ['status_stud_exists', function ($value) use ($prestudent_id) { if ($value != Prestudentstatus_model::STATUS_STUDENT) return true; // Only test if new status is Student - + $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); return $this->getDataOrTerminateWithError($result); @@ -1091,9 +1131,9 @@ class Status extends FHCAPI_Controller 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') ] ); - + $this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required'); - + $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required'); $this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date'); @@ -1244,7 +1284,7 @@ class Status extends FHCAPI_Controller 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'), 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent') ]); - + if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); @@ -1304,10 +1344,10 @@ class Status extends FHCAPI_Controller $oldstatus = current($oldstatus); - + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); $isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus'); - + $authUID = getAuthUID(); $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz') ?: $oldstatus->studiensemester_kurzbz; @@ -1338,9 +1378,9 @@ class Status extends FHCAPI_Controller return true; // Skip if access right says so if (!$value) return true; // Error will be handled by the required statement above - + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); - + return !$this->getDataOrTerminateWithError($result); }] ], @@ -1540,21 +1580,21 @@ class Status extends FHCAPI_Controller 'updatevon' => $authUID ]; foreach ([ - 'orgform_kurzbz', - 'anmerkung', - 'bewerbung_abgeschicktamum', - 'studienplan_id', - 'rt_stufe', - 'statusgrund_id' - ] as $key) + 'orgform_kurzbz', + 'anmerkung', + 'bewerbung_abgeschicktamum', + 'studienplan_id', + 'rt_stufe', + 'statusgrund_id' + ] as $key) if ($this->input->post($key)) $updateData[$key] = $this->input->post($key); - + if ($this->input->post('bestaetigtam')) { $updateData['bestaetigtam'] = $this->input->post('bestaetigtam'); $updateData['bestaetigtvon'] = $authUID; } - + $result = $this->PrestudentstatusModel->update([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => $status_kurzbz, @@ -1609,7 +1649,7 @@ class Status extends FHCAPI_Controller //Form Validation $this->load->library('form_validation'); - + $this->form_validation->set_data([ 'status_kurzbz' => $status_kurzbz ]); @@ -1622,7 +1662,7 @@ class Status extends FHCAPI_Controller ['status_stud_exists', function ($value) use ($prestudent_id) { if ($value != Prestudentstatus_model::STATUS_STUDENT) return true; - + $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); return $this->getDataOrTerminateWithError($result); @@ -1630,7 +1670,7 @@ class Status extends FHCAPI_Controller ], [ 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') ]); - + $this->form_validation->set_rules('_default', '', [ //check if Rolle already exists ['rolle_doesnt_exist', function () use ( @@ -1646,7 +1686,7 @@ class Status extends FHCAPI_Controller ], [ 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') ]); - + if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); @@ -1687,7 +1727,7 @@ class Status extends FHCAPI_Controller if (!$student) $this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); - + //process studentlehrverband $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); $result = $this->StudentlehrverbandModel->load([ @@ -1736,7 +1776,7 @@ class Status extends FHCAPI_Controller $result = $this->StudentlehrverbandModel->insert($newStudentlvb); $this->getDataOrTerminateWithError($result); - + $this->db->trans_commit(); return $this->outputJsonSuccess(true); @@ -1840,7 +1880,6 @@ class Status extends FHCAPI_Controller return; // No Update necessary $student = current($student); - $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); $result = $this->StudentlehrverbandModel->loadWhere([ @@ -1850,9 +1889,13 @@ class Status extends FHCAPI_Controller $studentlvb = $this->getDataOrTerminateWithError($result); + // NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing? + // TODO(chris): check if that is correct (in FAS)? + if ($studentlvb) + return; // No Update necessary $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); - + $this->LehrverbandModel->addLimit(1); $result = $this->LehrverbandModel->load([ $student->gruppe, @@ -1862,33 +1905,16 @@ class Status extends FHCAPI_Controller ]); $lv = $this->getDataOrTerminateWithError($result); - - if ($studentlvb && !$lv) - return; // No Update necessary - - if ($studentlvb) // Update current Student-Lehrverband entry - $this->StudentlehrverbandModel->update([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ], [ - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $ausbildungssemester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe, - 'updateamum' => date('c'), - 'updatevon' => $authUID - ]); - else // Add new Student-Lehrverband entry - $this->StudentlehrverbandModel->insert([ - 'student_uid' => $student->student_uid, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'studiengang_kz' => $student->studiengang_kz, - 'semester' => $lv ? $ausbildungssemester : $student->semester, - 'verband' => $student->verband, - 'gruppe' => $student->gruppe, - 'insertamum' => date('c'), - 'insertvon' => $authUID - ]); + $this->StudentlehrverbandModel->insert([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiengang_kz' => $student->studiengang_kz, + 'semester' => $lv ? $ausbildungssemester : $student->semester, + 'verband' => $student->verband, + 'gruppe' => $student->gruppe, + 'insertamum' => date('c'), + 'insertvon' => $authUID + ]); } private function _sanitizeAliasName($str) diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index 09da501d3..ab274805f 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -423,8 +423,7 @@ class PrestudentLib public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon) { - $insertvon = getAuthUID(); - + $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); if (isError($result)) return $result; @@ -474,7 +473,7 @@ class PrestudentLib 'statusgrund_id' => $statusgrund_id, 'ausbildungssemester' => $ausbildungssemester, 'datum' => date('c'), - 'insertvon' => $insertvon, + 'insertvon' => getAuthUID(), 'insertamum' => date('c'), 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, 'studienplan_id'=> $prestudent_status->studienplan_id, @@ -757,9 +756,9 @@ class PrestudentLib $prestudent_status = current($resultLastStatus); - //check studiensemester_kurzbz: - $studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ? - $prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz; + //check studiensemester_kurzbz TODO(Manu) check if Necessary: already checked in staus.php changeStatus() +/* $studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ? + $prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;*/ //Status updaten $result = $this->_ci->PrestudentstatusModel->insert([ @@ -817,7 +816,7 @@ class PrestudentLib return success(); } - public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){ + public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id){ $resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); if (isError($resultLastStatus)) @@ -838,6 +837,39 @@ class PrestudentLib 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, 'studienplan_id'=> $prestudent_status->studienplan_id, 'bestaetigtvon' => getAuthUID(), + 'bestaetigtam' => date('c'), + 'statusgrund_id' => $statusgrund_id + ]); + + if (isError($result)) + { + return $result; + } + else + return success(); + } + + public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){ + + $resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); + if (isError($resultLastStatus)) + return $resultLastStatus; + $resultLastStatus = getData($resultLastStatus); + + $prestudent_status = current($resultLastStatus); + + //Status updaten + $result = $this->_ci->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => Prestudentstatus_model::STATUS_WARTENDER, + 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'ausbildungssemester' => $ausbildungssemester, + 'datum' => date('c'), + 'insertvon' => getAuthUID(), + 'insertamum' => date('c'), + 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, + 'studienplan_id'=> $prestudent_status->studienplan_id, + 'bestaetigtvon' => getAuthUID(), 'bestaetigtam' => date('c') ]); diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index 20b42b46a..55488cf4c 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -111,13 +111,13 @@ class PrestudentstatusCheckLib public function checkIfExistingPrestudentRolle( $prestudent_id, $status_kurzbz, - $tudiensemester_kurzbz, + $studiensemester_kurzbz, $ausbildungssemester ) { $result = $this->_ci->PrestudentstatusModel->checkIfExistingPrestudentRolle( $prestudent_id, $status_kurzbz, - $tudiensemester_kurzbz, + $studiensemester_kurzbz, $ausbildungssemester ); if (isError($result)) diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index 8ba52ba2d..96380a6c0 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -369,6 +369,16 @@ class Prestudentstatus_model extends DB_Model */ public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { + $studentName = ''; + + $nameRes = $this->PersonModel->loadPrestudent($prestudent_id); + + if (hasData($nameRes)) + { + $nameData = getData($nameRes)[0]; + $studentName = $nameData->vorname.' '.$nameData->nachname; + } + $qry = "SELECT * FROM @@ -394,7 +404,7 @@ class Prestudentstatus_model extends DB_Model } else { - return success("1", $this->p->t('lehre','error_rolleBereitsVorhanden')); + return success("1", $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])); } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js index 5f10b2454..78df8ad2d 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js @@ -172,35 +172,28 @@ export default { this.$refs.confirmStatusAction.show(); }, addStudent(prestudentIds){ - console.log("function addStudent "); - //this.hideModal('confirmStatusAction'); + this.resetChangeModals(); let changeData = {}; //for Feedback Sucess, Error let countSuccess = 0; let countError = 0; - //if(!prestudentIds) - // prestudentIds = [this.modelValue.prestudent_id]; - const promises = prestudentIds.map(prestudentId => { changeData = this.newArray.find(item => item.prestudent_id === prestudentId); - //changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId); - return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId, changeData ).then(response => { countSuccess++; return response; }) - //.catch(this.$fhcAlert.handleSystemError) - .catch(error => { - countError++; - //For each Prestudent show Error in Alert - this.$fhcAlert.handleSystemError(error); - }); + .catch(error => { + countError++; + //For each Prestudent show Error in Alert + this.$fhcAlert.handleSystemError(error); + }); }); Promise @@ -257,7 +250,6 @@ export default { this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher'); }, changeStatusToStudent(statusgrund_id){ - this.resetChangeModals(); let def_date = this.getDefaultDate(); //TODO Manu validation if Bewerber already before asking for ausbildungssemester //this.checkIfBewerber(); @@ -348,13 +340,11 @@ export default { ...deltaData, })); - this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen'); + this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommener'); }, changeInteressentToStudent(statusgrund_id){ this.resetChangeModals(); - //TODO(Manu) test statusgrund_id - console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id); let def_date = this.getDefaultDate(); let deltaData = { @@ -388,7 +378,7 @@ export default { ...deltaData, })); - this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen'); + this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesener'); }, changeStatusToWartender(){ this.resetChangeModals(); @@ -404,12 +394,10 @@ export default { ...deltaData, })); - this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden'); + this.actionConfirmDialogue(this.updateData, 'wartender','Wartender'); }, changeStatus(prestudentIds){ - console.log("function changeStatus "); this.resetChangeModals(); - //Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds]; let changeData = {}; //for Feedback Sucess, Error @@ -426,8 +414,6 @@ export default { this.newArray.push({ ausbildungssemester: this.actionSem }); } - console.log("ausbildungssem: " + this.actionSem); - const promises = prestudentIds.map(prestudentId => { changeData = this.newArray.find(item => item.prestudent_id === prestudentId); @@ -461,7 +447,7 @@ export default { // } //Feedback Success als infoalert - if (countSuccess > 0) { + if (countSuccess > 0 || countError > 0 ) { this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', { 'countSuccess': countSuccess, 'status': this.newStatus, @@ -469,9 +455,7 @@ export default { })); } - //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working - - if(this.prestudentIds.length == 1){ + if(this.prestudentIds.length == 1 && countSuccess > 0){ this.reload(); //necessary to see new status in List @@ -496,58 +480,6 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - /*checkIfBewerber(prestudentIds){ - - if(!prestudentIds) - prestudentIds = [this.modelValue.prestudent_id]; - - const promises = prestudentIds.map(prestudentId => { - - return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId, - ).then(response => { - countSuccess++; - return response; - }) - //.catch(this.$fhcAlert.handleSystemError) - .catch(error => { - countError++; - //For each Prestudent show Error in Alert - this.$fhcAlert.handleSystemError(error); - }); - }); - - Promise - .allSettled(promises) - .then(values => { - - //Feedback Success als infoalert - if (countSuccess > 0) { - this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', { - 'countSuccess': countSuccess, - 'status': this.newStatus, - 'countError': countError - })); - } - - if (this.modelValue.prestudent_id) { - this.reload(); - //TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe - } - else { - this.$reloadList(); - } - - /!*return this.$fhcApi - .get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id) - .then( - result => { - this.isBewerber = result.data; - console.log(result); - return result; - }) - .catch(this.$fhcAlert.handleSystemError);*!/ - //} - },*/ getDefaultDate() { const today = new Date(); return today; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index b0259bfb3..6052de48e 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -27997,6 +27997,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_rolleBereitsVorhandenMitNamen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '{name}: Diese Rolle ist bereits vorhanden!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '{name}: This role already exists!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'lehre', From 009360a12741377eeb6235030b2979628b46d066 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 31 Jul 2024 09:45:20 +0200 Subject: [PATCH 377/464] Confirm Status Message --- .../api/frontend/v1/stv/Status.php | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 647de1e98..3c59eed06 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -1844,6 +1844,48 @@ class Status extends FHCAPI_Controller $this->getDataOrTerminateWithError($result); + + //Send Message + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $this->PrestudentModel->addSelect('p.*'); + $this->PrestudentModel->addSelect('stg.oe_kurzbz'); + $this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung'); + $this->PrestudentModel->addSelect('stg.email AS stg_email'); + $this->PrestudentModel->addSelect('plan.orgform_kurzbz'); + $this->PrestudentModel->addSelect('typ.bezeichnung AS typ_bezeichnung'); + + $this->PrestudentModel->addJoin('public.tbl_person p', 'person_id'); + $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz'); + $this->PrestudentModel->addJoin('public.tbl_studiengangstyp typ', 'typ'); + $this->PrestudentModel->addJoin('public.tbl_studienplan plan', 'studienplan_id', 'LEFT'); + + $result = $this->PrestudentModel->load($prestudent_id); + + $studentdata = $this->getDataOrTerminateWithError($result); + + $this->load->library('MessageLib'); + $result = $this->messagelib->sendMessageUserTemplate( + $studentdata->person_id, // receiversPersonId + 'MailStatConfirm' . $status_kurzbz, // vorlage + [ + 'anrede' => $studentdata->anrede, + 'vorname' => $studentdata->vorname, + 'nachname' => $studentdata->nachname, + 'typ' => $studentdata->typ_bezeichnung, + 'studiengang' => $studentdata->stg_bezeichnung, + 'orgform' => $studentdata->orgform_kurzbz ?: $oldstatus->orgform_kurzbz, + 'stgMail' => $studentdata->stg_email + ], // parseData + null, // orgform + 1, // TODO + $studentdata->oe_kurzbz, // senderOU + null, // relationmessage_id + MSG_PRIORITY_NORMAL, // priority + true // multiPartMime + ); + + $this->terminateWithSuccess(true); } From e548e17776de33a62a06204077372e00c1a4e64c Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 31 Jul 2024 15:09:09 +0200 Subject: [PATCH 378/464] Status insert/edit: Orgform in Mischform Stg --- .../api/frontend/v1/stv/Prestudent.php | 27 ++++++++++++++++--- .../Details/Status/Modal.js | 22 ++++++++++++++- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index c423a61b8..d75ad5fbc 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -19,7 +19,8 @@ class Prestudent extends FHCAPI_Controller 'getAufmerksamdurch' => self::PERM_LOGGED, 'getBerufstaetigkeit' => self::PERM_LOGGED, 'getTypenStg' => self::PERM_LOGGED, - 'getStudienplaene' => self::PERM_LOGGED + 'getStudienplaene' => self::PERM_LOGGED, + 'getStudiengang' => self::PERM_LOGGED ]); // Load Libraries @@ -266,8 +267,6 @@ class Prestudent extends FHCAPI_Controller public function getStudienplaene($prestudent_id) { - if (!is_int((int)$prestudent_id) || (int)$prestudent_id . '' != $prestudent_id) - show_404(); $this->load->model('organisation/Studienplan_model', 'StudienplanModel'); $result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_id); @@ -275,4 +274,26 @@ class Prestudent extends FHCAPI_Controller return $this->terminateWithSuccess($data); } + + /** + * Gets details for the Studiengang of the Prestudent + * + * @param integer $prestudent_id + * + * @return stdClass + */ + public function getStudiengang($prestudent_id) + { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + $this->PrestudentModel->addSelect('stg.*'); + + $this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz'); + + $result = $this->PrestudentModel->load($prestudent_id); + + $stg = $this->getDataOrTerminateWithError($result); + + $this->terminateWithSuccess(current($stg)); + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js index d97d15225..5a77c7348 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js @@ -44,6 +44,7 @@ export default{ prestudent: {}, originalDatum: null, statusNew: true, + mischform: false, statusId: {}, formData: {}, studienplaene: [], @@ -171,7 +172,9 @@ export default{ return this.$fhcApi .get('api/frontend/v1/stv/prestudent/getStudienplaene/' + prestudent.prestudent_id) - .then(result => this.studienplaene = result.data); + .then(result => this.studienplaene = result.data) + .then(() => this.$fhcApi.get('api/frontend/v1/stv/prestudent/getStudiengang/' + prestudent.prestudent_id)) + .then(result => this.mischform = result.data.mischform); } }, created() { @@ -263,6 +266,23 @@ export default{ {{ number }} + + + Date: Thu, 1 Aug 2024 08:43:59 +0200 Subject: [PATCH 379/464] validation checks changeStatus --- .../api/frontend/v1/stv/Status.php | 522 ++++++++++-------- application/libraries/PrestudentLib.php | 6 +- .../libraries/PrestudentstatusCheckLib.php | 102 ++-- 3 files changed, 338 insertions(+), 292 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 3c59eed06..d88259cb9 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -153,236 +153,319 @@ class Status extends FHCAPI_Controller public function changeStatus($prestudent_id) { - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $prestudent_id, - ]); - if(isError($result)) - { - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } - $result = current(getData($result)); + $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); + $isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus'); - $stg = $result->studiengang_kz; - $isStudent = false; + //$isStudent = false; //GET lastStatus $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - elseif(!hasData($result)) - { - $lastStatusData = []; - } - else - $lastStatusData = current(getData($result)); + $lastStatusData = $this->getDataOrTerminateWithError($result); + $lastStatusData = current($lastStatusData); + //TODO(Manu) check phrase: why bewerbung? + if (!$isBerechtigtBasisPrestudentstatus) + $this->form_validation->set_rules( + 'bewerbung_abgeschicktamum', + $this->p->t('lehre', 'bewerbung_abgeschickt_am'), + 'is_null', + [ + 'is_null' => $this->p->t('ui', 'error_fieldWriteAccess') + ] + ); - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - $result = $this->p->t('lehre','error_keineSchreibrechte'); + $this->load->model('person/Person_model', 'PersonModel'); + $this->PersonModel->addJoin('public.tbl_prestudent', 'person_id'); + $result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]); + $prestudent_person = $this->getDataOrTerminateWithError($result); + $prestudent_person = current($prestudent_person); - return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); - } + $studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname); - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - $uid = getAuthUID(); $status_kurzbz = $this->input->post('status_kurzbz'); - $ausbildungssemester = $this->input->post('ausbildungssemester') ? $this->input->post('ausbildungssemester') : $lastStatusData->ausbildungssemester; - $datum = $this->input->post('datum'); - $bestaetigtam = $this->input->post('bestaetigtam'); - $bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum'); - $studienplan_id = $this->input->post('studienplan_id'); - $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz'); - $anmerkung = $this->input->post('anmerkung'); + + $studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz; + if ($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT + || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND + ) { + $this->load->library('VariableLib', ['uid' => getAuthUID()]); + $studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell'); + } + + $ausbildungssemester = $lastStatusData->ausbildungssemester; + if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) { + $ausbildungssemester = $this->input->post('ausbildungssemester'); + } + $statusgrund_id = $this->input->post('statusgrund_id'); - $rt_stufe = $this->input->post('rt_stufe'); - $bestaetigtvon = $uid; - $name = $this->input->post('name'); - - //Different handling depending on newStatus - if($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND) - { - $ausbildungssemester = $lastStatusData->ausbildungssemester; - } - - if($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER){ - //check studiensemester_kurzbz: - $studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz != $studiensemester_kurzbz ? - $lastStatusData->studiensemester_kurzbz : $studiensemester_kurzbz; - } - //Check if Bewerberstatus exists - if( - $status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || - $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER || - $status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER - ) - { - $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - - $studiensemester_kurzbz = $this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER); - } + $datum = $this->input->post('datum'); //Form Validation $this->load->library('form_validation'); - $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [ - 'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester']) - ]); + $this->form_validation->set_rules( + 'status_kurzbz', + $this->p->t('lehre', 'status_rolle'), + [ + 'required', + //Check Reihungstest + ['reihungstest_check', function ($value) use ($prestudent_person) { + if (!REIHUNGSTEST_CHECK) + return true; + if ($value != Prestudentstatus_model::STATUS_BEWERBER) + return true; + $result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person); + return $this->getDataOrTerminateWithError($result); + }] + ], + //Check ZGV + ['checkIfZGV', function ($value) use ($prestudent_person) { + if (!ZGV_CHECK) + return true; + if ($value != Prestudentstatus_model::STATUS_BEWERBER) + return true; + $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person); + return $this->getDataOrTerminateWithError($result); + }], + //Check ZGV Master + ['checkIfZGVMaster', function ($value) use ($prestudent_person) { + if (!ZGV_CHECK) + return true; + if ($value != Prestudentstatus_model::STATUS_BEWERBER) + return true; + $result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person); + return $this->getDataOrTerminateWithError($result); + }], + //Check Bewerberstatus + ['checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) { + if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER && + $status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER && + $status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER) + return true; + $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); + return $this->getDataOrTerminateWithError($result); + }], + //Check If Student + [ + 'required', + ['status_stud_exists', function ($value) use ($prestudent_id) { + if ($value != Prestudentstatus_model::STATUS_STUDENT) + return true; // Only test if new status is Student - //TODO(Manu) how to work with name: with $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])); - /* $this->form_validation->set_rules('_global', '', [ - //check if Rolle already exists - ['checkIfExistingPrestudentRolle', function () use ( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ); - return $this->getDataOrTerminateWithError($result); - }] - ], [ - 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden') - ]);*/ + $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); - if (!$this->form_validation->run()) - $this->terminateWithValidationErrors($this->form_validation->error_array()); + return $this->getDataOrTerminateWithError($result); + }], + ], + [ + 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]), + 'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]), + 'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]), + 'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]), + 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') + ] + ); - //check if prestudent_rolle exists - $result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester); + if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) + $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [ + 'integer' => $this->p->t('ui', 'error_fieldNotInteger') + ]); + else + $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'integer', [ + 'integer' => $this->p->t('ui', 'error_fieldNotInteger') + ]); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - // return $this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL); - - if($result->retval == '1') - { - return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $name]), self::ERROR_TYPE_GENERAL); - } - - //Check Reihungstest - if(REIHUNGSTEST_CHECK) - { - if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER) - { - $result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } - } - - //Check ZGV - if(!defined("ZGV_CHECK") || ZGV_CHECK) - { - if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER) - { - $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } - } - - - //Check ZGV-Master - $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); - $result = $this->StudiengangModel->load([ - 'studiengang_kz'=> $stg - ]); - if(isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson(getError($result)); - } - $result = current(getData($result)); - $typ = $result->typ; - //$stgkzl = $result->kurzbz; - - if(!defined("ZGV_CHECK") || ZGV_CHECK) - { - if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER && $typ=='m') - { - $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } - } - - //check if bewerberstatus exists TODO(Manu) necessary? - if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER) - { - $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } - - //check if studentrolle already exists - if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) - { - $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - $isStudent = getData($result); - } - - $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - - if(!$isBerechtigtNoStudstatusCheck) - { - //Block STATUSCHECKS - $new_status_datum = isset($datum) ? $datum : date('Y-m-d'); - - $result = $this->prestudentstatuschecklib->checkStatusAdd( + $this->form_validation->set_rules('_default', '', [ + //check if Rolle already exists + ['checkIfExistingPrestudentRolle', function () use ( $prestudent_id, $status_kurzbz, $studiensemester_kurzbz, - $new_status_datum, - $ausbildungssemester, - $studienplan_id - ); + $ausbildungssemester + ) { + if (!$ausbildungssemester) + return true; // Error will be handled by the required statement above + $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( + $prestudent_id, + $status_kurzbz, + $studiensemester_kurzbz, + $ausbildungssemester + ); + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]) + ]); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } + //TODO(Manu) check if really necessary, in FAS code + $this->form_validation->set_rules( + 'datum', + $this->p->t('global', 'datum'), + [ + 'is_valid_date', + ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$value) + return true; // Error will be handled by the required statement above - //TODO(manu) check Berechtigung - //check if Bismeldestichtag erreicht ADDNEW status - $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz); + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - } + return !$this->getDataOrTerminateWithError($result); + }] + ], + [ + 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag') + ] + ); + + $this->form_validation->set_rules('_default', '', [ + ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { + if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]); + + return !$this->getDataOrTerminateWithError($result); + }], + ['history_timesequence', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_laststatus', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_unterbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_abbrecher', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }], + ['history_diplomant', function () use ( + $isBerechtigtNoStudstatusCheck, + $prestudent_id, + $status_kurzbz, + $datum, + $studiensemester_kurzbz, + $ausbildungssemester + ) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) + return true; // Error will be handled by the required statements above + + $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant( + $prestudent_id, + $status_kurzbz, + new DateTime($datum), + $studiensemester_kurzbz, + $ausbildungssemester, + '', + '' + ); + + return $this->getDataOrTerminateWithError($result); + }] + ], [ + 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), + 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), + 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), + 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'), + 'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'), + 'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent') + ]); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); switch($status_kurzbz){ case Prestudentstatus_model::STATUS_ABBRECHER: @@ -399,7 +482,7 @@ class Status extends FHCAPI_Controller $statusgrund_kurzbz = $result->statusgrund_kurzbz; $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon); + $result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, null, null); if (isError($result)) { return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); @@ -426,7 +509,7 @@ class Status extends FHCAPI_Controller case Prestudentstatus_model::STATUS_STUDENT: { $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon); + $result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id); if (isError($result)) { @@ -517,37 +600,11 @@ class Status extends FHCAPI_Controller } else $this->terminateWithSuccess($prestudent_id); - } break; default: { $this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL); - $result = $this->PrestudentstatusModel->insert( - [ - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => $status_kurzbz, - 'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, - 'studienplan_id' => $lastStatusData->studienplan_id, - 'ausbildungssemester' => $ausbildungssemester, - 'anmerkung' => $anmerkung, - 'statusgrund_id' => $statusgrund_id, - 'insertvon' => $uid, - 'insertamum' => date('c'), - 'bestaetigtam' => $bestaetigtam, - 'bestaetigtvon' => $bestaetigtvon, - 'datum' => $datum, - 'rt_stufe' => $rt_stufe - ] - ); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - else - $this->terminateWithSuccess($prestudent_id); } } } @@ -1018,6 +1075,7 @@ class Status extends FHCAPI_Controller $student = $this->getDataOrTerminateWithError($result); if ($student) { + $student = current($student); $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); $result = $this->StudentlehrverbandModel->delete( array( diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index ab274805f..c034caece 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -421,7 +421,7 @@ class PrestudentLib return success(); } - public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon) + public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id) { $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); @@ -477,8 +477,8 @@ class PrestudentLib 'insertamum' => date('c'), 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, 'studienplan_id'=> $prestudent_status->studienplan_id, - 'bestaetigtvon' => $bestaetigtVon, - 'bestaetigtam' => $bestaetigtAm + 'bestaetigtvon' => getAuthUID(), + 'bestaetigtam' => date('c') ]); if (isError($result)) diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php index 55488cf4c..ed9b0dd69 100644 --- a/application/libraries/PrestudentstatusCheckLib.php +++ b/application/libraries/PrestudentstatusCheckLib.php @@ -145,85 +145,73 @@ class PrestudentstatusCheckLib /** * Check if Reihungstest was admitted - * @param integer $prestudent_id - * @return booleans $reihungstest_angetreten, error if not angetreten + * + * @param stdClass $prestudent + * + * @return stdClass */ - public function checkIfAngetreten($prestudent_id) + public function checkIfAngetreten($prestudent) { - $result = $this->_getApplicationData($prestudent_id); - if(isError($result)) - { - return getData($result); - } - $result = current(getData($result)); - $studentName = trim ($result->vorname.' '.$result->nachname); - - if (!$result->reihungstestangetreten) - return error($this->_ci->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName])); - - return success($result->reihungstestangetreten); + return success($prestudent->reihungstestangetreten); } - /** + /** * Check if ZGV-Code is registered - * @param integer $prestudent_id + * + * @param stdClass $prestudent + * + * @return stdClass + */ + public function checkIfZGVEingetragen($prestudent_person) + { + return success((boolean)$prestudent_person->zgv_code); + return !!$prestudent_person->zgv_code; + //return success(false); + //return error(false); + } + + /** + * Check if Master ZGV-Code is registered + * + * @param stdClass $prestudent + * * @return booleans $zgv_code, error if not registered */ - public function checkIfZGVEingetragen($prestudent_id, $typ=null) + //TODO(Manu) TEST + public function checkIfZGVEingetragenMaster($prestudent, $typ=null) { - $result = $this->_getApplicationData($prestudent_id); - if(isError($result)) - { - return getData($result); - } - $result = current(getData($result)); - $studentName = trim ($result->vorname.' '.$result->nachname); + $this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel'); + $result = $this->_ci->StudiengangModel->load($prestudent->studiengang_kz); + if (isError($result)) + return $result; + if (!hasData($result)) + return error($this->_ci->p->t('studierendenantrag','error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz])); // TODO(chris): phrase - if ($typ && $typ=='m' && !$result->zgvmas_code) - { - return error($this->_ci->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName])); - } - else - return success($result->zgvmas_code); + if (current($result->retval)->typ != 'm') + return success(true); // TODO(chris): correct? - - if(!$result->zgv_code) - { - return error($this->_ci->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName])); - } - - return success($result->zgv_code); + return success((boolean)$prestudent->zgv_code); } /** * Checks if a bewerber status already exists. - * @return error if invalid - * @return error if no bewerberstatus, success otherwise + * + * @param integer $prestudent_id + * * + * @return stdClass */ public function checkIfExistingBewerberstatus($prestudent_id) { - $result = $this->_getApplicationData($prestudent_id); - if(isError($result)) - { - return getData($result); - } - $result = current(getData($result)); - $studentName = trim ($result->vorname.' '.$result->nachname); - $result = $this->_ci->PrestudentstatusModel->checkIfExistingBewerberstatus( $prestudent_id ); - if(isError($result)) - { - return getData($result); - } - if(getData($result) == "0") - { - return error($this->_ci->p->t('lehre','error_keinBewerber', ['name' => $studentName])); - } - return success(getData($result)); + if (isError($result)) + return $result; + + return success(getData($result) != '0'); } + /** * Checks if status aufgenommen already exists. * @return error if invalid From 96b8d49ef28a8b9ddf7369c14e6e8ac249c7a69f Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 1 Aug 2024 08:52:38 +0200 Subject: [PATCH 380/464] add changeStatus to PermissionChecks --- application/controllers/api/frontend/v1/stv/Status.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index d88259cb9..096285c43 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -42,6 +42,7 @@ class Status extends FHCAPI_Controller || $this->router->method == 'confirmStatus' || $this->router->method == 'deleteStatus' || $this->router->method == 'advanceStatus' + || $this->router->method == 'changeStatus' ) { $prestudent_id = current(array_slice($this->uri->rsegments, 2)); $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']); From f2180257c516e281e611e6664fbff1f7c09f3a8f Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 1 Aug 2024 12:45:55 +0200 Subject: [PATCH 381/464] adapt validation changeStatus --- .../api/frontend/v1/stv/Status.php | 144 ++++++++++++------ 1 file changed, 100 insertions(+), 44 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 096285c43..11528214c 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -205,9 +205,68 @@ class Status extends FHCAPI_Controller //Form Validation $this->load->library('form_validation'); + // $this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_kurzbz'), + // [ + // 'required', + // //Check Reihungstest + // ['reihungstest_check', function ($value) use ($prestudent_person) { + // if (!REIHUNGSTEST_CHECK) + // return true; + // if ($value != Prestudentstatus_model::STATUS_BEWERBER) + // return true; + // $result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person); + // return $this->getDataOrTerminateWithError($result); + // }], + // //Check ZGV + // ['checkIfZGV', function ($value) use ($prestudent_person) { + // if (!ZGV_CHECK) + // return true; + // if ($value != Prestudentstatus_model::STATUS_BEWERBER) + // return true; + // $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person); + // return $this->getDataOrTerminateWithError($result); + // }], + // ], + + // [ + // 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]), + // 'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]), + // ]); + + + // $this->form_validation->set_rules( + // 'status_kurzbz', + // $this->p->t('lehre', 'status_kurzbz'), + // [ + // 'required', + // //Check Reihungstest + // ['reihungstest_check', function ($value) use ($prestudent_person) { + // if (!REIHUNGSTEST_CHECK) + // return true; + // if ($value != Prestudentstatus_model::STATUS_BEWERBER) + // return true; + // $result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person); + // return $this->getDataOrTerminateWithError($result); + // }] + // ], + // //Check Bewerberstatus + // [ + // 'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) { + // if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER && + // $status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER && + // $status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER) + // return true; + // $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); + // return $this->getDataOrTerminateWithError($result); + // }] + // , [ + // 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]), + // 'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]), + // ]); + $this->form_validation->set_rules( 'status_kurzbz', - $this->p->t('lehre', 'status_rolle'), + 'Status', [ 'required', //Check Reihungstest @@ -218,38 +277,36 @@ class Status extends FHCAPI_Controller return true; $result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person); return $this->getDataOrTerminateWithError($result); - }] - ], - //Check ZGV - ['checkIfZGV', function ($value) use ($prestudent_person) { - if (!ZGV_CHECK) - return true; - if ($value != Prestudentstatus_model::STATUS_BEWERBER) - return true; - $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person); - return $this->getDataOrTerminateWithError($result); - }], - //Check ZGV Master - ['checkIfZGVMaster', function ($value) use ($prestudent_person) { - if (!ZGV_CHECK) - return true; - if ($value != Prestudentstatus_model::STATUS_BEWERBER) - return true; - $result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person); - return $this->getDataOrTerminateWithError($result); - }], - //Check Bewerberstatus - ['checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) { - if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER && - $status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER && - $status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER) - return true; - $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); - return $this->getDataOrTerminateWithError($result); - }], - //Check If Student - [ - 'required', + }], + //Check ZGV + ['checkIfZGV', function ($value) use ($prestudent_person) { + if (!ZGV_CHECK) + return true; + if ($value != Prestudentstatus_model::STATUS_BEWERBER) + return true; + $result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person); + return $this->getDataOrTerminateWithError($result); + }], + //Check ZGV Master + ['checkIfZGVMaster', function ($value) use ($prestudent_person) { + if (!ZGV_CHECK) + return true; + if ($value != Prestudentstatus_model::STATUS_BEWERBER) + return true; + $result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person); + return $this->getDataOrTerminateWithError($result); + }], + //Check Bewerberstatus + [ + 'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) { + if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER && + $status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER && + $status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER) + return true; + $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); + return $this->getDataOrTerminateWithError($result); + }], + //Check If Student ['status_stud_exists', function ($value) use ($prestudent_id) { if ($value != Prestudentstatus_model::STATUS_STUDENT) return true; // Only test if new status is Student @@ -258,17 +315,15 @@ class Status extends FHCAPI_Controller return $this->getDataOrTerminateWithError($result); }], - - ], - [ - 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]), - 'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]), - 'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]), - 'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]), - 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') - ] + ], [ + 'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]), + 'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]), + 'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]), + 'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]), + 'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus') + ] ); - + if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [ 'integer' => $this->p->t('ui', 'error_fieldNotInteger') @@ -278,6 +333,7 @@ class Status extends FHCAPI_Controller 'integer' => $this->p->t('ui', 'error_fieldNotInteger') ]); + //TODO(Manu) check if really necessary, sth similiar above: rolle_doesnt_exist $this->form_validation->set_rules('_default', '', [ //check if Rolle already exists ['checkIfExistingPrestudentRolle', function () use ( @@ -457,7 +513,7 @@ class Status extends FHCAPI_Controller return $this->getDataOrTerminateWithError($result); }] ], [ - 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'), + 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]), 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), 'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'), From 6f0e46ac575f18c8cdd43e1599bc6d8d88eef020 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 1 Aug 2024 12:57:06 +0200 Subject: [PATCH 382/464] Status: Max Semester --- .../api/frontend/v1/stv/Status.php | 36 +++++++++++++++++++ .../models/organisation/Lehrverband_model.php | 30 ++++++++++++++++ .../Details/Prestudent/MultiStatus.js | 20 +++++++++-- .../Details/Status/Modal.js | 16 +++++---- system/phrasesupdate.php | 20 +++++++++++ 5 files changed, 113 insertions(+), 9 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 11528214c..ac6d4b3aa 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -11,6 +11,7 @@ class Status extends FHCAPI_Controller { parent::__construct([ 'getHistoryPrestudent' => ['admin:r', 'assistenz:r'], + 'getMaxSemester' => ['admin:r', 'assistenz:r'], 'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], 'getStatusgruende' => self::PERM_LOGGED, @@ -63,6 +64,41 @@ class Status extends FHCAPI_Controller $this->terminateWithSuccess($data); } + /** + * Gets the maximum possible semester for one or more Studiengaenge. + * If there are more than one Studiengang each maximum is calculated and + * the smallest result is returned. + * + * @return void + */ + public function getMaxSemester() + { + $studiengang_kzs = $this->input->post('studiengang_kzs'); + + if (!$studiengang_kzs || !is_array($studiengang_kzs)) { + $this->load->library('form_validation'); + + $this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [ + 'is_null' => $this->p->t('ui', 'error_fieldMustBeArray') + ]); + + if (!$this->form_validation->run()) + $this->terminateWithValidationErrors($this->form_validation->error_array()); + } + + + if (defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER == false) + $this->terminateWithSuccess(100); + + $this->load->model('organisation/Lehrverband_model', 'LehrverbandModel'); + + $result = $this->LehrverbandModel->getMaxSemester($studiengang_kzs); + + $maxsem = $this->getDataOrTerminateWithError($result); + + $this->terminateWithSuccess($maxsem ? current($maxsem)->maxsem : 10); + } + public function getStatusgruende() { $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php index 2573b92e8..bc4858e5f 100644 --- a/application/models/organisation/Lehrverband_model.php +++ b/application/models/organisation/Lehrverband_model.php @@ -53,4 +53,34 @@ class Lehrverband_model extends DB_Model return success("1","Lehrverband vorhanden!"); } } + + /** + * Gets the maximum possible semester for one or more Studiengaenge. + * If there are more than one Studiengang each maximum is calculated and + * the smallest result is returned. + * + * @param array $studiengang_kzs + * + * @return stdClass + */ + public function getMaxSemester($studiengang_kzs) + { + $sqls = []; + foreach ($studiengang_kzs as $studiengang_kz) { + $this->addSelect('MAX(semester) AS maxsem'); + $this->db->where('studiengang_kz', $studiengang_kz); + $sqls[] = $this->db->get_compiled_select($this->dbTable); + } + + $this->addSelect('MIN(a.maxsem) AS maxsem'); + + $dbTable = $this->dbTable; + $this->dbTable = '(' . implode(' UNION ', $sqls) . ') AS a'; + + $result = $this->load(); + + $this->dbTable = $dbTable; + + return $result; + } } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 146450341..8cab0ea1a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -235,7 +235,8 @@ export default{ statusData: {}, statusId: {}, dataMeldestichtag: null, - statusNew: true + statusNew: true, + maxSem: 0 }; }, watch: { @@ -246,9 +247,20 @@ export default{ else this.data.tabulatorOptions.ajaxURL = 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id; } + this.getMaxSem(); } }, methods: { + getMaxSem() { + const studiengang_kzs = this.modelValue.studiengang_kz + ? [this.modelValue.studiengang_kz] + : this.modelValue.map(prestudent => prestudent.studiengang_kz); + this.maxSem = 0; + this.$fhcApi + .post('api/frontend/v1/stv/status/getMaxSemester/', {studiengang_kzs}) + .then(result => this.maxSem = result.data) + .catch(this.$fhcAlert.handleSystemError); + }, actionNewStatus() { this.$refs.test.open(this.modelValue); }, @@ -317,6 +329,8 @@ export default{ } }, created() { + this.getMaxSem(); + this.$fhcApi .get('api/frontend/v1/stv/status/getLastBismeldestichtag/') .then(result => { @@ -327,9 +341,9 @@ export default{ .catch(this.$fhcAlert.handleSystemError); }, template: ` -
    +
    - + index), + ] }; }, computed: { + semester() { + return Array.from({length: this.maxSem}, (_, index) => index); + }, bisLocked() { if (this.statusNew || this.hasPermissionToSkipStatusCheck) return false; @@ -207,7 +212,7 @@ export default{ - +

    @@ -249,7 +254,6 @@ export default{ {{ sem.studiensemester_kurzbz }} -

    {{ item.status_kurzbz }} From ee78a94aa2c6c4cfa7c0cb0c22809c73b19429fc Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 6 Aug 2024 14:20:22 +0200 Subject: [PATCH 392/464] codesniff Prestudentstatus_model --- application/models/crm/Prestudentstatus_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index aa2a8a3b0..37b6c6762 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -348,10 +348,10 @@ class Prestudentstatus_model extends DB_Model */ public function withGrund($statusgrund_kurzbz) { - if($statusgrund_kurzbz) + if ($statusgrund_kurzbz) $this->db->set( 'statusgrund_id', - '(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')', + '(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz=' . $this->db->escape($statusgrund_kurzbz) . ')', false ); From 9b034a6753a92d57f394dab5944cd36f48d5fb09 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 6 Aug 2024 14:21:53 +0200 Subject: [PATCH 393/464] Status cleanup --- .../api/frontend/v1/stv/Status.php | 152 +++++------------- 1 file changed, 44 insertions(+), 108 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index df6fdb5b5..ef5030c0d 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -12,12 +12,11 @@ class Status extends FHCAPI_Controller parent::__construct([ 'getHistoryPrestudent' => ['admin:r', 'assistenz:r'], 'getMaxSemester' => ['admin:r', 'assistenz:r'], - 'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], - 'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'], + 'changeStatus' => ['admin:rw', 'assistenz:rw'], + 'addStudent' => ['admin:rw', 'assistenz:rw'], 'getStatusgruende' => self::PERM_LOGGED, 'getLastBismeldestichtag' => self::PERM_LOGGED, 'isLastStatus' => self::PERM_LOGGED, - 'isErsterStudent' => self::PERM_LOGGED, 'hasStatusBewerber' => self::PERM_LOGGED, 'getStatusarray' => self::PERM_LOGGED, 'deleteStatus' => ['admin:rw','assistenz:rw'], @@ -130,22 +129,6 @@ class Status extends FHCAPI_Controller return $this->terminateWithSuccess($result); } - public function isErsterStudent($prestudent_id) - { - //check if studentrolle already exists - $this->load->model('crm/Student_model', 'StudentModel'); - $result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - if($result->retval == "0") - { - return $this->terminateWithSuccess($result); - } - return $this->terminateWithSuccess($result); - } - public function hasStatusBewerber($prestudent_id) { $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); @@ -190,7 +173,6 @@ class Status extends FHCAPI_Controller public function changeStatus($prestudent_id) { $isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'); - $isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus'); //GET lastStatus $result = $this->PrestudentstatusModel->getLastStatus($prestudent_id); @@ -198,16 +180,6 @@ class Status extends FHCAPI_Controller $lastStatusData = $this->getDataOrTerminateWithError($result); $lastStatusData = current($lastStatusData); - if (!$isBerechtigtBasisPrestudentstatus) - $this->form_validation->set_rules( - 'berechtigt', - $this->p->t('ui', 'nurLeseberechtigung'), - 'is_null', - [ - 'is_null' => $this->p->t('ui', 'error_fieldWriteAccess') - ] - ); - $this->load->model('person/Person_model', 'PersonModel'); $this->PersonModel->addJoin('public.tbl_prestudent', 'person_id'); $result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]); @@ -232,14 +204,15 @@ class Status extends FHCAPI_Controller } $statusgrund_id = $this->input->post('statusgrund_id'); - $datum = $this->input->post('datum'); + $datum_string = date('c'); + $datum = new DateTime($datum_string); //Form Validation $this->load->library('form_validation'); $this->form_validation->set_rules( 'status_kurzbz', - 'Status', + $this->p->t('global', 'status'), [ 'required', //Check Reihungstest @@ -253,7 +226,7 @@ class Status extends FHCAPI_Controller }], //Check ZGV ['checkIfZGV', function ($value) use ($prestudent_person) { - if (!ZGV_CHECK) + if (defined("ZGV_CHECK") && !ZGV_CHECK) return true; if ($value != Prestudentstatus_model::STATUS_BEWERBER) return true; @@ -262,7 +235,7 @@ class Status extends FHCAPI_Controller }], //Check ZGV Master ['checkIfZGVMaster', function ($value) use ($prestudent_person) { - if (!ZGV_CHECK) + if (defined("ZGV_CHECK") && !ZGV_CHECK) return true; if ($value != Prestudentstatus_model::STATUS_BEWERBER) return true; @@ -270,19 +243,19 @@ class Status extends FHCAPI_Controller return $this->getDataOrTerminateWithError($result); }], //Check Bewerberstatus - [ - 'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) { - if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER && - $status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER && - $status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER - ) + ['checkIfExistingBewerberstatus', function ($value) use ($prestudent_id) { + if ($value != Prestudentstatus_model::STATUS_AUFGENOMMENER + && $value != Prestudentstatus_model::STATUS_WARTENDER + ) return true; - $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); - return $this->getDataOrTerminateWithError($result); - }], + $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id); + return $this->getDataOrTerminateWithError($result); + }], //Check If Student ['status_stud_exists', function ($value) use ($prestudent_id) { - if ($value != Prestudentstatus_model::STATUS_STUDENT) + if ($value != Prestudentstatus_model::STATUS_STUDENT + && $value != Prestudentstatus_model::STATUS_ABBRECHER + ) return true; // Only test if new status is Student $result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id); @@ -308,52 +281,16 @@ class Status extends FHCAPI_Controller 'integer' => $this->p->t('ui', 'error_fieldNotInteger') ]); - //TODO(Manu) check if really necessary, sth similiar with check rolle_doesnt_exist $this->form_validation->set_rules('_default', '', [ + ['meldestichtag_not_exceeded', function () use ($datum, $isBerechtigtNoStudstatusCheck) { + if ($isBerechtigtNoStudstatusCheck) + return true; // Skip if access right says so + + $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum); + + return !$this->getDataOrTerminateWithError($result); + }], //check if Rolle already exists - ['checkIfExistingPrestudentRolle', function () use ( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ) { - if (!$ausbildungssemester) - return true; // Error will be handled by the required statement above - $result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle( - $prestudent_id, - $status_kurzbz, - $studiensemester_kurzbz, - $ausbildungssemester - ); - return $this->getDataOrTerminateWithError($result); - }] - ], [ - 'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]) - ]); - - //TODO(Manu) check if really necessary, in FAS code - $this->form_validation->set_rules( - 'datum', - $this->p->t('global', 'datum'), - [ - 'is_valid_date', - ['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) { - if ($isBerechtigtNoStudstatusCheck) - return true; // Skip if access right says so - if (!$value) - return true; // Error will be handled by the required statement above - - $result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value); - - return !$this->getDataOrTerminateWithError($result); - }] - ], - [ - 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag') - ] - ); - - $this->form_validation->set_rules('_default', '', [ ['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) { if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester) return true; // Error will be handled by the required statements above @@ -372,13 +309,13 @@ class Status extends FHCAPI_Controller ) { if ($isBerechtigtNoStudstatusCheck) return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above + if (!$status_kurzbz) + return true; // Error will be handled by the required statement above $result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence( $prestudent_id, $status_kurzbz, - new DateTime($datum), + $datum, $studiensemester_kurzbz, $ausbildungssemester, '', @@ -397,13 +334,13 @@ class Status extends FHCAPI_Controller ) { if ($isBerechtigtNoStudstatusCheck) return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above + if (!$status_kurzbz) + return true; // Error will be handled by the required statement above $result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus( $prestudent_id, $status_kurzbz, - new DateTime($datum), + $datum, $studiensemester_kurzbz, $ausbildungssemester, '', @@ -422,13 +359,13 @@ class Status extends FHCAPI_Controller ) { if ($isBerechtigtNoStudstatusCheck) return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above + if (!$status_kurzbz) + return true; // Error will be handled by the required statement above $result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester( $prestudent_id, $status_kurzbz, - new DateTime($datum), + $datum, $studiensemester_kurzbz, $ausbildungssemester, '', @@ -447,13 +384,13 @@ class Status extends FHCAPI_Controller ) { if ($isBerechtigtNoStudstatusCheck) return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above + if (!$status_kurzbz) + return true; // Error will be handled by the required statement above $result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester( $prestudent_id, $status_kurzbz, - new DateTime($datum), + $datum, $studiensemester_kurzbz, $ausbildungssemester, '', @@ -472,13 +409,13 @@ class Status extends FHCAPI_Controller ) { if ($isBerechtigtNoStudstatusCheck) return true; // Skip if access right says so - if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester) - return true; // Error will be handled by the required statements above + if (!$status_kurzbz) + return true; // Error will be handled by the required statement above $result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant( $prestudent_id, $status_kurzbz, - new DateTime($datum), + $datum, $studiensemester_kurzbz, $ausbildungssemester, '', @@ -486,8 +423,9 @@ class Status extends FHCAPI_Controller ); return $this->getDataOrTerminateWithError($result); - }] + }] // TODO(chris): history_student? ], [ + 'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'), 'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]), 'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'), 'history_laststatus' => $this->p->t('lehre', 'error_endstatus'), @@ -501,8 +439,6 @@ class Status extends FHCAPI_Controller switch($status_kurzbz){ case Prestudentstatus_model::STATUS_ABBRECHER: - $studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz; - $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); $result = $this->StatusgrundModel->load($statusgrund_id); if (isError($result)) @@ -518,13 +454,13 @@ class Status extends FHCAPI_Controller $studiensemester_kurzbz, null, $statusgrund_kurzbz, - $datum, + $datum_string, null, null ); if (isError($result)) { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + return $this->terminateWithError(getError($result)); } else $this->terminateWithSuccess($prestudent_id); From e6676e8868e3dbb26fc375bb04ec82b44edbbaac Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 6 Aug 2024 14:26:52 +0200 Subject: [PATCH 394/464] setAbbrecherNeu --- .../api/frontend/v1/stv/Status.php | 31 ++-- application/libraries/PrestudentLib.php | 152 ++++++++++++++++++ 2 files changed, 165 insertions(+), 18 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index ef5030c0d..6e4a671ee 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -437,33 +437,22 @@ class Status extends FHCAPI_Controller if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); + + $this->load->library('PrestudentLib'); + + $this->db->trans_start(); + switch($status_kurzbz){ case Prestudentstatus_model::STATUS_ABBRECHER: - $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); - $result = $this->StatusgrundModel->load($statusgrund_id); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - $result = current(getData($result)); - $statusgrund_kurzbz = $result->statusgrund_kurzbz; - - $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setAbbrecher( + $result = $this->prestudentlib->setAbbrecherNeu( $prestudent_id, $studiensemester_kurzbz, null, - $statusgrund_kurzbz, + $statusgrund_id, $datum_string, null, null ); - if (isError($result)) - { - return $this->terminateWithError(getError($result)); - } - else - $this->terminateWithSuccess($prestudent_id); break; case Prestudentstatus_model::STATUS_UNTERBRECHER: $ausbildungssemester = $lastStatusData->ausbildungssemester; @@ -558,6 +547,12 @@ class Status extends FHCAPI_Controller default: $this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL); } + + $this->getDataOrTerminateWithError($result); + + $this->trans_complete(); + + $this->terminateWithSuccess($prestudent_id); } public function addStudent($prestudent_id) diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index d8950ad43..58e519565 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -35,6 +35,141 @@ class PrestudentLib $this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel'); } + public function setAbbrecherNeu( + $prestudent_id, + $studiensemester_kurzbz, + $insertvon = null, + $statusgrund_id = null, + $datum = null, + $bestaetigtam = null, + $bestaetigtvon = null + ) { + if (!$insertvon) + $insertvon = getAuthUID(); + if (!$bestaetigtvon) + $bestaetigtvon = $insertvon; + + $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); + if (isError($result)) + return $result; + $result = getData($result); + if (!$result) + return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [ + 'prestudent_id' => $prestudent_id, + 'studiensemester_kurzbz' => $studiensemester_kurzbz + ])); + + $prestudent_status = current($result); + + $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]); + + if (isError($result)) + return $result; + $result = getData($result); + if (!$result) + return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); + + $student = current($result); + + if(!$datum) + $datum = date('c'); + + if(!$bestaetigtam) + $bestaetigtam = date('c'); + + //Status und Statusgrund updaten + $result = $this->_ci->PrestudentstatusModel->insert([ + 'prestudent_id' => $prestudent_id, + 'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER, + 'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz, + 'ausbildungssemester' => $prestudent_status->ausbildungssemester, + 'datum' => $datum, + 'insertvon' => $insertvon, + 'insertamum' => date('c'), + 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, + 'studienplan_id'=> $prestudent_status->studienplan_id, + 'bestaetigtvon' => $bestaetigtvon, + 'bestaetigtam' => $bestaetigtam, + 'statusgrund_id' => $statusgrund_id + ]); + + if (isError($result)) + return $result; + + //refactored with processStudentlehrverband + $result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband( + $student->student_uid, + $student->studiengang_kz, + 0, + 'A', + '', + $studiensemester_kurzbz, + Prestudentstatus_model::STATUS_ABBRECHER + ); + + if (isError($result)) + return $result; + + + //noch nicht eingetragene Zeugnisnoten auf 9 setzen + $result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz); + if (isError($result)) + return $result; + $result = getData($result) ?: []; + + foreach ($result as $lv) + { + if (!$lv->note) + { + $result = $this->_ci->ZeugnisnoteModel->insert([ + 'note' => 9, + 'studiensemester_kurzbz' => $lv->studiensemester_kurzbz, + 'student_uid' => $lv->uid, + 'lehrveranstaltung_id' => $lv->lehrveranstaltung_id + ]); + if (isError($result)) { + $result = $this->_ci->ZeugnisnoteModel->update([ + 'studiensemester_kurzbz' => $lv->studiensemester_kurzbz, + 'student_uid' => $lv->uid, + 'lehrveranstaltung_id' => $lv->lehrveranstaltung_id + ], [ + 'note' => 9 + ]); + + if (isError($result)) + return $result; + } + } + } + + + //Update Aktionen + + //StudentModel updaten + $this->_ci->StudentModel->update([ + 'student_uid' => $student->student_uid + ], [ + 'verband' => 'A', + 'gruppe' => '', + 'semester' => 0, + 'updatevon' => $insertvon, + 'updateamum' => date('c') + ]); + + //Benutzer inaktiv setzen + $this->_ci->BenutzerModel->update([ + 'uid' => $student->student_uid + ], [ + 'aktiv' => false, + 'updateaktivvon' => $insertvon, + 'updateaktivam' => date('c'), + 'updatevon' => $insertvon, + 'updateamum' => date('c') + ]); + + return success(); + } + public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null) { if (!$insertvon) @@ -134,6 +269,9 @@ class PrestudentLib } } + // TODO(chris): student updaten (hier oder in studentlehrverband) + // TODO(chris): db transaction + //Benutzer inaktiv setzen $this->_ci->BenutzerModel->update([ 'uid' => $student->student_uid @@ -285,6 +423,20 @@ class PrestudentLib } } + + //Update Aktionen + + //StudentModel updaten + $this->_ci->StudentModel->update([ + 'student_uid' => $student->student_uid + ], [ + 'verband' => 'B', + 'gruppe' => '', + 'semester' => 0, + 'updatevon' => $insertvon, + 'updateamum' => date('c') + ]); + return success(); } From 07400e7551ddb7a8b8a0066d76d9461a96f5e7d5 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 6 Aug 2024 14:49:20 +0200 Subject: [PATCH 395/464] change all setAbbrecher to setAbbrecherNeu and rename --- .../api/frontend/v1/studstatus/Leitung.php | 3 +- .../api/frontend/v1/stv/Status.php | 2 +- application/controllers/jobs/AntragJob.php | 18 ++- application/libraries/AntragLib.php | 31 ++++- application/libraries/PrestudentLib.php | 118 +----------------- system/phrasesupdate.php | 20 +++ 6 files changed, 66 insertions(+), 126 deletions(-) diff --git a/application/controllers/api/frontend/v1/studstatus/Leitung.php b/application/controllers/api/frontend/v1/studstatus/Leitung.php index 2699a3dbb..87099ad74 100644 --- a/application/controllers/api/frontend/v1/studstatus/Leitung.php +++ b/application/controllers/api/frontend/v1/studstatus/Leitung.php @@ -53,7 +53,8 @@ class Leitung extends FHCAPI_Controller // Load language phrases $this->loadPhrases([ - 'studierendenantrag' + 'studierendenantrag', + 'lehre' ]); } diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 6e4a671ee..9df1a8ec4 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -444,7 +444,7 @@ class Status extends FHCAPI_Controller switch($status_kurzbz){ case Prestudentstatus_model::STATUS_ABBRECHER: - $result = $this->prestudentlib->setAbbrecherNeu( + $result = $this->prestudentlib->setAbbrecher( $prestudent_id, $studiensemester_kurzbz, null, diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 0bac8794f..d079658af 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -29,6 +29,10 @@ class AntragJob extends JOB_Controller $this->load->model('crm/Student_model', 'StudentModel'); $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + + $this->loadPhrases([ + 'lehre' + ]); } /** @@ -451,11 +455,23 @@ class AntragJob extends JOB_Controller if (isError($result)) $this->logError(getError($result)); + $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); + $result = $this->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']); + if (isError($result)) { + $this->logError(getError($result)); + continue; + } elseif (!hasData($result)) { + $this->logError($this->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl'])); // TODO(chris): phrase + continue; + } + + $statusgrund = current(getData($result)); + $result = $this->prestudentlib->setAbbrecher( $antrag->prestudent_id, $antrag->studiensemester_kurzbz, 'AntragJob', - 'abbrecherStgl', + $statusgrund->statusgrund_id, $antrag->insertamum, null, $antrag->insertvon ?: $insertvon diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php index ce4485279..c1649587d 100644 --- a/application/libraries/AntragLib.php +++ b/application/libraries/AntragLib.php @@ -121,7 +121,7 @@ class AntragLib public function unpauseAntrag($antrag_id, $insertvon) { if ($insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED) - return error($this->p->t('studierendenantrag', 'error_no_right')); + return error($this->_ci->p->t('studierendenantrag', 'error_no_right')); if ($insertvon == Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) { return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id); } @@ -257,18 +257,28 @@ class AntragLib if (isError($result)) $errors[] = getError($result); + $this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel'); + $result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStud']); + if (isError($result)) { + $errors[] = getError($result); + continue; + } elseif (!hasData($result)) { + $errors[] = $this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStud']); + continue; + } + $statusgrund = current(getData($result)); + $result = $this->_ci->prestudentlib->setAbbrecher( $antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, - 'abbrecherStud', + $statusgrund->statusgrund_id, $antrag->datum, $insertam ); - if (isError($result)) - { + if (isError($result)) { $errors[] = getError($result); - return $errors; + continue; } $result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id); @@ -421,11 +431,20 @@ class AntragLib // NOTE(chris): here we should have error handling but at the // moment there is no way to notify the user for "soft" errors + $this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel'); + $result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']); + if (isError($result)) + return $result; + if (!hasData($result)) + return error($this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl'])); + + $statusgrund = current(getData($result)); + $result = $this->_ci->prestudentlib->setAbbrecher( $antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, - 'abbrecherStgl', + $statusgrund->statusgrund_id, $status->insertamum ); diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index 58e519565..e8ee7902f 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -35,7 +35,7 @@ class PrestudentLib $this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel'); } - public function setAbbrecherNeu( + public function setAbbrecher( $prestudent_id, $studiensemester_kurzbz, $insertvon = null, @@ -170,122 +170,6 @@ class PrestudentLib return success(); } - public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null) - { - if (!$insertvon) - $insertvon = getAuthUID(); - if (!$bestaetigtvon) - $bestaetigtvon = $insertvon; - - $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); - if (isError($result)) - return $result; - $result = getData($result); - if (!$result) - return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [ - 'prestudent_id' => $prestudent_id, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ])); - - $prestudent_status = current($result); - - $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]); - - if (isError($result)) - return $result; - $result = getData($result); - if (!$result) - return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); - - $student = current($result); - - if(!$datum) - $datum = date('c'); - - if(!$bestaetigtam) - $bestaetigtam = date('c'); - - //Status und Statusgrund updaten - $result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([ - 'prestudent_id' => $prestudent_id, - 'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER, - 'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz, - 'ausbildungssemester' => $prestudent_status->ausbildungssemester, - 'datum' => $datum, - 'insertvon' => $insertvon, - 'insertamum' => date('c'), - 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, - 'studienplan_id'=> $prestudent_status->studienplan_id, - 'bestaetigtvon' => $bestaetigtvon, - 'bestaetigtam' => $bestaetigtam - ]); - - if (isError($result)) - return $result; - - //refactored with processStudentlehrverband - $result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband( - $student->student_uid, - $student->studiengang_kz, - 0, - 'A', - '', - $studiensemester_kurzbz, - Prestudentstatus_model::STATUS_ABBRECHER - ); - - if (isError($result)) - return $result; - - - //noch nicht eingetragene Zeugnisnoten auf 9 setzen - $result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz); - if (isError($result)) - return $result; - $result = getData($result) ?: []; - - foreach ($result as $lv) - { - if (!$lv->note) - { - $result = $this->_ci->ZeugnisnoteModel->insert([ - 'note' => 9, - 'studiensemester_kurzbz' => $lv->studiensemester_kurzbz, - 'student_uid' => $lv->uid, - 'lehrveranstaltung_id' => $lv->lehrveranstaltung_id - ]); - if (isError($result)) { - $result = $this->_ci->ZeugnisnoteModel->update([ - 'studiensemester_kurzbz' => $lv->studiensemester_kurzbz, - 'student_uid' => $lv->uid, - 'lehrveranstaltung_id' => $lv->lehrveranstaltung_id - ], [ - 'note' => 9 - ]); - - if (isError($result)) - return $result; - } - } - } - - // TODO(chris): student updaten (hier oder in studentlehrverband) - // TODO(chris): db transaction - - //Benutzer inaktiv setzen - $this->_ci->BenutzerModel->update([ - 'uid' => $student->student_uid - ], [ - 'aktiv' => false, - 'updateaktivvon' => $insertvon, - 'updateaktivam' => date('c'), - 'updatevon' => $insertvon, - 'updateamum' => date('c') - ]); - - return success(); - } - public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id = null, $insertvon = null, $ausbildungssemester = null) { $ausbildungssemester_plus = 0; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 69773fef3..5be674fc5 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -30065,6 +30065,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'error_noStatusgrund', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Statusgrund {statusgrundkurzbz} nicht gefunden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Statusgrund {statusgrundkurzbz} not found', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'lehre', From 21e69c6d94b9d812a398aa16ce3728ab2ab66af5 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 6 Aug 2024 16:19:35 +0200 Subject: [PATCH 396/464] Status: Unterbrecher & Student --- .../api/frontend/v1/stv/Status.php | 38 ++-- application/libraries/PrestudentLib.php | 195 ++++++++++-------- .../Details/Status/Modal.js | 2 +- system/phrasesupdate.php | 20 ++ 4 files changed, 148 insertions(+), 107 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 9df1a8ec4..63c149a82 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -280,6 +280,10 @@ class Status extends FHCAPI_Controller $this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'integer', [ 'integer' => $this->p->t('ui', 'error_fieldNotInteger') ]); + + $this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [ + 'integer' => $this->p->t('ui', 'error_fieldNotInteger') + ]); $this->form_validation->set_rules('_default', '', [ ['meldestichtag_not_exceeded', function () use ($datum, $isBerechtigtNoStudstatusCheck) { @@ -455,28 +459,22 @@ class Status extends FHCAPI_Controller ); break; case Prestudentstatus_model::STATUS_UNTERBRECHER: - $ausbildungssemester = $lastStatusData->ausbildungssemester; - $studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz; - - $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester); - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - else - $this->terminateWithSuccess($prestudent_id); + $result = $this->prestudentlib->setUnterbrecher( + $prestudent_id, + $studiensemester_kurzbz, + null, + null, + $ausbildungssemester, + $statusgrund_id + ); break; case Prestudentstatus_model::STATUS_STUDENT: - $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - else - $this->terminateWithSuccess($prestudent_id); + $result = $this->prestudentlib->setStudent( + $prestudent_id, + $studiensemester_kurzbz, + $ausbildungssemester, + $statusgrund_id + ); break; case Prestudentstatus_model::STATUS_DIPLOMAND: $this->load->library('PrestudentLib'); diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index e8ee7902f..fcbf46419 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -77,7 +77,7 @@ class PrestudentLib if(!$bestaetigtam) $bestaetigtam = date('c'); - //Status und Statusgrund updaten + // Status und Statusgrund updaten $result = $this->_ci->PrestudentstatusModel->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER, @@ -96,7 +96,7 @@ class PrestudentLib if (isError($result)) return $result; - //refactored with processStudentlehrverband + // refactored with processStudentlehrverband $result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband( $student->student_uid, $student->studiengang_kz, @@ -111,7 +111,7 @@ class PrestudentLib return $result; - //noch nicht eingetragene Zeugnisnoten auf 9 setzen + // noch nicht eingetragene Zeugnisnoten auf 9 setzen $result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz); if (isError($result)) return $result; @@ -143,9 +143,9 @@ class PrestudentLib } - //Update Aktionen + // Update Aktionen - //StudentModel updaten + // StudentModel updaten $this->_ci->StudentModel->update([ 'student_uid' => $student->student_uid ], [ @@ -156,7 +156,7 @@ class PrestudentLib 'updateamum' => date('c') ]); - //Benutzer inaktiv setzen + // Benutzer inaktiv setzen $this->_ci->BenutzerModel->update([ 'uid' => $student->student_uid ], [ @@ -170,17 +170,28 @@ class PrestudentLib return success(); } - public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id = null, $insertvon = null, $ausbildungssemester = null) - { + public function setUnterbrecher( + $prestudent_id, + $studiensemester_kurzbz, + $studierendenantrag_id = null, + $insertvon = null, + $ausbildungssemester = null, + $statusgrund_id = null + ) { $ausbildungssemester_plus = 0; + if (!$insertvon) $insertvon = getAuthUID(); + $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz); + if (isError($result)) return $result; + $result = getData($result); - if (!$result) { + + if (!$result) { // NOTE(chris): no status in target stdsem //NOTE(manu): only valid if nextSemester focus max $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); @@ -188,7 +199,7 @@ class PrestudentLib return $result; $result = getData($result); - //check if ausbildungssemester is last + // check if ausbildungssemester is last $this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz'); $res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]); if(isError($res)) @@ -213,17 +224,22 @@ class PrestudentLib } $prestudent_status = current($result); + + $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]); if (isError($result)) return $result; + $result = getData($result); + if (!$result) return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); $student = current($result); - if($studierendenantrag_id) + + if ($studierendenantrag_id) { $resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id); if (isError($resultAntrag)) @@ -238,12 +254,12 @@ class PrestudentLib else $anmerkung = ''; - if($ausbildungssemester) + if ($ausbildungssemester) $semester = $ausbildungssemester; else $semester = $prestudent_status->ausbildungssemester + $ausbildungssemester_plus; - //Status updaten + // Status updaten $result = $this->_ci->PrestudentstatusModel->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER, @@ -256,13 +272,14 @@ class PrestudentLib 'studienplan_id'=> $prestudent_status->studienplan_id, 'bestaetigtvon' => $insertvon, 'bestaetigtam' => date('c'), - 'anmerkung'=> $anmerkung + 'anmerkung'=> $anmerkung, + 'statusgrund_id' => $statusgrund_id ]); if (isError($result)) return $result; - //refactored with processStudentlehrverband + // refactored with processStudentlehrverband $result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband( $student->student_uid, $student->studiengang_kz, @@ -276,7 +293,7 @@ class PrestudentLib if (isError($result)) return $result; - //noch nicht eingetragene Zeugnisnoten auf 9 setzen + // noch nicht eingetragene Zeugnisnoten auf 9 setzen $result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz); if (isError($result)) return $result; @@ -308,9 +325,9 @@ class PrestudentLib } - //Update Aktionen + // Update Aktionen - //StudentModel updaten + // StudentModel updaten $this->_ci->StudentModel->update([ 'student_uid' => $student->student_uid ], [ @@ -326,106 +343,112 @@ class PrestudentLib public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id) { + $authUID = getAuthUID(); + $now = date('c'); + + $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); + if (isError($result)) return $result; - $resultStatus = getData($result); + if (!hasData($result)) + return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [ + 'prestudent_id' => $prestudent_id + ])); - //if not Wiederholer - if($statusgrund_id != 16) - { - //check if ausbildungssemester is last - $this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz'); - $resultStg = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]); - if(isError($resultStg)) - return $resultStg; - if(!hasData($resultStg)) - return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [ - 'prestudent_id' => $prestudent_id - ])); + $prestudent_status = current(getData($result)); - $studiengang = current(getData($resultStg)); - - $prestudent_status = ($resultStatus[0] ?: null ); - if(!$prestudent_status) - { - return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [ - 'prestudent_id' => $prestudent_id, - 'studiensemester_kurzbz' => $studiensemester_kurzbz - ])); - } - } - $result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]); if (isError($result)) return $result; - $result = getData($result); - if (!$result) + if (!hasData($result)) return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); - // $student = current($result); + $student = current(getData($result)); - //Status updaten + + $this->_ci->load->library('VariableLib', ['uid' => $authUID]); + $semester_aktuell = $this->variablelib->getVar('semester_aktuell'); + + + // Update Aktionen + + // Status updaten $result = $this->_ci->PrestudentstatusModel->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT, 'studiensemester_kurzbz' => $studiensemester_kurzbz, 'statusgrund_id' => $statusgrund_id, 'ausbildungssemester' => $ausbildungssemester, - 'datum' => date('c'), - 'insertvon' => getAuthUID(), - 'insertamum' => date('c'), + 'datum' => $now, + 'insertvon' => $authUID, + 'insertamum' => $now, 'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz, 'studienplan_id'=> $prestudent_status->studienplan_id, - 'bestaetigtvon' => getAuthUID(), - 'bestaetigtam' => date('c') + 'bestaetigtvon' => $authUID, + 'bestaetigtam' => $now ]); if (isError($result)) return $result; - $result = $this->_ci->StudentModel->checkIfUid($prestudent_id); - if (isError($result)) { - return $result; - } - //$student_uid = $result->retval; - $student_uid = getData($result); - //load student - $result = $this->_ci->StudentModel->loadWhere( - array( - 'student_uid' => $student_uid - ) - ); - if (isError($result)) - { - return $result; - } - - $studentData = current(getData($result) ? : []); - //TODO(Manu) check why in FAS == 0; correct there?? - //$verband = $studentData->verband == '' ? '' : $studentData->verband; - //$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe; - $studiengang_kz = $studentData->studiengang_kz; - - //process studentlehrverband - $this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); - $result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband( - $student_uid, - $studiengang_kz, - $ausbildungssemester, - "", //TODO(Manu) checkFAS: 0 - "",//TODO(Manu) checkFAS: 0 - $studiensemester_kurzbz - ); + // Student updaten + $result = $this->_ci->StudentModel->update([ + 'student_uid' => $student->student_uid + ], [ + 'studiensemester_kurzbz' => $semester_aktuell, + 'semester' => $ausbildungssemester, + 'verband' => '', + 'gruppe' => '', + 'updatevon' => $authUID, + 'updateamum' => $now + ]); if (isError($result)) - { return $result; + + + // Studentlehrverband updaten + $result = $this->_ci->StudentlehrverbandModel->update([ + 'student_uid' => $student->student_uid, + 'studiensemester_kurzbz' => $semester_aktuell + ], [ + 'semester' => $ausbildungssemester, + 'verband' => '', + 'gruppe' => '', + 'updatevon' => $authUID, + 'updateamum' => $now + ]); + + if (isError($result)) + return $result; + + + // Benutzer updaten + $result = $this->_ci->BenutzerModel->load([$student->student_uid]); + + if (isError($result)) + return $result; + if (!hasData($result)) + return error($this->_ci->p->t('person', 'error_noBenutzer')); + + $benutzer = current(getData($result)); + $updateData = [ + 'aktiv' => true, + 'updateamum' => $now, + 'updatevon' => $authUID + ]; + if (!$benutzer->aktiv) { + $updateData['updateaktivam'] = $now; + $updateData['updateaktivvon'] = $authUID; } + + $this->_ci->BenutzerModel->update([$student->student_uid], $updateData); + return success(); } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js index 2b3f2f580..0b0736ea1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js @@ -371,7 +371,7 @@ export default{ type="select" v-model="formData.statusgrund_id" name="statusgrund_id" - :label="$p.t('studierendenantrag/antrag_grund')" + :label="$p.t('international/grund')" >
    + ` + /* TODO(chris): Ausgeblendet für Testing
    + */`
    + ` + /* TODO(chris): Ausgeblendet für Testing + */` Date: Tue, 13 Aug 2024 11:20:32 +0200 Subject: [PATCH 441/464] Bugfix: uft8 json & codequality --- .../api/frontend/v1/stv/Prestudent.php | 55 +++++-------------- 1 file changed, 14 insertions(+), 41 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index d75ad5fbc..5917ae8f1 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -10,7 +10,7 @@ class Prestudent extends FHCAPI_Controller { parent::__construct([ 'get' => ['admin:r', 'assistenz:r'], - 'updatePrestudent' => ['admin:w', 'assistenz:w'], + 'updatePrestudent' => ['admin:rw', 'assistenz:rw'], 'getHistoryPrestudents' => ['admin:r', 'assistenz:r'], 'getBezeichnungZGV' => self::PERM_LOGGED, 'getBezeichnungDZgv' => self::PERM_LOGGED, @@ -23,6 +23,11 @@ class Prestudent extends FHCAPI_Controller 'getStudiengang' => self::PERM_LOGGED ]); + if ($this->router->method == 'updatePrestudent') { + $prestudent_id = current(array_slice($this->uri->rsegments, 2)); + $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']); + } + // Load Libraries $this->load->library('VariableLib', ['uid' => getAuthUID()]); @@ -52,30 +57,11 @@ class Prestudent extends FHCAPI_Controller public function updatePrestudent($prestudent_id) { - $this->load->library('form_validation'); - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - - //get Studiengang von prestudent_id - $this->load->model('crm/Prestudent_model', 'PrestudentModel'); - $result = $this->PrestudentModel->load([ - 'prestudent_id'=> $prestudent_id, - ]); - if(isError($result)) - { - $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - $result = current(getData($result)); - - $stg = $result->studiengang_kz; - - if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) - { - return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL); - } - //Form validation + $this->load->library('form_validation'); + $this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [ - 'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung']) + 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Priorisierung']) ]); if ($this->form_validation->run() == false) @@ -83,8 +69,6 @@ class Prestudent extends FHCAPI_Controller $this->terminateWithValidationErrors($this->form_validation->error_array()); } - $deltaData = $_POST; - $uid = getAuthUID(); $array_allowed_props_prestudent = [ @@ -124,7 +108,7 @@ class Prestudent extends FHCAPI_Controller $update_prestudent = array(); foreach ($array_allowed_props_prestudent as $prop) { - $val = isset($deltaData[$prop]) ? $deltaData[$prop] : null; + $val = $this->input->post($prop); if ($val !== null || $prop == 'foerderrelevant') { $update_prestudent[$prop] = $val; } @@ -133,28 +117,17 @@ class Prestudent extends FHCAPI_Controller $update_prestudent['updateamum'] = date('c'); $update_prestudent['updatevon'] = $uid; - //utf8-decode for special chars (eg tag der offenen Tür, FH-Führer) - function utf8_decode_if_string($value) - { - if (is_string($value)) { - return utf8_decode($value); - } else { - return $value; - } - } - $update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent); - if (count($update_prestudent)) { $result = $this->PrestudentModel->update( $prestudent_id, - $update_prestudent_encoded + $update_prestudent ); - if (isError($result)) { - $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } + $this->getDataOrTerminateWithError($result); + return $this->terminateWithSuccess(true); } + return $this->terminateWithSuccess(false); } public function getHistoryPrestudents($person_id) From 3d07aa3bd0ae57942dbdfa74b794f72f3c3bfa6a Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 11:29:24 +0200 Subject: [PATCH 442/464] UDFs Prestudent aktivieren --- .../api/frontend/v1/stv/Prestudent.php | 18 ++++++++++++++++++ .../api/frontend/v1/stv/Student.php | 4 ++-- .../Studentenverwaltung/Details/Prestudent.js | 9 ++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index 5917ae8f1..df8b14710 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -57,9 +57,19 @@ class Prestudent extends FHCAPI_Controller public function updatePrestudent($prestudent_id) { + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + + // UDF + $this->load->library('UDFLib'); + + $result = $this->udflib->getCiValidations($this->PrestudentModel, $this->input->post()); + $udf_field_validations = $this->getDataOrTerminateWithError($result); + //Form validation $this->load->library('form_validation'); + $this->form_validation->set_rules($udf_field_validations); + $this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [ 'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Priorisierung']) ]); @@ -105,6 +115,14 @@ class Prestudent extends FHCAPI_Controller 'standort_code' ]; + // add UDFs + $result = $this->udflib->getDefinitionForModel($this->PrestudentModel); + + $definitions = $this->getDataOrTerminateWithError($result); + + foreach ($definitions as $def) + $array_allowed_props_prestudent[] = $def['name']; + $update_prestudent = array(); foreach ($array_allowed_props_prestudent as $prop) { diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 2f7b02972..89c317ae4 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -143,9 +143,9 @@ class Student extends FHCAPI_Controller $result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post()); //TODO(Manu) check with Chris: input number not allowed - $field_validations = $this->getDataOrTerminateWithError($result); + $udf_field_validations = $this->getDataOrTerminateWithError($result); - $this->form_validation->set_rules($field_validations); + $this->form_validation->set_rules($udf_field_validations); if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 6857bef0b..e6db926cc 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -2,11 +2,14 @@ import FormForm from '../../../Form/Form.js'; import FormInput from '../../../Form/Input.js'; import TblHistory from "./Prestudent/History.js"; +import CoreUdf from '../../../Udf/Udf.js'; + export default { components: { FormForm, FormInput, - TblHistory + TblHistory, + CoreUdf }, inject: { lists: { @@ -98,6 +101,9 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, + udfsLoaded(udfs) { + this.initialFormData = {...(this.initialFormData || {}), ...udfs}; + }, updatePrestudent(){ this.$refs.form .post('api/frontend/v1/stv/prestudent/updatePrestudent/' + this.modelValue.prestudent_id, this.deltaArray) @@ -505,6 +511,7 @@ export default { >
    +
    From e5217afc0942eef4ace84277234597674f4f32f4 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 13:10:11 +0200 Subject: [PATCH 443/464] ZGV Ausstellungsstaat --- application/models/crm/Prestudent_model.php | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index e2acde497..242c26518 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -14,6 +14,39 @@ class Prestudent_model extends DB_Model $this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel'); } + /** + * Update Data in DB-Table + * + * @param string $id PK for DB-Table + * @param array $data DataArray for Insert + * @return array + */ + public function update($id, $data, $encryptedColumns = null) + { + if (isset($data['zgvmas_code']) + || isset($data['zgvmanation']) + || isset($data['zgv_code']) + || isset($data['zgvnation']) + ) { + /** + * Falls ZGV vorhanden, setze Ausstellungsstaat (für BIS-Meldung) + * auf Nation der höchsten angegebenen ZGV + */ + $case = '(CASE + WHEN zgvmas_code IS NOT NULL AND zgvmanation IS NOT NULL THEN zgvmanation + WHEN zgv_code IS NOT NULL AND zgvnation IS NOT NULL THEN zgvnation + ELSE NULL END)'; + + foreach (['zgvmas_code', 'zgvmanation', 'zgv_code', 'zgvnation'] as $key) + if (isset($data[$key])) + $case = str_replace($key, $this->escape($data[$key]), $case); + + $this->db->set('ausstellungsstaat', $case, false); + } + + return parent::update($id, $data, $encryptedColumns); + } + /** * getLastStatuses */ From f9a41b9685a5a03d562e92b14f46074018a62ff1 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 13:25:10 +0200 Subject: [PATCH 444/464] Studienplan & Studiensemester => Auth Controller --- application/controllers/components/stv/Studienplan.php | 6 ++++-- .../controllers/components/stv/Studiensemester.php | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/application/controllers/components/stv/Studienplan.php b/application/controllers/components/stv/Studienplan.php index 2e7c2f425..b60388ac1 100644 --- a/application/controllers/components/stv/Studienplan.php +++ b/application/controllers/components/stv/Studienplan.php @@ -2,12 +2,14 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -class Studienplan extends FHC_Controller +class Studienplan extends Auth_Controller { public function __construct() { // TODO(chris): access! - parent::__construct(); + parent::__construct([ + 'get' => self::PERM_LOGGED + ]); } public function get() diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php index 09bbf8886..17c229e2c 100644 --- a/application/controllers/components/stv/Studiensemester.php +++ b/application/controllers/components/stv/Studiensemester.php @@ -2,12 +2,16 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -class Studiensemester extends FHC_Controller +class Studiensemester extends Auth_Controller { public function __construct() { // TODO(chris): access! - parent::__construct(); + parent::__construct([ + 'index' => self::PERM_LOGGED, + 'now' => self::PERM_LOGGED, + 'set' => self::PERM_LOGGED + ]); } public function index() From 6fb050fa58932842d9fc357f4243966a18f05873 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 13:32:29 +0200 Subject: [PATCH 445/464] Tab Config Permissions --- application/controllers/api/frontend/v1/stv/Config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php index 45ae7be01..c28c49485 100644 --- a/application/controllers/api/frontend/v1/stv/Config.php +++ b/application/controllers/api/frontend/v1/stv/Config.php @@ -33,8 +33,8 @@ class Config extends FHCAPI_Controller { // TODO(chris): permissions parent::__construct([ - 'student' => self::PERM_LOGGED, - 'students' => self::PERM_LOGGED + 'student' => ['admin:r', 'assistenz:r'], + 'students' => ['admin:r', 'assistenz:r'] ]); From a988ff20c886887b22566bcc6929ff06acf37247 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 13:38:09 +0200 Subject: [PATCH 446/464] Notiz Permissions --- application/controllers/api/frontend/v1/stv/Notiz.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php index 426408863..19e568f33 100644 --- a/application/controllers/api/frontend/v1/stv/Notiz.php +++ b/application/controllers/api/frontend/v1/stv/Notiz.php @@ -11,9 +11,9 @@ class Notiz extends Notiz_Controller parent::__construct([ 'getUid' => ['admin:r', 'assistenz:r'], 'getNotizen' => ['admin:r', 'assistenz:r'], - 'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED - 'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED - 'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED + 'loadNotiz' => ['admin:r', 'assistenz:r'], // TODO(manu): self::PERM_LOGGED + 'addNewNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED + 'updateNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED 'deleteNotiz' => ['admin:r', 'assistenz:r'], 'loadDokumente' => ['admin:r', 'assistenz:r'], 'getMitarbeiter' => ['admin:r', 'assistenz:r'] From f8f352fe65683178977aee1de8c3bf5dabc21eaf Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 13:41:35 +0200 Subject: [PATCH 447/464] Students Permissions --- application/controllers/api/frontend/v1/stv/Students.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php index 1a90b51cd..5fb7b592c 100644 --- a/application/controllers/api/frontend/v1/stv/Students.php +++ b/application/controllers/api/frontend/v1/stv/Students.php @@ -32,7 +32,7 @@ class Students extends FHCAPI_Controller { $permissions = []; $router = load_class('Router'); - $permissions[$router->method] = self::PERM_LOGGED; + $permissions[$router->method] = ['admin:r', 'assistenz:r']; parent::__construct($permissions); $this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: []; From 4fc61c342c622300f0d142c4084749d9e29467ac Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 13:52:04 +0200 Subject: [PATCH 448/464] Prestudent Permissions --- .../api/frontend/v1/stv/Prestudent.php | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index df8b14710..abbbb16d9 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -12,20 +12,29 @@ class Prestudent extends FHCAPI_Controller 'get' => ['admin:r', 'assistenz:r'], 'updatePrestudent' => ['admin:rw', 'assistenz:rw'], 'getHistoryPrestudents' => ['admin:r', 'assistenz:r'], - 'getBezeichnungZGV' => self::PERM_LOGGED, - 'getBezeichnungDZgv' => self::PERM_LOGGED, - 'getBezeichnungMZgv' => self::PERM_LOGGED, - 'getAusbildung' => self::PERM_LOGGED, - 'getAufmerksamdurch' => self::PERM_LOGGED, - 'getBerufstaetigkeit' => self::PERM_LOGGED, - 'getTypenStg' => self::PERM_LOGGED, - 'getStudienplaene' => self::PERM_LOGGED, - 'getStudiengang' => self::PERM_LOGGED + 'getBezeichnungZGV' => ['admin:r', 'assistenz:r'], + 'getBezeichnungDZgv' => ['admin:r', 'assistenz:r'], + 'getBezeichnungMZgv' => ['admin:r', 'assistenz:r'], + 'getAusbildung' => ['admin:r', 'assistenz:r'], + 'getAufmerksamdurch' => ['admin:r', 'assistenz:r'], + 'getBerufstaetigkeit' => ['admin:r', 'assistenz:r'], + 'getTypenStg' => ['admin:r', 'assistenz:r'], + 'getStudienplaene' => ['admin:r', 'assistenz:r'], + 'getStudiengang' => ['admin:r', 'assistenz:r'] ]); if ($this->router->method == 'updatePrestudent') { $prestudent_id = current(array_slice($this->uri->rsegments, 2)); $this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']); + } elseif ($this->router->method == 'get' + || $this->router->method == 'getStudienplaene' + || $this->router->method == 'getStudiengang' + ) { + $prestudent_id = current(array_slice($this->uri->rsegments, 2)); + $this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']); + } elseif ($this->router->method == 'getHistoryPrestudents') { + $person_id = current(array_slice($this->uri->rsegments, 2)); + $this->checkPermissionsForPrestudent($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']); } // Load Libraries From 5d169e188a082215538a8d624307c2d5359f97da Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 13 Aug 2024 14:12:55 +0200 Subject: [PATCH 449/464] move permissions from abstract to concrete Notiz Controller --- .../api/frontend/v1/notiz/NotizPerson.php | 8 +++ .../core/Abstract_Searchbar_Controller.php | 69 +++++++++++++++++++ application/core/Notiz_Controller.php | 35 ++++++---- 3 files changed, 100 insertions(+), 12 deletions(-) create mode 100644 application/core/Abstract_Searchbar_Controller.php diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php index 15445bd14..cb9d31024 100644 --- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php +++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php @@ -9,6 +9,14 @@ class NotizPerson extends Notiz_Controller public function __construct() { parent::__construct([ + 'getUid' => ['admin:r', 'assistenz:r'], + 'getNotizen' => ['admin:r', 'assistenz:r'], + 'loadNotiz' => ['admin:r', 'assistenz:r'], + 'addNewNotiz' => ['admin:rw', 'assistenz:rw'], + 'updateNotiz' => ['admin:rw', 'assistenz:rw'], + 'deleteNotiz' => ['admin:rw', 'assistenz:rw'], + 'loadDokumente' => ['admin:r', 'assistenz:r'], + 'getMitarbeiter' => ['admin:r', 'assistenz:r'], 'isBerechtigt' => ['admin:r', 'assistenz:r'], ]); } diff --git a/application/core/Abstract_Searchbar_Controller.php b/application/core/Abstract_Searchbar_Controller.php new file mode 100644 index 000000000..8b383e042 --- /dev/null +++ b/application/core/Abstract_Searchbar_Controller.php @@ -0,0 +1,69 @@ +. + */ + +if (! defined('BASEPATH')) exit('No direct script access allowed'); + +/** + * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end) + * Provides data to the ajax get calls about the searchbar component + * This controller works with JSON calls on the HTTP GET and the output is always JSON + */ +class Searchbar extends FHCAPI_Controller +{ + const SEARCHSTR_PARAM = 'searchstr'; + const TYPES_PARAM = 'types'; + + /** + * Object initialization + */ + public function __construct() + { + // NOTE(chris): additional permission checks will be done in SearchBarLib + parent::__construct([ + 'search' => self::PERM_LOGGED + ]); + + // Load the library SearchBarLib + $this->load->library('SearchBarLib'); + } + + //------------------------------------------------------------------------------------------------------------------ + // Public methods + + /** + * Gets a JSON body via HTTP POST and provides the parameters + */ + public function search() + { + $this->load->library('form_validation'); + + // Checks if the searchstr and the types parameters are in the POSTed JSON + $this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required'); + $this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required'); + + if (!$this->form_validation->run()) + $this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL); + + // Convert to json the result from searchbarlib->search + $result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM)); + if (property_exists($result, 'error')) + $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); + $this->terminateWithSuccess($result); + } +} + diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php index 17bd28481..05f70ee85 100644 --- a/application/core/Notiz_Controller.php +++ b/application/core/Notiz_Controller.php @@ -6,20 +6,31 @@ use \DateTime as DateTime; abstract class Notiz_Controller extends FHCAPI_Controller { + const DEFAULT_PERMISSION_R = 'admin:r'; + const DEFAULT_PERMISSION_RW = 'admin:rw'; //public function __construct($zuordnung = 'person/Notizzuordnung_model') - public function __construct() + public function __construct($permissions) { - parent::__construct([ - 'getUid' => self::PERM_LOGGED, - 'getNotizen' => self::PERM_LOGGED, - 'loadNotiz' => self::PERM_LOGGED, - 'addNewNotiz' => self::PERM_LOGGED, - 'updateNotiz' => self::PERM_LOGGED, - 'deleteNotiz' => ['admin:w', 'assistenz:w'], - 'loadDokumente' => ['admin:w', 'assistenz:w'], - 'getMitarbeiter' => self::PERM_LOGGED, - 'isBerechtigt' => self::PERM_LOGGED, - ]); + $default_permissions = [ + 'getUid' => self::DEFAULT_PERMISSION_R, + 'getNotizen' => self::DEFAULT_PERMISSION_R, + 'loadNotiz' => self::DEFAULT_PERMISSION_R, + 'addNewNotiz' => self::DEFAULT_PERMISSION_RW, + 'updateNotiz' => self::DEFAULT_PERMISSION_RW, + 'deleteNotiz' => self::DEFAULT_PERMISSION_RW, + 'loadDokumente' => self::DEFAULT_PERMISSION_R, + 'getMitarbeiter' => self::DEFAULT_PERMISSION_R, + 'isBerechtigt' => self::DEFAULT_PERMISSION_R, + ]; + + if(!is_array($permissions)) + { + $this->terminateWithError("Notiz_controller construct: permissions must be an array"); + } + + $merged_permissions = array_merge($default_permissions, $permissions); + + parent::__construct($merged_permissions); //Load Models $this->load->model('person/Notiz_model', 'NotizModel'); From 50a96b3e4f6c0636556e12f6c5d6110a95f9b81d Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 14:20:40 +0200 Subject: [PATCH 450/464] Prestudent History: Wrong Function for Permissioncheck --- application/controllers/api/frontend/v1/stv/Prestudent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index abbbb16d9..ef9aeb111 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -34,7 +34,7 @@ class Prestudent extends FHCAPI_Controller $this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']); } elseif ($this->router->method == 'getHistoryPrestudents') { $person_id = current(array_slice($this->uri->rsegments, 2)); - $this->checkPermissionsForPrestudent($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']); + $this->checkPermissionsForPerson($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']); } // Load Libraries From 98f335ec0085621a30bb6fed39dc8d06b7cfec7a Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 14:30:25 +0200 Subject: [PATCH 451/464] mising fileextension on import in Prompt.js --- public/js/components/Bootstrap/Prompt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Bootstrap/Prompt.js b/public/js/components/Bootstrap/Prompt.js index 74e5c8b3f..f7af263b0 100644 --- a/public/js/components/Bootstrap/Prompt.js +++ b/public/js/components/Bootstrap/Prompt.js @@ -1,5 +1,5 @@ -import BsAlert from './Alert'; +import BsAlert from './Alert.js'; export default { mixins: [ From 2e3576b06e773e978dd3b01ee7695739da689537 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 14:34:53 +0200 Subject: [PATCH 452/464] Bugfix: Advance Status: object in array --- application/controllers/api/frontend/v1/stv/Status.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index c5daf78a2..074f4029e 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -1490,6 +1490,7 @@ class Status extends FHCAPI_Controller if (!$student) $this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id])); + $student = current($student); //process studentlehrverband From e24c610bf17d0580a32d02664c4cc1fca996b7a9 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 14:59:54 +0200 Subject: [PATCH 453/464] Studiensemester now: change getAkt to getNearest --- application/controllers/components/stv/Studiensemester.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php index 17c229e2c..c3db99686 100644 --- a/application/controllers/components/stv/Studiensemester.php +++ b/application/controllers/components/stv/Studiensemester.php @@ -32,7 +32,7 @@ class Studiensemester extends Auth_Controller { $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - $result = $this->StudiensemesterModel->getAkt(); + $result = $this->StudiensemesterModel->getNearest(); if (isError($result)) { $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); From 308412b5a305daa0edba92aa23704ddabff1e928 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 13 Aug 2024 15:00:13 +0200 Subject: [PATCH 454/464] Bugfix Creditpoints --- .../components/Stv/Studentenverwaltung/Details/Konto/New.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js index 52e15a4d5..ddbb59faa 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js @@ -89,7 +89,7 @@ export default { buchungstext: '', mahnspanne: 30, studiensemester_kurzbz: this.defaultSemester, - credit_points: '', + credit_points: null, anmerkung: '' }; this.$refs.modal.show(); @@ -110,7 +110,7 @@ export default { if (!this.data.buchungstext) this.data.buchungstext = text; - if (this.config.showCreditpoints && this.data.credit_points == '0.00') + if (this.config.showCreditpoints && (this.data.credit_points == '0.00' || this.data.credit_points === null)) this.data.credit_points = creditpoints; } }, From 2bd578edb3426d6714e92f0cb5a256056f973c06 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 13 Aug 2024 16:42:09 +0200 Subject: [PATCH 455/464] remove unused Abstract_Searchbar_Controller --- .../core/Abstract_Searchbar_Controller.php | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 application/core/Abstract_Searchbar_Controller.php diff --git a/application/core/Abstract_Searchbar_Controller.php b/application/core/Abstract_Searchbar_Controller.php deleted file mode 100644 index 8b383e042..000000000 --- a/application/core/Abstract_Searchbar_Controller.php +++ /dev/null @@ -1,69 +0,0 @@ -. - */ - -if (! defined('BASEPATH')) exit('No direct script access allowed'); - -/** - * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end) - * Provides data to the ajax get calls about the searchbar component - * This controller works with JSON calls on the HTTP GET and the output is always JSON - */ -class Searchbar extends FHCAPI_Controller -{ - const SEARCHSTR_PARAM = 'searchstr'; - const TYPES_PARAM = 'types'; - - /** - * Object initialization - */ - public function __construct() - { - // NOTE(chris): additional permission checks will be done in SearchBarLib - parent::__construct([ - 'search' => self::PERM_LOGGED - ]); - - // Load the library SearchBarLib - $this->load->library('SearchBarLib'); - } - - //------------------------------------------------------------------------------------------------------------------ - // Public methods - - /** - * Gets a JSON body via HTTP POST and provides the parameters - */ - public function search() - { - $this->load->library('form_validation'); - - // Checks if the searchstr and the types parameters are in the POSTed JSON - $this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required'); - $this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required'); - - if (!$this->form_validation->run()) - $this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL); - - // Convert to json the result from searchbarlib->search - $result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM)); - if (property_exists($result, 'error')) - $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - $this->terminateWithSuccess($result); - } -} - From 2c6212f75fb5f4d6a786af002be906de59d7ae16 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Wed, 14 Aug 2024 07:36:14 +0200 Subject: [PATCH 456/464] fix reuse of for multiple purposes overwriting each other --- application/controllers/api/frontend/v1/stv/Konto.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php index a4344889c..ac36b5d8f 100644 --- a/application/controllers/api/frontend/v1/stv/Konto.php +++ b/application/controllers/api/frontend/v1/stv/Konto.php @@ -246,11 +246,11 @@ class Konto extends FHCAPI_Controller if (isError($id)) { $this->addError(getError($id), self::ERROR_TYPE_DB); } else { - $data = $this->KontoModel->withAdditionalInfo()->load(getData($id)); - if (isError($data)) - $this->addError(getError($data), self::ERROR_TYPE_DB); + $kontodata = $this->KontoModel->withAdditionalInfo()->load(getData($id)); + if (isError($kontodata)) + $this->addError(getError($kontodata), self::ERROR_TYPE_DB); else - $result[] = current(getData($data)); + $result[] = current(getData($kontodata)); } } From d33163aae8e5e72a920cb65a1df75e1b2b74e873 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 14 Aug 2024 09:09:13 +0200 Subject: [PATCH 457/464] Add stv_favorites to variablenames --- system/dbupdate_3.4/44031_stv_favorites.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 system/dbupdate_3.4/44031_stv_favorites.php diff --git a/system/dbupdate_3.4/44031_stv_favorites.php b/system/dbupdate_3.4/44031_stv_favorites.php new file mode 100644 index 000000000..473001c68 --- /dev/null +++ b/system/dbupdate_3.4/44031_stv_favorites.php @@ -0,0 +1,16 @@ +db_query("SELECT 1 FROM public.tbl_variablenname WHERE name = 'stv_favorites';")) +{ + if ($db->db_num_rows($result) == 0) + { + $qry = "INSERT INTO public.tbl_variablenname(name, defaultwert) VALUES('stv_favorites', null);"; + + if (!$db->db_query($qry)) + echo 'public.tbl_variablenname '.$db->db_last_error().'
    '; + else + echo 'public.tbl_variablenname: Added name "stv_favorites"
    '; + } +} From 67398607d8041a428cea5c923209667734e54965 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 14 Aug 2024 09:11:14 +0200 Subject: [PATCH 458/464] dbupdate entry --- system/dbupdate_3.4.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php index f728910e9..11880fd55 100644 --- a/system/dbupdate_3.4.php +++ b/system/dbupdate_3.4.php @@ -57,6 +57,7 @@ require_once('dbupdate_3.4/34543_ux_template.php'); require_once('dbupdate_3.4/17513_Entwicklungsteam.php'); require_once('dbupdate_3.4/28575_softwarebereitstellung.php'); require_once('dbupdate_3.4/41150_oe-pfad_db_view.php'); +require_once('dbupdate_3.4/44031_stv_favorites.php'); // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen echo '

    Pruefe Tabellen und Attribute!

    '; From f771b54f10c86223ce6af987d64828d1f76f2e17 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 14 Aug 2024 09:16:11 +0200 Subject: [PATCH 459/464] StV: Favorites use now correct API return functions --- application/controllers/api/frontend/v1/stv/Favorites.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php index e651bf85e..8d7a6cd14 100644 --- a/application/controllers/api/frontend/v1/stv/Favorites.php +++ b/application/controllers/api/frontend/v1/stv/Favorites.php @@ -46,9 +46,9 @@ class Favorites extends FHCAPI_Controller $data = $this->getDataOrTerminateWithError($result); if (!$data) - $this->outputJson(null); + $this->terminateWithSuccess(null); else - $this->outputJson($data['stv_favorites']); + $this->terminateWithSuccess($data['stv_favorites']); } public function set() @@ -66,6 +66,6 @@ class Favorites extends FHCAPI_Controller $this->getDataOrTerminateWithError($result); - $this->outputJsonSuccess(true); + $this->terminateWithSuccess(true); } } From a594ddeb753403efce0fb814e1945a62037d7b78 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 19 Aug 2024 13:08:12 +0200 Subject: [PATCH 460/464] AntragJob: Abmeldungen durch Stg config mismatch --- application/controllers/jobs/AntragJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 4ad601070..46a31f3d6 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -421,7 +421,7 @@ class AntragJob extends JOB_Controller $this->StudierendenantragModel->db->where_in( 'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', - $this->config->item('antrag_prestudentstatus_whitelist') + $this->config->item('antrag_prestudentstatus_whitelist_abmeldung') ); $result = $this->StudierendenantragModel->getWithLastStatusWhere([ From a2f9fba8964781871bdf6f95d1d3aeb70c0e2270 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 21 Aug 2024 12:50:58 +0200 Subject: [PATCH 461/464] =?UTF-8?q?Bugfix:=20Favorites:=20Correct=20loadin?= =?UTF-8?q?g=20procedure=20for=20Prestudent-Subverb=C3=A4nde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/api/frontend/v1/stv/Verband.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php index 8d508399b..e8c532652 100644 --- a/application/controllers/api/frontend/v1/stv/Verband.php +++ b/application/controllers/api/frontend/v1/stv/Verband.php @@ -70,12 +70,16 @@ class Verband extends FHCAPI_Controller if ($count == 1) { if (is_numeric($params[0])) return $this->getSemester($method, $params[0]); + elseif ($params[0] == 'prestudent') + return $this->terminateWithSuccess($this->getStdSem($method . '/prestudent/', $method)); else return $this->getStudiengang($method, $params[0]); } if ($count == 2) { if (is_numeric($params[0])) return $this->getVerband($method, $params[0], $params[1]); + elseif ($params[1] == 'prestudent') + return $this->terminateWithSuccess($this->getStdSem($method . '/' . $params[0] . '/prestudent/', $method)); else return $this->getSemester($method, $params[1], $params[0]); } From ec6efc5c2b76a09576ac3c206ab0d2d0f1933d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 21 Aug 2024 16:54:22 +0200 Subject: [PATCH 462/464] Added studiengang_kz to Akadgrad DropDown --- vilesci/lehre/studienordnung.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vilesci/lehre/studienordnung.inc.php b/vilesci/lehre/studienordnung.inc.php index fc84e7047..c354e0484 100644 --- a/vilesci/lehre/studienordnung.inc.php +++ b/vilesci/lehre/studienordnung.inc.php @@ -139,7 +139,7 @@ switch($method) $selected=' selected'; else $selected=''; - echo ''; + echo ''; } echo ' @@ -312,7 +312,7 @@ switch($method) '; break; - + case 'semesterSTPLZuordnung': $studienplan_id = $_GET["studienplan_id"]; @@ -362,7 +362,7 @@ switch($method) { if (array_key_exists($row->studiensemester, $studiensemester_array)) $studiensemester_array[$row->studiensemester] = true; - + echo ''.$row->studiensemester.''; for($i = 1; $i<=$ausbildungssemester; $i++) { @@ -385,7 +385,7 @@ switch($method) foreach($studiensemester_array AS $key => $value) { if ($value == true) - { + { echo ''; $lastStudiensemesterActive = false; } From 493405951d037a94176c24ca64de8db6359986a4 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 5 Sep 2024 16:31:56 +0200 Subject: [PATCH 463/464] zusaetzlicher Filter bei Handyverwaltung nach beendeten DVs --- system/filtersupdate.php | 47 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/system/filtersupdate.php b/system/filtersupdate.php index 3872d1905..e885b4e14 100644 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -1402,14 +1402,53 @@ $filters = array( {"name": "Wochenstunden"}, {"name": "WS_von"}, {"name": "WS_bis"}, - {"name": "Standardkostenstelle"} + {"name": "Standardkostenstelle"}, + {"name": "DV_status"} ], "filters": [ { - "name": "Nachname", + "name": "DV_status", "option": "", - "operation": "", - "condition": "" + "operation": "nequal", + "condition": "beendet" + } + ] + } + ', + 'oe_kurzbz' => null, + ), + array( + 'app' => 'personalverwaltung', + 'dataset_name' => 'handyverwaltung', + 'filter_kurzbz' => 'ma4handyverwaltung_beendet', + 'description' => '{MA Handyverwaltung (DV beendet)}', + 'sort' => 2, + 'default_filter' => false, + 'filter' => ' + { + "name": "MA Handyverwaltung (DV beendet)", + "columns": [ + {"name": "UID"}, + {"name": "PersonId"}, + {"name": "Vorname"}, + {"name": "Nachname"}, + {"name": "EMail"}, + {"name": "Unternehmen"}, + {"name": "Vertragsart"}, + {"name": "DV_von"}, + {"name": "DV_bis"}, + {"name": "Wochenstunden"}, + {"name": "WS_von"}, + {"name": "WS_bis"}, + {"name": "Standardkostenstelle"}, + {"name": "DV_status"} + ], + "filters": [ + { + "name": "DV_status", + "option": "", + "operation": "equal", + "condition": "beendet" } ] } From 555e74b8cd8d183629ae5cd2d0492d4b9a9c8c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 10 Sep 2024 11:48:43 +0200 Subject: [PATCH 464/464] =?UTF-8?q?Projektexport=20ist=20jetzt=20auch=20m?= =?UTF-8?q?=C3=B6glich=20wenn=20aktuell=20keine=20Projekte=20zugeordnet=20?= =?UTF-8?q?sind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/tools/zeitaufzeichnung.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php index 7b1fb1fbb..0b463fe37 100644 --- a/cis/private/tools/zeitaufzeichnung.php +++ b/cis/private/tools/zeitaufzeichnung.php @@ -1014,9 +1014,9 @@ if ($projekt->getProjekteMitarbeiter($user, true)) } echo "     Projektübersichtexport"; - if($anzprojekte > 0) - echo " | ".$p->t("zeitaufzeichnung/projektexport").""; - echo " + //if($anzprojekte > 0) + echo " | ".$p->t("zeitaufzeichnung/projektexport").""; + echo " "; if ($p->t("dms_link/handbuchZeitaufzeichnung")!='') {