dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TB-49: Add back navigation ability in customer profile view in full-screen mode.

Browse Source
This commit is contained in:
Igor Kulikov 2017-04-17 20:22:16 +03:00
parent 0a78e0b081
commit 38e735b26c
3 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ui/src/app/components/grid.directive.js
View File

@ -211,26 +211,31 @@ function GridController($scope, $state, $mdDialog, $document, $q, $timeout, $tra
vm.items.pending = true; vm.items.pending = true;
promise.then( promise.then(
function success(items) { function success(items) {
vm.items.data = vm.items.data.concat(items.data); if (vm.items.reloadPending) {
var startIndex = vm.items.data.length - items.data.length; vm.items.pending = false;
var endIndex = vm.items.data.length; reload();
for (var i = startIndex; i < endIndex; i++) { } else {
var item = vm.items.data[i]; vm.items.data = vm.items.data.concat(items.data);
item.index = i; var startIndex = vm.items.data.length - items.data.length;
var row = Math.floor(i / vm.columns); var endIndex = vm.items.data.length;
var itemRow = vm.items.rowData[row]; for (var i = startIndex; i < endIndex; i++) {
if (!itemRow) { var item = vm.items.data[i];
itemRow = []; item.index = i;
vm.items.rowData.push(itemRow); var row = Math.floor(i / vm.columns);
var itemRow = vm.items.rowData[row];
if (!itemRow) {
itemRow = [];
vm.items.rowData.push(itemRow);
}
itemRow.push(item);
} }
itemRow.push(item); vm.items.nextPageLink = items.nextPageLink;
vm.items.hasNext = items.hasNext;
if (vm.items.hasNext) {
vm.items.nextPageLink.limit = pageSize;
}
vm.items.pending = false;
} }
vm.items.nextPageLink = items.nextPageLink;
vm.items.hasNext = items.hasNext;
if (vm.items.hasNext) {
vm.items.nextPageLink.limit = pageSize;
}
vm.items.pending = false;
}, },
function fail() { function fail() {
vm.items.hasNext = false; vm.items.hasNext = false;
@ -425,26 +430,35 @@ function GridController($scope, $state, $mdDialog, $document, $q, $timeout, $tra
} }
$scope.$on('searchTextUpdated', function () { $scope.$on('searchTextUpdated', function () {
vm.items = { reload();
data: [],
rowData: [],
nextPageLink: {
limit: pageSize,
textSearch: $scope.searchConfig.searchText
},
selections: {},
selectedCount: 0,
hasNext: true,
pending: false
};
vm.detailsConfig.isDetailsOpen = false;
vm.itemRows.getItemAtIndex(pageSize);
}); });
vm.onGridInited(vm); vm.onGridInited(vm);
vm.itemRows.getItemAtIndex(pageSize); vm.itemRows.getItemAtIndex(pageSize);
function reload() {
if (vm.items && vm.items.pending) {
vm.items.reloadPending = true;
} else {
vm.items = {
data: [],
rowData: [],
nextPageLink: {
limit: pageSize,
textSearch: $scope.searchConfig.searchText
},
selections: {},
selectedCount: 0,
hasNext: true,
pending: false
};
vm.detailsConfig.isDetailsOpen = false;
vm.items.reloadPending = false;
vm.itemRows.getItemAtIndex(pageSize);
}
}
function refreshList() { function refreshList() {
$state.go($state.current, vm.refreshParamsFunc(), {reload: true}); $state.go($state.current, vm.refreshParamsFunc(), {reload: true});
} }

7
ui/src/app/layout/home.controller.js
View File

@ -26,7 +26,7 @@ import logoSvg from '../../svg/logo_title_white.svg';
/*@ngInject*/ /*@ngInject*/
export default function HomeController(loginService, userService, deviceService, Fullscreen, $scope, $element, $rootScope, $document, $state, export default function HomeController(loginService, userService, deviceService, Fullscreen, $scope, $element, $rootScope, $document, $state,
$log, $mdMedia, $animate, $timeout) { $window, $log, $mdMedia, $animate, $timeout) {
var siteSideNav = $('.tb-site-sidenav', $element); var siteSideNav = $('.tb-site-sidenav', $element);
@ -48,6 +48,7 @@ export default function HomeController(loginService, userService, deviceService,
vm.displaySearchMode = displaySearchMode; vm.displaySearchMode = displaySearchMode;
vm.openSidenav = openSidenav; vm.openSidenav = openSidenav;
vm.goBack = goBack;
vm.searchTextUpdated = searchTextUpdated; vm.searchTextUpdated = searchTextUpdated;
vm.sidenavClicked = sidenavClicked; vm.sidenavClicked = sidenavClicked;
vm.toggleFullscreen = toggleFullscreen; vm.toggleFullscreen = toggleFullscreen;
@ -104,6 +105,10 @@ export default function HomeController(loginService, userService, deviceService,
vm.isShowSidenav = true; vm.isShowSidenav = true;
} }
function goBack() {
$window.history.back();
}
function closeSidenav() { function closeSidenav() {
vm.isShowSidenav = false; vm.isShowSidenav = false;
} }

4
ui/src/app/layout/home.tpl.html
View File

@ -45,6 +45,10 @@
class="md-icon-button" ng-click="vm.openSidenav()" aria-label="{{ 'home.menu' | translate }}" ng-class="{'tb-invisible': vm.displaySearchMode()}"> class="md-icon-button" ng-click="vm.openSidenav()" aria-label="{{ 'home.menu' | translate }}" ng-class="{'tb-invisible': vm.displaySearchMode()}">
<md-icon aria-label="{{ 'home.menu' | translate }}" class="material-icons">menu</md-icon> <md-icon aria-label="{{ 'home.menu' | translate }}" class="material-icons">menu</md-icon>
</md-button> </md-button>
<md-button ng-show="forceFullscreen"
class="md-icon-button" aria-label="{{ 'action.back' | translate }}" ng-click="vm.goBack()" ng-class="{'tb-invisible': vm.displaySearchMode()}">
<md-icon aria-label="{{ 'action.back' | translate }}" class="material-icons">arrow_back</md-icon>
</md-button>
<md-button class="md-icon-button" aria-label="{{ 'action.back' | translate }}" ng-click="searchConfig.showSearch = !searchConfig.showSearch" ng-class="{'tb-invisible': !vm.displaySearchMode()}" > <md-button class="md-icon-button" aria-label="{{ 'action.back' | translate }}" ng-click="searchConfig.showSearch = !searchConfig.showSearch" ng-class="{'tb-invisible': !vm.displaySearchMode()}" >
<md-icon aria-label="{{ 'action.back' | translate }}" class="material-icons">arrow_back</md-icon> <md-icon aria-label="{{ 'action.back' | translate }}" class="material-icons">arrow_back</md-icon>
</md-button> </md-button>