From b785dd8ca77a84e838adbe6916ff2ee245665f46 Mon Sep 17 00:00:00 2001
From: Spacelord <git@spacelord.de>
Date: Tue, 27 Jun 2023 23:47:00 +0200
Subject: [PATCH] Mitigated frontend selection issues

---
 src/frontend/items.eta.html  | 21 ++++++++++++++-------
 src/routes/frontend/items.ts |  5 ++++-
 static/js/editItems.js       | 16 +++++++++++++---
 static/js/editStorages.js    |  4 ++--
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/frontend/items.eta.html b/src/frontend/items.eta.html
index b7562d0..674e5f6 100644
--- a/src/frontend/items.eta.html
+++ b/src/frontend/items.eta.html
@@ -21,8 +21,8 @@
 					</div>
 					<div class="mb-3">
 						<label for="itemModifyModalStorageLocation" class="form-label">Select a storage location</label>
-						<select class="form-select" id="itemModifyModalStorageLocation" name="storageLocation" required>
-							<option value="undefined"><i>Do not assign a storage location</i></option>
+						<select class="form-select" id="itemModifyModalStorageLocation" name="storageLocation">
+							<option value=""><i>Do not assign a storage location</i></option>
 							<% it.storeLocs.forEach(function(locs){ %>
 							<option value="<%= locs.id %>"><%= locs.name %></option>
 							<% }) %>
@@ -46,8 +46,8 @@
 					</div>
 					<div class="mb-3">
 						<label for="itemModifyModalCategory" class="form-label">Select a category</label>
-						<select class="form-select" id="itemModifyModalCategory" name="category" required>
-							<option value="undefined"><i>Do not assign a category</i></option>
+						<select class="form-select" id="itemModifyModalCategory" name="category">
+							<option value=""><i>Do not assign a category</i></option>
 							<% it.categories.forEach(function(cat){ %>
 							<option value="<%= cat.id %>"><%= cat.name %></option>
 							<% }) %>
@@ -61,13 +61,20 @@
 							<option value="normal" class="text-success">Normal</option>
 							<option value="borrowed"  class="text-info">Borrowed</option>
 							<option value="stolen"  class="text-danger">Stolen</option>
-							<option value="lost" class="text-warning"">Lost</option>
-
-							
+							<option value="lost" class="text-warning">Lost</option>
 						</select>
 
 						<div id="storageLocationModalLocationText" class="form-text">You have to create a storage location beforehand.</div>
 					</div>
+					<div class="mb-3">
+					<label for="itemModifyModalContact" class="form-label">Contact Info</label>
+						<select class="form-select" id="itemModifyModalContact" name="contactInfoId" onchange="handleSelector()">
+							<option value=""><i>Do not assign contact info</i></option>
+							<% it.contactInfo.forEach(function(address){ %>
+							<option value="<%= address.id %>"><%= address.street %> <%= address.houseNumber %>, <%= address.city %> <%= address.country %></option>
+							<% }) %>
+						</select>
+					</div>
 					<input type="text" id="itemModifyModalId" name="id" hidden />
 				</div>
 				<div class="modal-footer">
