latest changes

This commit is contained in:
Dobie Wollert
2015-07-19 21:31:10 -04:00
parent 4496b9c240
commit 24f4acc1d3
15 changed files with 671 additions and 13 deletions

132
app/controllers/devices.js Normal file
View File

@ -0,0 +1,132 @@
var mongoose = require('mongoose'),
Device = mongoose.model('Device');
var _ = require('lodash');
var md5 = require('MD5');
var log = require('log4node');
exports.index = function(req, res) {
log.info('devices.index');
var query = Device.find({ deleted: false })
.exec(function(err, results) {
if (err) {
res.json(500, err);
} else {
res.json(results);
}
});
};
exports.get = function(req, res, next) {
var id = req.param('device_id');
log.info("devices.get %s", id);
Device.findById(id)
.exec(function(err, device) {
if (err) return next(err);
if (!device) return next(new Error('failed to load device ' + id));
res.json(device);
});
};
exports.deviceTypes = function(req, res, next) {
log.info("devices.deviceTypes");
var query = Device.find({ deleted: false })
.select('deviceType')
.exec(function(err, results) {
if (err) {
res.json(500, err);
} else {
res.json(_.uniq(_.pluck(results, 'deviceType')));
}
});
};
exports.makes = function(req, res, next) {
log.info("devices.makes");
var query = Device.find({ deleted: false })
.select('make')
.exec(function(err, results) {
if (err) {
res.json(500, err);
} else {
res.json(_.uniq(_.pluck(results, 'make')));
}
});
};
exports.models = function(req, res, next) {
log.info("devices.models");
var query = Device.find({ deleted: false })
.select('model')
.exec(function(err, results) {
if (err) {
res.json(500, err);
} else {
res.json(_.uniq(_.pluck(results, 'model')));
}
});
};
exports.create = function(req, res, next) {
log.info("devices.create %j", res.body);
var device = new Device({
deviceType: req.body.deviceType,
make: req.body.make,
model: req.body.model,
technicalData: req.body.technicalData,
links: req.body.links,
partsRecommended: req.body.partsRecommended,
images: req.body.images
});
return device.save(function(err) {
if (err)
log.error("Error: %s", err);
return res.json(device);
});
};
exports.update = function(req, res, next) {
var id = req.param('device_id');
log.info('devices.update %s %j', id, req.body);
return Device.findById(id, function(err, device) {
device.deviceType = req.body.deviceType;
device.make = req.body.make;
device.model = req.body.model;
device.technicalData = req.body.technicalData;
device.links = req.body.links;
device.partsRecommended = req.body.partsRecommended;
device.images = req.body.images;
return device.save(function(err) {
if (err)
log.error("Error: %s", err);
return res.json(device);
});
});
};
exports.upload = function(req, res, next) {
var path = req.files.file.path;
fs.readFile(path, function(err, data) {
var hash = md5(data);
fs.writeFile('/srv/biomed-site/images/devices/' + hash, data, function(err) {
if (err)
log.error("Error: %s", err);
return res.json({
filename: hash
});
});
});
};

16
app/model/device.js Normal file
View File

@ -0,0 +1,16 @@
var mongoose = require('mongoose')
Schema = mongoose.Schema,
ObjectId = Schema.ObjectId;
var deviceSchema = new Schema({
deviceType: String,
make: String,
model: String,
technicalData: String,
links: String,
partsRecommended: String,
images: [{ type: String }],
deleted: { type: Boolean, default: false }
});
module.exports = mongoose.model('Device', deviceSchema);

View File

@ -60,6 +60,10 @@ html(lang="en", ng-app="biomed", ng-controller="PageCtrl")
a(href='/accounting') a(href='/accounting')
| Accounting | Accounting
li(data-match-route='/devices.*')
a(href='/devices')
| Devices
li(data-match-route='/posts.*', ng-show="accountHasPermission('system.admin')") li(data-match-route='/posts.*', ng-show="accountHasPermission('system.admin')")
a(href='/posts') a(href='/posts')
| Posts | Posts

17
cli.js Normal file
View File

@ -0,0 +1,17 @@
var fs = require('fs');
var env = 'prod',
config = require('./config/config')[env],
mongoose = require('mongoose'),
Promise = require('bluebird');
// bootstrap db connection
mongoose.set('debug', config.debug);
mongoose.connect(config.database);
// bootstrap model
var modelPath = __dirname + '/app/model'
fs.readdirSync(modelPath).forEach(function (file) {
require(modelPath + '/' + file)
})

