diff --git a/src/main/webapp/js/dao/people.js b/src/main/webapp/js/dao/people.js index 29618ee5eafbab06acb34bd0320c8c9e5604ac40..4557599697d79d7bd7c407c21c449491f432a0b7 100644 --- a/src/main/webapp/js/dao/people.js +++ b/src/main/webapp/js/dao/people.js @@ -16,6 +16,14 @@ var PeopleDAO = (function() { }; function PeopleDAO() { + + this.getPeople = function(id,done, fail, always) { + requestByAjax({ + url : resourcePath + id, + type : 'GET' + }, done, fail, always); + }; + this.listPeople = function(done, fail, always) { requestByAjax({ url : resourcePath, diff --git a/src/main/webapp/js/view/people.js b/src/main/webapp/js/view/people.js index dd8f4cd6672f82e637f150fe2aef9d4065d39617..c8b841f7ed74663ff3fed5b1f044d38747624868 100644 --- a/src/main/webapp/js/view/people.js +++ b/src/main/webapp/js/view/people.js @@ -24,7 +24,7 @@ var PeopleView = (function() { }); }, function() { - alert('No has sido posible acceder al listado de personas.'); + alert('No ha sido posible acceder al listado de personas.'); }); // La acción por defecto de enviar formulario (submit) se sobreescribe @@ -110,15 +110,18 @@ var PeopleView = (function() { this.listPets = function(id) { $('.containerGeneric').empty(); - $('.containerGeneric').append('
\ -

Mascotas

\ -
'); + $('.containerGeneric').append('
'); var viewPets = new PetsView(new PetsDAO(), 'pets-container', 'pets-container', - ); - viewPets.initPeople(id); + ); + dao.getPeople(id, + function(person) { + viewPets.initPetsPerson(id, person); + }, + showErrorMessage + ); }; this.isEditing = function() { diff --git a/src/main/webapp/js/view/pets.js b/src/main/webapp/js/view/pets.js index 9ed2b8a10bcf46eaa3d6d7c1168bf784beb278f7..a41d07ce5bb2cd87620935a0c1b2aa8bbb2bd20a 100644 --- a/src/main/webapp/js/view/pets.js +++ b/src/main/webapp/js/view/pets.js @@ -17,10 +17,18 @@ var PetsView = (function() { insertPetsList($('#' + listContainerId)); this.init = function() { - + $('#' + formContainerId).before('

Mascotas

'); dao.listPets(function(pets) { $.each(pets, function(key, pet) { - appendToTable(pet); + + var daoPeople = new PeopleDAO(); + + daoPeople.getPeople(pet.idOwner, + function(person) { + appendToTable(pet, person); + }, + showErrorMessage + ); }); }); @@ -58,12 +66,14 @@ var PetsView = (function() { $('#btnClearPet').click(this.resetForm); }; - this.initPeople = function(id) { + this.initPetsPerson = function(id, person) { + + $('#' + formContainerId).before('

Mascotas de ' + person.name + '

'); dao.listPeoplePets(id, function(pets) { $.each(pets, function(key, pet) { - appendToTable(pet); + appendToTable(pet, person); }); }); @@ -184,9 +194,10 @@ var PetsView = (function() { '\ \ \ - \ - \ - \ + \ + \ + \ + \ \ \ \ @@ -219,11 +230,14 @@ var PetsView = (function() { ); }; - var createPetRow = function(pet) { + var createPetRow = function(pet, person) { + return '\ - \ - \ - \ + \ + \ + \ + \ + \
NombreEspeciePropietarioNombreEspecieNombre PropietarioApellido Propietario 
' + pet.name + '' + pet.specie + '' + pet.idOwner + '' + pet.name + '' + pet.specie + '' + person.name + '' + person.surname + '\ Editar\ Eliminar\ @@ -245,9 +259,9 @@ var PetsView = (function() { }); }; - var appendToTable = function(pet) { + var appendToTable = function(pet, person) { $(listQuery + ' > tbody:last') - .append(createPetRow(pet)); + .append(createPetRow(pet, person)); addRowListeners(pet); }; diff --git a/src/main/webapp/main.html b/src/main/webapp/main.html index 3a1bf11c92db2f8ff0494fffec1c4d1606b465a9..85b54145ad0d89ca146128dcbcce273e2239b039 100644 --- a/src/main/webapp/main.html +++ b/src/main/webapp/main.html @@ -43,6 +43,17 @@ doLogout(); }); + $('.containerGeneric').empty(); + $('.containerGeneric').append('
\ +

Personas

\ +
'); + + var viewPeople = new PeopleView(new PeopleDAO(), + 'people-container', 'people-container' + ); + + viewPeople.init(); + $('#people').click(function(event) { $('.containerGeneric').empty(); @@ -53,15 +64,15 @@ var viewPeople = new PeopleView(new PeopleDAO(), 'people-container', 'people-container' ); + viewPeople.init(); + }); - + $('#pets').click(function(event) { $('.containerGeneric').empty(); - $('.containerGeneric').append('
\ -

Mascotas

\ -
'); + $('.containerGeneric').append('
'); var viewPets = new PetsView(new PetsDAO(), 'pets-container', 'pets-container',