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

Completes POCONSOLE-44. Gauge off Page working

Browse Source
This commit is contained in:
Patrick McDonagh
2016-06-15 17:40:06 -05:00
parent 3c4f63faeb
commit fa9c2925b5
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sails/api/controllers/Tag_valController.js
View File

@@ -134,5 +134,14 @@ module.exports = {
if (err) return res.serverError(err);
return res.ok(results);
});
},
gaugeOffTags: function(req, res){
var query = "SELECT v.id as id, t.id as tagid, t.name as name, DATE(v.createdAt) as date, v.val as val FROM tag_vals v JOIN tags t ON v.tagID = t.id WHERE t.tag_class = 3";
Tag_val.query(query, function(err, results){
if (err) return res.serverError(err);
return res.ok(results);
});
}
};

30
sails/assets/templates/gaugeOff.html
View File

@@ -46,21 +46,21 @@
</thead>
<tbody>
<tr ng-repeat="entry in gaugeOffData">
<td nowrap>{{ entry.createdAt | date}}</td>
<td nowrap ng-if="show.PctRun">{{ entry.percent_run}} %</td>
<td nowrap ng-if="show.kWh">{{ entry.kWh }} kWh</td>
<td nowrap ng-if="show.kWhRegen">{{ entry.kWh_regen }} kWh</td>
<td nowrap ng-if="show.CostToOperate">{{ entry.electricity_cost }}</td>
<td nowrap ng-if="show.LiftingCost">{{ entry.lifting_cost }}</td>
<td nowrap ng-if="show.PeakLoad">{{ entry.peak_load }} lbs</td>
<td nowrap ng-if="show.MinLoad">{{ entry.min_load }} lbs</td>
<td nowrap ng-if="show.AvgSPM">{{ entry.average_SPM }} SPM</td>
<td nowrap ng-if="show.CalcProduction">{{ entry.production_calculated }} BBL</td>
<td nowrap ng-if="show.ProjProduction">{{ entry.full_card_production }}BBL</td>
<td nowrap ng-if="show.PolishedRodHP">{{ entry.polished_rod_HP }} HP</td>
<td nowrap ng-if="show.FluidLevel">{{ entry.fluid_above_pump }} ft.</td>
<td nowrap ng-if="show.PumpIntakePressure">{{ entry.pump_intake_pressure }} PSI</td>
<td nowrap ng-if="show.InflowRate">{{ entry.inflow_rate }} BBL/hr</td>
<td nowrap>{{ entry.date | date}}</td>
<td nowrap ng-if="show.PctRun">{{ entry.go_percent_run | number: 1 }} %</td>
<td nowrap ng-if="show.kWh">{{ entry.go_kwh | number: 3 }} kWh</td>
<td nowrap ng-if="show.kWhRegen">{{ entry.go_kwh_regen | number: 3 }} kWh</td>
<td nowrap ng-if="show.CostToOperate">{{ entry.go_electricity_cost | number: 3 }}</td>
<td nowrap ng-if="show.LiftingCost">{{ entry.go_lifting_cost | number: 3 }}</td>
<td nowrap ng-if="show.PeakLoad">{{ entry.go_max_load | number: 3 }} lbs</td>
<td nowrap ng-if="show.MinLoad">{{ entry.go_min_load | number: 3 }} lbs</td>
<td nowrap ng-if="show.AvgSPM">{{ entry.go_average_spm | number: 3 }} SPM</td>
<td nowrap ng-if="show.CalcProduction">{{ entry.go_production_calculated | number: 3 }} BBL</td>
<td nowrap ng-if="show.ProjProduction">{{ entry.go_full_card_production | number: 3 }}BBL</td>
<td nowrap ng-if="show.PolishedRodHP">{{ entry.go_polished_rod_hp | number: 3 }} HP</td>
<td nowrap ng-if="show.FluidLevel">{{ entry.go_fluid_level | number: 3 }} ft.</td>
<td nowrap ng-if="show.PumpIntakePressure">{{ entry.go_pump_intake_pressure | number: 3 }} PSI</td>
<td nowrap ng-if="show.InflowRate">{{ entry.go_inflow_rate | number: 3 }} BBL/hr</td>
</tr>
</tbody>
</table>

2
sails/config/blueprints.js
View File

@@ -157,6 +157,6 @@ module.exports.blueprints = {
* *
****************************************************************************/
// defaultLimit: 30
defaultLimit: 300
};