diff -r a8b5b11ef6b2 -r c6fa8ee3f562 client/app/books/books_controller.js --- a/client/app/books/books_controller.js Tue Jun 09 19:09:29 2015 +0200 +++ b/client/app/books/books_controller.js Tue Jun 09 19:10:45 2015 +0200 @@ -11,28 +11,15 @@ }); for (var i = 0; i < data.length; i++) { - if (data[i].idArticle === null){ + if (data[i].id_article === null){ data[i].slides = Slide.query({idBook:data[i].id, limit: 5, format:'json'}); } } }); - - $scope.toggleModal = function (index) { - - var modalInstance = $modal.open({ - templateUrl: 'books/add_book_modal.html', - controller: 'ModalAddBookCtrl', - size: 'sm' - }); - - modalInstance.result.then(function (idBook) { - var newSlide = { - book: idBook, - idInventory: $scope.results.hits[index].metas_dict.inventorynumber - }; - Slide.save(newSlide); - }); - }; + +// $scope.$on('slideDeleted', function (event, data) { +// console.log(data); // 'Data to send' +// }); $scope.addBook = function (idParent) { $modal.open({ @@ -44,30 +31,6 @@ }); }); }; - $scope.deleteItem = function(item){ - if(window.confirm('Êtes-vous sûr(e) de vouloir effacer cet élément ? Cette action est irrémédiable.')){ - Slide.delete({idSlide: item.id}, function(){ - $scope.book.slides.splice($scope.book.slides.indexOf(item), 1); - }, - function(error) { - if (error.status === 404){ - $scope.book.slides.splice($scope.book.indexOf(item), 1); - } - }); - } - }; - $scope.deleteBook = function(book){ - if(window.confirm('Êtes-vous sûr(e) de vouloir effacer cet élément ? Cette action est irrémédiable.')){ - Book.delete({idBook: book.id}, function(){ - $scope.books.splice($scope.books.indexOf(book), 1); - }, - function(error) { - if (error.status === 404){ - $scope.books.splice($scope.books.indexOf(book), 1); - } - }); - } - }; }) .controller('bookCtrl', function($scope, $location, $routeParams, $modal, Book, Slide, Order) { @@ -81,23 +44,6 @@ }); }); - $scope.toggleModal = function (index) { - - var modalInstance = $modal.open({ - templateUrl: 'books/add_book_modal.html', - controller: 'ModalAddBookCtrl', - size: 'sm' - }); - - modalInstance.result.then(function (idBook) { - var newSlide = { - book: idBook, - idInventory: $scope.results.hits[index].metas_dict.inventorynumber - }; - Slide.save(newSlide); - }); - }; - $scope.sortableOptions = { stop: function() { var order = $scope.book.slides.map(function(i){