diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js index d5812ce83..b34e3b8ec 100644 --- a/public/js/components/Betriebsmittel/Betriebsmittel.js +++ b/public/js/components/Betriebsmittel/Betriebsmittel.js @@ -23,8 +23,8 @@ export default { props: [ 'person_id', 'uid' - ], - data(){ + ], + data() { return { tabulatorOptions: { ajaxURL: 'api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id, @@ -138,27 +138,27 @@ export default { } }, watch: { - uid(){ + uid() { this.$refs.table.tabulator.setData('api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id); } }, methods: { - actionEditBetriebsmittel(betriebsmittelperson_id){ + actionEditBetriebsmittel(betriebsmittelperson_id) { this.statusNew = false; this.loadBetriebsmittel(betriebsmittelperson_id); }, - actionNewBetriebsmittel(){ + actionNewBetriebsmittel() { this.resetModal(); this.statusNew = true; this.formData.ausgegebenam = this.getDefaultDate(); this.reload(); }, - actionDeleteBetriebsmittel(betriebsmittelperson_id){ + actionDeleteBetriebsmittel(betriebsmittelperson_id) { this.loadBetriebsmittel(betriebsmittelperson_id).then(() => { this.$refs.deleteBetriebsmittelModal.show(); }); }, - addNewBetriebsmittel(){ + addNewBetriebsmittel() { this.param = { 'uid': this.uid, 'person_id': this.person_id, @@ -175,7 +175,7 @@ export default { this.reload(); }); }, - deleteBetriebsmittel(betriebsmittelperson_id){ + deleteBetriebsmittel(betriebsmittelperson_id) { this.param = { 'betriebsmittelperson_id': betriebsmittelperson_id }; @@ -193,7 +193,7 @@ export default { this.reload(); }); }, - updateBetriebsmittel(){ + updateBetriebsmittel() { this.param = { 'uid': this.uid, 'person_id': this.person_id, @@ -210,7 +210,7 @@ export default { this.reload(); }); }, - loadBetriebsmittel(betriebsmittelperson_id){ + loadBetriebsmittel(betriebsmittelperson_id) { this.resetModal(); this.statusNew = false; this.param = { @@ -224,20 +224,20 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - searchInventar(event){ + searchInventar(event) { return this.$fhcApi .get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + event.query) .then(result => { this.filteredInventar = result.data.retval; }); }, - reload(){ + reload() { this.$refs.table.reloadTable(); }, - hideModal(modalRef){ + hideModal(modalRef) { this.$refs[modalRef].hide(); }, - resetModal(){ + resetModal() { this.formData = {}; this.formData.ausgegebenam = this.getDefaultDate(); this.formData.retouram = null; @@ -340,7 +340,7 @@ export default {
- +
@@ -410,7 +410,6 @@ export default {
{ this.notizData = result.data; this.notizData.typeId = this.typeId; + this.notizData.anhang = []; return result; }) .catch(this.$fhcAlert.handleSystemError); @@ -344,7 +358,7 @@ export default { typeId: this.typeId, titel: null, statusNew: true, - text: null, + text: '', lastUpdate: null, von: null, bis: null, @@ -409,31 +423,33 @@ export default { }); }, }, - created(){ + created() { this.initializeShowVariables(); this.getUid(); }, async mounted() { - if(this.showTinyMCE){ + if(this.showTinyMce){ this.initTinyMCE(); } }, watch: { //watcher für Tinymce-Textfeld - 'notizData.text': function (newVal) { - if(this.showTinyMCE) { - const tinymcsVal = this.editor.getContent(); + 'notizData.text': { + handler(newVal) { + 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 'notizData.intBearbeiter': { handler(newVal) { - if(typeof newVal === 'object') { + if (typeof newVal === 'object') { this.notizData.bearbeiter = newVal.mitarbeiter_uid; } }, @@ -441,7 +457,7 @@ export default { }, 'notizData.intVerfasser': { handler(newVal) { - if(typeof newVal === 'object') { + if (typeof newVal === 'object') { this.notizData.verfasser = newVal.mitarbeiter_uid; } }, @@ -449,189 +465,184 @@ export default { } }, beforeDestroy() { - if(this.showTinyMCE) { + if(this.showTinyMce) { this.editor.destroy(); } }, template: ` - -
- - - - - - - - - -
- - -
-

-
-
-
- [{{notizData.typeId}}] -
-
- -
-
-

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

-

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

-
-
- -
- -
- -
-
- -
- - - -
- -
- -
- -
- -
- - -
-
- - -
- - -
- -
-
+
+
+ + + + + + - -
+ + -
- - -
- -
-
- -
- - -
- -
-
- -
- - -
- -
- -
- -
- - - -
- -
- -
- -
- -
- -
-
- -
- -
- -
-

{{notizData.lastupdate}}

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

+ +
+

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

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

+

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

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

{{notizData.lastupdate}}

+
+
+ + + +
+
+ +
+ + + + + + + + +
+
+
-
- -
- +
+
+ - -
- - +

{{$p.t('notiz','notiz_new')}} [{{notizData.typeId}}]

{{$p.t('notiz','notiz_edit')}} [{{notizData.typeId}}]

@@ -664,318 +673,129 @@ export default {
- -
- - -
- -
- - -
- - -
- -
- - -
- -
- - -
-
- -
- - - -
- -
-
- - -
- +
- - - - - -
- -
- - - - - - - - - -
- +
-
- - -
- -
- -
- -
- -
-

{{notizData.lastupdate}}

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

{{$p.t('notiz','notiz_new')}} [{{notizData.typeId}}]

-

{{$p.t('notiz','notiz_edit')}} [{{notizData.typeId}}]

-
- - -
- - -
- -
- - -
- - -
- -
- - -
- -
- - -
-
- -
- - - + +
+ +
- -
-
- - -
- -
- - - - - +
+ + +
- -
- - - - - - - - - - - + +
+
+
+ + + +
+
- -
+ + +
+
+ + + + + +
+ +
+ + + + + + + + + + + +
+ +
- + +
-
- -
- -
-

{{notizData.lastupdate}}

+
+ +
+

{{notizData.lastupdate}}

+
-
+ +
+
+
+ +
+ + + + + + + +
+
+
+
+

{{$p.t('notiz','notiz_new')}} [{{notizData.typeId}}]

+

{{$p.t('notiz','notiz_edit')}} [{{notizData.typeId}}]

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

{{notizData.lastupdate}}

+
+
+
- -
-
- -
-
+ +
+ +
+
-
+
+
+
- -
- -
- -
-

Kein Layout übergeben

-
-
-
-`, +
+

Kein Layout übergeben

+
+
`, } \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js index 9e1a2484a..fbee3dda3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js @@ -1,21 +1,20 @@ -import Betriebsmittel from "../../../Betriebsmittel/Betriebsmittel.js"; +import CoreBetriebsmittel from "../../../Betriebsmittel/Betriebsmittel.js"; export default { components: { - Betriebsmittel + CoreBetriebsmittel }, props: { modelValue: Object }, template: ` -
-

Betriebsmittel

- + - +
` }; diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js index ce718d61b..f9eff15f7 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js @@ -19,7 +19,7 @@ export default { } }, template: ` -
+
{{this.$p.t('person', 'adressen')}} diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index e2301f7a3..1e7423fd9 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -11,7 +11,7 @@ export default{ BsModal }, props: { - uid: String + uid: Number }, data() { return{ @@ -309,7 +309,7 @@ export default{
- +
@@ -330,7 +330,7 @@ export default{
- +
@@ -388,20 +388,20 @@ export default{
- +
- +
- +
@@ -427,7 +427,7 @@ export default{
- +
@@ -447,7 +447,7 @@ export default{
- +
@@ -460,7 +460,7 @@ export default{
- +
@@ -509,28 +509,28 @@ 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 1d5833044..b448529fb 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js @@ -7,7 +7,7 @@ export default{ BsModal }, props: { - uid: String + uid: Number }, data() { return{ @@ -203,38 +203,38 @@ export default{
- +
- +
- +
- +
- +
- +
@@ -269,37 +269,37 @@ 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 50694fb76..be4d6c7f5 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -11,7 +11,7 @@ export default{ BsModal }, props: { - uid: String + uid: Number }, data() { return{ @@ -223,13 +223,13 @@ export default{
- +
- +
@@ -245,7 +245,7 @@ export default{
- +
@@ -271,13 +271,13 @@ export default{
- +
- +
@@ -289,16 +289,16 @@ export default{
- +
- +
- +
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js index e0bc1cb7e..dfbfa17b3 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js @@ -8,11 +8,10 @@ export default { modelValue: Object, }, template: ` - -
-
+
+
Status - +
` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 185b8d0d5..78a0940f8 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -1,29 +1,25 @@ -import NotizComponent from "../../../Notiz/NotizComponent.js"; +import CoreNotiz from "../../../Notiz/Notiz.js"; export default { components: { - NotizComponent + CoreNotiz }, props: { modelValue: Object }, template: ` -
-

Notizen

- +
- - + + -->
` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index 149556508..8f3773ad7 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -41,7 +41,7 @@ export default { props: { modelValue: Object, }, - data(){ + data() { return { data: [], listZgvs: [], @@ -174,7 +174,7 @@ export default { .catch(this.$fhcAlert.handleSystemError); }, template: ` -
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js index 41a5241db..ff89c5549 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js @@ -5,7 +5,7 @@ export default{ CoreFilterCmpt }, props: { - person_id: String + person_id: Number }, data() { return { @@ -23,29 +23,29 @@ export default{ {title:"UID", field:"student_uid"}, {title:"Status", field:"status"} ], - 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', selectable: false, }, + 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') + }); + } + } + ] } }, template: ` diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 590cab3c0..5dbc9ef4a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -694,7 +694,6 @@ export default{
@@ -723,7 +721,6 @@ export default{
{{$p.t('lehre', 'studienplan')}}
@@ -810,11 +803,10 @@ export default{
- + > +
@@ -841,7 +833,7 @@ export default{
- + {{$p.t('lehre', 'studiensemester')}}
@@ -893,7 +883,6 @@ export default{
{{$p.t('lehre', 'studienplan')}}
@@ -980,7 +965,6 @@ export default{