From 70386a58f385d1db42dec2cd8e0eea17c32e6942 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 16 Feb 2024 08:53:34 +0100
Subject: [PATCH 1/7] Tabs Component: removed TODOs

---
 public/js/components/Tabs.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 25f225e01..8090a9d29 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -11,7 +11,6 @@ export default {
 		'changed'
 	],
 	props: {
-		// TODO(chris): rename to config?
 		config: {
 			type: [String, Object],
 			required: true

From 6aebbada064689ef8dcc853e957aa41a928d2036 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 19 Feb 2024 10:39:18 +0100
Subject: [PATCH 2/7] Form Input: only setFeedback on last radio/checkbox in
 production mode

---
 public/js/components/Form/Input.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 4103c75cf..97a261779 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -200,13 +200,9 @@ export default {
 			this.valid = valid;
 			// NOTE(chris): On a list of radios/checkboxes only add the feedback message to the last item
 			if (this.name && (this.lcType == 'radio' || this.lcType == 'checkbox')) {
-				let n = this.$el.nextSibling;
-				for (; n; n = n.nextSibling)
-					if (n.nodeType == 1
-						&& n.__vueParentComponent?.ctx?.lcType == this.lcType
-						&& n.__vueParentComponent?.ctx?.name == this.name
-						)
-						return;
+				const selector = 'input[type="' + this.lcType + '"][name="' + this.name + '"]';
+				if ([...this.$el.parentNode.querySelectorAll(selector)].pop() != this.$refs.input)
+					return;
 			}
 			this.feedback = feedback;
 		},

From 8ad2908ca9da25c386574b4899771a76f402302b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 19 Feb 2024 15:23:00 +0100
Subject: [PATCH 3/7] UploadDms: Delete Button styles

---
 public/js/components/Form/Upload/Dms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index da37a2105..fe58fa74b 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -75,7 +75,7 @@ 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">
+			<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)">

From 469b3e983348fda469a9509c13683bbab08aa307 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 19 Feb 2024 15:23:13 +0100
Subject: [PATCH 4/7] Form Input: auto classes

---
 public/js/components/Form/Input.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 97a261779..11ad357a5 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -120,13 +120,19 @@ export default {
 						if (!c.includes('form-check-input') && !c.includes('btn-check'))
 							classes.push('form-check-input');
 						break;
+					case 'color':
+						if (!c.includes('form-control-color'))
+							classes.push('form-control-color');
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
 					case 'autocomplete':
 					case 'datepicker':
 						classes.push('p-0');
 						classes.push('border-0');
-					case 'color':
-						if (!c.includes('form-control-color'))
-							classes.push('form-control-color');
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
 					case 'text':
 					case 'number':
 					case 'password':

From 013664db700da955af8180a919e31c3aaec5d6ad Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 19 Feb 2024 15:23:43 +0100
Subject: [PATCH 5/7] FhcApi Controller: new helper functions

---
 application/core/FHCAPI_Controller.php | 29 +++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index fea4e76f0..3bc5c7280 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -98,7 +98,7 @@ class FHCAPI_Controller extends FHC_Controller
 
 	/**
 	 * @param array					$data
-	 * @param string (optional)		$type
+	 * @param string				$type (optional)
 	 * @return void
 	 */
 	public function addError($data, $type = null)
@@ -171,6 +171,33 @@ class FHCAPI_Controller extends FHC_Controller
 		exit;
 	}
 
+	/**
+	 * @param array					$error
+	 * @param string				$type (optional)
+	 * @return void
+	 */
+	protected function terminateWithError($error, $type = null)
+	{
+		$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		$this->addError($error, $type);
+		$this->setStatus(self::STATUS_ERROR);
+		exit;
+	}
+
+	/**
+	 * @param stdclass				$result
+	 * @param string				$errortype
+	 * @return void
+	 */
+	protected function checkForErrors($result, $errortype = self::ERROR_TYPE_GENERAL)
+	{
+		// TODO(chris): IMPLEMENT!
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), $errortype);
+		}
+		return $result->retval;
+	}
+
 	// TODO(chris): complete list
 
 

