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

Notizcomponent: add twoColumnsLayout, refactor UX

Browse Source
This commit is contained in:
ma0068
2024-04-16 15:42:49 +02:00
parent 69067c1ef9
commit 2f08d1b1c1
4 changed files with 746 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Notiz.php
+5 -4
View File
@@ -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);
public/js/components/Form/Upload/Dms.js
+7 -1
View File
@@ -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 = [];
public/js/components/Notiz/NotizComponent.js
+693 -173
View File
File diff suppressed because it is too large Load Diff
public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+41 -4
View File
@@ -14,13 +14,50 @@ export default {
ref="formc"
typeId="person_id"
:id="modelValue.person_id"
:showErweitert=true
:showDocument=true
:showTinyMCE="true"
notizLayout="twoColumnsFormRight"
:showErweitert="false"
:showDocument="false"
:showTinyMCE="false"
:visibleColumns=['titel','text','verfasser','bearbeiter']
>
</NotizComponent>
<!-- <br><br>
<!--
---------------------------------------------------------------------------------------------
-------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
---------------------------------------------------------------------------------------------
notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
showErweitert: if true: section with following fields will be displayed:
'verfasser', 'bearbeiter', 'von', 'bis'
showDocument: if true: section with documentHandling will be displayed
showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed
typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
bestellung_id, lehreinheit_id, anrechnung_id, uid
in progress for extensions
visibleColumns: list, which fields shoult be showed as default in filter component
fullVersion: :visibleColumns=['titel','text','bearbeiter','verfasser','von','bis','erledigt']
---------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------
-->
<!--
---------------------------------------------------------------------------------------------
------------------------ SOME TESTDATA -----------------------------------------------------
---------------------------------------------------------------------------------------------
<br><br>
<h3>Test prestudentId</h3>
<NotizComponent
ref="formc"