From fb4997b1ac5080821297a08b9eda0374b4aa15a4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 28 May 2024 14:37:54 +0200
Subject: [PATCH 1/3] 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 {
 	<div class="form-upload-dms">
 		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
-			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-start">
-				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
-				<span class="col">{{ file.name }}</span>
-				<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">
-					<i class="fa fa-close"></i>
-				</button>
-			</li>
+			<dms-item
+				v-for="(file, index) in modelValue"
+				:key="index"
+				v-model="file"
+				class="d-flex mx-1 mt-1 align-items-start"
+				@delete="removeFile(index)"
+				>
+			</dms-item>
 		</ul>
 	</div>`
 }
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: `
+	<li class="form-upload-dms-item">
+		<span class="col-auto"><i class="fa fa-file me-1"></i></span>
+		<span class="col">{{ modelValue.name }}</span>
+		<a v-if="preview" :href="preview" target="_blank" class="col-auto btn btn-outline-secondary btn-p-0 me-1">
+			<i class="fa fa-download"></i>
+		</a>
+		<button class="col-auto btn btn-outline-secondary btn-p-0" @click="$emit('delete')">
+			<i class="fa fa-close"></i>
+		</button>
+	</li>`
+}

From dccf845e3b371fcd7bf576fccc9785495d2938fb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 28 May 2024 14:38:37 +0200
Subject: [PATCH 2/3] 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 <christopher.gerbrich@technikum-wien.at>
Date: Tue, 28 May 2024 14:39:41 +0200
Subject: [PATCH 3/3] 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();