From 8f0e7c6ce40c027bed22588a5478da5b5dac16d5 Mon Sep 17 00:00:00 2001
From: Jordi Albert <63541019+jarg1023@users.noreply.github.com>
Date: Fri, 26 Aug 2022 12:50:27 +0200
Subject: [PATCH] #25 | Fix ips not shown when no it object was assigned and
 improve table UI

---
 msp/msp/doctype/ip_network/ip_network.js | 18 +++++++++---------
 msp/msp/doctype/ip_network/ip_network.py |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/msp/msp/doctype/ip_network/ip_network.js b/msp/msp/doctype/ip_network/ip_network.js
index b72534a..c203e09 100644
--- a/msp/msp/doctype/ip_network/ip_network.js
+++ b/msp/msp/doctype/ip_network/ip_network.js
@@ -30,31 +30,31 @@ function getUsedIpsInNetwork(frm) {
 				tableBody += `
 						<tr>
 							<td
-								style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left; ${element?.ip_address_name ? 'cursor: pointer;' : ''}"
+								${element?.ip_address_name ? 'style="cursor: pointer;"' : ''}
 								data-doctype-name="${element?.ip_address_name ?? ''}"
 								data-doctype-type="IP Address"
 							>
 								${(element?.ip_address === '') ? "-" : element?.ip_address}
 							</td>
 							<td
-								style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left; ${element?.ip_address_name ? 'cursor: pointer;' : ''}"
+								${element?.ip_address_name ? 'style="cursor: pointer; text-decoration: underline;"' : ''}
 								data-doctype-name="${element?.it_object_name ?? ''}"
 								data-doctype-type="IT Object"
 							>
-								${(element?.title === '') ? "-" : element?.title}
+								${(element?.title === '') ? __("no object assigned") : element?.title}
 							</td>
-							<td style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left;">${(element?.type === '') ? "-" : element?.type}</td>
+							<td style="">${(element?.type === '') ? __("no type assigned") : element?.type}</td>
 						</tr>
 					`;
 			});
 
 			const table = tableBody ? `
-					<table style="border-collapse: collapse; border: 2px solid #000; text-align: left; width: 100%; color: #000;">
-						<thead>
+					<table style="" class="table table-striped table-bordered">
+						<thead class="thead-dark">
 							<tr>
-								<th scope="col" style="border: 1px solid #000; padding: 0.5rem 1rem;">IP</th>
-								<th scope="col" style="border: 1px solid #000; padding: 0.5rem 1rem;">Name</th>
-								<th scope="col" style="border: 1px solid #000; padding: 0.5rem 1rem;">Type</th>
+								<th scope="col">IP</th>
+								<th scope="col">Name</th>
+								<th scope="col">Type</th>
 							</tr>
 						</thead>
 						<tbody>
diff --git a/msp/msp/doctype/ip_network/ip_network.py b/msp/msp/doctype/ip_network/ip_network.py
index aab3951..4da4577 100644
--- a/msp/msp/doctype/ip_network/ip_network.py
+++ b/msp/msp/doctype/ip_network/ip_network.py
@@ -20,7 +20,7 @@ class IPNetwork(Document):
 				ito.title,
 				ito.type
 			FROM `tabIP Address` ipa
-				JOIN `tabIT Object` ito
+				LEFT JOIN `tabIT Object` ito
 				ON ipa.it_object = ito.name
 			WHERE ipa.ip_network = %(ip_network)s
 				AND ito.status != %(status)s