From b463d8e42e43404e342d3262345d2b6877f1ee1e Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Mon, 21 Nov 2011 13:33:00 +0100 Subject: [PATCH] it changes REPORT_ADVANCE for REPORT_PROGRESS and set properly the copyright --- .../daos/CustomerComunicationDAO.java | 6 +-- .../daos/ICustomerComunicationDAO.java | 6 +-- .../entities/ComunicationType.java | 9 ++-- .../entities/CustomerComunication.java | 6 +-- .../daos/ISubcontractedTaskDataDAO.java | 2 + .../daos/ISubcontractorComunicationDAO.java | 4 +- .../daos/SubcontractedTaskDataDAO.java | 2 + .../daos/SubcontractorComunicationDAO.java | 4 +- .../entities/SubcontractorComunication.java | 4 +- .../SubcontractorComunicationValue.java | 10 +--- .../qualityforms/entities/QualityForm.java | 1 + .../daos/CustomerComunicationDAOTest.java | 6 +-- .../SubcontractorComunicationDAOTest.java | 6 +-- .../web/common/CustomMenuController.java | 2 + .../web/common/converters/TaskConverter.java | 4 +- .../converters/TaskElementConverter.java | 2 +- .../AdvanceAssignmentPlanningController.java | 2 + .../order/OrderPlanningController.java | 2 + .../planner/tabs/IGlobalViewEntryPoints.java | 2 + .../tabs/MultipleTabsPlannerController.java | 2 + .../CustomerComunicationCRUDController.java | 6 +-- .../CustomerComunicationModel.java | 4 +- .../subcontract/FilterComunicationEnum.java | 47 +++++++++---------- .../ICustomerComunicationModel.java | 4 +- .../ISubcontractorComunicationModel.java | 6 +-- .../SubcontractedTasksController.java | 2 + ...bcontractorComunicationCRUDController.java | 6 +-- .../SubcontractorComunicationModel.java | 6 +-- .../impl/ReportAdvancesServiceREST.java | 5 +- .../impl/SubcontractServiceREST.java | 3 ++ .../subcontract/customerComunications.zul | 6 +-- .../subcontractorComunications.zul | 6 +-- .../ReportAdvancesServiceTest.java | 2 + 33 files changed, 82 insertions(+), 103 deletions(-) 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/CustomerComunicationDAO.java index 52499a67b..c307fe97c 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/CustomerComunicationDAO.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-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 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/ICustomerComunicationDAO.java index 5d6c1b270..e7217b272 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/ICustomerComunicationDAO.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 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/ComunicationType.java index d94038ca6..959a5d90f 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/ComunicationType.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 @@ -30,8 +28,7 @@ import static org.libreplan.business.i18n.I18nHelper._; */ public enum ComunicationType { - NEW_PROJECT(_("New project")), - REPORT_ADVANCE(_("Report advance")); + NEW_PROJECT(_("New project")), REPORT_PROGRESS(_("Report advance")); private String description; 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 index 02b908f84..c3c3400e1 100644 --- 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 @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractedTaskDataDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractedTaskDataDAO.java index 86da35b8a..df7bd86de 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractedTaskDataDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractedTaskDataDAO.java @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 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/ISubcontractorComunicationDAO.java index e00763f3a..a856d6047 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/ISubcontractorComunicationDAO.java @@ -1,9 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java index 8699a5574..da6d3c839 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 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/SubcontractorComunicationDAO.java index 929fc032c..b456702c9 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/SubcontractorComunicationDAO.java @@ -1,9 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 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 index d2fd52eb2..d1a52e11f 100644 --- 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 @@ -1,9 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 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/SubcontractorComunicationValue.java index 66322cde6..21844c930 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/SubcontractorComunicationValue.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 @@ -35,10 +33,6 @@ import org.libreplan.business.INewObject; */ public class SubcontractorComunicationValue implements INewObject { - public final static String propertyDate = "date"; - - public final static String propertyProgress = "progress"; - public static SubcontractorComunicationValue create() { SubcontractorComunicationValue subcontractorComunicationValue = new SubcontractorComunicationValue(); subcontractorComunicationValue.setNewObject(true); diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java index 235e0f5db..e0d401b01 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java @@ -4,6 +4,7 @@ * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-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 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/CustomerComunicationDAOTest.java index 59237cdec..935df1dfb 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/CustomerComunicationDAOTest.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 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/SubcontractorComunicationDAOTest.java index 875a5fac4..6962e441c 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/SubcontractorComunicationDAOTest.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 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 b7fcc8020..d68f49716 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 @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskConverter.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskConverter.java index b8996cff7..045043bbd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskConverter.java @@ -1,9 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskElementConverter.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskElementConverter.java index 8cbf74f7c..d80475111 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskElementConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskElementConverter.java @@ -1,7 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2010-2011 Wireless Galicia, S.L. + * Copyright (C) 2011 Wireless Galicia, 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningController.java index fee5a0410..534364508 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningController.java @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * Copyright (C) 2010-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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java index f061776ad..c2facb1ee 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java @@ -4,6 +4,7 @@ * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-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 @@ -73,6 +74,7 @@ import org.zkoss.zul.Vbox; /** * @author Óscar González Fernández + * @author Susana Montes Pedreira */ @Component @Scope(BeanDefinition.SCOPE_PROTOTYPE) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java index 3e8ea69cc..35057e261 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java @@ -4,6 +4,7 @@ * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. + * 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 @@ -31,6 +32,7 @@ import org.libreplan.web.common.entrypoints.EntryPoints; /** * Entry points for {@link MultipleTabsPlannerController}
* @author Óscar González Fernández + * @author Susana Montes Pedreira */ @EntryPoints(page = "/planner/index.zul", registerAs = "globalView") public interface IGlobalViewEntryPoints { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java index 78e4b80d2..15667efec 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java index ceab87024..e6a7071f9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java index 326e10308..6061fe79d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java @@ -1,9 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java index cdd323696..cde63a19e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 @@ -26,29 +24,28 @@ package org.libreplan.web.subcontract; * * @author Susana Montes Pedreira */ - public enum FilterComunicationEnum { - ALL(_("All")), - NOT_REVIEWED(_("Not Reviewed")); +public enum FilterComunicationEnum { + ALL(_("All")), NOT_REVIEWED(_("Not Reviewed")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } - private String displayName; + private String displayName; - private FilterComunicationEnum(String displayName) { - this.displayName = displayName; - } + private FilterComunicationEnum(String displayName) { + this.displayName = displayName; + } - public static FilterComunicationEnum getDefault() { - return ALL; - } + public static FilterComunicationEnum getDefault() { + return ALL; + } - @Override - public String toString() { - return displayName; - } - } \ No newline at end of file + @Override + public String toString() { + return displayName; + } +} \ No newline at end of file diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java index a6ecdd3d0..52febfc3d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java @@ -1,9 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java index a69ede783..a2abec0a3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java index d01b87a32..8e5288203 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java index 80e1e57a5..f635f0b6c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java index 292acc650..051b64936 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java @@ -1,9 +1,7 @@ /* - * This file is part of NavalPlan + * This file is part of LibrePlan * - * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * 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 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 461660675..8b96f0a87 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 @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 @@ -77,6 +79,7 @@ import org.springframework.transaction.annotation.Transactional; * REST-based implementation of {@link IReportAdvancesService}. * * @author Manuel Rego Casasnovas + * @author Susana Montes Pedreira */ @Path("/reportadvances/") @Produces("application/xml") @@ -250,7 +253,7 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { if (subcontractedTaskData != null) { SubcontractorComunication subcontractorComunication = SubcontractorComunication .create(subcontractedTaskData, - ComunicationType.REPORT_ADVANCE, new Date(), + ComunicationType.REPORT_PROGRESS, new Date(), false); for (AdvanceMeasurementDTO advanceMeasurementDTO : advanceMeasurementDTOs) { 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 f724a4a77..b3157cf0a 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 @@ -5,6 +5,8 @@ * Desenvolvemento Tecnolóxico de Galicia * Copyright (C) 2010-2011 Igalia, S.L. * + * 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 @@ -79,6 +81,7 @@ import org.springframework.stereotype.Service; * REST-based implementation of {@link ISubcontractService} * * @author Manuel Rego Casasnovas + * @author Susana Montes Pedreira */ @Path("/subcontract/") @Produces("application/xml") diff --git a/libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul b/libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul index df788525a..7aec332a9 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul @@ -1,9 +1,7 @@