blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Notiz component: new layout popupModal

Browse Source
This commit is contained in:
ma0068
2024-05-21 15:35:57 +02:00
parent 6d97a9e9aa
commit 1993e20ffc
3 changed files with 210 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/Notiz_Controller.php
+1 -2
View File
@@ -158,8 +158,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
$text = $this->input->post('text');
$erledigt = $this->input->post('erledigt');
$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
//$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
$type = $this->input->post('typeId');
$start = $this->input->post('start');
$ende = $this->input->post('ende');
public/js/components/Notiz/Notiz.js
+203 -3
View File
@@ -29,13 +29,13 @@ export default {
},
notizLayout: {
type: String,
default: 'twoColumnsFormLeft',
default: 'popupModal',
validator(value) {
// TODO(chris): modal version
return [
'classicFas',
'twoColumnsFormRight',
'twoColumnsFormLeft'
'twoColumnsFormLeft',
'popupModal'
].includes(value)
}
},
@@ -278,6 +278,9 @@ export default {
}
})
.then(() => {
if(this.notizLayout == 'popupModal') {
this.$refs.NotizModal.show();
}
if (this.notizData.dms_id) {
this.loadDocEntries(this.notizData.notiz_id);
} else
@@ -286,6 +289,9 @@ export default {
},
actionNewNotiz() {
this.resetFormData();
if(this.notizLayout == 'popupModal') {
this.$refs.NotizModal.show();
}
},
addNewNotiz() {
const formData = new FormData();
@@ -297,6 +303,9 @@ export default {
.then(response => {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.resetFormData();
if(this.notizLayout == 'popupModal') {
this.$refs.NotizModal.hide();
}
this.reload();
})
.catch(this.$fhcAlert.handleSystemError)
@@ -346,6 +355,9 @@ export default {
.then(response => {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.resetFormData();
if(this.notizLayout == 'popupModal') {
this.$refs.NotizModal.hide();
}
this.reload();
})
.catch(this.$fhcAlert.handleSystemError)
@@ -1024,6 +1036,194 @@ export default {
</div>
</div>
<div v-else-if="notizLayout=='popupModal'" class="notiz-notiz">
<!--Modal: deleteNotizModal-->
<BsModal ref="deleteNotizModal">
<template #title>Notiz löschen</template>
<template #default>
<p>Notiz wirklich löschen?</p>
</template>
<template #footer>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetFormData">Abbrechen</button>
<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
</template>
</BsModal>
<BsModal ref="NotizModal">
<template #title>
<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
</template>
<template #default>
<div>
<form ref="formc" @submit.prevent class="row">
<div class="row mb-3">
<form-input
container-class="col-12"
:label="$p.t('global','titel') + ' *'"
type="text"
v-model="notizData.titel"
name="titel"
>
</form-input>
</div>
<div class="row mb-3">
<!-- TinyMce 5 -->
<div v-if="showTinyMce" class="col-sm-12">
<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
<textarea
ref="editor"
rows="5"
cols="75"
class="form-control"
:value="notizData.text"
@input="updateText"></textarea>
</div>
<div v-else class="col-sm-12">
<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
</div>
</div>
<!-- show Documentupload-->
<div v-if="showDocument">
<div class="row mb-3">
<div class="col-sm-12 py-3">
<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
<!--Upload Component-->
<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
</div>
</div>
</div>
<!-- show Details-->
<div v-if="showErweitert">
<div class="row mb-3">
<form-input
container-class="col-6"
:label="$p.t('global', 'gueltigVon')"
type="DatePicker"
v-model="notizData['start']"
name="von"
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
<form-input
container-class="col-6"
:label="$p.t('global', 'gueltigBis')"
type="DatePicker"
v-model="notizData.ende"
name="bis"
auto-apply
:enable-time-picker="false"
format="dd.MM.yyyy"
preview-format="dd.MM.yyyy"
:teleport="true"
>
</form-input>
</div>
<div class="row mb-3">
<form-input
v-if="notizData.verfasser_uid"
container-class="col-6"
:label="$p.t('notiz', 'verfasser')"
type="text"
v-model="notizData.verfasser_uid"
name="titel"
>
</form-input>
<form-input
v-else
container-class="col-6"
:label="$p.t('notiz', 'verfasser')"
type="autocomplete"
v-model="notizData.intVerfasser"
:suggestions="filteredMitarbeiter"
@complete="search"
optionLabel="mitarbeiter"
minLength="3"
>
</form-input>
<form-input
v-if="notizData.bearbeiter_uid"
container-class="col-6"
:label="$p.t('notiz', 'bearbeiter')"
v-model="notizData.bearbeiter_uid"
minlength="3"
>
</form-input>
<form-input
v-else
container-class="col-6"
:label="$p.t('notiz', 'bearbeiter')"
type="autocomplete"
v-model="notizData.intBearbeiter"
:suggestions="filteredMitarbeiter"
@complete="search"
optionLabel="mitarbeiter"
minlength="3"
>
</form-input>
</div>
<div class="row mb-3">
<div class="col-2 pt-4 d-flex align-items-center">
<form-input
container-class="form-check"
:label="$p.t('notiz', 'erledigt')"
type="checkbox"
v-model="notizData.erledigt"
name="erledigt"
>
</form-input>
</div>
</div>
</div>
<div class="row mb-3">
<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
<div class="col-sm-5">
<p class="small">{{notizData.lastupdate}}</p>
</div>
</div>
<div>
<button v-if="notizData.statusNew" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
<button v-else class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
</div>
</form>
</div>
</template>
</BsModal>
<div class="row">
<core-filter-cmpt
ref="table"
:tabulator-options="tabulatorOptions"
:tabulator-events="tabulatorEvents"
table-only
:side-menu="false"
reload
new-btn-show
new-btn-label="Notiz"
@click:new="actionNewNotiz"
>
</core-filter-cmpt>
</div>
</div>
<div v-else>
<p v-if="notizLayout">Falsches Layout übergeben: {{notizLayout}}</p>
<p v-else>Kein Layout übergeben</p>
public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+6 -5
View File
@@ -13,6 +13,7 @@ export default {
<core-notiz
:endpoint="$fhcApi.factory.notiz.person"
ref="formc"
notiz-layout="twoColumnsFormLeft"
type-id="person_id"
:id="modelValue.person_id"
show-document
@@ -34,10 +35,10 @@ for extensions: write own controller extending core NotizController
ref="formc"
typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
type-id: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
bestellung_id, lehreinheit_id, anrechnung_id
notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
showErweitert: if true: section with following fields will be displayed:
'verfasser', 'bearbeiter', 'von', 'bis'
@@ -70,9 +71,9 @@ visibleColumns: list, which fields shoult be showed as default in filter compone
type-id="uid"
:id= "'ma0068'"
notiz-layout="twoColumnsFormLeft"
:show-erweitert="true"
:show-document="true"
:showTinyMCE="false"
show-document
show-tiny-mce
show-erweitert
:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
>
</core-notiz>