From e244ca49d9493f76a249a4d7f86b58e3b30e2581 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 17 Mar 2011 09:14:58 +0100
Subject: [PATCH] [Bug #939] Fixed adding the same method also in
 TaskQualityFormItem.

Fixed also translation of QualityForm type.

FEA: ItEr72S04BugFixing
---
 .../business/qualityforms/entities/TaskQualityFormItem.java | 4 ++++
 .../AssignedTaskQualityFormsToOrderElementController.java   | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java
index 67abe0453..b0a1b272f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java
@@ -89,6 +89,10 @@ public class TaskQualityFormItem implements INewObject {
         return position;
     }
 
+    public String getStringPosition() {
+        return position == null ? "" : new Integer(position + 1).toString();
+    }
+
     private void setPosition(Integer position) {
         this.position = position;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
index 179d0815c..5a5217626 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
@@ -275,8 +275,8 @@ public class AssignedTaskQualityFormsToOrderElementController extends
 
             appendDetails(row, taskQualityForm);
             appendNewLabel(row, taskQualityForm.getQualityForm().getName());
-            appendNewLabel(row, taskQualityForm.getQualityForm()
-                    .getQualityFormType().toString());
+            appendNewLabel(row, _(taskQualityForm.getQualityForm()
+                    .getQualityFormType().toString()));
             appendCheckboxReportAdvance(row, taskQualityForm);
             appendOperations(row);
         }
@@ -424,7 +424,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
             row.setValue(item);
 
             appendNewLabel(row, item.getName());
-            appendNewLabel(row, item.getPosition().toString());
+            appendNewLabel(row, item.getStringPosition());
             appendNewLabel(row, item.getPercentage().toString());
             appendCheckPassed(row);
             appendDate(row);