From ce58b4273fd02f1abe42a03e14162a475aa897cd Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 5 Apr 2010 02:18:13 +0200
Subject: [PATCH]  ItEr52S13CUCreacionRecursosLimitantes: Added column
 isLimitedResource in workers list

---
 .../navalplanner/business/resources/entities/Resource.java | 7 +++++++
 .../src/main/webapp/resources/worker/_list.zul             | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
index cab0897ca..bf53d0e7e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
@@ -19,6 +19,9 @@
  */
 
 package org.navalplanner.business.resources.entities;
+
+import static org.navalplanner.business.i18n.I18nHelper._;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1051,4 +1054,8 @@ public abstract class Resource extends IntegrationEntity {
         this.limitedResource = limitedResource;
     }
 
+    public String getLimitedResourceAsString() {
+        return (Boolean.TRUE.equals(isLimitedResource())) ? _("yes") : _("no");
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index f2aa5da0f..8a1ddf7d3 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -33,6 +33,7 @@
             <newdatasortablecolumn label="${i18n:_('Surname')}" sort="auto(surname)" />
             <newdatasortablecolumn label="${i18n:_('NIF')}" sort="auto(nif)" />
             <newdatasortablecolumn label="${i18n:_('Code')}"/>
+            <newdatasortablecolumn label="${i18n:_('Limited resource')}" sort="auto(limitedResource)" />
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
         <rows>
@@ -41,6 +42,7 @@
                 <label value="@{worker.surname}" />
                 <label value="@{worker.nif}" />
                 <label value="@{worker.code}" />
+                <label value="@{worker.limitedResourceAsString}" />
                 <hbox>
                     <button sclass="icono" image="/common/img/ico_editar1.png"
                         hoverImage="/common/img/ico_editar.png"
@@ -55,4 +57,4 @@
     <button id="show_create_form" onClick="controller.goToCreateForm();"
         label="${i18n:_('Create')}" sclass="create-button global-action">
     </button>
-</window>
\ No newline at end of file
+</window>