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

ItEr48S15CUFiltradoNaPlanificacionItEr47S17: Moved IPredicate to ganttzk.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-02-17 09:10:01 +01:00 • committed by Javier Moran Rua
parent 5fd19b424f
commit 005ae9a94b
17 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IPredicate.java → ganttzk/src/main/java/org/zkoss/ganttz/IPredicate.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.orders;
package org.zkoss.ganttz;
/**
* Classes implementing this interface check if object matches a given

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
View file

@ -36,6 +36,7 @@ import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionType;
import org.navalplanner.business.templates.entities.OrderElementTemplate;
import org.navalplanner.business.templates.entities.OrderTemplate;
import org.zkoss.ganttz.IPredicate;
/**
* Contract for {@link OrderModel}<br />

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java
View file

@ -25,6 +25,7 @@ import java.util.Set;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.orders.entities.OrderElement;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link Label} from {@link OrderElement} matches attribute label

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementPredicate.java
View file

@ -31,6 +31,7 @@ import org.navalplanner.business.requirements.entities.CriterionRequirement;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.web.common.components.finders.FilterPair;
import org.navalplanner.web.common.components.finders.OrderElementFilterEnum;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link OrderElement} matches with the different filters.

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
View file

@ -48,6 +48,7 @@ import org.navalplanner.web.orders.assigntemplates.TemplateFinderPopup;
import org.navalplanner.web.orders.assigntemplates.TemplateFinderPopup.IOnResult;
import org.navalplanner.web.templates.IOrderTemplatesControllerEntryPoints;
import org.navalplanner.web.tree.TreeController;
import org.zkoss.ganttz.IPredicate;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WrongValueException;

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -81,6 +81,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.zkoss.ganttz.IPredicate;
/**
* Model for UI operations related to {@link Order}. <br />

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java
View file

@ -34,6 +34,7 @@ import org.navalplanner.business.workreports.entities.WorkReport;
import org.navalplanner.business.workreports.entities.WorkReportType;
import org.navalplanner.web.common.components.finders.FilterPair;
import org.navalplanner.web.common.components.finders.OrderFilterEnum;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link WorkReportType}, the start date and finish date from

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPredicate.java
View file

@ -6,8 +6,8 @@ import java.util.List;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.web.common.components.finders.FilterPair;
import org.navalplanner.web.orders.IPredicate;
import org.navalplanner.web.orders.OrderPredicate;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link Order}, the start date and finish date from associated

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
View file

@ -32,11 +32,11 @@ import org.apache.commons.lang.Validate;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.common.components.bandboxsearch.BandboxMultipleSearch;
import org.navalplanner.web.common.components.finders.FilterPair;
import org.navalplanner.web.orders.IPredicate;
import org.navalplanner.web.planner.CompanyPredicate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.zkoss.ganttz.IPredicate;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.extensions.ICommandOnTask;
import org.zkoss.ganttz.resourceload.ScriptsRequiredByResourceLoadPanel;

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -60,7 +60,6 @@ import org.navalplanner.business.users.daos.IUserDAO;
import org.navalplanner.business.users.entities.User;
import org.navalplanner.business.workreports.daos.IWorkReportLineDAO;
import org.navalplanner.business.workreports.entities.WorkReportLine;
import org.navalplanner.web.orders.IPredicate;
import org.navalplanner.web.planner.ITaskElementAdapter;
import org.navalplanner.web.planner.chart.Chart;
import org.navalplanner.web.planner.chart.ChartFiller;
@ -80,6 +79,7 @@ import org.zkforge.timeplot.Plotinfo;
import org.zkforge.timeplot.Timeplot;
import org.zkforge.timeplot.geometry.TimeGeometry;
import org.zkforge.timeplot.geometry.ValueGeometry;
import org.zkoss.ganttz.IPredicate;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.adapters.IStructureNavigator;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
@ -180,7 +180,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
public void setConfigurationToPlanner(Planner planner,
Collection<ICommandOnTask<TaskElement>> additional,
ICommandOnTask<TaskElement> doubleClickCommand,
IPredicate predicate) {
IPredicate predicate) {
PlannerConfiguration<TaskElement> configuration = createConfiguration(predicate);
Tabbox chartComponent = new Tabbox();

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java
View file

@ -23,7 +23,7 @@ package org.navalplanner.web.planner.company;
import java.util.Collection;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.orders.IPredicate;
import org.zkoss.ganttz.IPredicate;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.extensions.ICommandOnTask;
@ -43,7 +43,6 @@ public interface ICompanyPlanningModel {
public void setConfigurationToPlanner(Planner planner,
Collection<ICommandOnTask<TaskElement>> additional,
ICommandOnTask<TaskElement> doubleClickCommand,
IPredicate predicate);
ICommandOnTask<TaskElement> doubleClickCommand, IPredicate predicate);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java
View file

@ -35,7 +35,7 @@ import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.resources.entities.Worker;
import org.navalplanner.web.common.components.finders.FilterPair;
import org.navalplanner.web.common.components.finders.ResourceFilterEnum;
import org.navalplanner.web.orders.IPredicate;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link Resource} matches with this predicate.

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java
View file

@ -35,7 +35,7 @@ import org.navalplanner.business.workreports.entities.WorkReportLine;
import org.navalplanner.business.workreports.entities.WorkReportType;
import org.navalplanner.business.workreports.valueobjects.DescriptionField;
import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
import org.navalplanner.web.orders.IPredicate;
import org.zkoss.ganttz.IPredicate;
/**
* Contract for {@link WorkRerportType}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
View file

@ -53,7 +53,7 @@ import org.navalplanner.web.common.components.NewDataSortableColumn;
import org.navalplanner.web.common.components.NewDataSortableGrid;
import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry;
import org.navalplanner.web.common.entrypoints.URLHandler;
import org.navalplanner.web.orders.IPredicate;
import org.zkoss.ganttz.IPredicate;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportLinePredicate.java
View file

@ -27,7 +27,7 @@ import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.workreports.entities.WorkReportLine;
import org.navalplanner.web.orders.IPredicate;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link WorkReportLine} matches the constraints

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
View file

@ -46,12 +46,12 @@ import org.navalplanner.business.workreports.entities.WorkReportLine;
import org.navalplanner.business.workreports.entities.WorkReportType;
import org.navalplanner.business.workreports.valueobjects.DescriptionField;
import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
import org.navalplanner.web.orders.IPredicate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.zkoss.ganttz.IPredicate;
/**
* Model for UI operations related to {@link WorkReport}.

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportPredicate.java
View file

@ -24,7 +24,7 @@ import java.util.Date;
import org.navalplanner.business.workreports.entities.WorkReport;
import org.navalplanner.business.workreports.entities.WorkReportType;
import org.navalplanner.web.orders.IPredicate;
import org.zkoss.ganttz.IPredicate;
/**
* Checks if {@link WorkReportType}, the start date and finish date from