nmelone/ABB-Flowmeter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds Notes to NodeDetailHeader

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-09 14:57:01 -06:00
parent 7afd88fb4a
commit 55f0b3e726
2 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
NodeDetailHeader.html
View File

@@ -4,3 +4,34 @@
<div class='col-xs-6'>
<h3><%= node.vanityname %></h3>
</div>
<div class='col-xs-4'>
<div class="text-center">
<h2>Last Note</h2>
<p class="note-text"><%= channels['advvfdipp.notes'].value %></p>
<p> at <%= channels["advvfdipp.notes"].timestamp %></p>
<button href="#" data-channelId="<%= channels['advvfdipp.notes'].channelId %>" class="data-table btn btn-theme note-btn" title="Note History"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-th-list icon-theme"></i> All Notes</button>
<br />
<button type="button" class="btn btn-theme note-btn" data-toggle="modal" data-target="#note-modal"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-pencil icon-theme"></i> New Note</button>
</div>
</div>
<style>
#note-modal{
position: absolute;
}
.modal-backdrop {
position: relative;
}
.modal-dialog {
top:5%;
}
.note-btn {
margin-top: 10px;
width: 75%;
}
.note-text {
font-size: 1.5em;
font-style: italic;
}
</style>

32
Overview.html
View File

@@ -1,3 +1,31 @@
<div class="modal fade" id="note-modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<form class='set_channel'>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">Note Entry</h4>
</div>
<div class="modal-body">
<input class="form-control" data-channelId='<%= channels["abbflow.notes"].channelId %>'
data-techName='<%=channels["abbflow.notes"].techName %>'
data-name='<%= channels["abbflow.notes"].name %>'
data-val="<%=channels["abbflow.notes"].value %>"
type="text"
id="<%= channels["abbflow.notes"].channelId %>"
value="<%=channels["abbflow.notes"].value %>">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button class="btn btn-primary set_channel_btn" value='Save'>Save Note</button>
</div>
</form>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class='row row-flex box-me'>
<div class='col-xs-4 text-center'>
<h2>Volume Flow</h2>
@@ -265,10 +293,10 @@
<span data-timeupdate="last_calculation_period_volume">
<%= channels["abbflow.last_calculation_period_volume"].timestamp %>
</span>
</div>
</div>
</div>
<div class='col-xs-4 text-center'>
<div class='col-xs-4 text-center box-me'>
<h2>Accumulated Volume</h2>
<div class="gauge-box">
<div data-labelheight="10"