From bfcbcc301181dcd3d54eb6f37121e6c135498ad9 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 22 Nov 2011 16:31:26 +0100 Subject: [PATCH] Refactoring the code for replacing the occurences of comunication by communication. --- ...DAO.java => CustomerCommunicationDAO.java} | 16 +-- ...AO.java => ICustomerCommunicationDAO.java} | 10 +- ...cationType.java => CommunicationType.java} | 8 +- .../entities/CustomerCommunication.java | 136 ++++++++++++++++++ .../entities/CustomerComunication.java | 129 ----------------- .../business/orders/entities/Order.java | 12 +- ...va => ISubcontractorCommunicationDAO.java} | 8 +- ...ava => SubcontractorCommunicationDAO.java} | 16 +-- .../entities/SubcontractorCommunication.java | 125 ++++++++++++++++ ...a => SubcontractorCommunicationValue.java} | 24 ++-- .../entities/SubcontractorComunication.java | 125 ---------------- .../src/main/resources/db.changelog-1.2.xml | 47 +++++- .../libreplan-business-spring-config.xml | 2 +- .../entities/ExternalCompanies.hbm.xml | 10 +- .../business/orders/entities/Orders.hbm.xml | 4 +- .../SubcontractorCommunication.hbm.xml | 40 ++++++ .../SubcontractorComunication.hbm.xml | 34 ----- ...java => CustomerCommunicationDAOTest.java} | 52 +++---- ...=> SubcontractorCommunicationDAOTest.java} | 62 ++++---- .../libreplan-business-spring-config-test.xml | 2 +- .../web/common/CustomMenuController.java | 4 +- ... CustomerCommunicationCRUDController.java} | 97 +++++++------ ...l.java => CustomerCommunicationModel.java} | 36 ++--- ...Enum.java => FilterCommunicationEnum.java} | 8 +- ....java => ICustomerCommunicationModel.java} | 14 +- ... => ISubcontractorCommunicationModel.java} | 14 +- ...ontractorCommunicationCRUDController.java} | 114 +++++++-------- ...a => SubcontractorCommunicationModel.java} | 50 +++---- .../impl/ReportAdvancesServiceREST.java | 34 ++--- .../impl/SubcontractServiceREST.java | 32 +++-- ...cations.zul => customerCommunications.zul} | 10 +- ...ns.zul => subcontractorCommunications.zul} | 18 +-- .../ReportAdvancesServiceTest.java | 14 +- .../libreplan-webapp-spring-config-test.xml | 2 +- 34 files changed, 689 insertions(+), 620 deletions(-) rename libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/{CustomerComunicationDAO.java => CustomerCommunicationDAO.java} (76%) rename libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/{ICustomerComunicationDAO.java => ICustomerCommunicationDAO.java} (79%) rename libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/{ComunicationType.java => CommunicationType.java} (85%) create mode 100644 libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java delete mode 100644 libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerComunication.java rename libreplan-business/src/main/java/org/libreplan/business/planner/daos/{ISubcontractorComunicationDAO.java => ISubcontractorCommunicationDAO.java} (75%) rename libreplan-business/src/main/java/org/libreplan/business/planner/daos/{SubcontractorComunicationDAO.java => SubcontractorCommunicationDAO.java} (75%) create mode 100644 libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java rename libreplan-business/src/main/java/org/libreplan/business/planner/entities/{SubcontractorComunicationValue.java => SubcontractorCommunicationValue.java} (74%) delete mode 100644 libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java create mode 100644 libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml delete mode 100644 libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml rename libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/{CustomerComunicationDAOTest.java => CustomerCommunicationDAOTest.java} (73%) rename libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/{SubcontractorComunicationDAOTest.java => SubcontractorCommunicationDAOTest.java} (80%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{CustomerComunicationCRUDController.java => CustomerCommunicationCRUDController.java} (54%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{CustomerComunicationModel.java => CustomerCommunicationModel.java} (59%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{FilterComunicationEnum.java => FilterCommunicationEnum.java} (85%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{ICustomerComunicationModel.java => ICustomerCommunicationModel.java} (70%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{ISubcontractorComunicationModel.java => ISubcontractorCommunicationModel.java} (71%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{SubcontractorComunicationCRUDController.java => SubcontractorCommunicationCRUDController.java} (53%) rename libreplan-webapp/src/main/java/org/libreplan/web/subcontract/{SubcontractorComunicationModel.java => SubcontractorCommunicationModel.java} (60%) rename libreplan-webapp/src/main/webapp/subcontract/{customerComunications.zul => customerCommunications.zul} (89%) rename libreplan-webapp/src/main/webapp/subcontract/{subcontractorComunications.zul => subcontractorCommunications.zul} (83%) diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerComunicationDAO.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerCommunicationDAO.java similarity index 76% rename from libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerComunicationDAO.java rename to libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerCommunicationDAO.java index c307fe97c..ed35d33bc 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerComunicationDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerCommunicationDAO.java @@ -24,29 +24,29 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.libreplan.business.common.daos.GenericDAOHibernate; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Repository; /** - * Hibernate DAO for {@link CustomerComunication} + * Hibernate DAO for {@link CustomerCommunication} * * @author Susana Montes Pedreira */ @Repository @Scope(BeanDefinition.SCOPE_SINGLETON) -public class CustomerComunicationDAO extends GenericDAOHibernate -implements ICustomerComunicationDAO { +public class CustomerCommunicationDAO extends GenericDAOHibernate +implements ICustomerCommunicationDAO { @Override - public List getAll(){ - return list(CustomerComunication.class); + public List getAll(){ + return list(CustomerCommunication.class); } @Override - public List getAllNotReviewed(){ - Criteria c = getSession().createCriteria(CustomerComunication.class); + public List getAllNotReviewed(){ + Criteria c = getSession().createCriteria(CustomerCommunication.class); c.add(Restrictions.eq("reviewed", false)); return c.list(); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerComunicationDAO.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerCommunicationDAO.java similarity index 79% rename from libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerComunicationDAO.java rename to libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerCommunicationDAO.java index e7217b272..e855b9e4c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerComunicationDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerCommunicationDAO.java @@ -22,18 +22,18 @@ package org.libreplan.business.externalcompanies.daos; import java.util.List; import org.libreplan.business.common.daos.IGenericDAO; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; /** - * Interface of the DAO for {@link CustomerComunication} + * Interface of the DAO for {@link CustomerCommunication} * * @author Susana Montes Pedreira */ -public interface ICustomerComunicationDAO extends IGenericDAO { +public interface ICustomerCommunicationDAO extends IGenericDAO { - List getAll(); + List getAll(); - List getAllNotReviewed(); + List getAllNotReviewed(); } \ No newline at end of file diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ComunicationType.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java similarity index 85% rename from libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ComunicationType.java rename to libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java index 959a5d90f..665249f9b 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ComunicationType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java @@ -22,17 +22,17 @@ package org.libreplan.business.externalcompanies.entities; import static org.libreplan.business.i18n.I18nHelper._; /** - * Enum for specified the type of {@link CustomerComunication} + * Enum for specified the type of {@link CustomerCommunication} * * @author Susana Montes Pedreira */ -public enum ComunicationType { +public enum CommunicationType { NEW_PROJECT(_("New project")), REPORT_PROGRESS(_("Report advance")); private String description; - private ComunicationType(String description) { + private CommunicationType(String description) { this.description = description; } @@ -40,7 +40,7 @@ public enum ComunicationType { return this.description; } - public static ComunicationType getDefault() { + public static CommunicationType getDefault() { return NEW_PROJECT; } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java new file mode 100644 index 000000000..4e6f4ed7b --- /dev/null +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java @@ -0,0 +1,136 @@ +/* + * This file is part of LibrePlan + * + * Copyright (C) 2011 WirelessGalicia, S.L. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package org.libreplan.business.externalcompanies.entities; + +import java.util.Date; + +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.libreplan.business.common.BaseEntity; +import org.libreplan.business.orders.entities.Order; + +/** + * Entity CustomerCommunication + * + * @author Susana Montes Pedreira + */ +public class CustomerCommunication extends BaseEntity { + + private Date deadline; + + private CommunicationType communicationType; + + private Date communicationDate; + + private Boolean reviewed = false; + + private Order order; + + protected CustomerCommunication() { + this.setCommunicationDate(new Date()); + } + + private CustomerCommunication(Date deadline) { + this.setDeadline(deadline); + this.setCommunicationDate(new Date()); + } + + public static CustomerCommunication create() { + return create(new CustomerCommunication()); + } + + public static CustomerCommunication createToday(Date deadline) { + return create(new CustomerCommunication(deadline)); + } + + public static CustomerCommunication createTodayNewProject(Date deadline) { + return create(new CustomerCommunication(deadline, new Date(), + CommunicationType.NEW_PROJECT)); + } + + protected CustomerCommunication(Date deadline, Date communicationDate, + CommunicationType communicationType) { + this.setDeadline(deadline); + this.setCommunicationDate(communicationDate); + this.setCommunicationType(communicationType); + } + + protected CustomerCommunication(Date deadline, Date communicationDate, + CommunicationType type, Order order) { + this.setDeadline(deadline); + this.setCommunicationDate(communicationDate); + this.setCommunicationType(type); + this.setOrder(order); + } + + public static CustomerCommunication create(Date deadline, + Date communicationDate, CommunicationType communicationType) { + return (CustomerCommunication) create(new CustomerCommunication( + deadline, communicationDate, communicationType)); + } + + public static CustomerCommunication create(Date deadline, + Date communicationDate, CommunicationType type, + Order order) { + return (CustomerCommunication) create(new CustomerCommunication( + deadline, communicationDate, type, order)); + } + + public void setDeadline(Date deadline) { + this.deadline = deadline; + } + + public Date getDeadline() { + return deadline; + } + + public void setCommunicationType(CommunicationType type) { + this.communicationType = type; + } + + public CommunicationType getCommunicationType() { + return this.communicationType; + } + + public void setCommunicationDate(Date communicationDate) { + this.communicationDate = communicationDate; + } + + public Date getCommunicationDate() { + return communicationDate; + } + + public void setReviewed(Boolean reviewed) { + this.reviewed = reviewed; + } + + public Boolean getReviewed() { + return reviewed; + } + + public void setOrder(Order order) { + this.order = order; + } + + @NotNull(message = "order not specified") + public Order getOrder() { + return order; + } +} diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerComunication.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerComunication.java deleted file mode 100644 index c3c3400e1..000000000 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerComunication.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * This file is part of LibrePlan - * - * Copyright (C) 2011 WirelessGalicia, S.L. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.libreplan.business.externalcompanies.entities; - -import java.util.Date; - -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; -import org.libreplan.business.common.BaseEntity; -import org.libreplan.business.orders.entities.Order; - -/** - * Entity CustomerComunication - * - * @author Susana Montes Pedreira - */ -public class CustomerComunication extends BaseEntity{ - - private Date deadline; - - private ComunicationType comunicationType; - - private Date comunicationDate; - - private Boolean reviewed = false; - - private Order order; - - protected CustomerComunication() { - this.setComunicationDate(new Date()); - } - - private CustomerComunication(Date deadline) { - this.setDeadline(deadline); - this.setComunicationDate(new Date()); - } - - public static CustomerComunication create() { - return create(new CustomerComunication()); - } - - public static CustomerComunication createToday(Date deadline) { - return create(new CustomerComunication(deadline)); - } - - public static CustomerComunication createTodayNewProject(Date deadline) { - return create(new CustomerComunication(deadline, - new Date(), ComunicationType.NEW_PROJECT)); - } - - protected CustomerComunication(Date deadline, Date comunicationDate, ComunicationType comunicationType) { - this.setDeadline(deadline); - this.setComunicationDate(comunicationDate); - this.setComunicationType(comunicationType); - } - - protected CustomerComunication(Date deadline, Date comunicationDate, ComunicationType comunicationType, Order order) { - this.setDeadline(deadline); - this.setComunicationDate(comunicationDate); - this.setComunicationType(comunicationType); - this.setOrder(order); - } - - public static CustomerComunication create(Date deadline, Date comunicationDate, ComunicationType comunicationType) { - return (CustomerComunication) create(new CustomerComunication(deadline, comunicationDate, comunicationType)); - } - - public static CustomerComunication create(Date deadline, Date comunicationDate, ComunicationType comunicationType, Order order) { - return (CustomerComunication) create(new CustomerComunication(deadline, comunicationDate, comunicationType, order)); - } - - public void setDeadline(Date deadline) { - this.deadline = deadline; - } - - public Date getDeadline() { - return deadline; - } - - public void setComunicationType(ComunicationType comunicationType) { - this.comunicationType = comunicationType; - } - - public ComunicationType getComunicationType() { - return comunicationType; - } - - public void setComunicationDate(Date comunicationDate) { - this.comunicationDate = comunicationDate; - } - - public Date getComunicationDate() { - return comunicationDate; - } - - public void setReviewed(Boolean reviewed) { - this.reviewed = reviewed; - } - - public Boolean getReviewed() { - return reviewed; - } - - public void setOrder(Order order) { - this.order = order; - } - - @NotNull(message = "order not specified") - public Order getOrder() { - return order; - } -} diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java index 6f702959a..c355d5f41 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java @@ -41,7 +41,7 @@ import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.common.Registry; import org.libreplan.business.common.entities.EntitySequence; import org.libreplan.business.common.exceptions.InstanceNotFoundException; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.planner.entities.DayAssignment; @@ -105,7 +105,7 @@ public class Order extends OrderLineGroup implements Comparable { private CurrentVersionInfo currentVersionInfo; - private Set customerComunications = new HashSet(); + private Set customerCommunications = new HashSet(); public enum SchedulingMode { FORWARD, BACKWARDS; @@ -568,12 +568,12 @@ public class Order extends OrderLineGroup implements Comparable { return this.getName().compareToIgnoreCase(((Order) o).getName()); } - public void setCustomerComunications(Set customerComunications) { - this.customerComunications = customerComunications; + public void setCustomerCommunications(Set customerCommunications) { + this.customerCommunications = customerCommunications; } - public Set getCustomerComunications() { - return customerComunications; + public Set getCustomerCommunications() { + return customerCommunications; } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorComunicationDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorCommunicationDAO.java similarity index 75% rename from libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorComunicationDAO.java rename to libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorCommunicationDAO.java index a856d6047..a8f91e681 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorComunicationDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorCommunicationDAO.java @@ -22,11 +22,11 @@ package org.libreplan.business.planner.daos; import java.util.List; import org.libreplan.business.common.daos.IGenericDAO; -import org.libreplan.business.planner.entities.SubcontractorComunication; +import org.libreplan.business.planner.entities.SubcontractorCommunication; -public interface ISubcontractorComunicationDAO extends IGenericDAO { +public interface ISubcontractorCommunicationDAO extends IGenericDAO { - List getAll(); + List getAll(); - List getAllNotReviewed(); + List getAllNotReviewed(); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorComunicationDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorCommunicationDAO.java similarity index 75% rename from libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorComunicationDAO.java rename to libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorCommunicationDAO.java index b456702c9..0ef904ddf 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorComunicationDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorCommunicationDAO.java @@ -24,29 +24,29 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.libreplan.business.common.daos.GenericDAOHibernate; -import org.libreplan.business.planner.entities.SubcontractorComunication; +import org.libreplan.business.planner.entities.SubcontractorCommunication; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Repository; /** - * DAO for {@link SubcontractorComunication} + * DAO for {@link SubcontractorCommunication} * @author Susana Montes Pedreira */ @Repository @Scope(BeanDefinition.SCOPE_SINGLETON) -public class SubcontractorComunicationDAO extends GenericDAOHibernate - implements ISubcontractorComunicationDAO { +public class SubcontractorCommunicationDAO extends GenericDAOHibernate + implements ISubcontractorCommunicationDAO { @Override - public List getAll() { - return list(SubcontractorComunication.class); + public List getAll() { + return list(SubcontractorCommunication.class); } @Override - public List getAllNotReviewed(){ - Criteria c = getSession().createCriteria(SubcontractorComunication.class); + public List getAllNotReviewed(){ + Criteria c = getSession().createCriteria(SubcontractorCommunication.class); c.add(Restrictions.eq("reviewed", false)); return c.list(); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java new file mode 100644 index 000000000..f0943d55d --- /dev/null +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java @@ -0,0 +1,125 @@ +/* + * This file is part of LibrePlan + * + * Copyright (C) 2011 WirelessGalicia, S.L. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package org.libreplan.business.planner.entities; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.hibernate.validator.NotNull; +import org.libreplan.business.common.BaseEntity; +import org.libreplan.business.externalcompanies.entities.CommunicationType; +import org.libreplan.business.qualityforms.entities.QualityFormItem; + +/** + * Entity {@link SubcontractorCommunication}. + * + * @author Susana Montes Pedreira + */ +public class SubcontractorCommunication extends BaseEntity { + + private SubcontractedTaskData subcontractedTaskData; + + private CommunicationType communicationType; + + private Date communicationDate; + + private Boolean reviewed = false; + + private List subcontractorCommunicationValues = new ArrayList(); + + // Default constructor, needed by Hibernate + protected SubcontractorCommunication() { + + } + + private SubcontractorCommunication ( SubcontractedTaskData subcontractedTaskData, CommunicationType communicationType, Date communicationDate, Boolean reviewed){ + this.setSubcontractedTaskData(subcontractedTaskData); + this.setCommunicationType(communicationType); + this.setCommunicationDate(communicationDate); + this.setReviewed(reviewed); + } + + public static SubcontractorCommunication create( + SubcontractedTaskData subcontractedTaskData, + CommunicationType communicationType, Date communicationDate, + Boolean reviewed) { + return create(new SubcontractorCommunication(subcontractedTaskData, + communicationType, communicationDate, reviewed)); + } + + public static SubcontractorCommunication create() { + return create(new SubcontractorCommunication()); + } + + public void setSubcontractedTaskData(SubcontractedTaskData subcontractedTaskData) { + this.subcontractedTaskData = subcontractedTaskData; + } + + @NotNull(message="subcontrated task data not specified") + public SubcontractedTaskData getSubcontractedTaskData() { + return subcontractedTaskData; + } + + public void setCommunicationType(CommunicationType communicationType) { + this.communicationType = communicationType; + } + + public CommunicationType getCommunicationType() { + return communicationType; + } + + public void setCommunicationDate(Date communicationDate) { + this.communicationDate = communicationDate; + } + + public Date getCommunicationDate() { + return communicationDate; + } + + public void setReviewed(Boolean reviewed) { + this.reviewed = reviewed; + } + + public Boolean getReviewed() { + return reviewed; + } + + public void setSubcontractorCommunicationValues( + List subcontractorCommunicationValues) { + this.subcontractorCommunicationValues = subcontractorCommunicationValues; + } + + public List getSubcontractorCommunicationValues() { + return subcontractorCommunicationValues; + } + + public SubcontractorCommunicationValue getLastSubcontractorCommunicationValues(){ + if (subcontractorCommunicationValues.isEmpty()){ + return null; + } + return subcontractorCommunicationValues.get(subcontractorCommunicationValues.size()-1); + } + + public Date getLastSubcontractorCommunicationValueDate(){ + SubcontractorCommunicationValue value = getLastSubcontractorCommunicationValues(); + return (value == null) ? null : value.getDate(); + } +} \ No newline at end of file diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java similarity index 74% rename from libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java rename to libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java index 21844c930..371556358 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java @@ -27,31 +27,31 @@ import org.hibernate.validator.AssertTrue; import org.libreplan.business.INewObject; /** - * Entity to represent each {@SubcontractorComunicationValue}. + * Entity to represent each {@SubcontractorCommunicationValue}. * * @author Susana Montes Pedreira */ -public class SubcontractorComunicationValue implements INewObject { +public class SubcontractorCommunicationValue implements INewObject { - public static SubcontractorComunicationValue create() { - SubcontractorComunicationValue subcontractorComunicationValue = new SubcontractorComunicationValue(); - subcontractorComunicationValue.setNewObject(true); - return subcontractorComunicationValue; + public static SubcontractorCommunicationValue create() { + SubcontractorCommunicationValue subcontractorCommunicationValue = new SubcontractorCommunicationValue(); + subcontractorCommunicationValue.setNewObject(true); + return subcontractorCommunicationValue; } - public static SubcontractorComunicationValue create(Date date, + public static SubcontractorCommunicationValue create(Date date, BigDecimal progress) { - SubcontractorComunicationValue subcontractorComunicationValue = new SubcontractorComunicationValue( + SubcontractorCommunicationValue subcontractorCommunicationValue = new SubcontractorCommunicationValue( date, progress); - subcontractorComunicationValue.setNewObject(true); - return subcontractorComunicationValue; + subcontractorCommunicationValue.setNewObject(true); + return subcontractorCommunicationValue; } - protected SubcontractorComunicationValue() { + protected SubcontractorCommunicationValue() { } - private SubcontractorComunicationValue(Date date, BigDecimal progress) { + private SubcontractorCommunicationValue(Date date, BigDecimal progress) { this.setDate(date); this.setProgress(progress); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java deleted file mode 100644 index d1a52e11f..000000000 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * This file is part of LibrePlan - * - * Copyright (C) 2011 WirelessGalicia, S.L. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.libreplan.business.planner.entities; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.hibernate.validator.NotNull; -import org.libreplan.business.common.BaseEntity; -import org.libreplan.business.externalcompanies.entities.ComunicationType; -import org.libreplan.business.qualityforms.entities.QualityFormItem; - -/** - * Entity {@link SubcontractorComunication}. - * - * @author Susana Montes Pedreira - */ -public class SubcontractorComunication extends BaseEntity { - - private SubcontractedTaskData subcontractedTaskData; - - private ComunicationType comunicationType; - - private Date comunicationDate; - - private Boolean reviewed = false; - - private List subcontratorComunicationValues = new ArrayList(); - - // Default constructor, needed by Hibernate - protected SubcontractorComunication() { - - } - - private SubcontractorComunication ( SubcontractedTaskData subcontractedTaskData, ComunicationType comunicationType, Date comunicationDate, Boolean reviewed){ - this.setSubcontractedTaskData(subcontractedTaskData); - this.setComunicationType(comunicationType); - this.setComunicationDate(comunicationDate); - this.setReviewed(reviewed); - } - - public static SubcontractorComunication create( - SubcontractedTaskData subcontractedTaskData, - ComunicationType comunicationType, Date comunicationDate, - Boolean reviewed) { - return create(new SubcontractorComunication(subcontractedTaskData, - comunicationType, comunicationDate, reviewed)); - } - - public static SubcontractorComunication create() { - return create(new SubcontractorComunication()); - } - - public void setSubcontractedTaskData(SubcontractedTaskData subcontractedTaskData) { - this.subcontractedTaskData = subcontractedTaskData; - } - - @NotNull(message="subcontrated task data not specified") - public SubcontractedTaskData getSubcontractedTaskData() { - return subcontractedTaskData; - } - - public void setComunicationType(ComunicationType comunicationType) { - this.comunicationType = comunicationType; - } - - public ComunicationType getComunicationType() { - return comunicationType; - } - - public void setComunicationDate(Date comunicationDate) { - this.comunicationDate = comunicationDate; - } - - public Date getComunicationDate() { - return comunicationDate; - } - - public void setReviewed(Boolean reviewed) { - this.reviewed = reviewed; - } - - public Boolean getReviewed() { - return reviewed; - } - - public void setSubcontratorComunicationValues( - List subcontratorComunicationValues) { - this.subcontratorComunicationValues = subcontratorComunicationValues; - } - - public List getSubcontratorComunicationValues() { - return subcontratorComunicationValues; - } - - public SubcontractorComunicationValue getLastSubcontratorComunicationValues(){ - if (subcontratorComunicationValues.isEmpty()){ - return null; - } - return subcontratorComunicationValues.get(subcontratorComunicationValues.size()-1); - } - - public Date getLastSubcontratorComunicationValueDate(){ - SubcontractorComunicationValue value = getLastSubcontratorComunicationValues(); - return (value == null) ? null : value.getDate(); - } -} \ No newline at end of file diff --git a/libreplan-business/src/main/resources/db.changelog-1.2.xml b/libreplan-business/src/main/resources/db.changelog-1.2.xml index fcc2ccc2f..37f7b1748 100644 --- a/libreplan-business/src/main/resources/db.changelog-1.2.xml +++ b/libreplan-business/src/main/resources/db.changelog-1.2.xml @@ -43,6 +43,51 @@ + + + + Rename table customer_comunication to customer_communication + - \ No newline at end of file + + Rename column comunication_type to communication_type + + + + + Rename column comunication_date to communication_date + + + + + Rename table subcontractor_comunication to subcontractor_communication + + + + + Rename column comunication_type to communication_type + + + + + Rename column comunication_date to communication_date + + + + + Rename table subcontractor_comunication_values to subcontractor_communication_values + + + + + Rename column subcontractor_comunication_id + + + + diff --git a/libreplan-business/src/main/resources/libreplan-business-spring-config.xml b/libreplan-business/src/main/resources/libreplan-business-spring-config.xml index 4fc2488df..732afe25c 100644 --- a/libreplan-business/src/main/resources/libreplan-business-spring-config.xml +++ b/libreplan-business/src/main/resources/libreplan-business-spring-config.xml @@ -82,7 +82,7 @@ org/libreplan/business/planner/entities/AdvanceConsolidations.hbm.xml - org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml + org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml org/libreplan/business/scenarios/entities/Scenarios.hbm.xml diff --git a/libreplan-business/src/main/resources/org/libreplan/business/externalcompanies/entities/ExternalCompanies.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/externalcompanies/entities/ExternalCompanies.hbm.xml index cff1bd4fa..969c5b19b 100644 --- a/libreplan-business/src/main/resources/org/libreplan/business/externalcompanies/entities/ExternalCompanies.hbm.xml +++ b/libreplan-business/src/main/resources/org/libreplan/business/externalcompanies/entities/ExternalCompanies.hbm.xml @@ -33,8 +33,8 @@ column="company_user" /> - - + + 100 @@ -43,14 +43,14 @@ - + - org.libreplan.business.externalcompanies.entities.ComunicationType + org.libreplan.business.externalcompanies.entities.CommunicationType - + diff --git a/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml index 883361db8..9a64422d8 100644 --- a/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml +++ b/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml @@ -146,9 +146,9 @@ class="org.libreplan.business.scenarios.entities.OrderVersion"/> - + - + diff --git a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml new file mode 100644 index 000000000..4aa2451fe --- /dev/null +++ b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml @@ -0,0 +1,40 @@ + + + + + + + + + 100 + + + + + + + org.libreplan.business.externalcompanies.entities.CommunicationType + + + + + + + + + + + + + + + + + + diff --git a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml deleted file mode 100644 index 015eb723e..000000000 --- a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - 100 - - - - - - - org.libreplan.business.externalcompanies.entities.ComunicationType - - - - - - - - - - - - - - - - - - diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerComunicationDAOTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerCommunicationDAOTest.java similarity index 73% rename from libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerComunicationDAOTest.java rename to libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerCommunicationDAOTest.java index 935df1dfb..5b891cf57 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerComunicationDAOTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerCommunicationDAOTest.java @@ -39,8 +39,8 @@ import org.libreplan.business.common.IAdHocTransactionService; import org.libreplan.business.common.IOnTransaction; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; -import org.libreplan.business.externalcompanies.daos.ICustomerComunicationDAO; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.daos.ICustomerCommunicationDAO; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.entities.Order; @@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertTrue; /** - * Tests for {@link CustomerComunication} + * Tests for {@link CustomerCommunication} * * @author Susana Montes Pedreira */ @@ -62,10 +62,10 @@ import static org.junit.Assert.assertTrue; @ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE, BUSINESS_SPRING_CONFIG_TEST_FILE }) @Transactional -public class CustomerComunicationDAOTest { +public class CustomerCommunicationDAOTest { @Autowired - ICustomerComunicationDAO customerComunicationDAO; + ICustomerCommunicationDAO customerCommunicationDAO; @Autowired IOrderDAO orderDAO; @@ -91,12 +91,12 @@ public class CustomerComunicationDAOTest { return date.toDateTimeAtStartOfDay().toDate(); } - public CustomerComunication createValidCustomerComunication() { + public CustomerCommunication createValidCustomerCommunication() { Order order = createValidOrder("Order A"); - CustomerComunication customerComunication = CustomerComunication + CustomerCommunication customerCommunication = CustomerCommunication .createTodayNewProject(givenDeadLine(2)); - customerComunication.setOrder(order); - return customerComunication; + customerCommunication.setOrder(order); + return customerCommunication; } @Test @@ -105,35 +105,35 @@ public class CustomerComunicationDAOTest { } @Test - public void testCustomerComunicationDAOInSpringContainer() { - assertNotNull(customerComunicationDAO); + public void testCustomerCommunicationDAOInSpringContainer() { + assertNotNull(customerCommunicationDAO); } @Test - public void testSaveCustomerComunication() { - CustomerComunication customerComunication = createValidCustomerComunication(); - customerComunicationDAO.save(customerComunication); - assertTrue(customerComunication.getId() != null); + public void testSaveCustomerCommunication() { + CustomerCommunication customerCommunication = createValidCustomerCommunication(); + customerCommunicationDAO.save(customerCommunication); + assertTrue(customerCommunication.getId() != null); } @Test - public void testRemoveCustomerComunication() + public void testRemoveCustomerCommunication() throws InstanceNotFoundException { - CustomerComunication customerComunication = createValidCustomerComunication(); - customerComunicationDAO.save(customerComunication); - assertTrue(customerComunication.getId() != null); - customerComunicationDAO.remove(customerComunication.getId()); - assertFalse(customerComunicationDAO - .exists(customerComunication.getId())); + CustomerCommunication customerCommunication = createValidCustomerCommunication(); + customerCommunicationDAO.save(customerCommunication); + assertTrue(customerCommunication.getId() != null); + customerCommunicationDAO.remove(customerCommunication.getId()); + assertFalse(customerCommunicationDAO + .exists(customerCommunication.getId())); } @Test - public void testSaveCustomerComunicationWithoutOrder() + public void testSaveCustomerCommunicationWithoutOrder() throws InstanceNotFoundException { - CustomerComunication customerComunication = createValidCustomerComunication(); - customerComunication.setOrder(null); + CustomerCommunication customerCommunication = createValidCustomerCommunication(); + customerCommunication.setOrder(null); try { - customerComunicationDAO.save(customerComunication); + customerCommunicationDAO.save(customerCommunication); fail("It should throw an exception"); } catch (ValidationException e) { // Ok diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorCommunicationDAOTest.java similarity index 80% rename from libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java rename to libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorCommunicationDAOTest.java index 6962e441c..3ea20f4a6 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorCommunicationDAOTest.java @@ -43,10 +43,10 @@ import org.libreplan.business.common.IOnTransaction; import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; -import org.libreplan.business.externalcompanies.daos.ICustomerComunicationDAO; +import org.libreplan.business.externalcompanies.daos.ICustomerCommunicationDAO; import org.libreplan.business.externalcompanies.daos.IExternalCompanyDAO; -import org.libreplan.business.externalcompanies.entities.ComunicationType; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CommunicationType; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.entities.HoursGroup; @@ -56,11 +56,11 @@ import org.libreplan.business.orders.entities.SchedulingDataForVersion; import org.libreplan.business.orders.entities.TaskSource; import org.libreplan.business.orders.entities.TaskSource.TaskSourceSynchronization; import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO; -import org.libreplan.business.planner.daos.ISubcontractorComunicationDAO; +import org.libreplan.business.planner.daos.ISubcontractorCommunicationDAO; import org.libreplan.business.planner.daos.ITaskElementDAO; import org.libreplan.business.planner.daos.ITaskSourceDAO; import org.libreplan.business.planner.entities.SubcontractedTaskData; -import org.libreplan.business.planner.entities.SubcontractorComunication; +import org.libreplan.business.planner.entities.SubcontractorCommunication; import org.libreplan.business.planner.entities.Task; import org.libreplan.business.scenarios.IScenarioManager; import org.libreplan.business.scenarios.bootstrap.IScenariosBootstrap; @@ -75,7 +75,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertTrue; /** - * Tests for {@link SubcontractorComunication} + * Tests for {@link SubcontractorCommunication} * * @author Susana Montes Pedreira */ @@ -83,10 +83,10 @@ import static org.junit.Assert.assertTrue; @ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE, BUSINESS_SPRING_CONFIG_TEST_FILE }) @Transactional -public class SubcontractorComunicationDAOTest { +public class SubcontractorCommunicationDAOTest { @Autowired - ISubcontractorComunicationDAO subcontractorComunicationDAO; + ISubcontractorCommunicationDAO subcontractorCommunicationDAO; @Autowired ISubcontractedTaskDataDAO subcontractedTaskDataDAO; @@ -204,45 +204,45 @@ public class SubcontractorComunicationDAOTest { return subcontractedTaskData; } - public SubcontractorComunication createValidSubcontractorComunication(){ + public SubcontractorCommunication createValidSubcontractorCommunication(){ SubcontractedTaskData subcontractedTaskData = createValidSubcontractedTaskData("Task A"); - Date comunicationDate = new Date(); - SubcontractorComunication subcontractorComunication = SubcontractorComunication - .create(subcontractedTaskData, ComunicationType.NEW_PROJECT, - comunicationDate, false); - return subcontractorComunication; + Date communicationDate = new Date(); + SubcontractorCommunication subcontractorCommunication = SubcontractorCommunication + .create(subcontractedTaskData, CommunicationType.NEW_PROJECT, + communicationDate, false); + return subcontractorCommunication; } @Test - public void testSubcontractorComunicationDAOInSpringContainer() { - assertNotNull(subcontractorComunicationDAO); + public void testSubcontractorCommunicationDAOInSpringContainer() { + assertNotNull(subcontractorCommunicationDAO); } @Test - public void testSaveCustomerComunication() { - SubcontractorComunication subcontractorComunication = createValidSubcontractorComunication(); - subcontractorComunicationDAO.save(subcontractorComunication); - assertTrue(subcontractorComunication.getId() != null); + public void testSaveCustomerCommunication() { + SubcontractorCommunication subcontractorCommunication = createValidSubcontractorCommunication(); + subcontractorCommunicationDAO.save(subcontractorCommunication); + assertTrue(subcontractorCommunication.getId() != null); } @Test - public void testRemoveCustomerComunication() + public void testRemoveCustomerCommunication() throws InstanceNotFoundException { - SubcontractorComunication customerComunication = createValidSubcontractorComunication(); - subcontractorComunicationDAO.save(customerComunication); - assertTrue(customerComunication.getId() != null); - subcontractorComunicationDAO.remove(customerComunication.getId()); - assertFalse(subcontractorComunicationDAO - .exists(customerComunication.getId())); + SubcontractorCommunication customerCommunication = createValidSubcontractorCommunication(); + subcontractorCommunicationDAO.save(customerCommunication); + assertTrue(customerCommunication.getId() != null); + subcontractorCommunicationDAO.remove(customerCommunication.getId()); + assertFalse(subcontractorCommunicationDAO + .exists(customerCommunication.getId())); } @Test - public void testSaveCustomerComunicationWithoutSubcontratedTaskData() + public void testSaveCustomerCommunicationWithoutSubcontratedTaskData() throws InstanceNotFoundException { - SubcontractorComunication subcontractorComunication = createValidSubcontractorComunication(); - subcontractorComunication.setSubcontractedTaskData(null); + SubcontractorCommunication subcontractorCommunication = createValidSubcontractorCommunication(); + subcontractorCommunication.setSubcontractedTaskData(null); try { - subcontractorComunicationDAO.save(subcontractorComunication); + subcontractorCommunicationDAO.save(subcontractorCommunication); fail("It should throw an exception"); } catch (ValidationException e) { // Ok diff --git a/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml b/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml index ca7a4fd12..3de0bcd9f 100644 --- a/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml +++ b/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml @@ -88,7 +88,7 @@ org/libreplan/business/planner/entities/AdvanceConsolidations.hbm.xml - org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml + org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml org/libreplan/business/scenarios/entities/Scenarios.hbm.xml diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index d68f49716..431fcbb8b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -299,9 +299,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { } resourcesItems.add(subItem(_("Subcontracting"), "/subcontract/subcontractedTasks.zul", "", subItem(_("Subcontracted Tasks"), "/subcontract/subcontractedTasks.zul", ""), - subItem(_("Incoming communications from subcontractors"), "/subcontract/subcontractorComunications.zul",""), + subItem(_("Incoming communications from subcontractors"), "/subcontract/subcontractorCommunications.zul",""), subItem(_("Report Progress"), "/subcontract/reportAdvances.zul", ""), - subItem(_("Customer subcontracted projects communications"), "/subcontract/customerComunications.zul",""))); + subItem(_("Customer subcontracted projects communications"), "/subcontract/customerCommunications.zul",""))); topItem(_("Resources"), "/resources/worker/worker.zul", "", resourcesItems); if (isScenariosVisible()) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java similarity index 54% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java index e6a7071f9..d04a72b36 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java @@ -29,8 +29,8 @@ import javax.annotation.Resource; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.exceptions.ValidationException; -import org.libreplan.business.externalcompanies.entities.ComunicationType; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CommunicationType; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.libreplan.business.orders.entities.Order; import org.libreplan.web.common.IMessagesForUser; import org.libreplan.web.common.MessagesForUser; @@ -49,19 +49,19 @@ import org.zkoss.zul.RowRenderer; import org.zkoss.zul.SimpleListModel; /** - * Controller for CRUD actions over a {@link CustomerComunication} + * Controller for CRUD actions over a {@link CustomerCommunication} * * @author Susana Montes Pedreira */ @SuppressWarnings("serial") -public class CustomerComunicationCRUDController extends GenericForwardComposer { +public class CustomerCommunicationCRUDController extends GenericForwardComposer { private static final org.apache.commons.logging.Log LOG = LogFactory - .getLog(CustomerComunicationCRUDController.class); + .getLog(CustomerCommunicationCRUDController.class); - private ICustomerComunicationModel customerComunicationModel; + private ICustomerCommunicationModel customerCommunicationModel; - private CustomerComunicationRenderer customerComunicationRenderer = new CustomerComunicationRenderer();; + private CustomerCommunicationRenderer customerCommunicationRenderer = new CustomerCommunicationRenderer();; protected IMessagesForUser messagesForUser; @@ -79,67 +79,67 @@ public class CustomerComunicationCRUDController extends GenericForwardComposer { messagesForUser = new MessagesForUser(messagesContainer); } - public void goToEdit(CustomerComunication customerComunication) { - if(customerComunication != null && customerComunication.getOrder() != null){ - Order order = customerComunication.getOrder(); + public void goToEdit(CustomerCommunication customerCommunication) { + if(customerCommunication != null && customerCommunication.getOrder() != null){ + Order order = customerCommunication.getOrder(); globalView.goToOrderDetails(order); } } - public FilterComunicationEnum[] getFilterItems(){ - return FilterComunicationEnum.values(); + public FilterCommunicationEnum[] getFilterItems(){ + return FilterCommunicationEnum.values(); } - public FilterComunicationEnum getCurrentFilterItem() { - return customerComunicationModel.getCurrentFilter(); + public FilterCommunicationEnum getCurrentFilterItem() { + return customerCommunicationModel.getCurrentFilter(); } - public void setCurrentFilterItem(FilterComunicationEnum selected) { - customerComunicationModel.setCurrentFilter(selected); + public void setCurrentFilterItem(FilterCommunicationEnum selected) { + customerCommunicationModel.setCurrentFilter(selected); - // update the customer comunication list - listing.setModel(new SimpleListModel(getCustomerComunications())); + // update the customer communication list + listing.setModel(new SimpleListModel(getCustomerCommunications())); listing.invalidate(); } - protected void save(CustomerComunication customerComunication) + protected void save(CustomerCommunication customerCommunication) throws ValidationException { - customerComunicationModel.confirmSave(customerComunication); + customerCommunicationModel.confirmSave(customerCommunication); } - public List getCustomerComunications() { - FilterComunicationEnum currentFilter = customerComunicationModel.getCurrentFilter(); + public List getCustomerCommunications() { + FilterCommunicationEnum currentFilter = customerCommunicationModel.getCurrentFilter(); switch(currentFilter){ - case ALL: return customerComunicationModel.getCustomerAllComunications(); - case NOT_REVIEWED: return customerComunicationModel.getCustomerComunicationWithoutReviewed(); - default: return customerComunicationModel.getCustomerAllComunications(); + case ALL: return customerCommunicationModel.getCustomerAllCommunications(); + case NOT_REVIEWED: return customerCommunicationModel.getCustomerCommunicationWithoutReviewed(); + default: return customerCommunicationModel.getCustomerAllCommunications(); } } - public CustomerComunicationRenderer getCustomerComunicationRenderer() { - return customerComunicationRenderer; + public CustomerCommunicationRenderer getCustomerCommunicationRenderer() { + return customerCommunicationRenderer; } - private class CustomerComunicationRenderer implements + private class CustomerCommunicationRenderer implements RowRenderer { @Override public void render(Row row, Object data) { - CustomerComunication customerComunication = (CustomerComunication) data; - row.setValue(customerComunication); + CustomerCommunication customerCommunication = (CustomerCommunication) data; + row.setValue(customerCommunication); - final ComunicationType type = customerComunication.getComunicationType(); - appendLabel(row, type.toString()); + final CommunicationType type = customerCommunication.getCommunicationType(); + appendLabel(row, toString(type)); - appendLabel(row, customerComunication.getOrder().getName()); - appendLabel(row, toString(customerComunication.getDeadline())); - appendLabel(row, customerComunication.getOrder().getCode()); - appendLabel(row, customerComunication.getOrder() + appendLabel(row, customerCommunication.getOrder().getName()); + appendLabel(row, toString(customerCommunication.getDeadline())); + appendLabel(row, customerCommunication.getOrder().getCode()); + appendLabel(row, customerCommunication.getOrder() .getCustomerReference()); appendLabel(row, - toString(customerComunication.getComunicationDate())); - appendCheckbox(row, customerComunication); - appendOperations(row, customerComunication); + toString(customerCommunication.getCommunicationDate())); + appendCheckbox(row, customerCommunication); + appendOperations(row, customerCommunication); } private String toString(Date date) { @@ -150,22 +150,29 @@ public class CustomerComunicationCRUDController extends GenericForwardComposer { return new SimpleDateFormat("dd/MM/yyyy HH:mm").format(date); } + private String toString(Object object) { + if (object == null) { + return ""; + } + return object.toString(); + } + private void appendLabel(Row row, String label) { row.appendChild(new Label(label)); } private void appendCheckbox(Row row, - final CustomerComunication customerComunication) { + final CustomerCommunication customerCommunication) { final Checkbox checkBoxReviewed = new Checkbox(); - checkBoxReviewed.setChecked(customerComunication.getReviewed()); + checkBoxReviewed.setChecked(customerCommunication.getReviewed()); checkBoxReviewed.addEventListener(Events.ON_CHECK, new EventListener() { @Override public void onEvent(Event arg0) throws Exception { - customerComunication.setReviewed(checkBoxReviewed.isChecked()); - save(customerComunication); + customerCommunication.setReviewed(checkBoxReviewed.isChecked()); + save(customerCommunication); } }); @@ -174,13 +181,13 @@ public class CustomerComunicationCRUDController extends GenericForwardComposer { } private void appendOperations(Row row, - final CustomerComunication customerComunication) { + final CustomerCommunication customerCommunication) { Button buttonEdit = new Button(_("edit")); buttonEdit.addEventListener(Events.ON_CLICK, new EventListener() { @Override public void onEvent(Event arg0) throws Exception { - goToEdit(customerComunication); + goToEdit(customerCommunication); } }); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationModel.java similarity index 59% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationModel.java index 6061fe79d..319310868 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationModel.java @@ -21,8 +21,8 @@ package org.libreplan.web.subcontract; import java.util.List; -import org.libreplan.business.externalcompanies.daos.ICustomerComunicationDAO; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.daos.ICustomerCommunicationDAO; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.libreplan.web.common.concurrentdetection.OnConcurrentModification; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -32,51 +32,51 @@ import org.springframework.transaction.annotation.Transactional; @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) -@OnConcurrentModification(goToPage = "/subcontract/customerComunication.zul") -public class CustomerComunicationModel implements ICustomerComunicationModel{ +@OnConcurrentModification(goToPage = "/subcontract/customerCommunication.zul") +public class CustomerCommunicationModel implements ICustomerCommunicationModel{ @Autowired - private ICustomerComunicationDAO customerComunicationDAO; + private ICustomerCommunicationDAO customerCommunicationDAO; - private FilterComunicationEnum currentFilter = FilterComunicationEnum.NOT_REVIEWED; + private FilterCommunicationEnum currentFilter = FilterCommunicationEnum.NOT_REVIEWED; @Override @Transactional - public void confirmSave(CustomerComunication customerComunication){ - customerComunicationDAO.save(customerComunication); + public void confirmSave(CustomerCommunication customerCommunication){ + customerCommunicationDAO.save(customerCommunication); } @Override @Transactional - public List getCustomerAllComunications(){ - List list = customerComunicationDAO.getAll(); + public List getCustomerAllCommunications(){ + List list = customerCommunicationDAO.getAll(); forceLoadAssociatedData(list); return list; } @Override @Transactional - public List getCustomerComunicationWithoutReviewed(){ - List list = customerComunicationDAO.getAllNotReviewed(); + public List getCustomerCommunicationWithoutReviewed(){ + List list = customerCommunicationDAO.getAllNotReviewed(); forceLoadAssociatedData(list); return list; } - private void forceLoadAssociatedData(List customerComunicationList){ - if (customerComunicationList != null) { - for (CustomerComunication customerComunication : customerComunicationList) { - customerComunication.getOrder().getName(); + private void forceLoadAssociatedData(List customerCommunicationList){ + if (customerCommunicationList != null) { + for (CustomerCommunication customerCommunication : customerCommunicationList) { + customerCommunication.getOrder().getName(); } } } @Override - public void setCurrentFilter(FilterComunicationEnum currentFilter) { + public void setCurrentFilter(FilterCommunicationEnum currentFilter) { this.currentFilter = currentFilter; } @Override - public FilterComunicationEnum getCurrentFilter() { + public FilterCommunicationEnum getCurrentFilter() { return currentFilter; } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java similarity index 85% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java index cde63a19e..06282dedf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java @@ -20,11 +20,11 @@ package org.libreplan.web.subcontract; /** - * Enum to filter the {@link CustomerComunication} list. + * Enum to filter the {@link CustomerCommunication} list. * * @author Susana Montes Pedreira */ -public enum FilterComunicationEnum { +public enum FilterCommunicationEnum { ALL(_("All")), NOT_REVIEWED(_("Not Reviewed")); /** @@ -36,11 +36,11 @@ public enum FilterComunicationEnum { private String displayName; - private FilterComunicationEnum(String displayName) { + private FilterCommunicationEnum(String displayName) { this.displayName = displayName; } - public static FilterComunicationEnum getDefault() { + public static FilterCommunicationEnum getDefault() { return ALL; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerCommunicationModel.java similarity index 70% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerCommunicationModel.java index 52febfc3d..7ec86cf0e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerCommunicationModel.java @@ -21,18 +21,18 @@ package org.libreplan.web.subcontract; import java.util.List; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; -public interface ICustomerComunicationModel { +public interface ICustomerCommunicationModel { - void confirmSave(CustomerComunication customerComunication); + void confirmSave(CustomerCommunication customerCommunication); - List getCustomerComunicationWithoutReviewed(); + List getCustomerCommunicationWithoutReviewed(); - List getCustomerAllComunications(); + List getCustomerAllCommunications(); - void setCurrentFilter(FilterComunicationEnum currentFilter); + void setCurrentFilter(FilterCommunicationEnum currentFilter); - FilterComunicationEnum getCurrentFilter(); + FilterCommunicationEnum getCurrentFilter(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorCommunicationModel.java similarity index 71% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorCommunicationModel.java index a2abec0a3..f78d05e76 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorCommunicationModel.java @@ -24,19 +24,19 @@ import java.util.List; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.planner.entities.SubcontractedTaskData; -import org.libreplan.business.planner.entities.SubcontractorComunication; +import org.libreplan.business.planner.entities.SubcontractorCommunication; -public interface ISubcontractorComunicationModel { +public interface ISubcontractorCommunicationModel { - void confirmSave(SubcontractorComunication customerComunication); + void confirmSave(SubcontractorCommunication customerCommunication); - List getSubcontractorComunicationWithoutReviewed(); + List getSubcontractorCommunicationWithoutReviewed(); - List getSubcontractorAllComunications(); + List getSubcontractorAllCommunications(); - void setCurrentFilter(FilterComunicationEnum currentFilter); + void setCurrentFilter(FilterCommunicationEnum currentFilter); - FilterComunicationEnum getCurrentFilter(); + FilterCommunicationEnum getCurrentFilter(); String getOrderCode(SubcontractedTaskData subcontractedTaskData); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java similarity index 53% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java index f635f0b6c..3b18ddb88 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java @@ -29,17 +29,14 @@ import javax.annotation.Resource; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.exceptions.ValidationException; -import org.libreplan.business.externalcompanies.entities.ComunicationType; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.planner.entities.SubcontractedTaskData; -import org.libreplan.business.planner.entities.SubcontractorComunication; -import org.libreplan.business.planner.entities.SubcontractorComunicationValue; -import org.libreplan.business.planner.entities.Task; +import org.libreplan.business.planner.entities.SubcontractorCommunication; +import org.libreplan.business.planner.entities.SubcontractorCommunicationValue; import org.libreplan.business.planner.entities.TaskElement; import org.libreplan.web.common.IMessagesForUser; import org.libreplan.web.common.MessagesForUser; -import org.libreplan.web.common.Util; import org.libreplan.web.planner.tabs.IGlobalViewEntryPoints; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; @@ -50,26 +47,25 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Checkbox; import org.zkoss.zul.Grid; import org.zkoss.zul.Label; -import org.zkoss.zul.Messagebox; import org.zkoss.zul.Popup; import org.zkoss.zul.Row; import org.zkoss.zul.RowRenderer; import org.zkoss.zul.SimpleListModel; /** - * Controller for CRUD actions over a {@link SubcontractorComunication} + * Controller for CRUD actions over a {@link SubcontractorCommunication} * * @author Susana Montes Pedreira */ @SuppressWarnings("serial") -public class SubcontractorComunicationCRUDController extends GenericForwardComposer { +public class SubcontractorCommunicationCRUDController extends GenericForwardComposer { private static final org.apache.commons.logging.Log LOG = LogFactory - .getLog(SubcontractorComunicationCRUDController.class); + .getLog(SubcontractorCommunicationCRUDController.class); - private ISubcontractorComunicationModel subcontractorComunicationModel; + private ISubcontractorCommunicationModel subcontractorCommunicationModel; - private SubcontractorComunicationRenderer subcontractorComunicationRenderer = new SubcontractorComunicationRenderer();; + private SubcontractorCommunicationRenderer subcontractorCommunicationRenderer = new SubcontractorCommunicationRenderer(); protected IMessagesForUser messagesForUser; @@ -93,66 +89,66 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo messagesForUser = new MessagesForUser(messagesContainer); } - public void goToEdit(SubcontractorComunication subcontractorComunication) { - if(subcontractorComunication != null){ - TaskElement task = subcontractorComunication.getSubcontractedTaskData().getTask(); + public void goToEdit(SubcontractorCommunication subcontractorCommunication) { + if(subcontractorCommunication != null){ + TaskElement task = subcontractorCommunication.getSubcontractedTaskData().getTask(); OrderElement orderElement = task.getOrderElement(); - Order order = subcontractorComunicationModel.getOrder(orderElement); + Order order = subcontractorCommunicationModel.getOrder(orderElement); globalView.goToAdvanceTask(order,task); } } - public FilterComunicationEnum[] getFilterItems(){ - return FilterComunicationEnum.values(); + public FilterCommunicationEnum[] getFilterItems(){ + return FilterCommunicationEnum.values(); } - public FilterComunicationEnum getCurrentFilterItem() { - return subcontractorComunicationModel.getCurrentFilter(); + public FilterCommunicationEnum getCurrentFilterItem() { + return subcontractorCommunicationModel.getCurrentFilter(); } - public void setCurrentFilterItem(FilterComunicationEnum selected) { - subcontractorComunicationModel.setCurrentFilter(selected); + public void setCurrentFilterItem(FilterCommunicationEnum selected) { + subcontractorCommunicationModel.setCurrentFilter(selected); - // update the subcontractor comunication list - listing.setModel(new SimpleListModel(getSubcontractorComunications())); + // update the subcontractor communication list + listing.setModel(new SimpleListModel(getSubcontractorCommunications())); listing.invalidate(); } - protected void save(SubcontractorComunication subcontractorComunication) + protected void save(SubcontractorCommunication subcontractorCommunication) throws ValidationException { - subcontractorComunicationModel.confirmSave(subcontractorComunication); + subcontractorCommunicationModel.confirmSave(subcontractorCommunication); } - public List getSubcontractorComunications() { - FilterComunicationEnum currentFilter = subcontractorComunicationModel.getCurrentFilter(); + public List getSubcontractorCommunications() { + FilterCommunicationEnum currentFilter = subcontractorCommunicationModel.getCurrentFilter(); switch(currentFilter){ - case ALL: return subcontractorComunicationModel.getSubcontractorAllComunications(); - case NOT_REVIEWED: return subcontractorComunicationModel.getSubcontractorComunicationWithoutReviewed(); - default: return subcontractorComunicationModel.getSubcontractorAllComunications(); + case ALL: return subcontractorCommunicationModel.getSubcontractorAllCommunications(); + case NOT_REVIEWED: return subcontractorCommunicationModel.getSubcontractorCommunicationWithoutReviewed(); + default: return subcontractorCommunicationModel.getSubcontractorAllCommunications(); } } - public SubcontractorComunicationRenderer getSubcontractorComunicationRenderer() { - return subcontractorComunicationRenderer; + public SubcontractorCommunicationRenderer getSubcontractorCommunicationRenderer() { + return subcontractorCommunicationRenderer; } - private class SubcontractorComunicationRenderer implements + private class SubcontractorCommunicationRenderer implements RowRenderer { @Override public void render(Row row, Object data) { - SubcontractorComunication subcontractorComunication = (SubcontractorComunication) data; - row.setValue(subcontractorComunication); + SubcontractorCommunication subcontractorCommunication = (SubcontractorCommunication) data; + row.setValue(subcontractorCommunication); - appendLabel(row, subcontractorComunication.getComunicationType().toString()); - appendLabel(row, subcontractorComunication.getSubcontractedTaskData().getTask().getName()); - appendLabel(row, getOrderName(subcontractorComunication.getSubcontractedTaskData())); - appendLabel(row, getOrderCode(subcontractorComunication.getSubcontractedTaskData())); - appendLabel(row, subcontractorComunication.getSubcontractedTaskData().getExternalCompany().getName()); - appendLabel(row, toString(subcontractorComunication.getComunicationDate())); - appendLabelWitTooltip(row,subcontractorComunication); - appendCheckbox(row, subcontractorComunication); - appendOperations(row, subcontractorComunication); + appendLabel(row, subcontractorCommunication.getCommunicationType().toString()); + appendLabel(row, subcontractorCommunication.getSubcontractedTaskData().getTask().getName()); + appendLabel(row, getOrderName(subcontractorCommunication.getSubcontractedTaskData())); + appendLabel(row, getOrderCode(subcontractorCommunication.getSubcontractedTaskData())); + appendLabel(row, subcontractorCommunication.getSubcontractedTaskData().getExternalCompany().getName()); + appendLabel(row, toString(subcontractorCommunication.getCommunicationDate())); + appendLabelWitTooltip(row,subcontractorCommunication); + appendCheckbox(row, subcontractorCommunication); + appendOperations(row, subcontractorCommunication); } private String toString(Date date) { @@ -164,17 +160,17 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo } private String getOrderCode(SubcontractedTaskData subcontractedTaskData) { - return subcontractorComunicationModel.getOrderCode(subcontractedTaskData); + return subcontractorCommunicationModel.getOrderCode(subcontractedTaskData); } private String getOrderName(SubcontractedTaskData subcontractedTaskData) { - return subcontractorComunicationModel.getOrderName(subcontractedTaskData); + return subcontractorCommunicationModel.getOrderName(subcontractedTaskData); } private String getLastValue( - SubcontractorComunication subcontractorComunication) { - SubcontractorComunicationValue value = subcontractorComunication - .getLastSubcontratorComunicationValues(); + SubcontractorCommunication subcontractorCommunication) { + SubcontractorCommunicationValue value = subcontractorCommunication + .getLastSubcontractorCommunicationValues(); return (value != null) ? value.toString() : ""; } @@ -182,8 +178,8 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo row.appendChild(new Label(label)); } - private void appendLabelWitTooltip(final Row row,final SubcontractorComunication subcontractorComunication) { - String lastValue = getLastValue(subcontractorComunication); + private void appendLabelWitTooltip(final Row row,final SubcontractorCommunication subcontractorCommunication) { + String lastValue = getLastValue(subcontractorCommunication); final Label compLabel = new Label(lastValue); compLabel.setTooltip(pp); @@ -191,8 +187,8 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo new EventListener() { @Override public void onEvent(Event arg0) throws Exception { - List model = subcontractorComunication - .getSubcontratorComunicationValues(); + List model = subcontractorCommunication + .getSubcontractorCommunicationValues(); listingValues.setModel(new SimpleListModel(model)); listingValues.invalidate(); } @@ -201,17 +197,17 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo } private void appendCheckbox(Row row, - final SubcontractorComunication subcontractorComunication) { + final SubcontractorCommunication subcontractorCommunication) { final Checkbox checkBoxReviewed = new Checkbox(); - checkBoxReviewed.setChecked(subcontractorComunication.getReviewed()); + checkBoxReviewed.setChecked(subcontractorCommunication.getReviewed()); checkBoxReviewed.addEventListener(Events.ON_CHECK, new EventListener() { @Override public void onEvent(Event arg0) throws Exception { - subcontractorComunication.setReviewed(checkBoxReviewed.isChecked()); - save(subcontractorComunication); + subcontractorCommunication.setReviewed(checkBoxReviewed.isChecked()); + save(subcontractorCommunication); } }); @@ -220,13 +216,13 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo } private void appendOperations(Row row, - final SubcontractorComunication subcontractorComunication) { + final SubcontractorCommunication subcontractorCommunication) { Button buttonEdit = new Button(_("edit")); buttonEdit.addEventListener(Events.ON_CLICK, new EventListener() { @Override public void onEvent(Event arg0) throws Exception { - goToEdit(subcontractorComunication); + goToEdit(subcontractorCommunication); } }); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationModel.java similarity index 60% rename from libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java rename to libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationModel.java index 051b64936..7f96c6db2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationModel.java @@ -24,10 +24,10 @@ import java.util.List; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; -import org.libreplan.business.planner.daos.ISubcontractorComunicationDAO; +import org.libreplan.business.planner.daos.ISubcontractorCommunicationDAO; import org.libreplan.business.planner.entities.SubcontractedTaskData; -import org.libreplan.business.planner.entities.SubcontractorComunication; -import org.libreplan.business.planner.entities.SubcontractorComunicationValue; +import org.libreplan.business.planner.entities.SubcontractorCommunication; +import org.libreplan.business.planner.entities.SubcontractorCommunicationValue; import org.libreplan.business.planner.entities.Task; import org.libreplan.web.common.concurrentdetection.OnConcurrentModification; import org.springframework.beans.factory.annotation.Autowired; @@ -38,53 +38,53 @@ import org.springframework.transaction.annotation.Transactional; @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) -@OnConcurrentModification(goToPage = "/subcontract/subcontractorComunication.zul") -public class SubcontractorComunicationModel implements ISubcontractorComunicationModel{ +@OnConcurrentModification(goToPage = "/subcontract/subcontractorCommunication.zul") +public class SubcontractorCommunicationModel implements ISubcontractorCommunicationModel{ @Autowired - private ISubcontractorComunicationDAO subcontractorComunicationDAO; + private ISubcontractorCommunicationDAO subcontractorCommunicationDAO; @Autowired IOrderDAO orderDAO; - private FilterComunicationEnum currentFilter = FilterComunicationEnum.NOT_REVIEWED; + private FilterCommunicationEnum currentFilter = FilterCommunicationEnum.NOT_REVIEWED; @Override @Transactional - public void confirmSave(SubcontractorComunication subcontractorComunication){ - subcontractorComunicationDAO.save(subcontractorComunication); + public void confirmSave(SubcontractorCommunication subcontractorCommunication){ + subcontractorCommunicationDAO.save(subcontractorCommunication); } @Override @Transactional - public List getSubcontractorAllComunications(){ - List list = subcontractorComunicationDAO.getAll(); + public List getSubcontractorAllCommunications(){ + List list = subcontractorCommunicationDAO.getAll(); forceLoadAssociatedData(list); return list; } @Override @Transactional - public List getSubcontractorComunicationWithoutReviewed(){ - List list = subcontractorComunicationDAO.getAllNotReviewed(); + public List getSubcontractorCommunicationWithoutReviewed(){ + List list = subcontractorCommunicationDAO.getAllNotReviewed(); forceLoadAssociatedData(list); return list; } - private void forceLoadAssociatedData(List subcontractorComunicationList){ - if (subcontractorComunicationList != null) { - for (SubcontractorComunication subcontractorComunication : subcontractorComunicationList) { - subcontractorComunication.getSubcontractedTaskData().getExternalCompany().getName(); - subcontractorComunication.getSubcontractedTaskData().getTask().getName(); - subcontractorComunication.getSubcontractedTaskData().getTask().getOrderElement().getName(); - subcontractorComunication.getLastSubcontratorComunicationValues().getDate(); + private void forceLoadAssociatedData(List subcontractorCommunicationList){ + if (subcontractorCommunicationList != null) { + for (SubcontractorCommunication subcontractorCommunication : subcontractorCommunicationList) { + subcontractorCommunication.getSubcontractedTaskData().getExternalCompany().getName(); + subcontractorCommunication.getSubcontractedTaskData().getTask().getName(); + subcontractorCommunication.getSubcontractedTaskData().getTask().getOrderElement().getName(); + subcontractorCommunication.getLastSubcontractorCommunicationValues().getDate(); } } } - private void forceLoadAssociatedDataValue(List subcontractorComunicationValueList){ - if (subcontractorComunicationValueList != null) { - for (SubcontractorComunicationValue value : subcontractorComunicationValueList) { + private void forceLoadAssociatedDataValue(List subcontractorCommunicationValueList){ + if (subcontractorCommunicationValueList != null) { + for (SubcontractorCommunicationValue value : subcontractorCommunicationValueList) { value.getDate(); } } @@ -109,12 +109,12 @@ public class SubcontractorComunicationModel implements ISubcontractorComunicatio } @Override - public void setCurrentFilter(FilterComunicationEnum currentFilter) { + public void setCurrentFilter(FilterCommunicationEnum currentFilter) { this.currentFilter = currentFilter; } @Override - public FilterComunicationEnum getCurrentFilter() { + public FilterCommunicationEnum getCurrentFilter() { return currentFilter; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java index 8b96f0a87..d07217cb3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java @@ -46,17 +46,17 @@ import org.libreplan.business.advance.exceptions.DuplicateValueTrueReportGlobalA import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.externalcompanies.daos.IExternalCompanyDAO; -import org.libreplan.business.externalcompanies.entities.ComunicationType; +import org.libreplan.business.externalcompanies.entities.CommunicationType; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.daos.IOrderElementDAO; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO; -import org.libreplan.business.planner.daos.ISubcontractorComunicationDAO; +import org.libreplan.business.planner.daos.ISubcontractorCommunicationDAO; import org.libreplan.business.planner.entities.SubcontractedTaskData; -import org.libreplan.business.planner.entities.SubcontractorComunication; -import org.libreplan.business.planner.entities.SubcontractorComunicationValue; +import org.libreplan.business.planner.entities.SubcontractorCommunication; +import org.libreplan.business.planner.entities.SubcontractorCommunicationValue; import org.libreplan.business.planner.entities.Task; import org.libreplan.business.scenarios.bootstrap.PredefinedScenarios; import org.libreplan.business.scenarios.entities.OrderVersion; @@ -93,7 +93,7 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { private ISubcontractedTaskDataDAO subcontractedTaskDataDAO; @Autowired - private ISubcontractorComunicationDAO subcontractorComunicationDAO; + private ISubcontractorCommunicationDAO subcontractorCommunicationDAO; @Autowired private IOrderDAO orderDAO; @@ -212,10 +212,10 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { /* * If the order element is subcontrated then create the - * subcontrated comunication for the subcontrated task data to + * subcontrated communication for the subcontrated task data to * which the order element belongs. */ - createSubcontractorComunication( + createSubcontractorCommunication( orderElement, orderElementWithAdvanceMeasurementsDTO.advanceMeasurements); @@ -241,7 +241,7 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { instanceConstraintViolationsList); } - public void createSubcontractorComunication(OrderElement orderElement, + public void createSubcontractorCommunication(OrderElement orderElement, Set advanceMeasurementDTOs) throws InstanceNotFoundException { if (orderElement != null @@ -251,26 +251,26 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { SubcontractedTaskData subcontractedTaskData = task .getSubcontractedTaskData(); if (subcontractedTaskData != null) { - SubcontractorComunication subcontractorComunication = SubcontractorComunication + SubcontractorCommunication subcontractorCommunication = SubcontractorCommunication .create(subcontractedTaskData, - ComunicationType.REPORT_PROGRESS, new Date(), + CommunicationType.REPORT_PROGRESS, new Date(), false); for (AdvanceMeasurementDTO advanceMeasurementDTO : advanceMeasurementDTOs) { - // add subcontractorComunicationValue - addSubcontractorComunicationValue(advanceMeasurementDTO, - subcontractorComunication); + // add subcontractorCommunicationValue + addSubcontractorCommunicationValue(advanceMeasurementDTO, + subcontractorCommunication); } - subcontractorComunicationDAO.save(subcontractorComunication); + subcontractorCommunicationDAO.save(subcontractorCommunication); } } } - private void addSubcontractorComunicationValue(AdvanceMeasurementDTO advanceMeasurementDTO, SubcontractorComunication subcontractorComunication ){ + private void addSubcontractorCommunicationValue(AdvanceMeasurementDTO advanceMeasurementDTO, SubcontractorCommunication subcontractorCommunication ){ Date dateValue = DateConverter.toDate(advanceMeasurementDTO.date); - SubcontractorComunicationValue value = SubcontractorComunicationValue + SubcontractorCommunicationValue value = SubcontractorCommunicationValue .create(dateValue, advanceMeasurementDTO.value); - subcontractorComunication.getSubcontratorComunicationValues() + subcontractorCommunication.getSubcontractorCommunicationValues() .add(value); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java index b3157cf0a..b1c662ca5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java @@ -47,10 +47,10 @@ import org.libreplan.business.common.entities.EntityNameEnum; import org.libreplan.business.common.entities.EntitySequence; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; -import org.libreplan.business.externalcompanies.daos.ICustomerComunicationDAO; +import org.libreplan.business.externalcompanies.daos.ICustomerCommunicationDAO; import org.libreplan.business.externalcompanies.daos.IExternalCompanyDAO; -import org.libreplan.business.externalcompanies.entities.ComunicationType; -import org.libreplan.business.externalcompanies.entities.CustomerComunication; +import org.libreplan.business.externalcompanies.entities.CommunicationType; +import org.libreplan.business.externalcompanies.entities.CustomerCommunication; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.orders.daos.IOrderElementDAO; import org.libreplan.business.orders.entities.Order; @@ -104,7 +104,7 @@ public class SubcontractServiceREST implements ISubcontractService { private IScenarioDAO scenarioDAO; @Autowired - private ICustomerComunicationDAO customerComunicationDAO; + private ICustomerCommunicationDAO customerCommunicationDAO; @Autowired private ITaskSourceDAO taskSourceDAO; @@ -240,10 +240,10 @@ public class SubcontractServiceREST implements ISubcontractService { orderElementDAO.save(order); /* - * create the customer comunication to a new subcontrating project. + * create the customer communication to a new subcontrating project. */ if(!StringUtils.isBlank(order.getExternalCode())){ - createCustomerComunication(order); + createCustomerCommunication(order); } } @@ -323,12 +323,20 @@ public class SubcontractServiceREST implements ISubcontractService { Util.generateInstanceId(1, code), message); } - private void createCustomerComunication(Order order){ + private void createCustomerCommunication(Order order){ Date deadline = order.getDeadline(); - Date comunicationDate = new Date(); - CustomerComunication customerComunication = CustomerComunication - .create(deadline, comunicationDate, - ComunicationType.NEW_PROJECT, order); - customerComunicationDAO.save(customerComunication); + Date communicationDate = new Date(); + CustomerCommunication customerCommunication = CustomerCommunication + .create(deadline, communicationDate, + CommunicationType.NEW_PROJECT, order); + if(customerCommunication.getCommunicationType() != null){ + System.out.println(" type before "+ customerCommunication.getCommunicationType().toString()); + }else{ + customerCommunication.setCommunicationType(CommunicationType.NEW_PROJECT); + } + customerCommunicationDAO.save(customerCommunication); + if(customerCommunication.getCommunicationType() != null){ + System.out.println(" type after "+ customerCommunication.getCommunicationType().toString()); + } } } diff --git a/libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul similarity index 89% rename from libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul rename to libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul index 7aec332a9..6d5e6b9b9 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul @@ -28,7 +28,7 @@ @@ -42,16 +42,16 @@ - + - + diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul similarity index 83% rename from libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul rename to libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul index 01427bafc..1d0fe0ba2 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul @@ -28,7 +28,7 @@ @@ -42,17 +42,17 @@ - + - - + + @@ -60,13 +60,13 @@ - + - + - + diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java index e88f98a99..0fb6a177f 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java @@ -72,7 +72,7 @@ import org.libreplan.business.orders.entities.SchedulingDataForVersion; import org.libreplan.business.orders.entities.TaskSource; import org.libreplan.business.orders.entities.TaskSource.TaskSourceSynchronization; import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO; -import org.libreplan.business.planner.daos.ISubcontractorComunicationDAO; +import org.libreplan.business.planner.daos.ISubcontractorCommunicationDAO; import org.libreplan.business.planner.daos.ITaskElementDAO; import org.libreplan.business.planner.daos.ITaskSourceDAO; import org.libreplan.business.planner.entities.SubcontractedTaskData; @@ -86,7 +86,7 @@ import org.libreplan.ws.subcontract.api.IReportAdvancesService; import org.libreplan.ws.subcontract.api.OrderElementWithAdvanceMeasurementsDTO; import org.libreplan.ws.subcontract.api.OrderElementWithAdvanceMeasurementsListDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.libreplan.business.planner.entities.SubcontractorComunication; +import org.libreplan.business.planner.entities.SubcontractorCommunication; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -155,7 +155,7 @@ public class ReportAdvancesServiceTest { private IScenarioManager scenarioManager; @Autowired - private ISubcontractorComunicationDAO subcontractorComunicationDAO; + private ISubcontractorCommunicationDAO subcontractorCommunicationDAO; @Autowired private ISubcontractedTaskDataDAO subcontractorTaskDataDAO; @@ -235,7 +235,7 @@ public class ReportAdvancesServiceTest { @Test public void validAdvancesReportToSubcontratedOrderElement() { - int previousComunications = subcontractorComunicationDAO.getAll().size(); + int previousCommunications = subcontractorCommunicationDAO.getAll().size(); OrderLine orderLine = createOrderLine(); String orderElementCode = orderLine.getCode(); @@ -244,7 +244,7 @@ public class ReportAdvancesServiceTest { OrderElementWithAdvanceMeasurementsListDTO orderElementWithAdvanceMeasurementsListDTO = givenOrderElementWithAdvanceMeasurementsListDTO( orderElementCode, values); - SubcontractorComunication subcontractorComunication = SubcontractorComunication.create(); + SubcontractorCommunication subcontractorCommunication = SubcontractorCommunication.create(); reportAdvancesService .updateAdvances(orderElementWithAdvanceMeasurementsListDTO); @@ -270,8 +270,8 @@ public class ReportAdvancesServiceTest { assertThat(advanceMeasurement.getValue(), equalTo(entry.getValue())); } - int currentComunications = subcontractorComunicationDAO.getAll().size(); - assertThat((previousComunications+1), equalTo(currentComunications)); + int currentCommunications = subcontractorCommunicationDAO.getAll().size(); + assertThat((previousCommunications+1), equalTo(currentCommunications)); } @Test diff --git a/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml b/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml index d440fb211..64d97c1f5 100644 --- a/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml +++ b/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml @@ -85,7 +85,7 @@ org/libreplan/business/planner/entities/AdvanceConsolidations.hbm.xml - org/libreplan/business/planner/entities/SubcontractorComunication.hbm.xml + org/libreplan/business/planner/entities/SubcontractorCommunication.hbm.xml org/libreplan/business/scenarios/entities/Scenarios.hbm.xml