Core - Base Station - Fixing the display, or rather not displaying, also stored in list for unique single item viewing

Author: GregJohnStewart

software/core/oqm-core-base-station/src/main/resources/META-INF/resources/res/js/obj/item/ItemView.js

@@ -453,12 +453,16 @@ export class ItemView extends PageUtility {
 							Getters.StoredItem.getSingleStoredForItem(itemId, async function (stored) {
 								let promises = [];
 								let storageLabel = $(`
-									<h3>
-										Stored in: <span class="uniqueItemStoredInLabel"></span>
-									</h3>
-									<p class="uniqueItemStoredAlsoInContainer">
-										Also found in: <span class="uniqueItemStoredAlsoInLabel"></span>
-									</p>`);
+									<div>
+										<h3>
+											Stored in: <span class="uniqueItemStoredInLabel"></span>
+										</h3>
+										<p class="uniqueItemStoredAlsoInContainer">
+											Also found in: <span class="uniqueItemStoredAlsoInLabel"></span>
+										</p>
+									</div>
+									`);
+								let alsoInLabel = storageLabel.find(".uniqueItemStoredAlsoInLabel");
 
 								itemData.storageBlocks.forEach(function (curBlock) {
 									promises.push(Getters.StorageBlock.getStorageBlockLabel(curBlock, function (labelText) {
@@ -467,7 +471,7 @@ export class ItemView extends PageUtility {
 										if (curBlock === stored.state.storageBlock) {
 											storageLabel.find(".uniqueItemStoredInLabel").append(newLink);
 										} else {
-											storageLabel.find(".uniqueItemStoredAlsoInLabel").append(newLink);
+											alsoInLabel.append(newLink);
 										}
 									}));
 								});
@@ -482,9 +486,8 @@ export class ItemView extends PageUtility {
 										})
 								);
 								await Promise.all(promises);
-								if (storageLabel.find(".uniqueItemStoredAlsoInLabel").children().length === 0) {
-									// storageLabel.find(".uniqueItemStoredAlsoInContainer").remove();//for some reason this doesn't work ("find" doesn't work)
-									storageLabel.get(1).remove()
+								if (alsoInLabel.children().length === 0) {
+									storageLabel.find(".uniqueItemStoredAlsoInContainer").hide();
 								}
 								ItemView.storedSingleContainer.show();
 							})
@@ -584,24 +587,6 @@ export class ItemView extends PageUtility {
 
 				console.log("Setting up view of stored.");
 
-				// let numStorageBlocks = itemData.stats.numStored;// Object.keys(itemData.storageBlocks).length;
-				//TODO:: show storage blocks associated
-				// if (numStorageBlocks === 0) {
-				// 	console.log("None stored.");
-				// 	ItemView.storedNonePresentContainer.show();
-				// 	//TODO:: if storage blocks present, prompt to edit item to add block(s)
-				// 	//TODO:: prompt to add stored item
-				// } else {
-				// 	//TODO:: display right; bulk vs multi vs single display
-				// 	console.log(numStorageBlocks + " stored.");
-				// 	ItemView.itemViewStoredNum.text(numStorageBlocks);
-				// 	ItemView.itemViewStored.show();
-				//
-				// 	ItemView.allStoredSearchFormItemInputName.val(itemData.name);
-				// 	ItemView.allStoredSearchFormItemInputId.val(itemId);
-				// 	ItemView.allStoredSearchForm.submit();
-				// }
-
 				ItemView.checkoutSearchFormItemNameInput.val(itemData.name);
 				ItemView.checkoutSearchFormItemIdInput.val(itemId);
 				ItemView.checkoutSearchForm.submit();

software/core/oqm-core-base-station/src/main/resources/templates/webui/mainWebPageTemplate.html

@@ -286,7 +286,7 @@ <h1>{#icons/pageIcon page=page addSpace=true}{/icons/pageIcon} {title}</h1>
 	<div class="row">
 		<div class="col-sm-4">
 			<span class="h5">Open QuarterMaster Base Station</span><br/>
-			
+
 			Version <b>{config:['service.version']}</b>,
 			<a href="{config:['service.gitLink']}" target="_blank">{#icons/github /} Github</a>
 			<br/>