Move device manipulation logic to device model

This commit is contained in:
Juan Cruz Viotti 2015-01-06 13:35:38 -03:00
parent be2b556d91
commit ac00a96728
2 changed files with 22 additions and 12 deletions

View File

@ -13,27 +13,27 @@ exports.list = permissions.user (params, options) ->
resin.models.device.getAllByApplication options.application, (error, devices) ->
errors.handle(error) if error?
log.out ui.widgets.table.horizontal devices, (device) ->
device.application = device.application[0].app_name
device.device_type = resin.models.device.getDisplayName(device.device_type)
return device
, [ 'ID', 'Name', 'Device Type', 'Is Online', 'Application', 'Status', 'Last Seen' ]
log.out ui.widgets.table.horizontal devices, _.identity, [
'ID'
'Name'
'Device Display Name'
'Is Online'
'Application Name'
'Status'
'Last Seen'
]
exports.info = permissions.user (params) ->
resin.models.device.get params.id, (error, device) ->
errors.handle(error) if error?
log.out ui.widgets.table.vertical device, (device) ->
device.device_type = resin.models.device.getDisplayName(device.device_type)
device.application = device.application[0].app_name
return device
, [
log.out ui.widgets.table.vertical device, _.identity, [
'ID'
'Name'
'Device Type'
'Device Display Name'
'Is Online'
'IP Address'
'Application'
'Application Name'
'Status'
'Last Seen'
'UUID'

View File

@ -55,6 +55,12 @@ exports.getAllByApplication = (applicationId, callback) ->
if _.isEmpty(devices)
return callback(new errors.NotAny('devices'))
# TODO: Move to server
devices = _.map devices, (device) ->
device.application_name = device.application[0].app_name
device.device_display_name = exports.getDisplayName(device.device_type)
return device
return callback(null, devices)
.catch (error) ->
@ -83,6 +89,10 @@ exports.get = (deviceId, callback) ->
if not device?
return callback(new errors.NotFound("device #{id}"))
# TODO: Move to server
device.application_name = device.application[0].app_name
device.device_display_name = exports.getDisplayName(device.device_type)
return callback(null, device)
.catch (error) ->