diff --git a/devpartner/Devpartner-PortalAdmin/app/app.controllers.js b/devpartner/Devpartner-PortalAdmin/app/app.controllers.js index b61b62e..ae9b636 100644 --- a/devpartner/Devpartner-PortalAdmin/app/app.controllers.js +++ b/devpartner/Devpartner-PortalAdmin/app/app.controllers.js @@ -1,4 +1,4 @@ -app.controller("appController", ["$scope", "$http", "$rootScope", "ngNotify", '$cookieStore', 'sysServicos', +app.controller("appController", ["$scope", "$http", "$rootScope", "ngNotify", '$cookieStore', 'sysServicos', function ($scope, $http, $rootScope, ngNotify, $cookieStore, sysServicos) { //var controllerMaster;//usado para passar o nome do controller quando ocorre um erro na promise @@ -62,7 +62,7 @@ app.controller('loadMenu', ['$scope', '$http', '$rootScope', 'sysServicos', '$st ); $scope.makeMenu = function (dataSet) { - + $scope.menuAreas = []; for (var n = 0; n < dataSet.length ; n++) { $scope.menuAreas[n] = dataSet[n]; @@ -80,7 +80,7 @@ app.controller('loadMenu', ['$scope', '$http', '$rootScope', 'sysServicos', '$st //controla as acoes de click nos itens do menu $scope.ctrlAction = function (estado,url) { - + if (estado == 'OLD') { $state.go('OLD', { stateUrl: url }, { reload: true }); } else if(url!=''){ @@ -96,14 +96,14 @@ app.controller('getUserData', ['$scope', '$http', '$rootScope', 'sysServicos', ' // $scope.flagMenu = true; $scope.flagSubMenu = true; - + $scope.changeMenu = function () { $scope.flagMenu = !$scope.flagMenu; if (!$scope.flagMenu) { angular.element('#menuOptions').addClass('showElem'); } else { angular.element('#menuOptions').removeClass('showElem'); - }; + }; }; $scope.changeSubMenu = function () { @@ -144,7 +144,7 @@ app.controller('getUserData', ['$scope', '$http', '$rootScope', 'sysServicos', ' // exporta excel relatorio/cadastros $scope.excelCadastros = function (target) { //console.log('exporta execel'); - + var url = rootURL + 'admin/relatorio/cliente'; $http({ url: url, @@ -215,7 +215,7 @@ app.controller('loadMsgAviso', ['$scope', '$http', '$rootScope', 'sysServicos', $scope.mgsAvisos = ret.data; $scope.mgsAvisos.counter = 0; $scope.mgsAvisos.view = false; - + for (n = 0; n < $scope.mgsAvisos.length;n++) { if (!$scope.mgsAvisos[0].visualizada) { $scope.mgsAvisos.counter++; diff --git a/devpartner/Devpartner-PortalAdmin/app/app.routes.js b/devpartner/Devpartner-PortalAdmin/app/app.routes.js index e673824..1b30667 100644 --- a/devpartner/Devpartner-PortalAdmin/app/app.routes.js +++ b/devpartner/Devpartner-PortalAdmin/app/app.routes.js @@ -12,13 +12,14 @@ app.config(function ($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) { }); $stateProvider - + //Galeria List .state('galeria', { url: '/galeria', views: { '': { - templateUrl: '../app/modules/galeria/views/galeriaList.html' + templateUrl: '../app/modules/galeria/views/galeriaList.html', + controller: 'galeriaController', } }, resolve: { @@ -33,7 +34,8 @@ app.config(function ($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) { url: '/galeria/:galeriaId', views: { '': { - templateUrl: '../app/modules/galeria/views/galeriaDetalhe.html' + templateUrl: '../app/modules/galeria/views/galeriaDetalhe.html', + controller: 'galeriaDetController', } }, resolve: { @@ -43,7 +45,37 @@ app.config(function ($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) { } }) - + .state('galeriaCadastro', { + url: '/galeria/cadastro', + views: { + '': { + templateUrl: '../app/modules/galeria/views/galeriaDetalhe.html', + controller: 'galeriaCadController', + } + }, + resolve: { + loadMyCtrl: ['$ocLazyLoad', function ($ocLazyLoad) { + return $ocLazyLoad.load('galeria'); + }] + }, + }) + + .state('galeriaVisualizar', { + url: '/visualizar', + views: { + '': { + templateUrl: '../app/modules/galeria/views/galeriaVisualizar.html', + controller: 'galeriaDetController', + } + }, + // resolve: { + // loadMyCtrl: ['$ocLazyLoad', function ($ocLazyLoad) { + // return $ocLazyLoad.load('galeria'); + // }] + // }, + }) + + }).run(function ($rootScope, $state) { $rootScope.$state = $state; diff --git a/devpartner/Devpartner-PortalAdmin/app/directives/menus/menu-top.html b/devpartner/Devpartner-PortalAdmin/app/directives/menus/menu-top.html index 335254b..bc2c010 100644 --- a/devpartner/Devpartner-PortalAdmin/app/directives/menus/menu-top.html +++ b/devpartner/Devpartner-PortalAdmin/app/directives/menus/menu-top.html @@ -19,7 +19,7 @@
@@ -29,11 +29,11 @@