Code Review
/
pharos-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixing Network Models
[pharos-tools.git]
/
dashboard
/
src
/
templates
/
dashboard
/
multiple_select_filter_widget.html
diff --git
a/dashboard/src/templates/dashboard/multiple_select_filter_widget.html
b/dashboard/src/templates/dashboard/multiple_select_filter_widget.html
index
31b8f33
..
4e47ce0
100644
(file)
--- a/
dashboard/src/templates/dashboard/multiple_select_filter_widget.html
+++ b/
dashboard/src/templates/dashboard/multiple_select_filter_widget.html
@@
-97,7
+97,7
@@
<script>
var initialized = false;
var mapping = {{ mapping|safe }};
<script>
var initialized = false;
var mapping = {{ mapping|safe }};
-var
items = {{
items|safe }};
+var
filter_items = {{ filter_
items|safe }};
var result = {};
var selection = {{selection_data|default_if_none:"null"|safe}};
var dropdown_count = 0;
var result = {};
var selection = {{selection_data|default_if_none:"null"|safe}};
var dropdown_count = 0;
@@
-108,31
+108,32
@@
make_selection({{selection_data|safe}});
function make_selection( selection_data ){
if(!initialized) {
function make_selection( selection_data ){
if(!initialized) {
- init();
+
filter_field_
init();
}
for(var k in selection_data) {
selected_items = selection_data[k];
}
for(var k in selection_data) {
selected_items = selection_data[k];
- for( var item in selected_items ){
- var node =
items[
item];
+ for( var
selected_
item in selected_items ){
+ var node =
filter_items[selected_
item];
if(!node['multiple']){
if(!node['multiple']){
- var input_value = selected_items[item];
+ var input_value = selected_items[
selected_
item];
if( input_value != 'false' ) {
select(node);
markAndSweep(node);
}
if( input_value != 'false' ) {
select(node);
markAndSweep(node);
}
- var div = document.getElementById(item)
+ var div = document.getElementById(selected_item)
+ var inputs = div.parentNode.getElementsByTagName("input")
var input = div.parentNode.getElementsByTagName("input")[0]
input.value = input_value;
var input = div.parentNode.getElementsByTagName("input")[0]
input.value = input_value;
- updateResult(item);
+ updateResult(
selected_
item);
} else {
} else {
- make_multiple_selection(selected_items, item);
+ make_multiple_selection(selected_items,
selected_
item);
}
}
}
}
function make_multiple_selection(data, item_class){
}
}
}
}
function make_multiple_selection(data, item_class){
- var node = items[item_class];
+ var node =
filter_
items[item_class];
select(node);
markAndSweep(node);
prepop_data = data[item_class];
select(node);
markAndSweep(node);
prepop_data = data[item_class];
@@
-143,8
+144,8
@@
function make_multiple_selection(data, item_class){
}
function markAndSweep(root){
}
function markAndSweep(root){
- for(var nodeId in items) {
- node = items[nodeId];
+ for(var nodeId in
filter_
items) {
+ node =
filter_
items[nodeId];
node['marked'] = true; //mark all nodes
//clears grey background of everything
}
node['marked'] = true; //mark all nodes
//clears grey background of everything
}
@@
-164,17
+165,17
@@
function markAndSweep(root){
var neighbors = mapping[mappingId];
for(var neighId in neighbors) {
neighId = neighbors[neighId];
var neighbors = mapping[mappingId];
for(var neighId in neighbors) {
neighId = neighbors[neighId];
- var neighbor = items[neighId];
+ var neighbor =
filter_
items[neighId];
toCheck.push(neighbor);
}
}
}
//now remove all nodes still marked
toCheck.push(neighbor);
}
}
}
//now remove all nodes still marked
- for(var nodeId in items){
- node = items[nodeId];
+ for(var nodeId in
filter_
items){
+ node =
filter_
items[nodeId];
if(node['marked']){
if(node['marked']){
- disable(node);
+ disable
_node
(node);
}
}
}
}
}
}
@@
-186,8
+187,8
@@
function process(node) {
else {
var selected = []
//remember the currently selected, then reset everything and reselect one at a time
else {
var selected = []
//remember the currently selected, then reset everything and reselect one at a time
- for(var nodeId in items) {
- node = items[nodeId];
+ for(var nodeId in
filter_
items) {
+ node =
filter_
items[nodeId];
if(node['selected']) {
selected.push(node);
}
if(node['selected']) {
selected.push(node);
}
@@
-205,9
+206,9
@@
function process(node) {
function select(node) {
elem = document.getElementById(node['id']);
node['selected'] = true;
function select(node) {
elem = document.getElementById(node['id']);
node['selected'] = true;
- elem.classList.remove('cleared_node')
- elem.classList.remove('disabled_node')
- elem.classList.add('selected_node')
+ elem.classList.remove('cleared_node')
;
+ elem.classList.remove('disabled_node')
;
+ elem.classList.add('selected_node')
;
var input = elem.parentNode.getElementsByTagName("input")[0];
input.disabled = false;
input.value = true;
var input = elem.parentNode.getElementsByTagName("input")[0];
input.disabled = false;
input.value = true;
@@
-218,27
+219,27
@@
function clear(node) {
node['selected'] = false;
node['selectable'] = true;
elem.classList.add('cleared_node')
node['selected'] = false;
node['selectable'] = true;
elem.classList.add('cleared_node')
- elem.classList.remove('disabled_node')
- elem.classList.remove('selected_node')
+ elem.classList.remove('disabled_node')
;
+ elem.classList.remove('selected_node')
;
elem.parentNode.getElementsByTagName("input")[0].disabled = true;
}
elem.parentNode.getElementsByTagName("input")[0].disabled = true;
}
-function disable(node) {
+function disable
_node
(node) {
elem = document.getElementById(node['id']);
node['selected'] = false;
node['selectable'] = false;
elem = document.getElementById(node['id']);
node['selected'] = false;
node['selectable'] = false;
- elem.classList.remove('cleared_node')
- elem.classList.add('disabled_node')
- elem.classList.remove('selected_node')
+ elem.classList.remove('cleared_node')
;
+ elem.classList.add('disabled_node')
;
+ elem.classList.remove('selected_node')
;
elem.parentNode.getElementsByTagName("input")[0].disabled = true;
}
function processClick(id, multiple){
if(!initialized){
elem.parentNode.getElementsByTagName("input")[0].disabled = true;
}
function processClick(id, multiple){
if(!initialized){
- init();
+
filter_field_
init();
}
var element = document.getElementById(id);
}
var element = document.getElementById(id);
- var node = items[id];
+ var node =
filter_
items[id];
if(!node['selectable']){
return;
}
if(!node['selectable']){
return;
}
@@
-259,11
+260,11
@@
function processClick(id, multiple){
function processClickMultipleObject(node){
select(node);
function processClickMultipleObject(node){
select(node);
- add_
item
(node);
+ add_
node
(node);
process(node);
}
process(node);
}
-function add_
item
(node){
+function add_
node
(node){
return add_item_prepopulate(node, {});
}
return add_item_prepopulate(node, {});
}
@@
-364,18
+365,19
@@
function remove_dropdown(id){
}
}
if(deselect_class){
}
}
if(deselect_class){
- clear(items[div_class]);
+ clear(
filter_
items[div_class]);
}
}
function updateResult(nodeId){
if(!initialized){
}
}
function updateResult(nodeId){
if(!initialized){
- init();
+
filter_field_
init();
}
}
- if(!items[nodeId]['multiple']){
+ if(!
filter_
items[nodeId]['multiple']){
var node = document.getElementById(nodeId);
var value = {}
value[nodeId] = node.parentNode.getElementsByTagName("input")[0].value;
var node = document.getElementById(nodeId);
var value = {}
value[nodeId] = node.parentNode.getElementsByTagName("input")[0].value;
+ result[node.parentNode.parentNode.id] = {};
result[node.parentNode.parentNode.id][nodeId] = value;
}
}
result[node.parentNode.parentNode.id][nodeId] = value;
}
}
@@
-391,10
+393,10
@@
function updateObjectResult(parentElem){
result[node_type][parentElem.id] = input;
}
result[node_type][parentElem.id] = input;
}
-function init() {
- for(nodeId in items) {
+function
filter_field_
init() {
+ for(nodeId in
filter_
items) {
element = document.getElementById(nodeId);
element = document.getElementById(nodeId);
- node = items[nodeId];
+ node =
filter_
items[nodeId];
result[element.parentNode.parentNode.id] = {}
}
initialized = true;
result[element.parentNode.parentNode.id] = {}
}
initialized = true;