RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

it changes REPORT_ADVANCE for REPORT_PROGRESS and set properly the copyright

Browse source
This commit is contained in:
Susana Montes Pedreira 2011-11-21 13:33:00 +01:00
parent b4689b1cf4
commit b463d8e42e
33 changed files with 82 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/CustomerComunicationDAO.java
View file

@ -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

6
libreplan-business/src/main/java/org/libreplan/business/externalcompanies/daos/ICustomerComunicationDAO.java
View file

@ -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

9
libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ComunicationType.java
View file

@ -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;

6
libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerComunication.java
View file

@ -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

2
libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractedTaskDataDAO.java
View file

@ -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

4
libreplan-business/src/main/java/org/libreplan/business/planner/daos/ISubcontractorComunicationDAO.java
View file

@ -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

2
libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java
View file

@ -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

4
libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractorComunicationDAO.java
View file

@ -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

4
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java
View file

@ -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

10
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java
View file

@ -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);

1
libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java
View file

@ -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

6
libreplan-business/src/test/java/org/libreplan/business/test/externalcompanies/daos/CustomerComunicationDAOTest.java
View file

@ -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

6
libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java
View file

@ -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

2
libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
View file

@ -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

4
libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskConverter.java
View file

@ -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

2
libreplan-webapp/src/main/java/org/libreplan/web/common/converters/TaskElementConverter.java
View file

@ -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

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningController.java
View file

@ -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

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
View file

@ -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 <ogonzalez@igalia.com>
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
@Component
@Scope(BeanDefinition.SCOPE_PROTOTYPE)

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
View file

@ -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} <br />
* @author Óscar González Fernández <ogonzalez@igalia.com>
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
@EntryPoints(page = "/planner/index.zul", registerAs = "globalView")
public interface IGlobalViewEntryPoints {

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -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

6
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationCRUDController.java
View file

@ -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

4
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java
View file

@ -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

47
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterComunicationEnum.java
View file

@ -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 <smontes@wirelessgalicia.com>
*/
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;
}
}
@Override
public String toString() {
return displayName;
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ICustomerComunicationModel.java
View file

@ -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

6
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractorComunicationModel.java
View file

@ -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

2
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
View file

@ -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

6
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java
View file

@ -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

6
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java
View file

@ -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

5
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java
View file

@ -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 <mrego@igalia.com>
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
@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) {

3
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java
View file

@ -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 <mrego@igalia.com>
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
@Path("/subcontract/")
@Produces("application/xml")

6
libreplan-webapp/src/main/webapp/subcontract/customerComunications.zul
View file

@ -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

6
libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul
View file

@ -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

2
libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java
View file

@ -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