diff --git a/src/routes/frontend/items.ts b/src/routes/frontend/items.ts
index c545a6c..55e23af 100644
--- a/src/routes/frontend/items.ts
+++ b/src/routes/frontend/items.ts
@@ -27,7 +27,10 @@ async function get(req: Request, res: Response) {
 		.then((items) => {
 			prisma.storageLocation.findMany({}).then((locations) => {
 				prisma.itemCategory.findMany({}).then((categories) => {
-					res.render(__path + '/src/frontend/items.eta.html', { items: items, currentPage: page, maxPages: pageSize, storeLocs: locations, categories: categories });
+					prisma.contactInfo.findMany({}).then((contactInfo) => {
+
+						res.render(__path + '/src/frontend/items.eta.html', { items: items, currentPage: page, maxPages: pageSize, storeLocs: locations, categories: categories, contactInfo: contactInfo });
+					})
 				});
 			});
 		})
diff --git a/static/js/editItems.js b/static/js/editItems.js
index 046484e..e1504ac 100644
--- a/static/js/editItems.js
+++ b/static/js/editItems.js
@@ -32,6 +32,7 @@ function getDataForEdit(id) {
 			const modal_itemCategory = document.getElementById('itemModifyModalCategory');
 			const modal_itemStatus = document.getElementById('itemModifyModalStatus');
 			const modal_itemid = document.getElementById('itemModifyModalId');
+			const modal_userinfo = document.getElementById('itemModifyModalContact');
 
 			modal_itemName.value = result.name;
 			modal_itemComment.value = result.comment;
@@ -42,7 +43,7 @@ function getDataForEdit(id) {
 			// Select the correct option in the dropdown
 			const modal_itemCategoryOptions = modal_itemCategory.options;
 			for (let i = 0; i < modal_itemCategoryOptions.length; i++) {
-				if (modal_itemCategoryOptions[i].value == result.category.id) {
+				if (modal_itemCategoryOptions[i].value == result.categoryId) {
 					modal_itemCategoryOptions[i].selected = true;
 				}
 			}
@@ -50,7 +51,7 @@ function getDataForEdit(id) {
 			// Select the correct option in the dropdown
 			const modal_itemStatusOptions = modal_itemStatus.options;
 			for (let i = 0; i < modal_itemStatusOptions.length; i++) {
-				if (modal_itemStatusOptions[i].value == result.status.id) {
+				if (modal_itemStatusOptions[i].value == result.statusId) {
 					modal_itemStatusOptions[i].selected = true;
 				}
 			}
@@ -58,11 +59,20 @@ function getDataForEdit(id) {
 			// Select the correct option in the dropdown
 			const modal_itemStorageLocationOptions = modal_itemStorageLocation.options;
 			for (let i = 0; i < modal_itemStorageLocationOptions.length; i++) {
-				if (modal_itemStorageLocationOptions[i].value == result.storageLocation.id) {
+				if (modal_itemStorageLocationOptions[i].value == result.storageLocationId) {
 					modal_itemStorageLocationOptions[i].selected = true;
 				}
 			}
 
+			modal_userinfo.selectedIndex = 0;
+			// Select the correct option in the dropdown
+			const modal_userInfoOptions = modal_userinfo.options;
+			for (let i = 0; i < modal_userInfoOptions.length; i++) {
+				if (modal_userInfoOptions[i].value == result.contactInfoId) {
+					modal_userInfoOptions[i].selected = true;
+				}
+			}
+
 			modal_itemid.value = result.id;
 		},
 		error: function (data) {
diff --git a/static/js/editStorages.js b/static/js/editStorages.js
index cccc3f1..54b2f9a 100644
--- a/static/js/editStorages.js
+++ b/static/js/editStorages.js
@@ -45,7 +45,7 @@ function primeEdit() {
 	document.getElementById('storageUnitModalLocationSelectText').innerText= "While editing you can only select already existing locations. Use the settings to create new ones.";
 	document.getElementById('storageUnitModalLabel').innerText = "Edit a storage unit";
 	document.getElementById('storageLocationModalTitle').innerText = "Edit a storage location"
-	document.getElementById('storageUnitModalLocationSelect').value = 1
+	document.getElementById('storageUnitModalLocationSelect').selectedIndex = 1
 	handleSelector()
 	form.setAttribute('method', 'PATCH');
 	form2.setAttribute('method', 'PATCH');
@@ -121,7 +121,7 @@ function getDataForEditLoc(id) {
 
 			// Select the correct location from the select based on the value of the option
 			for(var i, j = 0; i = modal_locationUnitSel.options[j]; j++) {
-				if(i.value == result.storageUnit) {
+				if(i.value == result.storageUnitId) {
 					console.log("Found it");
 					modal_locationUnitSel.selectedIndex = j;
 					break;