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
1e33f8a0
Commit
1e33f8a0
authored
Mar 12, 2020
by
Alan Mitchell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'essential'
parents
70657caf
dad1199b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
13 deletions
+27
-13
bmsapp/static/bmsapp/scripts/energy-reports.coffee
bmsapp/static/bmsapp/scripts/energy-reports.coffee
+2
-0
bmsapp/static/bmsapp/scripts/energy-reports.js
bmsapp/static/bmsapp/scripts/energy-reports.js
+3
-6
bmsapp/templates/bmsapp/base.html
bmsapp/templates/bmsapp/base.html
+8
-2
bmsapp/templates/bmsapp/energy-reports.html
bmsapp/templates/bmsapp/energy-reports.html
+14
-5
No files found.
bmsapp/static/bmsapp/scripts/energy-reports.coffee
View file @
1e33f8a0
...
@@ -79,6 +79,7 @@ load_report = ->
...
@@ -79,6 +79,7 @@ load_report = ->
report_url
=
"
#{
_base_url
}
organization/
#{
$
(
"#select_org"
).
val
()
}
/
#{
report_file_name
}
"
report_url
=
"
#{
_base_url
}
organization/
#{
$
(
"#select_org"
).
val
()
}
/
#{
report_file_name
}
"
$
(
"#report-content"
).
attr
(
"src"
,
report_url
)
$
(
"#report-content"
).
attr
(
"src"
,
report_url
)
$
(
"#print-link"
).
attr
(
"href"
,
report_url
)
# update link to printable version of report
# ---------------------------------------------------------------
# ---------------------------------------------------------------
# function that runs when the document is ready.
# function that runs when the document is ready.
...
@@ -119,3 +120,4 @@ $ ->
...
@@ -119,3 +120,4 @@ $ ->
$
(
"#select_org"
).
change
update_bldg_list
$
(
"#select_org"
).
change
update_bldg_list
$
(
"#select_org"
).
change
update_report_list
$
(
"#select_org"
).
change
update_report_list
$
(
"#select_bldg"
).
change
update_report_list
$
(
"#select_bldg"
).
change
update_report_list
\ No newline at end of file
bmsapp/static/bmsapp/scripts/energy-reports.js
View file @
1e33f8a0
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.7
(
function
()
{
(
function
()
{
var
_base_url
,
_bldg_reports
,
_
last_bldg
,
_last_org
,
_
org_reports
,
_org_to_bldgs
,
load_report
,
update_bldg_list
,
update_report_list
;
var
_base_url
,
_bldg_reports
,
_org_reports
,
_org_to_bldgs
,
load_report
,
update_bldg_list
,
update_report_list
;
_base_url
=
""
;
_base_url
=
""
;
...
@@ -30,10 +30,6 @@
...
@@ -30,10 +30,6 @@
}
}
};
};
_last_bldg
=
""
;
_last_org
=
""
;
update_report_list
=
function
()
{
update_report_list
=
function
()
{
var
add_report
,
bldg
,
i
,
j
,
len
,
len1
,
org
,
ref
,
ref1
,
rpt
;
var
add_report
,
bldg
,
i
,
j
,
len
,
len1
,
org
,
ref
,
ref1
,
rpt
;
org
=
$
(
"
#select_org
"
).
val
();
org
=
$
(
"
#select_org
"
).
val
();
...
@@ -71,7 +67,8 @@
...
@@ -71,7 +67,8 @@
}
else
{
}
else
{
report_url
=
_base_url
+
"
organization/
"
+
(
$
(
"
#select_org
"
).
val
())
+
"
/
"
+
report_file_name
;
report_url
=
_base_url
+
"
organization/
"
+
(
$
(
"
#select_org
"
).
val
())
+
"
/
"
+
report_file_name
;
}
}
return
$
(
"
#report-content
"
).
attr
(
"
src
"
,
report_url
);
$
(
"
#report-content
"
).
attr
(
"
src
"
,
report_url
);
return
$
(
"
#print-link
"
).
attr
(
"
href
"
,
report_url
);
};
};
$
(
function
()
{
$
(
function
()
{
...
...
bmsapp/templates/bmsapp/base.html
View file @
1e33f8a0
...
@@ -109,13 +109,19 @@
...
@@ -109,13 +109,19 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"container mt-0 pt-3"
>
<div
class=
"container mt-0 pt-3"
>
<h2>
{% block title %}{% endblock %}
</h2>
<h2>
{% block title %}{% endblock %}
</h2>
{% block content %}{% endblock %}
{% block content %}{% endblock %}
</div>
<div
class=
"container-fluid"
mt=
3
>
{% block fullwidth %}{% endblock %}
</div>
<div
class=
"container mt-0 pt-3"
>
<hr
/>
<hr
/>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-auto"
>
<div
class=
"col-auto"
>
...
...
bmsapp/templates/bmsapp/energy-reports.html
View file @
1e33f8a0
...
@@ -10,12 +10,12 @@
...
@@ -10,12 +10,12 @@
{% block this_nav_link %}link_energy-reports{% endblock %}
{% block this_nav_link %}link_energy-reports{% endblock %}
{% block title %}Energy Reports{% endblock %}
{% block content %}
{% block content %}
<span
id=
"energy-reports-url"
style=
"display:none"
>
{{ energy_reports_url }}
</span>
<span
id=
"energy-reports-url"
style=
"display:none"
>
{{ energy_reports_url }}
</span>
<h2>
Energy Reports
</h2>
<h5><i>
Under Construction: Formatting Improvements in Progress
</i></h5>
<h5><i>
Under Construction: Formatting Improvements in Progress
</i></h5>
<hr/>
<hr/>
...
@@ -39,10 +39,19 @@
...
@@ -39,10 +39,19 @@
</ul>
</ul>
</div>
</div>
<div
class=
"row mt-3"
>
{% endblock %}
<iframe
id=
"report-content"
src=
""
width=
"100%"
height=
"1000px"
></iframe>
</div>
{% block fullwidth %}
<div
class=
"row mt-3 mx-2"
>
<div
class=
"col"
>
<a
id=
"print-link"
href=
""
class=
"float-right"
target=
"_blank"
>
Click Here for Printable Report View
</a>
</div>
</div>
<div
class=
"row mx-2"
>
<iframe
id=
"report-content"
src=
""
width=
"100%"
height=
"750px"
></iframe>
</div>
{% endblock %}
{% endblock %}
{% block scripts %}
{% block scripts %}
...
...
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