View File

@ -58,6 +58,16 @@ module.exports = function(app, auth, piler, calendar, directory, config) {
app.post('/api/workorders/:workorder_id', workorders.update); app.post('/api/workorders/:workorder_id', workorders.update);
app.del('/api/workorders/:workorder_id', workorders.destroy); app.del('/api/workorders/:workorder_id', workorders.destroy);
var devices = require('../app/controllers/devices');
app.get('/api/devices', devices.index);
app.get('/api/devices/deviceTypes', devices.deviceTypes);
app.get('/api/devices/makes', devices.makes);
app.get('/api/devices/models', devices.models);
app.post('/api/devices/images', devices.upload);
app.get('/api/devices/:device_id', devices.get);
app.post('/api/devices', devices.create);
app.post('/api/devices/:device_id', devices.update);
var pms = require('../app/controllers/pms'); var pms = require('../app/controllers/pms');
app.get('/api/pms', pms.index); app.get('/api/pms', pms.index);

View File

@ -61,6 +61,19 @@ angular.module('biomed', ['biomed.filters', 'biomed.services', 'biomed.directive
templateUrl: '/partials/clients/edit.html', templateUrl: '/partials/clients/edit.html',
controller: "ClientEditCtrl" controller: "ClientEditCtrl"
}) })
.when('/devices', {
templateUrl: '/partials/devices/index.html',
controller: "DeviceIndexCtrl",
reloadOnSearch: false
})
.when('/devices/add', {
templateUrl: '/partials/devices/add.html',
controller: "DeviceAddCtrl"
})
.when('/devices/:id', {
templateUrl: '/partials/devices/edit.html',
controller: "DeviceEditCtrl"
})
.when('/accounting', { .when('/accounting', {
templateUrl: '/partials/accounting/index.html', templateUrl: '/partials/accounting/index.html',
controller: "AccountingIndexCtrl", controller: "AccountingIndexCtrl",

View File

@ -705,6 +705,257 @@ angular.module('biomed')
} }
}) })
.controller("DeviceIndexCtrl", function($scope, $filter, $routeParams, Devices, LocationBinder) {
$scope.loading = true;
var allData = Devices.index(function() {
$scope.loading = false;
$scope.filter();
});
var filteredData = [];
var index = 0;
var initialPageSize = 100;
var pageSize = 5;
$scope.canLoad = true;
$scope.$watch('query', function() {
$scope.filter();
});
LocationBinder($scope, ['query']);
$scope.filter = function() {
filteredData = $filter('orderBy')($filter('filter')(allData, $scope.query), $scope.sort.column, $scope.sort.descending);
index = initialPageSize;
$scope.canLoad = true;
$scope.devices = filteredData.slice(0, initialPageSize);
};
$scope.addItems = function() {
$scope.devices = $scope.devices.concat(filteredData.slice(index, index + pageSize));
index += pageSize;
$scope.canLoad = index < filteredData.length;
}
$scope.sort = {
column: 'deviceType',
descending: false
};
$scope.selectedCls = function(column) {
return column == $scope.sort.column && 'sort-' + $scope.sort.descending;
}
$scope.changeSorting = function(column) {
var sort = $scope.sort;
if (sort.column == column) {
sort.descending = !sort.descending;
} else {
sort.column = column;
sort.descending = false;
}
$scope.filter();
};
})
.controller("DeviceAddCtrl", function($scope, Devices, $location, $filter) {
$scope.model = {};
$scope.deviceTypes = Devices.deviceTypes();
$scope.deviceMakes = Devices.makes();
$scope.deviceTypeOpts = {
containerCssClass: 'input-xxlarge',
placeholder: 'Choose a Device Type',
query: function(query) {
var data = $filter('filter')($scope.deviceTypes, query.term);
var results = [];
data.forEach(function(item) {
results.push({id: item, text: item});
});
query.callback({results: results });
},
createSearchChoice: function(term) {
return { id: term, text: term };
}
};
$scope.makeOpts = {
containerCssClass: 'input-xxlarge',
placeholder: 'Choose a Device Make',
query: function(query) {
var data = $filter('filter')($scope.deviceMakes, query.term);
var results = [];
data.forEach(function(item) {
results.push({id: item, text: item});
});
query.callback({results: results });
},
createSearchChoice: function(term) {
return { id: term, text: term };
}
};
var images = {};
$scope.imageOpts = {
options: {
url: '/api/devices/images',
addRemoveLinks: true
},
eventHandlers: {
success: function(file, response) {
file.filename = response.filename;
if (images[file.filename]) {
images[file.filename]++;
this.removeFile(file);
} else {
images[file.filename] = 1;
}
},
removedfile: function(file) {
images[file.filename]--;
if (images[file.filename] <= 0) {
delete images[file.filename];
}
}
}
};
$scope.$watch('deviceTypePicker', function() {
if ($scope.deviceTypePicker) {
$scope.model.deviceType = $scope.deviceTypePicker.id;
} else {
$scope.model.deviceType = null;
}
});
$scope.$watch('makePicker', function() {
if ($scope.makePicker) {
$scope.model.make = $scope.makePicker.id;
} else {
$scope.model.make = null;
}
});
$scope.save = function() {
$scope.model.images = Object.keys(images);
Devices.create($scope.model, function(result) {
// $location.path("/devices/" + result._id);
$location.path("/devices/");
});
};
})
.controller("DeviceEditCtrl", function($scope, Devices, $location, $filter, $routeParams) {
var images = {};
$scope.model = Devices.get($routeParams, function() {
$scope.loading = false;
$scope.existingImages = $scope.model.images;
if ($scope.model.images) {
for (var i = 0; i < $scope.model.images.length; i++) {
images[$scope.model.images[i]] = 1;
}
}
$scope.deviceTypePicker = {id: $scope.model.deviceType, text: $scope.model.deviceType};
$scope.makePicker = {id: $scope.model.make, text: $scope.model.make};
});
$scope.deviceTypes = Devices.deviceTypes();
$scope.deviceMakes = Devices.makes();
$scope.deviceTypeOpts = {
containerCssClass: 'input-xxlarge',
placeholder: 'Choose a Device Type',
query: function(query) {
var data = $filter('filter')($scope.deviceTypes, query.term);
var results = [];
data.forEach(function(item) {
results.push({id: item, text: item});
});
query.callback({results: results });
},
createSearchChoice: function(term) {
return { id: term, text: term };
}
};
$scope.makeOpts = {
containerCssClass: 'input-xxlarge',
placeholder: 'Choose a Device Make',
query: function(query) {
var data = $filter('filter')($scope.deviceMakes, query.term);
var results = [];
data.forEach(function(item) {
results.push({id: item, text: item});
});
query.callback({results: results });
},
createSearchChoice: function(term) {
return { id: term, text: term };
}
};
$scope.imageOpts = {
options: {
url: '/api/devices/images',
addRemoveLinks: true
},
eventHandlers: {
success: function(file, response) {
file.filename = response.filename;
if (images[file.filename]) {
images[file.filename]++;
this.removeFile(file);
} else {
images[file.filename] = 1;
}
},
removedfile: function(file) {
images[file.filename]--;
if (images[file.filename] <= 0) {
delete images[file.filename];
}
}
}
};
$scope.$watch('deviceTypePicker', function() {
if ($scope.deviceTypePicker) {
$scope.model.deviceType = $scope.deviceTypePicker.id;
} else {
$scope.model.deviceType = null;
}
});
$scope.$watch('makePicker', function() {
if ($scope.makePicker) {
$scope.model.make = $scope.makePicker.id;
} else {
$scope.model.make = null;
}
});
$scope.save = function() {
$scope.model.images = Object.keys(images);
Devices.update({id: $scope.model._id}, $scope.model, function(result) {
$location.path("/devices/");
});
};
})
.controller("AccountingIndexCtrl", function($scope, $filter, $routeParams, Workorders, LocationBinder) { .controller("AccountingIndexCtrl", function($scope, $filter, $routeParams, Workorders, LocationBinder) {
$scope.loading = true; $scope.loading = true;

View File

@ -807,7 +807,8 @@ angular.module('biomed.directives', [])
return { return {
scope: { scope: {
dropzone: '=', dropzone: '=',
existing: '=' existing: '=',
prefix: '@'
}, },
controller: function($scope, $element, $attrs) { controller: function($scope, $element, $attrs) {
var config, dropzone; var config, dropzone;
@ -821,13 +822,16 @@ angular.module('biomed.directives', [])
$scope.$watch('existing', function() { $scope.$watch('existing', function() {
var existing = $scope.existing; var existing = $scope.existing;
console.log(dropzone); var prefix = "http://atlanticbiomedical.com/images/";
if ($scope.prefix) {
prefix = prefix + $scope.prefix;
}
if (existing) { if (existing) {
for (var i = 0; i < existing.length; i++) { for (var i = 0; i < existing.length; i++) {
var file = { name: existing[i], size: 0, accepted: true, filename: existing[i] }; var file = { name: existing[i], size: 0, accepted: true, filename: existing[i] };
dropzone.options.addedfile.call(dropzone, file); dropzone.options.addedfile.call(dropzone, file);
dropzone.options.thumbnail.call(dropzone, file, "http://atlanticbiomedical.com/images/" + existing[i]); dropzone.options.thumbnail.call(dropzone, file, prefix + existing[i]);
dropzone.files.push(file); dropzone.files.push(file);
} }
} }

View File

@ -14,6 +14,20 @@ angular.module('biomed.services', [])
isUnique: { method: 'GET', params: { cmd: 'isUnique' } }, isUnique: { method: 'GET', params: { cmd: 'isUnique' } },
}); });
}) })
.factory("Devices", function($resource) {
return $resource('/api/devices/:id/:cmd',
{ id: "@id", cmd: "@cmd" },
{
index: { method: 'GET', params: {}, isArray: true },
deviceTypes: { method: 'GET', params: { cmd: 'deviceTypes' }, isArray: true },
makes: { method: 'GET', params: { cmd: 'makes' }, isArray: true },
models: { method: 'GET', params: { cmd: 'models' }, isArray: true },
get: { method: 'GET', params: { id: 0} },
create: { method: 'POST', params: {} },
update: { method: 'POST', params: { id: 0} },
destroy: { method: 'DELETE', params: { id: 0 } },
});
})
.factory("Posts", function($resource) { .factory("Posts", function($resource) {
return $resource('/api/posts/:id', return $resource('/api/posts/:id',
{ id: "@id" }, { id: "@id" },

View File

@ -6,8 +6,8 @@
<header ng-hide="loading"> <header ng-hide="loading">
<h1>{{master.name}}</h1> <h1>{{master.name}}</h1>
<p class="lead">{{master.identifier}}</p> <p class="lead">{{master.identifier}}</p>
<a class="btn btn-primary" href="/workorders/add?clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Create new Workorder</a> <a class="btn btn-primary" href="/workorders/add?clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Work Order</a>
<a class="btn" href="/workorders/add?workorderType=meeting&clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Create new Meeting</a> <a class="btn" href="/workorders/add?workorderType=meeting&clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Meeting</a>
</header> </header>
<div ng-hide="loading" class="tabbable"> <div ng-hide="loading" class="tabbable">
<div class="tab-content"> <div class="tab-content">
@ -305,9 +305,7 @@
<th style="width: 8%">Purchase Date</th> <th style="width: 8%">Purchase Date</th>
<th style="width: 6%">Warranty Expiration</th> <th style="width: 6%">Warranty Expiration</th>
<th style="width: 8%">PM Test</th> <th style="width: 8%">PM Test</th>
<th style="width: 4%">Room #</th> <th style="width: 4%">Location</th>
<th style="width: 4%">PO Number</th>
<th style="width: 4%">Move to</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -322,8 +320,6 @@
<td>{{tag.data.deviceWarrantyExpiration}}</td> <td>{{tag.data.deviceWarrantyExpiration}}</td>
<td>{{tag.data.test}}</td> <td>{{tag.data.test}}</td>
<td>{{tag.data.roomNumber}}</td> <td>{{tag.data.roomNumber}}</td>
<td>{{tag.data.poNumber}}</td>
<td>{{tag.data.MoveTo}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -0,0 +1,80 @@
<ul class="breadcrumb">
<li><a href="/devices"><i class="icon-briefcase"></i> Devices</a><span class="divider"></span><li>
<li class="active">New Device<li>
</ul>
<header>
<h1>New Device</h1>
</header>
<form name="form" class="form">
<div class="form-section">
<div class="section-label">Device Identification</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Device Type</label>
<div class="controls">
<input type="hidden" ng-model="deviceTypePicker" ui-select2="deviceTypeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Make</label>
<div class="controls">
<input type="hidden" ng-model="makePicker" ui-select2="makeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Model</label>
<div class="controls">
<input ng-model="model.model" type="text" class="input-xlarge">
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Device Details</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Technical Data</label>
<div class="controls">
<textarea ng-model="model.technicalData" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Links</label>
<div class="controls">
<textarea ng-model="model.links" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Recommended Parts</label>
<div class="controls">
<textarea ng-model="model.partsRecommended" type="text" class="input-xxlarge"></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Images</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Images</label>
<div class="controls">
<div class="dropzone" dropzone="imageOpts"></div>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">&nbsp;</div>
<div class="section-container">
<button ng-click="save()" ng-disabled="form.$invalid" type="button" class="btn btn-primary">Save</button>
</div>
</div>
</form>

View File

@ -0,0 +1,80 @@
<ul class="breadcrumb">
<li><a href="/devices"><i class="icon-briefcase"></i> Devices</a><span class="divider"></span><li>
<li class="active">Edit Device<li>
</ul>
<header>
<h1>Edit Device</h1>
</header>
<form name="form" class="form">
<div class="form-section">
<div class="section-label">Device Identification</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Device Type</label>
<div class="controls">
<input type="hidden" ng-model="deviceTypePicker" ui-select2="deviceTypeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Make</label>
<div class="controls">
<input type="hidden" ng-model="makePicker" ui-select2="makeOpts" />
</div>
</div>
<div class="control-group">
<label class="control-label">Model</label>
<div class="controls">
<input ng-model="model.model" type="text" class="input-xlarge">
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Device Details</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Technical Data</label>
<div class="controls">
<textarea ng-model="model.technicalData" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Links</label>
<div class="controls">
<textarea ng-model="model.links" type="text" class="input-xxlarge"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label">Recommended Parts</label>
<div class="controls">
<textarea ng-model="model.partsRecommended" type="text" class="input-xxlarge"></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">Images</div>
<div class="section-container">
<div class="form-editor">
<div class="control-group">
<label class="control-label">Images</label>
<div class="controls">
<div class="dropzone" dropzone="imageOpts" existing="existingImages" prefix="devices/"></div>
</div>
</div>
</div>
</div>
</div>
<div class="form-section">
<div class="section-label">&nbsp;</div>
<div class="section-container">
<button ng-click="save()" ng-disabled="form.$invalid" type="button" class="btn btn-primary">Save</button>
</div>
</div>
</form>

View File

@ -0,0 +1,41 @@
<ul class="breadcrumb">
<li><a href="/devices"><i class="icon-briefcase"></i> Devices</a><li>
</ul>
<header>
<h1>Devices</h1>
</header>
<div class="row-fluid">
<div class="span12">
<div class="toolbelt">
<a href="/devices/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Device</a>
<div class="pull-right">
<span class="toolbelt-text">Search:</span>
<div class="input-append">
<input type="text" ng-model="query" class="input-large" placeholder="Search">
<span class="add-on"><i class="icon-search"></i></span>
</div>
</div>
</div>
<table class="biomed-table" infinite-scroll="addItems()" can-load="canLoad" threshold="300">
<thead>
<tr>
<th style="width: 33%" ng-class="selectedCls('deviceType')" ng-click="changeSorting('deviceType')">Device Type</th>
<th style="width: 33%" ng-class="selectedCls('make')" ng-click="changeSorting('make')">Make</th>
<th style="width: 33%" ng-class="selectedCls('model')" ng-click="changeSorting('model')">Model</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-show="loading"><td colspan="4" class="table-loading"><i class="loader"></i></td></tr>
<tr ng-hide="loading || devices.length"><td colspan="4" class="table-message">There is no information to display.</td></tr>
<tr ng-hide="loading" ng-repeat="device in devices">
<td>{{device.deviceType}}</td>
<td>{{device.make}}</td>
<td>{{device.model}}</td>
<td><a href="/devices/{{device._id}}">Edit</a></td>
</tr>
</tbody>
</table>
</div>
</div>

View File

@ -8,8 +8,8 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="toolbelt"> <div class="toolbelt">
<a href="/workorders/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Workorder</a> <a href="/workorders/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Work Order</a>
<a href="/workorders/add?workorderType=meeting" class="btn" ng-show="accountHasPermission('system.edit')">Create new Meeting</a> <a href="/workorders/add?workorderType=meeting" class="btn" ng-show="accountHasPermission('system.edit')">Meeting</a>
<div class="pull-right"> <div class="pull-right">
<span class="toolbelt-text">Group: </span> <span class="toolbelt-text">Group: </span>
<div class="input-append"> <div class="input-append">

View File

@ -9,7 +9,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="toolbelt"> <div class="toolbelt">
<a href="/clients/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Workorder</a> <a href="/clients/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Work Order</a>
<span class="toolbelt-text">Filter:</span> <span class="toolbelt-text">Filter:</span>
<select ng-model="filter" name="filter" class="input-xlarge"> <select ng-model="filter" name="filter" class="input-xlarge">
<option value="all">All</option> <option value="all">All</option>