Merge branch 'master' of https://github.com/LADOSSIFPB/nutrif

LADOSSIFPB · May 31, 2016 · b647658 · b647658
2 parents 29a4f4d + 4ca9f0d
commit b647658
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/nutrif-web-refactor/js/controllers/editarAlunoCtrl.js b/nutrif-web-refactor/js/controllers/editarAlunoCtrl.js
@@ -22,6 +22,36 @@ angular.module('NutrifApp').controller('editarAlunoCtrl', function ($scope, alun
             .error(onErrorCallback);
     }
 
+    $scope.apagarAlunos = function (selected) {
+        if (selected.length === 0) {
+            $mdToast.show(
+                $mdToast.simple()
+                .textContent('Antes de apagar, selecione alguma refeição')
+                .position('top right')
+                .action('OK')
+                .hideDelay(6000)
+            );
+        } else {
+            var _length = selected.length;
+            for (var i = 0; i < _length; i++) {
+                diaRefeicaoService.removerRefeicao(selected[i])
+                    .success(function functionName() {
+                        $scope.refeicoes.splice($scope.refeicoes.indexOf(selected[i]));
+                    })
+                    .error(function (data, status) {
+
+                        $mdToast.show(
+                            $mdToast.simple()
+                            .textContent('Erro ao apagar uma refeição')
+                            .position('top right')
+                            .action('OK')
+                            .hideDelay(6000)
+                        );
+                    });
+            }
+        }
+    }
+
     function carregamentoInicial() {
         var _matricula = $stateParams.matricula;
 

diff --git a/nutrif-web-refactor/js/controllers/listarAlunosCtrl.js b/nutrif-web-refactor/js/controllers/listarAlunosCtrl.js
@@ -35,7 +35,7 @@ angular.module('NutrifApp').controller('listarAlunosCtrl', function ($scope, $md
         var _message = '';
 
         if (!data) {
-            _message = 'Ocorreu um erro na comunicação com o servidor, favor chamar o suporte.'
+            _message = 'Não foram encontrados alunos com esses dados'
         } else {
             _message = data.mensagem
         }

diff --git a/nutrif-web-refactor/js/services/api/diaRefeicaoService.js b/nutrif-web-refactor/js/services/api/diaRefeicaoService.js
@@ -15,6 +15,9 @@ angular.module("NutrifApp").factory("diaRefeicaoService", function($http, config
 	};
 
 	var _removerRefeicao = function (refeicao) {
+        delete refeicao.refeicao.horaFinal;
+        delete refeicao.refeicao.horaInicio;
+        delete refeicao.refeicao.horaPretensao;
 		return $http.post(_path + "/remover", refeicao)
 	};
 

diff --git a/nutrif-web-refactor/view/manager/admin/editar-aluno.html b/nutrif-web-refactor/view/manager/admin/editar-aluno.html
@@ -57,7 +57,7 @@
         <md-card-actions layout="row">
             <md-card-icon-actions>
 
-                <md-button class="md-icon-button" aria-label="Apagar refeições">
+                <md-button class="md-icon-button" aria-label="Apagar refeições" ng-click="apagarAlunos(selected)">
                     <md-tooltip md-direction="bottom">Apagar refeições</md-tooltip>
                     <md-icon md-svg-icon="img/icon/rubbish-bin-delete-button.svg"></md-icon>
                 </md-button>