atlanticbiomedical/biomedjs
1
0
Fork 0
mirror of https://github.com/atlanticbiomedical/biomedjs.git synced 2025-07-02 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

More features

Browse Source
This commit is contained in:
Dobie Wollert
2015-08-23 22:40:30 -07:00
parent 447d80f1b8
commit 68b2c8114b
8 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/devices.js
View File

@ -32,7 +32,6 @@ exports.get = function(req, res, next) {
Device.findById(id)
.populate('deviceType', 'category make model checkList')
.populate('deviceType.checkList', 'name fields')
.populate('client', 'name identifier')
.exec(returnResult(res));
};

9
app/controllers/testRuns.js
View File

@ -115,6 +115,15 @@ module.exports = function(config) {
}
testRun.save(returnResult(res));
Device.findById(testRun.device, function(err, device) {
if (err) {
log.error("Failed to fetch device for testRun: %s", err);
} else {
device.lastTestRun = testRun;
device.save();
}
});
},
update: function(req, res, next) {

12
app/controllers/workorders.js
View File

@ -108,12 +108,12 @@ module.exports = function(config, calendar) {
});
},
function(callback) {
Device.find({client: req.body.client, deleted: false })
.populate({path: 'deviceType'})
.exec(function(err, results) {
devices = results;
callback(err);
});
Device.find({'_id': { $in: req.body.devices }})
.populate({path: 'deviceType'})
.exec(function(err, results) {
devices = results;
callback(err);
});
},
function(callback) {
User.find({

1
app/model/device.js
View File

@ -13,6 +13,7 @@ var deviceSchema = new Schema({
location: String,
frequencyType: String,
frequencySchedule: [],
lastTestRun: {},
deleted: { type: Boolean, default: false }
});

4
public/js/controllers/testRuns.js
View File

@ -40,6 +40,8 @@ function testRunAddController($scope, Devices, CheckLists, TestRuns, $location,
field.result = (field.value == 'true');
} else if (field.type == 'range') {
field.result = field.value >= field.min && field.value <= field.max;
} else if (field.type == 'text') {
field.result = true;
}
$scope.model.result &= field.result;
@ -55,4 +57,4 @@ function testRunAddController($scope, Devices, CheckLists, TestRuns, $location,
function testRunViewController($scope, Devices, CheckLists, TestRuns, $location, $filter, $routeParams) {
$scope.model = TestRuns.get($routeParams);
}
}

1
public/partials/checkLists/add.html
View File

@ -38,6 +38,7 @@
<select ng-model="field.type" class="input-xlarge" required>
<option value="boolean">Pass / Fail</option>
<option value="range">Range</option>
<option value="text">Text</option>
</select>
</div>
</div>

14
public/partials/clients/edit.html
View File

@ -305,7 +305,8 @@
<th style="width: 5%">Serial No.</th>
<th style="width: 8%">Purchase Date</th>
<th style="width: 6%">Warranty Expiration</th>
<th style="width: 8%">PM Test</th>
<th style="width: 4%">PM Test</th>
<th style="width: 8%">Last Test Run</th>
<th style="width: 4%">Location</th>
</tr>
</thead>
@ -319,7 +320,16 @@
<td>{{device.serialNumber}}</td>
<td>{{device.purchaseDate | date}}</td>
<td>{{device.warrantyExpiration | date}}</td>
<td></td>
<td><a href="/testRuns/add?deviceId{{device._id}}">New</a></td>
<td>
<div ng-if="device.lastTestRun">
<a href="http://localhost:9000/testRuns/{{device.lastTestRun._id}}">
<span>{{device.lastTestRun.date | date}} | </span>
<span ng-if="device.lastTestRun.result">Passed</span>
<span ng-if="!device.lastTestRun.result">Failed</span>
</a>
</div>
</td>
<td>{{device.location}}</td>
</tr>
</tbody>

6
public/partials/testRuns/add.html
View File

@ -32,6 +32,12 @@
<input ng-model="field.value" type="number" class="input-xlarge" required>
</div>
</div>
<div class="control-group" ng-if="field.type == 'text'">
<label class="control-label">Result</label>
<div class="controls">
<input ng-model="field.value" type="text" class="input-xlarge" required>
</div>
</div>
<div class="control-group">
<label class="control-label">Comments</label>
<div class="controls">