yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 19:42:01 +02:00
Code Issues Releases Wiki Activity

Add support of device market name property in group feature

Browse source
This commit is contained in:
Denis barbaron 2020-01-24 16:18:28 +01:00
parent 1dd9f45f06
commit d9ea4ab85e
9 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/units/groups-engine/watchers/devices.js
View file

@ -127,6 +127,7 @@ module.exports = function(push, pushdev, channelRouter) {
, 'cpuPlatform'
, 'openGLESVersion'
, {phone: ['imei']}
, 'marketName'
)
.changes(), function(err, cursor) {
if (err) {

1
lib/util/fakedevice.js
View file

@ -53,6 +53,7 @@ module.exports.generate = function(wantedModel) {
, product: model
, cpuPlatform: 'msm8996'
, openGLESVersion: '3.1'
, marketName: 'Bar F9+'
})
})
.then(function() {

1
lib/wire/wire.proto
View file

@ -176,6 +176,7 @@ message DeviceField {
optional DevicePhoneField phone = 12;
optional DeviceProviderField provider = 13;
optional DeviceGroupField group = 14;
optional string marketName = 15;
}
message DeviceChangeMessage {

1
res/app/group-list/group-list-controller.js
View file

@ -30,6 +30,7 @@ module.exports = function GroupListCtrl(
'serial,' +
'version,' +
'manufacturer,' +
'marketName,' +
'sdk,' +
'display.width,' +
'display.height,' +

2
res/app/group-list/groups/groups.pug
View file

@ -94,7 +94,7 @@
.device-line
i.fa.fa-mobile.group-device-icon
.group-device-details.selectable
a.group-device-name(ng-bind-template="{{device.manufacturer + ' ' + device.model}}")
a.group-device-name(ng-bind-template="{{device.manufacturer + ' ' + device.model + ' (' + device.marketName + ')'}}")
.group-device-id
span(translate) Serial
span(ng-bind-template="{{::': ' + device.serial + ' - '}}")

1
res/app/settings/devices/devices-controller.js
View file

@ -24,6 +24,7 @@ module.exports = function DevicesCtrl(
'abi,' +
'cpuPlatform,' +
'openGLESVersion,' +
'marketName,' +
'phone.imei,' +
'provider.name,' +
'group.originName'

2
res/app/settings/devices/devices.pug
View file

@ -115,7 +115,7 @@
.device-line.device-actions
i.fa.fa-mobile.fa-2x.fa-fw.device-list-icon
.device-list-details.selectable
.device-list-name(ng-bind-template="{{device.manufacturer + ' ' + device.model}}")
.device-list-name(ng-bind-template="{{device.manufacturer + ' ' + device.model + ' (' + device.marketName + ')'}}")
.device-list-id
span(translate) Serial
span(ng-bind-template="{{::': ' + device.serial + ' - '}}")

14
res/app/settings/groups/devices/devices.pug
View file

@ -91,9 +91,10 @@ li.list-group-item.groups-list
td(ng-if='groupDeviceData.columns[8].selected') {{device.abi}}
td(ng-if='groupDeviceData.columns[9].selected') {{device.cpuPlatform}}
td(ng-if='groupDeviceData.columns[10].selected') {{device.openGLESVersion}}
td(ng-if='groupDeviceData.columns[11].selected') {{device.phone.imei}}
td(ng-if='groupDeviceData.columns[12].selected') {{device.provider.name}}
td(ng-if='groupDeviceData.columns[13].selected') {{device.group.originName}}
td(ng-if='groupDeviceData.columns[11].selected') {{device.marketName}}
td(ng-if='groupDeviceData.columns[12].selected') {{device.phone.imei}}
td(ng-if='groupDeviceData.columns[13].selected') {{device.provider.name}}
td(ng-if='groupDeviceData.columns[14].selected') {{device.group.originName}}
.panel.panel-default
.panel-heading.text-center
@ -190,6 +191,7 @@ li.list-group-item.groups-list
td(ng-if='deviceData.columns[8].selected') {{device.abi}}
td(ng-if='deviceData.columns[9].selected') {{device.cpuPlatform}}
td(ng-if='deviceData.columns[10].selected') {{device.openGLESVersion}}
td(ng-if='deviceData.columns[11].selected') {{device.phone.imei}}
td(ng-if='deviceData.columns[12].selected') {{device.provider.name}}
td(ng-if='deviceData.columns[13].selected') {{device.group.originName}}
td(ng-if='deviceData.columns[11].selected') {{device.marketName}}
td(ng-if='deviceData.columns[12].selected') {{device.phone.imei}}
td(ng-if='deviceData.columns[13].selected') {{device.provider.name}}
td(ng-if='deviceData.columns[14].selected') {{device.group.originName}}

3
res/app/settings/groups/groups-controller.js
View file

@ -37,6 +37,7 @@ module.exports = function GroupsCtrl(
'abi,' +
'cpuPlatform,' +
'openGLESVersion,' +
'marketName,' +
'phone.imei,' +
'provider.name,' +
'group.originName'
@ -384,6 +385,7 @@ module.exports = function GroupsCtrl(
, {name: 'ABI', property: 'abi'}
, {name: 'CPU Platform', property: 'cpuPlatform'}
, {name: 'OpenGL ES version', property: 'openGLESVersion'}
, {name: 'Market name', property: 'marketName'}
, {name: 'Phone IMEI', property: 'phone.imei'}
, {name: 'Location', property: 'provider.name'}
, {name: 'Group Origin', property: 'group.originName'}
@ -401,6 +403,7 @@ module.exports = function GroupsCtrl(
, {name: 'ABI', selected: false, sort: 'none'}
, {name: 'CPU Platform', selected: false, sort: 'none'}
, {name: 'OpenGL ES version', selected: false, sort: 'none'}
, {name: 'Market name', selected: true, sort: 'none'}
, {name: 'Phone IMEI', selected: false, sort: 'none'}
, {name: 'Location', selected: true, sort: 'none'}
, {name: 'Group Origin', selected: true, sort: 'none'}