From a5fa3431e8f598f0d09c12b5a1721c7311867576 Mon Sep 17 00:00:00 2001 From: "Tony.Nguyen" Date: Wed, 11 Feb 2015 16:42:51 +0800 Subject: [PATCH] TN: Make add pet work without BirthDate --- .../_partials/_modal_add_owner.html | 12 ++++++------ .../components/_partials/_modal_add_pet.html | 4 ++-- .../components/owners/OwnerController.js | 16 ++++++---------- .../components/owners/owner_details.html | 17 ++++++++++++----- .../webapp/components/pets/PetController.js | 18 +++++++++++++----- src/main/webapp/images/avatars/owner11.jpg | Bin 0 -> 4266 bytes src/main/webapp/images/avatars/owner12.jpg | Bin 0 -> 4186 bytes src/main/webapp/index.html | 8 +------- src/main/webapp/js/app.js | 9 +++++---- 9 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 src/main/webapp/images/avatars/owner11.jpg create mode 100644 src/main/webapp/images/avatars/owner12.jpg diff --git a/src/main/webapp/components/_partials/_modal_add_owner.html b/src/main/webapp/components/_partials/_modal_add_owner.html index fa1b44c7a..257a4c560 100644 --- a/src/main/webapp/components/_partials/_modal_add_owner.html +++ b/src/main/webapp/components/_partials/_modal_add_owner.html @@ -130,11 +130,11 @@
- +
- +
@@ -156,15 +156,15 @@
- +
- +
- +
@@ -173,7 +173,7 @@
- +
diff --git a/src/main/webapp/components/_partials/_modal_add_pet.html b/src/main/webapp/components/_partials/_modal_add_pet.html index 344d054ae..697182feb 100644 --- a/src/main/webapp/components/_partials/_modal_add_pet.html +++ b/src/main/webapp/components/_partials/_modal_add_pet.html @@ -37,8 +37,8 @@
- +
diff --git a/src/main/webapp/components/owners/OwnerController.js b/src/main/webapp/components/owners/OwnerController.js index bdcfd5dde..62c45a1d5 100644 --- a/src/main/webapp/components/owners/OwnerController.js +++ b/src/main/webapp/components/owners/OwnerController.js @@ -9,30 +9,26 @@ var OwnerController = ['$scope','$state','Owner',function($scope,$state,Owner) { }]; var OwnerDetailsController = ['$scope','$rootScope','$stateParams','Owner', function($scope,$rootScope,$stateParams,Owner) { - + var currentId = $stateParams.id; var nextId = parseInt($stateParams.id) + 1; var prevId = parseInt($stateParams.id) - 1; - + $scope.prevOwner = Owner.get({id:prevId}); $scope.nextOwner = Owner.get({id:nextId}); $scope.currentOwner = Owner.get($stateParams); - + $scope.saveOwner = function(){ owner = $scope.currentOwner; Owner.save(owner); } - - $scope.setCurrentOwner = function() { - $rootScope.currentOwner = $scope.currentOwner; - } - + }]; var AddOwnerController = ['$scope','Owner', function($scope,Owner) { - + $scope.owner={id:0,pets:[]}; - + $scope.addOwner = function(){ Owner.save($scope.owner); } diff --git a/src/main/webapp/components/owners/owner_details.html b/src/main/webapp/components/owners/owner_details.html index e81b5873c..e6dbfa1ab 100644 --- a/src/main/webapp/components/owners/owner_details.html +++ b/src/main/webapp/components/owners/owner_details.html @@ -59,13 +59,13 @@
@@ -81,7 +81,7 @@ Add New Pet
- View as + View as
@@ -127,4 +127,11 @@
  • {{nextOwner.firstName + ' ' + nextOwner.lastName}}
    • - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/components/pets/PetController.js b/src/main/webapp/components/pets/PetController.js index fb9c894f3..3f2eff547 100644 --- a/src/main/webapp/components/pets/PetController.js +++ b/src/main/webapp/components/pets/PetController.js @@ -5,15 +5,23 @@ var PetController = ['$scope', 'Pet', function($scope, Pet) { scrollTop: $("#pets").offset().top }, 1000); }); - + $scope.pets = Pet.query(); - + }]; -var AddPetController = ['$scope','$rootScope','PetType','Pet',function($scope,$rootScope,PetType,Pet) { +var AddPetController = ['$scope','$rootScope','PetType','OwnerPet',function($scope,$rootScope,PetType,OwnerPet) { $scope.petTypes = PetType.query(); - + $scope.currentPet = {type:{}}; + $scope.save = function(){ - Pet.$save($scope.currentPet); + currentOwnerId = $scope.currentOwner.id; + + for (i=0; i<$scope.petTypes.length; i++){ + if ($scope.petTypes[i].id == $scope.currentPet.type.id){ + $scope.currentPet.type.name = $scope.petTypes[i].name; + } + } + OwnerPet.save({ownerId:currentOwnerId},$scope.currentPet); }; }]; \ No newline at end of file diff --git a/src/main/webapp/images/avatars/owner11.jpg b/src/main/webapp/images/avatars/owner11.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2458a42b43a34442898fc6d02c056237254487f9 GIT binary patch literal 4266 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 QM#PDbqxzYx>VG=t<8 literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/avatars/owner12.jpg b/src/main/webapp/images/avatars/owner12.jpg new file mode 100644 index 0000000000000000000000000000000000000000..409db1437a5eae3818156e41b3e3cfa7e770c2ca GIT binary patch literal 4186 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 m@ATsY_vGrX - - - - - - @@ -44,7 +38,7 @@ - + diff --git a/src/main/webapp/js/app.js b/src/main/webapp/js/app.js index dbc315d45..3083b7074 100644 --- a/src/main/webapp/js/app.js +++ b/src/main/webapp/js/app.js @@ -9,9 +9,9 @@ app.constant('context', '/petclinic'); app.config(['stateHelperProvider','$urlRouterProvider','$urlMatcherFactoryProvider',function(stateHelperProvider,$urlRouterProvider,$urlMatcherFactoryProvider) { $urlRouterProvider.otherwise("/"); - + $urlMatcherFactoryProvider.strictMode(false) - + stateHelperProvider.state({ name: "landing", url: "/", @@ -49,7 +49,7 @@ app.config(['stateHelperProvider','$urlRouterProvider','$urlMatcherFactoryProvid controller: "OwnerDetailsController", data: {requireLogin : true} }); - + } ]); /** Controllers **/ @@ -67,6 +67,7 @@ app.controller('SearchController', SearchController); /** Services **/ app.factory('Owner', Owner); app.factory('Pet', Pet); +app.factory('OwnerPet', OwnerPet); app.factory('Vet', Vet); app.factory('Visit', Visit); app.factory('PetType', PetType); @@ -79,7 +80,7 @@ app.directive('scrollToTarget', function() { element.bind('click', function() { angular.element('html, body').stop().animate({ scrollTop: angular.element(angular.element(element).attr('href')).offset().top - 20 - }, 1500); + }, 1500); return false; }); };