From 48ec1bedd01b7cd4679f2d7403a7a28d2c1ba7dd Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 24 Dec 2009 07:56:50 +0100
Subject: [PATCH]  ItEr40S22CUProcuraOrganizacionsTraballoItEr32S10: Regenerate
 order code when autogenerated checkbox is set.

---
 .../java/org/navalplanner/web/orders/IOrderModel.java |  3 +++
 .../navalplanner/web/orders/OrderCRUDController.java  | 11 ++++++++++-
 .../java/org/navalplanner/web/orders/OrderModel.java  | 11 +++++++++++
 .../src/main/webapp/orders/_edition.zul               |  5 ++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
index caa745269..8d560b3bc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
@@ -99,4 +99,7 @@ public interface IOrderModel {
 
     boolean isCodeAutogenerated();
 
+    void setCodeAutogenerated(boolean codeAutogenerated)
+            throws ConcurrentModificationException;
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index ea3f06ebb..33a2d3fac 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -425,7 +425,16 @@ public class OrderCRUDController extends GenericForwardComposer {
         orderModel.setCalendar(calendar);
     }
 
-    public void codeAutogeneratedChanged() {
+    public boolean isCodeAutogenerated() {
+        return orderModel.isCodeAutogenerated();
+    }
+
+    public void setCodeAutogenerated(boolean codeAutogenerated) {
+        try {
+            orderModel.setCodeAutogenerated(codeAutogenerated);
+        } catch (ConcurrentModificationException e) {
+            messagesForUser.showMessage(Level.ERROR, e.getMessage());
+        }
         Util.reloadBindings(editWindow);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index 2d13f80b8..cb576818e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -503,4 +503,15 @@ public class OrderModel implements IOrderModel {
         return order.isCodeAutogenerated();
     }
 
+    @Override
+    public void setCodeAutogenerated(boolean codeAutogenerated)
+            throws ConcurrentModificationException {
+        if (order != null) {
+            if (codeAutogenerated) {
+                setDefaultOrderCode();
+            }
+            order.setCodeAutogenerated(codeAutogenerated);
+        }
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index dd71f7624..d9515c2b3 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -55,10 +55,9 @@
                             <label value="${i18n:_('Code')}" />
                             <hbox>
                                 <textbox value="@{controller.order.code}" width="250px"
-                                    disabled="@{controller.order.codeAutogenerated}" />
+                                    disabled="@{controller.codeAutogenerated}" />
                                 <checkbox label="${i18n:_('Autogenerated')}"
-                                    checked="@{controller.order.codeAutogenerated}"
-                                    onCheck="controller.codeAutogeneratedChanged()" />
+                                    checked="@{controller.codeAutogenerated}" />
                             </hbox>
                         </row>
                         <row>