Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
B
bmon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
energy
bmon
Commits
c19e3ffc
Commit
c19e3ffc
authored
Sep 09, 2019
by
Alan Mitchell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed sensor mult-select refresh problem on Excel export.
parent
d2edef81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
bmsapp/static/bmsapp/scripts/reports.coffee
bmsapp/static/bmsapp/scripts/reports.coffee
+4
-3
bmsapp/static/bmsapp/scripts/reports.js
bmsapp/static/bmsapp/scripts/reports.js
+3
-3
No files found.
bmsapp/static/bmsapp/scripts/reports.coffee
View file @
c19e3ffc
# Need to use Coffeescript 1.x to maintain IE compatibility.
# controls whether results are updated automatically or manually by
# a direct call to 'update_results'
_auto_recalc
=
true
...
...
@@ -7,15 +8,15 @@ _loading_inputs = false
# Called when inputs that affect the results have changed
inputs_changed
=
->
# having trouble with multi-select refreshing
if
$
(
'#select_sensor_multi'
).
prop
(
'disabled'
)
==
false
$
(
'#select_sensor_multi'
).
selectpicker
(
'refresh'
)
if
_auto_recalc
and
not
_loading_inputs
# update the window location url if needed
if
urlQueryString
()
==
''
history
.
replaceState
(
null
,
null
,
"?"
.
concat
(
serializedInputs
()))
else
if
serializedInputs
()
!=
urlQueryString
()
history
.
pushState
(
null
,
null
,
"?"
.
concat
(
serializedInputs
()))
# having trouble with multi-select refreshing
if
$
(
'#select_sensor_multi'
).
prop
(
'disabled'
)
==
false
$
(
'#select_sensor_multi'
).
selectpicker
(
'refresh'
)
# update the results display
update_results
()
...
...
bmsapp/static/bmsapp/scripts/reports.js
View file @
c19e3ffc
...
...
@@ -8,15 +8,15 @@
_loading_inputs
=
false
;
inputs_changed
=
function
()
{
if
(
$
(
'
#select_sensor_multi
'
).
prop
(
'
disabled
'
)
===
false
)
{
$
(
'
#select_sensor_multi
'
).
selectpicker
(
'
refresh
'
);
}
if
(
_auto_recalc
&&
!
_loading_inputs
)
{
if
(
urlQueryString
()
===
''
)
{
history
.
replaceState
(
null
,
null
,
"
?
"
.
concat
(
serializedInputs
()));
}
else
if
(
serializedInputs
()
!==
urlQueryString
())
{
history
.
pushState
(
null
,
null
,
"
?
"
.
concat
(
serializedInputs
()));
}
if
(
$
(
'
#select_sensor_multi
'
).
prop
(
'
disabled
'
)
===
false
)
{
$
(
'
#select_sensor_multi
'
).
selectpicker
(
'
refresh
'
);
}
return
update_results
();
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment