formatting fixes for on mobile

This commit is contained in:
Patrick McDonagh
2017-03-01 18:17:07 -06:00
parent c6489d9b85
commit bfbbd762c3
3 changed files with 129 additions and 126 deletions

View File

@@ -4,111 +4,114 @@
{% block content %}
<div class="content">
<div class="row">
<div class="col-xs-12">
<h2>Well Configuration</h2>
<form>
<div class="form-group">
<label for="wellName">Well Name</label>
<input type="text" class="form-control" id="wellName" value="{{config.wellName}}">
</div>
<div class="form-group">
<label for="deltaT">Delta T</label>
<input type="number" class="form-control" id="deltaT" value="{{config.deltaT}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="pumpDiameter">Pump Diameter</label>
<input type="number" class="form-control" id="pumpDiameter" value="{{config.pumpDiameter}}" step="0.001" min="0.001" max="10">
</div>
<div class="form-group">
<label for="fluidGradient">Fluid Gradient</label>
<input type="number" class="form-control" id="fluidGradient" value="{{config.fluidGradient}}" step="0.001" min="0.001" max="2.0">
</div>
<div class="form-group">
<label for="tubingID">Tubing ID</label>
<input type="number" class="form-control" id="tubingID" value="{{config.tubingID}}" step="0.001" min="0.001" max="24">
</div>
<div class="form-group">
<label for="tubingOD">Tubing OD</label>
<input type="number" class="form-control" id="tubingOD" value="{{config.tubingOD}}" step="0.001" min="0.001" max="24">
</div>
<div class="form-group">
<label for="tubingAnchorDepth">Tubing Anchor Depth</label>
<input type="number" class="form-control" id="tubingAnchorDepth" value="{{config.tubingAnchorDepth}}" step="0.001" min="0.001">
</div>
<div class="form-group">
<label for="structuralRating">Structural Rating</label>
<input type="number" class="form-control" id="structuralRating" value="{{config.structuralRating}}" step="0.001" min="0.001">
</div>
<div class="form-group">
<label for="stuffingBoxFriction">Stuffing Box Friction</label>
<input type="number" class="form-control" id="stuffingBoxFriction" value="{{config.stuffingBoxFriction}}" step="0.5" min="0.0">
</div>
<div class="form-group">
<label for="tubingHeadPressure">Tubing Head Pressure</label>
<input type="number" class="form-control" id="tubingHeadPressure" value="{{config.tubingHeadPressure}}" step="0.001" min="0.0">
</div>
<div class="form-group">
<label for="storedBy">Last Stored By</label>
<input type="text" class="form-control disabled" id="storedBy" value="{{config.storedBy}}" disabled>
</div>
<h2>Taper Setup</h2>
<div class="table table-responsive">
<table class="table">
<thead>
<tr>
<th>Taper</th>
<th>Length</th>
<th>Diameter</th>
<th>Material</th>
<th>Damping Factor</th>
</tr>
</thead>
<tbody>
{% for taper in config.tapers %}
<tr>
<td class="taper-number">{{loop.index}}</td>
<td><input type="number" class="form-control" id="taper-{{loop.index}}-length" value="{{taper.length}}" /></td>
<td><input type="number" class="form-control" id="taper-{{loop.index}}-diameter" value="{{taper.diameter}}" /></td>
<td><select class="form-control" id="taper-{{loop.index}}-material" value="{{taper.material}}"><option value="steel">Steel</option><option value="fiberglass">Fiberglass</option></select></td>
<!-- <td><input type="text" class="form-control" id="taper-{{loop.index}}-material" value="{{taper.material}}" /></td> -->
<td><input type="number" class="form-control" id="taper-{{loop.index}}-dampingFactor" value="{{taper.dampingFactor}}" /></td>
</tr>
{% endfor %}
<span id="morerows"></span>
</tbody>
</table>
<button id="add-row" class="btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Taper</button>
<hr />
<div class="alert alert-success alert-dismissable hidden" id="update-success">
<span>
<p>Configuration successfully updated!</p>
</span>
<div class="container">
<div class="row">
<div class="col-xs-12">
<h2>Well Configuration</h2>
<form>
<div class="form-group">
<label for="wellName">Well Name</label>
<input type="text" class="form-control" id="wellName" value="{{config.wellName}}">
</div>
<div class="alert alert-danger alert-dismissable hidden" id="update-failed">
<span>
<p>Failed to update configuration.</p>
</span>
</div>
<button id="submit" class="btn btn-default">Update Well Configuration</button>
</form>
<div class="form-group">
<label for="deltaT">Delta T</label>
<input type="number" class="form-control" id="deltaT" value="{{config.deltaT}}" step="0.001" min="0.001" max="0.2">
</div>
<div class="form-group">
<label for="pumpDiameter">Pump Diameter</label>
<input type="number" class="form-control" id="pumpDiameter" value="{{config.pumpDiameter}}" step="0.001" min="0.001" max="10">
</div>
<div class="form-group">
<label for="fluidGradient">Fluid Gradient</label>
<input type="number" class="form-control" id="fluidGradient" value="{{config.fluidGradient}}" step="0.001" min="0.001" max="2.0">
</div>
<div class="form-group">
<label for="tubingID">Tubing ID</label>
<input type="number" class="form-control" id="tubingID" value="{{config.tubingID}}" step="0.001" min="0.001" max="24">
</div>
<div class="form-group">
<label for="tubingOD">Tubing OD</label>
<input type="number" class="form-control" id="tubingOD" value="{{config.tubingOD}}" step="0.001" min="0.001" max="24">
</div>
<div class="form-group">
<label for="tubingAnchorDepth">Tubing Anchor Depth</label>
<input type="number" class="form-control" id="tubingAnchorDepth" value="{{config.tubingAnchorDepth}}" step="0.001" min="0.001">
</div>
<div class="form-group">
<label for="structuralRating">Structural Rating</label>
<input type="number" class="form-control" id="structuralRating" value="{{config.structuralRating}}" step="0.001" min="0.001">
</div>
<div class="form-group">
<label for="stuffingBoxFriction">Stuffing Box Friction</label>
<input type="number" class="form-control" id="stuffingBoxFriction" value="{{config.stuffingBoxFriction}}" step="0.5" min="0.0">
</div>
<div class="form-group">
<label for="tubingHeadPressure">Tubing Head Pressure</label>
<input type="number" class="form-control" id="tubingHeadPressure" value="{{config.tubingHeadPressure}}" step="0.001" min="0.0">
</div>
<div class="form-group">
<label for="storedBy">Last Stored By</label>
<input type="text" class="form-control disabled" id="storedBy" value="{{config.storedBy}}" disabled>
</div>
<h2>Taper Setup</h2>
<div class="table table-responsive">
<table class="table">
<thead>
<tr>
<th>Taper</th>
<th>Length</th>
<th>Diameter</th>
<th>Material</th>
<th>Damping Factor</th>
</tr>
</thead>
<tbody>
{% for taper in config.tapers %}
<tr>
<td class="taper-number">{{loop.index}}</td>
<td><input type="number" class="form-control" id="taper-{{loop.index}}-length" value="{{taper.length}}" /></td>
<td><input type="number" class="form-control" id="taper-{{loop.index}}-diameter" value="{{taper.diameter}}" /></td>
<td><select class="form-control" id="taper-{{loop.index}}-material" value="{{taper.material}}"><option value="steel">Steel</option><option value="fiberglass">Fiberglass</option></select></td>
<!-- <td><input type="text" class="form-control" id="taper-{{loop.index}}-material" value="{{taper.material}}" /></td> -->
<td><input type="number" class="form-control" id="taper-{{loop.index}}-dampingFactor" value="{{taper.dampingFactor}}" /></td>
</tr>
{% endfor %}
<span id="morerows"></span>
</tbody>
</table>
<button id="add-row" class="btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Taper</button>
<hr />
<div class="alert alert-success alert-dismissable hidden" id="update-success">
<span>
<p>Configuration successfully updated!</p>
</span>
</div>
<div class="alert alert-danger alert-dismissable hidden" id="update-failed">
<span>
<p>Failed to update configuration.</p>
</span>
</div>
<button id="submit" class="btn btn-default">Update Well Configuration</button>
</form>
</div>
</div>
</div>
</div>
</div>
<script>
<script>
$( "#add-row" ).click(function( event ) {
event.preventDefault();
var nextTaper = parseInt($(".taper-number").last().text()) + 1;
@@ -167,5 +170,5 @@
success: configUpdatedSuccessfully
});
})
</script>
{% endblock content %}
</script>
{% endblock content %}

View File

@@ -33,23 +33,23 @@
<tbody>
{% for t in tag_values %}
<tr>
<td><a href="/values/tag/{{t._id}}">{{t._id}}</a></td>
<td>
<button type="button" class="btn btn-default" title="{{t._id}}" data-container="body" data-toggle="popover" data-trigger="focus" data-placement="right" data-content="Max: {{t.max | round(3)}}<br \>
Min: {{t.min | round(3)}}<br \>
Average: {{t.average | round(3)}}<br \>
Total: {{t.total | round(3)}}">
Details
</button>
</td>
<td>{{t.value | round(3)}}</td>
<td>{{t.timestamp | datetime('short')}}</td>
<!-- <td>{{t.max | round(3)}}</td>
<td>{{t.min | round(3)}}</td>
<td>{{t.average | round(3)}}</td>
<td>{{t.total | round(3)}}</td> -->
</tr>
<tr>
<td><a href="/values/tag/{{t._id}}">{{t._id}}</a></td>
<td>
<button type="button" class="btn btn-default" title="{{t._id}}" data-container="body" data-toggle="popover" data-trigger="focus" data-placement="right" data-content="Max: {{t.max | round(3)}}<br \>
Min: {{t.min | round(3)}}<br \>
Average: {{t.average | round(3)}}<br \>
Total: {{t.total | round(3)}}">
Details
</button>
</td>
<td>{{t.value | round(3)}}</td>
<td>{{t.timestamp | datetime('short')}}</td>
<!-- <td>{{t.max | round(3)}}</td>
<td>{{t.min | round(3)}}</td>
<td>{{t.average | round(3)}}</td>
<td>{{t.total | round(3)}}</td> -->
</tr>
{% endfor %}
</tbody>
@@ -67,14 +67,14 @@
<h3>{{card.timestamp | datetime('long')}}</h1>
<canvas id="surfacecard" height="140"></canvas>
<canvas id="downholecard" height="140"></canvas>
{% else %}
<h3>No card data yet...</h3>
{% endif %}
{% else %}
<h3>No card data yet...</h3>
{% endif %}
</div>
</div>
</div>
</div>
<script>
<script>
function getCardData(){
$.ajax({
dataType: 'json',
@@ -88,5 +88,5 @@
$('[data-toggle="popover"]').popover({html: true})
})
</script>
{% endblock content %}
</script>
{% endblock content %}

View File

@@ -118,7 +118,7 @@
function setRunStatus(data){
$("#runstatus").text(data.runstatus.status);
$("#db-runstatus").text(data.runstatus.status);
var ts_date = new Date(Date.parse(data.runstatus.timestamp));
var ts_date = new Date(Date.parse(data.runstatus.timestamp.replace(" ", "T")));
$("#runstatustimestamp").text(ts_date.toString());
$("#db-runstatustimestamp").text(ts_date.toString());
}