beenull/visualsubnetcalc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add note preservation during split/join functions

Browse source
This commit is contained in:
Caesar Kabalan 2023-05-19 02:15:07 -05:00
parent e4b6e65059
commit a54366eaa6
No known key found for this signature in database
GPG key ID: DDFEF5FF6CFAB608
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dist/main.js vendored
View file

@ -104,6 +104,13 @@ $('#calcbody').on('keyup', 'td.note input', function(event) {
}, delay, this); }, delay, this);
}) })
$('#calcbody').on('focusout', 'td.note input', function(event) {
// HTML DOM Data elements! Yay! See the `data-*` attributes of the HTML tags
clearTimeout(noteTimeout);
console.log('CAP')
subnetNotes[this.dataset.subnet] = this.value
})
function renderTable() { function renderTable() {
// TODO: Validation Code // TODO: Validation Code
@ -241,7 +248,6 @@ function split_network(networkInput, netSize) {
} }
function mutate_subnet_map(verb, network, subnetTree) { function mutate_subnet_map(verb, network, subnetTree) {
// TODO: Decide what to do with subnetNotes when you join/split a subnet with notes
for (let mapKey in subnetTree) { for (let mapKey in subnetTree) {
if (Object.keys(subnetTree[mapKey]).length > 0) { if (Object.keys(subnetTree[mapKey]).length > 0) {
mutate_subnet_map(verb, network, subnetTree[mapKey]) mutate_subnet_map(verb, network, subnetTree[mapKey])
@ -258,8 +264,17 @@ function mutate_subnet_map(verb, network, subnetTree) {
let new_networks = split_network(netSplit[0], parseInt(netSplit[1])) let new_networks = split_network(netSplit[0], parseInt(netSplit[1]))
subnetTree[mapKey][new_networks[0]] = {} subnetTree[mapKey][new_networks[0]] = {}
subnetTree[mapKey][new_networks[1]] = {} subnetTree[mapKey][new_networks[1]] = {}
// Copy note to both children and delete Delete parent note
subnetNotes[new_networks[0]] = subnetNotes[mapKey]
subnetNotes[new_networks[1]] = subnetNotes[mapKey]
delete subnetNotes[mapKey]
} }
} else if (verb === 'join') { } else if (verb === 'join') {
// Keep the note of the first subnet (which matches the network address) and lose the second subnet's note
// Could consider changing this to concatenate the notes into the parent, but I think this is more intuitive
subnetNotes[mapKey] = subnetNotes[Object.keys(subnetTree[mapKey])[0]]
subnetNotes[Object.keys(subnetTree[mapKey])[0]] = ''
subnetNotes[Object.keys(subnetTree[mapKey])[1]] = ''
subnetTree[mapKey] = {} subnetTree[mapKey] = {}
} else { } else {
// How did you get here? // How did you get here?