From 8a9b78050a929a82c779c3f52ece3f15a88a5901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Mon, 28 Jan 2013 10:02:14 +0100 Subject: [PATCH] Added accesors to settings controller for manipulation of filtering preferences FEA: ItEr77S15FilteringEnhancements --- .../web/users/settings/ISettingsModel.java | 21 +++++++++ .../users/settings/SettingsController.java | 34 ++++++++++++++ .../web/users/settings/SettingsModel.java | 46 +++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java index b95d164b3..3a49f7e12 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java @@ -2,6 +2,7 @@ * This file is part of LibrePlan * * Copyright (C) 2011 ComtecSF, S.L. + * Copyright (C) 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 @@ -19,6 +20,7 @@ package org.libreplan.web.users.settings; import org.libreplan.business.common.exceptions.ValidationException; +import org.libreplan.business.labels.entities.Label; import org.libreplan.business.settings.entities.Language; @@ -27,6 +29,7 @@ import org.libreplan.business.settings.entities.Language; * * @author Cristina Alvarino Perez * @author Ignacio Diaz Teijido + * @author Lorenzo Tilve Álvaro */ public interface ISettingsModel { @@ -67,4 +70,22 @@ public interface ISettingsModel { boolean isBound(); + Integer getProjectsFilterPeriodSince(); + + void setProjectsFilterPeriodSince(Integer period); + + Integer getProjectsFilterPeriodTo(); + + void setProjectsFilterPeriodTo(Integer period); + + Integer getResourcesLoadFilterPeriodSince(); + + void setResourcesLoadFilterPeriodSince(Integer period); + + Integer getResourcesLoadFilterPeriodTo(); + + void setResourcesLoadFilterPeriodTo(Integer period); + + Label getProjectsFilterLabel(); + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java index db6a1515e..882ebf26c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java @@ -2,6 +2,7 @@ * This file is part of LibrePlan * * Copyright (C) 2011 ComtecSF, S.L. + * Copyright (C) 2013 Igalia. * * 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 @@ -41,6 +42,7 @@ import org.zkoss.zul.Textbox; * * @author Cristina Alvarino Perez * @author Ignacio Diaz Teijido + * @author Lorenzo Tilve Álvaro */ public class SettingsController extends GenericForwardComposer { @@ -176,4 +178,36 @@ public class SettingsController extends GenericForwardComposer { return settingsModel.isBound(); } + public Integer getProjectsFilterPeriodSince() { + return settingsModel.getProjectsFilterPeriodSince(); + } + + public void setProjectsFilterPeriodSince(Integer period) { + settingsModel.setProjectsFilterPeriodSince(period); + } + + public Integer getProjectsFilterPeriodTo() { + return settingsModel.getProjectsFilterPeriodTo(); + } + + public void setProjectsFilterPeriodTo(Integer period) { + settingsModel.setProjectsFilterPeriodTo(period); + } + + public Integer getResourcesLoadFilterPeriodSince() { + return settingsModel.getResourcesLoadFilterPeriodSince(); + } + + public void setResourcesLoadFilterPeriodSince(Integer period) { + settingsModel.setResourcesLoadFilterPeriodSince(period); + } + + public Integer getResourcesLoadFilterPeriodTo() { + return settingsModel.getResourcesLoadFilterPeriodTo(); + } + + public void setResourcesLoadFilterPeriodTo(Integer period) { + settingsModel.setResourcesLoadFilterPeriodTo(period); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java index 4a7df6763..63e4aaf4c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java @@ -22,6 +22,7 @@ package org.libreplan.web.users.settings; import org.apache.commons.lang.Validate; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; +import org.libreplan.business.labels.entities.Label; import org.libreplan.business.settings.entities.Language; import org.libreplan.business.users.daos.IUserDAO; import org.libreplan.business.users.entities.Profile; @@ -202,4 +203,49 @@ public class SettingsModel implements ISettingsModel { return false; } + @Override + public Label getProjectsFilterLabel() { + return user.getProjectsFilterLabel(); + } + + @Override + public Integer getProjectsFilterPeriodSince() { + return user.getProjectsFilterPeriodSince(); + } + + @Override + public void setProjectsFilterPeriodSince(Integer period) { + user.setProjectsFilterPeriodSince(period); + } + + @Override + public Integer getProjectsFilterPeriodTo() { + return user.getProjectsFilterPeriodTo(); + } + + @Override + public void setProjectsFilterPeriodTo(Integer period) { + user.setProjectsFilterPeriodTo(period); + } + + @Override + public Integer getResourcesLoadFilterPeriodSince() { + return user.getResourcesLoadFilterPeriodSince(); + } + + @Override + public void setResourcesLoadFilterPeriodSince(Integer period) { + user.setResourcesLoadFilterPeriodSince(period); + } + + @Override + public Integer getResourcesLoadFilterPeriodTo() { + return user.getResourcesLoadFilterPeriodTo(); + } + + @Override + public void setResourcesLoadFilterPeriodTo(Integer period) { + user.setResourcesLoadFilterPeriodTo(period); + } + }