diff --git a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java index 7f0faba8924631b042d6c19d4fb307b11dc7b7c8..5e520f6944b8bf004090a0881fe6bbf6dc54cdca 100644 --- a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java +++ b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java @@ -7,10 +7,10 @@ import java.util.Map; import java.util.Optional; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.faces.context.FacesContext; import javax.faces.view.ViewScoped; -import javax.inject.Inject; import javax.inject.Named; import org.primefaces.model.FilterMeta; @@ -27,7 +27,7 @@ import es.uvigo.esei.xcs.service.PetService; public class PetManagedBean implements Serializable{ private static final long serialVersionUID = 1L; - @Inject + @EJB private PetService service; private String name; @@ -159,6 +159,7 @@ public class PetManagedBean implements Serializable{ this.service.update(pet); } else { //this.service.create(new Pet(name, animal, birth)); + this.service.createPet(name, animal, new Date()); } this.clear(); diff --git a/jsf/src/main/webapp/owner/pets.xhtml b/jsf/src/main/webapp/owner/pets.xhtml index 1531d0e3c303502ae6fe87db8c1c3a2b6259b8b2..b5bd6b32a6637e65eced809f1265df365cea950a 100644 --- a/jsf/src/main/webapp/owner/pets.xhtml +++ b/jsf/src/main/webapp/owner/pets.xhtml @@ -2,60 +2,59 @@ - - Pet Store - Pets - - - - -

New Pet

- - - - - - - - - - - - + xmlns:p="http://primefaces.org/ui" + xmlns:f="http://xmlns.jcp.org/jsf/core" + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:a="http://xmlns.jcp.org/jsf/passthrough"> + + Pet Store - Pets + + + + +

New Pet

+ + + + + + + + + + + + - - - -
- - - Error: #{pet.errorMessage} - -
- - - - #{petEntity.name} - - - - - - #{petEntity.animal} - - - - - - - + + + +
+ + + Error: #{pet.errorMessage} + +
- - - - \ No newline at end of file + + #{petEntity.name} + + + + + + #{petEntity.animal} + + + + + + + + + + diff --git a/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java b/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java index 9c113faec37c1b19281c3cf1ba5ee8721267de1b..3e77222e10bdf15197f3a5e5e826e995648c3a21 100644 --- a/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java +++ b/service/src/main/java/es/uvigo/esei/xcs/service/PetService.java @@ -4,6 +4,7 @@ import static java.util.Objects.requireNonNull; import java.io.Console; import java.security.Principal; +import java.util.Date; import java.util.List; import javax.annotation.security.PermitAll; @@ -15,6 +16,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import es.uvigo.esei.xcs.domain.entities.AnimalType; import es.uvigo.esei.xcs.domain.entities.Owner; import es.uvigo.esei.xcs.domain.entities.Pet; import es.uvigo.esei.xcs.domain.entities.Vaccination; @@ -142,6 +144,14 @@ public class PetService { } } + public Pet createPet(String name, AnimalType animal, Date birth) { + Owner owner = em.find(Owner.class, currentUser.getName()); + Pet pet = new Pet(name, animal, birth, owner); + this.em.persist(pet); + return pet; + + } + /** * Updates the information of a pet. If the pet is not stored, it will be * created.