From 72d166a05070b62bfb34472cde057b5673dccc52 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 20 Feb 2024 08:38:29 +0100
Subject: [PATCH 6/7] FHCAPI Controller: multipart upload

---
 application/core/FHCAPI_Controller.php |  4 +++
 public/js/plugin/FhcApi.js             | 39 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 3bc5c7280..e59740ded 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -89,6 +89,10 @@ class FHCAPI_Controller extends FHC_Controller
 		// For JSON Requests (as opposed to multipart/form-data) get the $_POST variable from the input stream instead
 		if ($this->input->get_request_header('Content-Type', true) == 'application/json')
 			$_POST = json_decode($this->security->xss_clean($this->input->raw_input_stream), true);
+		elseif (isset($_POST['_jsondata'])) {
+			$_POST = array_merge($_POST, json_decode($_POST['_jsondata'], true));
+			unset($_POST['_jsondata']);
+		}
 	}
 
 
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 335dec45e..bacd27d43 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -52,6 +52,45 @@ export default {
 			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"
 		});
 
+		fhcApiAxios.interceptors.request.use(config => {
+			if (config.method != 'post' || !config.data)
+				return config;
+
+			if (config.data instanceof FormData)
+				return config;
+			
+			if (!Object.values(config.data).every(item => {
+				if (item instanceof FileList)
+					return false;
+				if (Array.isArray(item))
+					return item.every(i => !(i instanceof File));
+				return true;
+			})) {
+				const newData = Object.entries(config.data).reduce((nd, [key, item]) => {
+					if (item instanceof FileList) {
+						for (const file of item)
+							nd.FormData.append(key + (item.length > 1 ? '[]' : ''), file);
+					} else if (Array.isArray(item)) {
+						if (item.every(i => !(i instanceof File))) {
+							nd.jsondata[key] = item;
+						} else {
+							item.forEach(file => nd.FormData.append(key + (item.length > 1 ? '[]' : ''), file));
+						}
+					} else {
+						nd.jsondata[key] = item;
+					}
+					return nd;
+				}, {
+					FormData: new FormData(),
+					jsondata: {}
+				});
+				newData.FormData.append('_jsondata', JSON.stringify(newData.jsondata));
+				config.data = newData.FormData;
+			}
+
+			return config;
+		});
+
 		fhcApiAxios.interceptors.response.use(response => {
 			if (response.config?.errorHandling == 'off'
 				|| response.config?.errorHandling === false

From 2d1e8a829dd48834f37d39665c2f38a9eb9b91ee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 21 Feb 2024 13:50:38 +0100
Subject: [PATCH 7/7] userdata changes

---
 public/js/apps/api/userdata.js | 58 ++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 public/js/apps/api/userdata.js

diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
new file mode 100644
index 000000000..defea2cbb
--- /dev/null
+++ b/public/js/apps/api/userdata.js
@@ -0,0 +1,58 @@
+export default {
+  //! API Calls for Profil Views
+
+  getGemeinden: function(nation,zip=null){
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getGemeinden`;
+    return axios.get(url,{params:{nation:nation,zip:zip}});
+  },
+
+  getAllNationen:function(){
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getAllNationen`;
+    return axios.get(url);
+  },
+
+  getView: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + `cis.php/Cis/Profil/getView/${uid}`;
+    return axios.get(url);
+  },
+
+  sperre_foto_function: function (value) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/foto_sperre_function/${value}`;
+    return axios.get(url);
+  },
+
+  isStudent: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/isStudent/${uid}`;
+    return axios.get(url);
+  },
+
+  isMitarbeiter: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/isMitarbeiter/${uid}`;
+    return axios.get(url);
+  },
+
+  getZustellAdresse: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getZustellAdresse`;
+    return axios.get(url);
+  },
+
+  getZustellKontakt: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getZustellKontakt`;
+    return axios.get(url);
+  },
+};