Fixes all functions except CSV for time period.

This commit is contained in:
Patrick McDonagh
2016-11-01 16:56:22 -05:00
parent 72f1cb6684
commit 849b4e5d82
859 changed files with 54963 additions and 178925 deletions

View File

@@ -18,16 +18,16 @@
<div class="container">
<div class="row row-flex">
<div ng-repeat="doc in docs" class="col-md-3">
<div ng-repeat="doc in docs" class="col-md-4">
<div class="well" style="margin:10px;">
<div style="text-align:center;">
<h3><a href="{{doc.location}}">{{doc.trunc_filename}}</a></h3>
<h3><a href="/docs/{{doc.name}}">{{doc.trunc_filename}}</a></h3>
</div>
<img ng-if="doc.img_url" class="img img-responsive" src="{{doc.img_url}}">
<img ng-if="!doc.img_url" class="img img-responsive" src="/images/icons/_blank.png">
<br/>
<h4>{{doc.description}}</h4>
<h6>Uploaded at: {{ doc.createdAt | date: 'medium'}}</h6>
<h6>Uploaded at: {{ doc.created_on | date: 'medium'}}</h6>
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#deleteDocModal" ng-click="selectDelete(doc.id)">
Delete
</button>
@@ -41,11 +41,7 @@
<h1>Upload a new document... </h1>
<form action="/doc/upload" enctype="multipart/form-data" method="post">
<input type="file" name="document" class="form-control"><br>
<label for="description">File Description</label>
<input type="text" name="description" class="form-control"><br>
<input type="file" name="file" class="form-control"><br>
<input type="submit" class="btn btn-default" value="Upload">
</form>

View File

@@ -64,22 +64,6 @@
<div class="collapse" id="collapseJSON">
<pre>{{table_vals | json}}</pre>
</div>
<!-- <table class="table">
<thead>
<tr>
<td>ID</td>
<td>Value</td>
<td>Date Added</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="val in data.vals">
<td>{{val.id}}</td>
<td>{{val.val}} {{tag.units}}</td>
<td>{{val.dtime | date:'short'}}</td>
</tr>
</tbody>
</table> -->
</div>
</div>
</div>

View File

@@ -10,7 +10,7 @@
<form>
<div class="form-group">
<label for="data_source">Data Source</label>
<select ng-model="newTag.device_id" ng-options="d as device_label(d) for d in devices track" class="form-control" id="data_source"></select>
<select ng-model="newTag.device_id" ng-options="d.id as device_label(d) for d in devices" class="form-control" id="data_source"></select>
</div>
<div class="form-group">
<label for="tag">Tag</label>
@@ -26,7 +26,7 @@
</div>
<div class="form-group">
<label for="data_type">Data Type</label>
<select ng-model="newTag.data_type_id" ng-options="t as t.data_type.id for t in data_types" class="form-control" id="data_type"></select>
<select ng-model="newTag.data_type_id" ng-options="t.id as t.data_type for t in data_types" class="form-control" id="data_type"></select>
</div>
<div class="form-group">
<label for="tag_type">Tag Type</label>