Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions devpartner/Devpartner-PortalAdmin/app/app.controllers.js
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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];
Expand All @@ -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!=''){
Expand All @@ -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 () {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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++;
Expand Down
40 changes: 36 additions & 4 deletions devpartner/Devpartner-PortalAdmin/app/app.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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: {
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<div class="col-md-2 col-sm-2 col-xs-12 hidden-xs mt10">
<button class="btn btn-warning mt14 btn-logout pull-right" ng-click="logOut()">Sair</button>
<!--<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario">{{userName}}</button>
<!--<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario">{{userName}}</button>
<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario"><img src="/assets/img/icon-user.png" alt="Usuários" title="Usuários" /></button>-->
</div>
</div>
Expand All @@ -29,11 +29,11 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<nav class="navbar navbar-default">


<div class="collapse navbar-collapse" id="menu-top">
<ul class="nav navbar-nav ">


<li ui-sref-active="active" ng-class="{active: $state.includes('galeria')}"><a ui-sref="galeria" ng-click="closeSubMenu()">Galeria</a></li>
</ul>
</div>
Expand All @@ -44,10 +44,10 @@
</nav>
<div class="col-xs-12">
<ul class="nav navbar-nav content-center collapse navbar-collapse" id="menuOptions">


<li ui-sref-active="active"><a ui-sref="galeria">Galeria</a></li>

<li>
<!--<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario">{{userName}}</button> -->
<button class="btn btn-warning mt14 btn-logout pull-right" ng-click="logOut()">Sair</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,47 @@
.controller('galeriaController', ['$scope', '$http', '$rootScope', 'sysServicos', '$stateParams', '$timeout','$state',
function ($scope, $http, $rootScope, sysServicos, $stateParams, $timeout,$state) {

$scope.getData = function() {
$scope.returnItems = sessionStorage.getItem('items');
console.log('retrievedObject: ', JSON.parse($scope.returnItems));
return $scope.returnItems;
}

$scope.deleteItems = function () {
$scope.items = [];
$scope.returnItems = [];
$sessionStorage.empty();
$scope.returnItems = sessionStorage.getItem('items');
console.log('sessionStorage: ', JSON.parse($scope.returnItems));
}

}

},
])

.controller('galeriaDetController', ['$scope', '$http', '$rootScope', 'sysServicos', '$stateParams', '$timeout','$state',
function ($scope, $http, $rootScope, sysServicos, $stateParams, $timeout,$state) {

}
$scope.items = [];
$scope.itemsToAdd = [{
titulo: '',
subtitulo: '',
texto: '',
youtubeId: '',
}];

$scope.submit = function (itemToAdd) {

var index = $scope.itemsToAdd.indexOf(itemToAdd);
$scope.itemsToAdd.splice(index, 1);
$scope.items.push(angular.copy(itemToAdd));
window.sessionStorage.setItem("items", JSON.stringify($scope.items));

$scope.itemsToAdd.push({
titulo: '',
subtitulo: '',
texto: '',
youtubeId: '',
});
}
},
])
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<div class="panel-heading">
<h2>Cadastro de Galeria</h2>
</div>
<div class="panel-body admin-form">
<div class="panel-body admin-form" ng-repeat="itemToAdd in itemsToAdd">
<div class="row mt40">
<div class="col-xs-12 col-sm-12 mt40">
<div class="form-group">
<md-input-container class="md-block flex-gt-sm">
<label>Título
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text" >
<input type="text" ng-model="itemToAdd.titulo">
</md-input-container>
</div>
</div>
Expand All @@ -24,7 +24,7 @@ <h2>Cadastro de Galeria</h2>
<label>Subtítulo
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text">
<input type="text" ng-model="itemToAdd.subtitulo">
</md-input-container>
</div>
</div>
Expand All @@ -35,7 +35,7 @@ <h2>Cadastro de Galeria</h2>
<label>Texto
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text">
<input type="text" ng-model="itemToAdd.texto">
</md-input-container>
</div>
</div>
Expand All @@ -46,7 +46,7 @@ <h2>Cadastro de Galeria</h2>
<label>Youtube Id
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text"></input>
<input type="text" ng-model="itemToAdd.youtubeId"></input>
<span id="ptest" class="glyphicon glyphicon-question-sign toltip-question" aria-hidden="true" type="button" data-container="body"
data-toggle="popover" data-placement="bottom" title="Exemplo: B65ghzKoFUE" data-content="O Id fica no final da url do video http://www.youtube.com/B65ghzKoFUE"></span>
<script>
Expand All @@ -70,9 +70,12 @@ <h2>Cadastro de Galeria</h2>
<div class="row">
<div class="col-xs-12 col-sm-12 text-center mt20 mb20">

<button type="button" class="btn btn-xl btn-success" >Salvar</button>
<button ng-click="submit(itemToAdd)" class="btn btn-xl btn-success">Salvar</button>
</div>
</div>

<p>{{ callback }}</p>

</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,34 @@
<div class="panel-heading">
<h2>Galeria</h2>
<br>

</div>
<div class="panel-body admin-form">
<div class="row mb40">

</div>
<div class="row">
<div class="col-xs-12 text-center">
<a class="btn btn-xl btn-success">Cadastrar Galeria</a>
<a class="btn btn-xl btn-success" href="#/galeria/cadastro">Cadastrar Galeria</a>
</div>


</div>

<div class="row mt20 mb20">

<div class="row mt20 mb20">
<div class="col-xs-12 text-center">
<a class="btn btn-xl btn-success" ng-click="getData()">Visualizar Galeria</a>
</div>
<div class="col-xs-12 text-center">
tabela
<div class="card" style="width: 18rem;" ng-if="returnItems" *ngFor="let item of returnItems">
<div class="card-body">
<h5 class="card-title">{{ returnItems || '' }}</h5>
<a class="btn btn-primary" ng-click="deleteItems()">Delete </a>
</div>
</div>

</div>


</div>





</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div ng-controller="galeriaDetController">
<div class="container">
<div class="card" style="width: 18rem;">

<div class="card-body">
<h5 class="card-title">{{ JSON.stringify(item) }}</h5>
<p class="card-text">{{item} {{item.texto}} {{item.youtubeId}}</p>
<a href="#" class="btn btn-primary">Go somewhere href="#/visualizar" </a>
</div>

</div>
</div>
</div>
Loading