From eeb61f8336f1d6f31425afe2d09855b55c4ac7d4 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 11 Sep 2012 12:30:45 +0200 Subject: [PATCH] Add option in menu and new role for new project status report FEA: ItEr77S09WBSReport --- .../business/users/bootstrap/PredefinedProfiles.java | 4 +++- .../java/org/libreplan/business/users/entities/UserRole.java | 3 ++- .../java/org/libreplan/web/common/CustomMenuController.java | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java b/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java index a4ff28c61..897e321e0 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java @@ -39,6 +39,7 @@ import static org.libreplan.business.users.entities.UserRole.ROLE_PLANNING; import static org.libreplan.business.users.entities.UserRole.ROLE_PROFILES; import static org.libreplan.business.users.entities.UserRole.ROLE_PROGRESS_TYPES; import static org.libreplan.business.users.entities.UserRole.ROLE_PROJECT_COSTS_REPORT; +import static org.libreplan.business.users.entities.UserRole.ROLE_PROJECT_STATUS_REPORT; import static org.libreplan.business.users.entities.UserRole.ROLE_QUALITY_FORMS; import static org.libreplan.business.users.entities.UserRole.ROLE_READ_ALL_PROJECTS; import static org.libreplan.business.users.entities.UserRole.ROLE_RECEIVED_FROM_CUSTOMERS; @@ -112,7 +113,8 @@ public enum PredefinedProfiles { ROLE_ESTIMATED_PLANNED_HOURS_PER_TASK_REPORT, ROLE_PROJECT_COSTS_REPORT, ROLE_TASK_SCHEDULING_STATUS_IN_PROJECT_REPORT, - ROLE_MATERIALS_NEED_AT_DATE_REPORT); + ROLE_MATERIALS_NEED_AT_DATE_REPORT, + ROLE_PROJECT_STATUS_REPORT); private String name; private UserRole[] roles; diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java index 6f3d2c394..565c888fd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java @@ -78,7 +78,8 @@ public enum UserRole { ROLE_ESTIMATED_PLANNED_HOURS_PER_TASK_REPORT(_("Estimated/Planned Hours Per Task Report")), ROLE_PROJECT_COSTS_REPORT(_("Project Costs Report")), ROLE_TASK_SCHEDULING_STATUS_IN_PROJECT_REPORT(_("Task Scheduling Status In Project Report")), - ROLE_MATERIALS_NEED_AT_DATE_REPORT(_("Materials Needs At Date Report")); + ROLE_MATERIALS_NEED_AT_DATE_REPORT(_("Materials Needs At Date Report")), + ROLE_PROJECT_STATUS_REPORT(_("Project Status Report")); private final String displayName; 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 18bfd0956..f88a54167 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 @@ -491,6 +491,11 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { reportsItems.add(subItem(_("Materials Needs At Date"), "/reports/timeLineMaterialReport.zul", "15-informes.html")); } + if (SecurityUtils + .isSuperuserOrUserInRoles(UserRole.ROLE_PROJECT_STATUS_REPORT)) { + reportsItems.add(subItem(_("Project Status"), + "/reports/projectStatusReport.zul", "15-informes.html")); + } if (!reportsItems.isEmpty()) { topItem(_("Reports"), "/reports/hoursWorkedPerWorkerReport.zul", "", reportsItems);