diff -r e165f7647ae3 -r c7c424e9eed5 client/app/my_visit/my_visit_controller.js --- a/client/app/my_visit/my_visit_controller.js Wed May 27 19:01:25 2015 +0200 +++ b/client/app/my_visit/my_visit_controller.js Wed May 27 19:02:43 2015 +0200 @@ -1,67 +1,45 @@ (function(){ - 'use strict'; - - angular.module('ammicoMyvisit',['ngRoute', 'ui.sortable']) - .controller('my_visitCtrl', function($scope, $location, $modal, ammicoApi){ + 'use strict'; - //get list book - $scope.books = ammicoApi.listBooks.query({format:'json'}, function(data){ - data.sort(function (a, b) { - return a.date < b.date; - }); + angular.module('ammicoMyvisit',['ngRoute', 'ui.sortable']) + .controller('my_visitCtrl', function($scope, $location, $modal, Book, Slide){ - for (var i = 0; i < data.length; i++) { - if (data[i].idArticle){ - data[i].slides = ammicoApi.booksSlides.query({idBook:data[i].id, format:'json'}); - } - } - }); + //get list book + $scope.books = Book.query({format:'json'}, function(data){ + data.sort(function (a, b) { + return a.date < b.date; + }); - $scope.addBook = function (idParent) { - $modal.open({ - templateUrl: 'my_visit/add_modal_my_visit.html', - controller: 'ModalAddMyvisitCtrl' - }).result.then(function (title) { - //add book with the title written in the modal - ammicoApi.listBooks.save({idParent:idParent, title: title}, function(newBook){ - $scope.books.push(newBook); - }); - }); - }; - + for (var i = 0; i < data.length; i++) { + if (data[i].idArticle){ + data[i].slides = Slide.query({idBook:data[i].id, format:'json'}); + } + } + }); - $scope.share = function (idParent) { - $modal.open({ - templateUrl: 'my_visit/share_modal_my_visit.html', - controller: 'ModalAddMyvisitCtrl' - }).result.then(function (title) { - //add book with the title written in the modal - ammicoApi.slidesBook.query({idParent:idParent, title: title}, function(newBook){ - $scope.books(newBook); - }); - }); - }; - - - }) - - .controller('ModalAddMyvisitCtrl', function ($scope, ammicoApi, $modalInstance) { + $scope.addBook = function (idParent) { + $modal.open({ + templateUrl: 'my_visit/add_modal_my_visit.html', + controller: 'ModalAddMyvisitCtrl' + }).result.then(function (title) { + //add book with the title written in the modal + Book.save({idParent:idParent, title: title}, function(newBook){ + $scope.books.push(newBook); + }); + }); + }; + }) + .controller('ModalAddMyvisitCtrl', function ($scope, $modalInstance) { - $scope.add = function(){ - $modalInstance.close($scope.title); -// ammicoApi.listBooks.save({title: $scope.title}, function(newBook){ -// }); - }; - $scope.cancel = function () { - $modalInstance.dismiss('cancel'); - }; - $scope.share = function () { - $modalInstance($scope.book); - }; - }); - - - - + $scope.add = function(){ + $modalInstance.close($scope.title); + }; + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + $scope.share = function () { + $modalInstance($scope.book); + }; + }); })();