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

+ +
` };