From c3d077efce0dc3a9c24723a9fa84a1edad2b39e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Mon, 28 Jan 2013 09:51:11 +0100 Subject: [PATCH] Added new parameters to user preferences for company view and resource load filtering FEA: ItEr77S15FilteringEnhancements --- .../business/users/entities/User.java | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java index bd285c96e..1f5a5b425 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2012 Igalia, S.L. + * Copyright (C) 2010-2013 Igalia, 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 @@ -33,6 +33,7 @@ import org.libreplan.business.common.BaseEntity; import org.libreplan.business.common.IHumanIdentifiable; import org.libreplan.business.common.Registry; import org.libreplan.business.common.exceptions.InstanceNotFoundException; +import org.libreplan.business.labels.entities.Label; import org.libreplan.business.resources.entities.Worker; import org.libreplan.business.scenarios.entities.Scenario; import org.libreplan.business.settings.entities.Language; @@ -47,6 +48,7 @@ import org.libreplan.business.users.daos.IUserDAO; * @author Ignacio Diaz Teijido * @author Manuel Rego Casasnovas * @author Javier Moran Rua + * @author Lorenzo Tilve Álvaro */ public class User extends BaseEntity implements IHumanIdentifiable{ @@ -81,6 +83,16 @@ public class User extends BaseEntity implements IHumanIdentifiable{ private Worker worker; + private Label projectsFilterLabel = null; + + private Integer projectsFilterPeriodSince; + + private Integer projectsFilterPeriodTo; + + private Integer resourcesLoadFilterPeriodSince; + + private Integer resourcesLoadFilterPeriodTo; + /** * Necessary for Hibernate. Please, do not call it. */ @@ -373,4 +385,43 @@ public class User extends BaseEntity implements IHumanIdentifiable{ return true; } + public Label getProjectsFilterLabel() { + return projectsFilterLabel; + } + + public void setProjectsFilterLabel(Label label) { + projectsFilterLabel = label; + } + + public Integer getProjectsFilterPeriodSince() { + return projectsFilterPeriodSince; + } + public void setProjectsFilterPeriodSince(Integer period) { + projectsFilterPeriodSince = period; + } + + public Integer getProjectsFilterPeriodTo() { + return projectsFilterPeriodTo; + } + + public void setProjectsFilterPeriodTo(Integer period) { + projectsFilterPeriodTo = period; + } + + public Integer getResourcesLoadFilterPeriodSince() { + return resourcesLoadFilterPeriodSince; + } + + public void setResourcesLoadFilterPeriodSince(Integer period) { + resourcesLoadFilterPeriodSince = period; + } + + public Integer getResourcesLoadFilterPeriodTo() { + return resourcesLoadFilterPeriodTo; + } + + public void setResourcesLoadFilterPeriodTo(Integer period) { + resourcesLoadFilterPeriodTo = period; + } + }