diff --git a/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal.js b/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js similarity index 100% rename from res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal.js rename to res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js diff --git a/res/app/components/stf/common-ui/modals/external-url-modal/index.js b/res/app/components/stf/common-ui/modals/external-url-modal/index.js index 3698cae7..51c905c1 100644 --- a/res/app/components/stf/common-ui/modals/external-url-modal/index.js +++ b/res/app/components/stf/common-ui/modals/external-url-modal/index.js @@ -3,5 +3,5 @@ require('./external-url-modal.css') module.exports = angular.module('stf.external-url-modal', [ require('stf/common-ui/modals/common').name ]) - .factory('ExternalUrlModalService', require('./external-url-modal')) + .factory('ExternalUrlModalService', require('./external-url-modal-service')) .directive('onLoadEvent', require('./on-load-event-directive')) diff --git a/res/app/control-panes/advanced/remote-debug/index.js b/res/app/control-panes/advanced/remote-debug/index.js new file mode 100644 index 00000000..b1639a06 --- /dev/null +++ b/res/app/control-panes/advanced/remote-debug/index.js @@ -0,0 +1,6 @@ +require('./remote-debug.css') + +module.exports = angular.module('stf.remote-debug', [ + +]) + .controller('RemoteDebugCtrl', require('./remote-debug-controller')) diff --git a/res/app/control-panes/advanced/remote-debug/remote-debug-controller.js b/res/app/control-panes/advanced/remote-debug/remote-debug-controller.js new file mode 100644 index 00000000..1e9003d2 --- /dev/null +++ b/res/app/control-panes/advanced/remote-debug/remote-debug-controller.js @@ -0,0 +1,3 @@ +module.exports = function RemoteDebugCtrl($scope) { + +} diff --git a/res/app/control-panes/advanced/remote-debug/remote-debug-spec.js b/res/app/control-panes/advanced/remote-debug/remote-debug-spec.js new file mode 100644 index 00000000..e2301609 --- /dev/null +++ b/res/app/control-panes/advanced/remote-debug/remote-debug-spec.js @@ -0,0 +1,17 @@ +describe('RemoteDebugCtrl', function () { + + beforeEach(module('stf.remote-debug')); + + var scope, ctrl; + + beforeEach(inject(function ($rootScope, $controller) { + scope = $rootScope.$new(); + ctrl = $controller('RemoteDebugCtrl', {$scope: scope}); + })); + + it('should ...', inject(function () { + expect(1).toEqual(1); + + })); + +}); \ No newline at end of file diff --git a/res/app/control-panes/advanced/remote-debug/remote-debug.css b/res/app/control-panes/advanced/remote-debug/remote-debug.css new file mode 100644 index 00000000..905a28a8 --- /dev/null +++ b/res/app/control-panes/advanced/remote-debug/remote-debug.css @@ -0,0 +1,3 @@ +.stf-remote-debug { + +} \ No newline at end of file diff --git a/res/app/control-panes/advanced/remote-debug/remote-debug.jade b/res/app/control-panes/advanced/remote-debug/remote-debug.jade new file mode 100644 index 00000000..109a62ad --- /dev/null +++ b/res/app/control-panes/advanced/remote-debug/remote-debug.jade @@ -0,0 +1,6 @@ +.widget-container.fluid-height.stf-remote-debug + .heading + i.fa + span(translate) Remote debug + .widget-content.padded + div \ No newline at end of file diff --git a/res/app/device-list/device-list-details-controller.js b/res/app/device-list/device-list-details-controller.js index b6c3e65b..17c2818f 100644 --- a/res/app/device-list/device-list-details-controller.js +++ b/res/app/device-list/device-list-details-controller.js @@ -28,7 +28,7 @@ module.exports = function DeviceListCtrlDetails($scope, DeviceService, GroupServ // $scope.tableFilter = data // }) - if ($scope.ngTableEnabled) { + //if ($scope.ngTableEnabled) { $scope.statusFilter = function () { var def = $q.defer() @@ -78,7 +78,7 @@ module.exports = function DeviceListCtrlDetails($scope, DeviceService, GroupServ $scope.$on('devices.update', function () { $scope.tableParams.reload() }) - } + //} if (!$scope.ngTableEnabled) { $scope.tableLimit = 1000 diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade index 078638c4..a7f7d2ab 100644 --- a/res/app/device-list/device-list.jade +++ b/res/app/device-list/device-list.jade @@ -85,7 +85,7 @@ div.stf-device-list nothing-to-show(message='{{"No devices connected"|translate}}', icon='fa-sitemap', ng-show='!tracker.devices.length') .filtering-buttons - span(ng-if='ngTableEnabled') + div(ng-show='ngTableEnabled') clear-button(ng-click="clearSorting()") filter-button(ng-model='filterEnabled') .button-spacer.pull-right @@ -94,7 +94,7 @@ div.stf-device-list i.fa.fa-list-alt span {{"Show All"|translate}} - span(ng-if='!ngTableEnabled') + //span(ng-if='!ngTableEnabled') .btn-group(dropdown).pull-right button.btn.btn-sm.btn-primary-outline.dropdown-toggle i.fa.fa-list-alt @@ -106,7 +106,7 @@ div.stf-device-list input(type='checkbox', checklist-model='selectedColumns', checklist-value='column') span(ng-bind='column.title | translate') - div(ng-if='!ngTableEnabled') + //div(ng-if='!ngTableEnabled') table.table.table-hover.dataTable thead tr @@ -121,75 +121,74 @@ div.stf-device-list //table.table.table-hover.dataTable(ng-table='tableParams') thead tr - th(ng-repeat='column in $parent.selectedColumns', ng-show='column.visible') + th(ng-repeat='column in selectedColumns', ng-show='column.visible') div PEPE tbody tr(ng-repeat='device in $data | limitTo:5', ng-class='{ "device-not-usable": !device.usable }') td(ng-repeat='column in selectedColumns', ng-show='column.visible', sortable='column.field') span {{ device[column.field] }} - div(ng-if='ngTableEnabled') - table.table.table-hover.dataTable(ng-table='tableParams', show-filter='filterEnabled', ng-show='tracker.devices.length').device-list-details - tr(ng-repeat='device in $data', ng-class='{ "device-not-usable": !device.usable }') + table.table.table-hover.dataTable(ng-table='tableParams', show-filter='filterEnabled', ng-show='tracker.devices.length').device-list-details + tr(ng-repeat='device in $data', ng-class='{ "device-not-usable": !device.usable }') - td(data-title="'Status'|translate", sortable='"enhancedStateSorting"', filter="{ 'usable': 'select' }", filter-data="statusFilter($column)") + td(data-title="'Status'|translate", sortable='"enhancedStateSorting"', filter="{ 'usable': 'select' }", filter-data="statusFilter($column)") - button(ng-class='device.enhancedButtonClass', - ng-dblclick='tryToKick(device)', - ng-click='device.usable && toggle(device)').btn.btn-xs.device-status {{device.enhancedStateAction | translate}} + button(ng-class='device.enhancedButtonClass', + ng-dblclick='tryToKick(device)', + ng-click='device.usable && toggle(device)').btn.btn-xs.device-status {{device.enhancedStateAction | translate}} - td(data-title="::'Model'|translate", sortable='"model"', filter='{"model": "text"}') - span.device-small-image - img(ng-src='{{device.enhancedImage24}}') + td(data-title="::'Model'|translate", sortable='"model"', filter='{"model": "text"}') + span.device-small-image + img(ng-src='{{device.enhancedImage24}}') - span(ng-if='device.state !== "using"') {{device.enhancedModel}} - a(ng-if='device.state === "using"', ng-href='/#!/control/{{ device.serial }}') {{device.enhancedModel}} + span(ng-if='device.state !== "using"') {{device.enhancedModel}} + a(ng-if='device.state === "using"', ng-href='/#!/control/{{ device.serial }}') {{device.enhancedModel}} - td(data-title="'Product'|translate", sortable='"enhancedName"', filter='{"enhancedName": "text"}').device-list-product - span {{::device.enhancedName}} - td(data-title="'Carrier'|translate", sortable='"operator"', filter='{"operator": "text"}').device-list-carrier - span {{::device.operator}} - td(data-title="'Released'|translate", sortable='"enhancedReleasedAt"', filter='{"enhancedReleasedAt": "text"}') - span {{::device.enhancedReleasedAt}} - td(data-title="'OS'|translate", sortable='"version"', filter='{"version": "text"}') - span {{::device.version}} - td(data-title="'Network'|translate", sortable='"phone.network"', filter='{"phone": "text"}') - span {{device.phone.network}} + td(data-title="'Product'|translate", sortable='"enhancedName"', filter='{"enhancedName": "text"}').device-list-product + span {{::device.enhancedName}} + td(data-title="'Carrier'|translate", sortable='"operator"', filter='{"operator": "text"}').device-list-carrier + span {{::device.operator}} + td(data-title="'Released'|translate", sortable='"enhancedReleasedAt"', filter='{"enhancedReleasedAt": "text"}') + span {{::device.enhancedReleasedAt}} + td(data-title="'OS'|translate", sortable='"version"', filter='{"version": "text"}') + span {{::device.version}} + td(data-title="'Network'|translate", sortable='"phone.network"', filter='{"phone": "text"}') + span {{device.phone.network}} - td(ng-show='showAll', data-title="'Screen'|translate", sortable='"enhanceDisplayRes"', filter='{"enhanceDisplayRes": "text"}') - span {{device.enhanceDisplayRes }} - td(ng-show='showAll', data-title="'Serial'|translate", sortable='"serial"', filter='{"serial": "text"}') - span {{::device.serial}} - td(ng-show='showAll', data-title="'Manufacturer'|translate", sortable='"manufacturer"', filter='{"manufacturer": "text"}') - span {{::device.manufacturer}} - td(ng-show='showAll', data-title="'SDK'|translate", sortable='"sdk"', filter='{"sdk": "text"}') - span {{::device.sdk}} - td(ng-show='showAll', data-title="'ABI'|translate", sortable='"abi"', filter='{"abi": "text"}') - span {{::device.abi}} - td(ng-show='showAll', data-title="'Phone'|translate", sortable='"phone.phoneNumber"') - span {{device.phone.phoneNumber }} - td(ng-show='showAll', data-title="'Phone IMEI'|translate", sortable='"phone.imei"') - span {{device.phone.imei}} - td(ng-show='showAll', data-title="'Phone ICCID'|translate", sortable='"phone.iccid"') - span {{device.phone.iccid}} + td(ng-show='showAll', data-title="'Screen'|translate", sortable='"enhanceDisplayRes"', filter='{"enhanceDisplayRes": "text"}') + span {{device.enhanceDisplayRes }} + td(ng-show='showAll', data-title="'Serial'|translate", sortable='"serial"', filter='{"serial": "text"}') + span {{::device.serial}} + td(ng-show='showAll', data-title="'Manufacturer'|translate", sortable='"manufacturer"', filter='{"manufacturer": "text"}') + span {{::device.manufacturer}} + td(ng-show='showAll', data-title="'SDK'|translate", sortable='"sdk"', filter='{"sdk": "text"}') + span {{::device.sdk}} + td(ng-show='showAll', data-title="'ABI'|translate", sortable='"abi"', filter='{"abi": "text"}') + span {{::device.abi}} + td(ng-show='showAll', data-title="'Phone'|translate", sortable='"phone.phoneNumber"') + span {{device.phone.phoneNumber }} + td(ng-show='showAll', data-title="'Phone IMEI'|translate", sortable='"phone.imei"') + span {{device.phone.imei}} + td(ng-show='showAll', data-title="'Phone ICCID'|translate", sortable='"phone.iccid"') + span {{device.phone.iccid}} - td(ng-show='showAll', data-title="'Battery Health'|translate", sortable='"enhancedBatteryHealth"') - span {{ device.enhancedBatteryHealth | translate }} - td(ng-show='showAll', data-title="'Battery Source'|translate", sortable='"enhancedBatterySource"') - span {{ device.enhancedBatterySource | translate }} - td(ng-show='showAll', data-title="'Battery Status'|translate", sortable='"enhancedBatteryStatus"') - span {{ device.enhancedBatteryStatus | translate }} - td(ng-show='showAll', data-title="'Battery Level'|translate", sortable='"battery.level"') - progressbar(value='device.battery.level', max='device.battery.scale', type='success') - span {{ device.enhancedBatteryPercentage }} - td(ng-show='showAll', data-title="'Battery Temperature'|translate", sortable='"battery.temp"') - span {{ device.enhancedBatteryTem }} + td(ng-show='showAll', data-title="'Battery Health'|translate", sortable='"enhancedBatteryHealth"') + span {{ device.enhancedBatteryHealth | translate }} + td(ng-show='showAll', data-title="'Battery Source'|translate", sortable='"enhancedBatterySource"') + span {{ device.enhancedBatterySource | translate }} + td(ng-show='showAll', data-title="'Battery Status'|translate", sortable='"enhancedBatteryStatus"') + span {{ device.enhancedBatteryStatus | translate }} + td(ng-show='showAll', data-title="'Battery Level'|translate", sortable='"battery.level"') + progressbar(value='device.battery.level', max='device.battery.scale', type='success') + span {{ device.enhancedBatteryPercentage }} + td(ng-show='showAll', data-title="'Battery Temperature'|translate", sortable='"battery.temp"') + span {{ device.enhancedBatteryTem }} - td(data-title="'Location'|translate", sortable='"provider.name"', filter='{"provider": "text"}') - span {{::device.provider.name}} - td(data-title="'User'|translate", sortable='"owner.name"', filter='{"owner": "text"}') - a(ng-if='device.owner', ng-href='{{ device.enhancedUserContactUrl }}', role='button', target='_href') {{ device.enhancedUserName }} - a(ng-if='!device.owner') - + td(data-title="'Location'|translate", sortable='"provider.name"', filter='{"provider": "text"}') + span {{::device.provider.name}} + td(data-title="'User'|translate", sortable='"owner.name"', filter='{"owner": "text"}') + a(ng-if='device.owner', ng-href='{{ device.enhancedUserContactUrl }}', role='button', target='_href') {{ device.enhancedUserName }} + a(ng-if='!device.owner') - //p strong Sorting pre {{tableParams.sorting() | json}}