From 96c3aec7bb35c49dd1e1b7b2cf82f32f0154fa65 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 22 Dec 2011 11:06:33 +0100 Subject: [PATCH] Disable some options in progress management if there is a consolidated progress FEA: ItEr75S04BugFixing --- .../ManageOrderElementAdvancesController.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java index e95883405..83d89a6e2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java @@ -719,6 +719,11 @@ public class ManageOrderElementAdvancesController extends removeButton.setDisabled(true); removeButton .setTooltiptext(_("Calculated progress can not be removed")); + } else if (manageOrderElementAdvancesModel + .hasConsolidatedAdvances(advance)) { + removeButton.setDisabled(true); + removeButton + .setTooltiptext(_("Consolidated progress can not be removed")); } hbox.appendChild(removeButton); @@ -1034,7 +1039,9 @@ public class ManageOrderElementAdvancesController extends listitem.appendChild(listcell); value.setScale(4); - value.setDisabled(isReadOnlyAdvanceMeasurements()); + value.setDisabled(isReadOnlyAdvanceMeasurements() + || manageOrderElementAdvancesModel + .hasConsolidatedAdvances(advanceMeasurement)); value.addEventListener(Events.ON_CHANGE, new EventListener() { @Override @@ -1090,7 +1097,9 @@ public class ManageOrderElementAdvancesController extends listcell.appendChild(date); listitem.appendChild(listcell); - date.setDisabled(isReadOnlyAdvanceMeasurements()); + date.setDisabled(isReadOnlyAdvanceMeasurements() + || manageOrderElementAdvancesModel + .hasConsolidatedAdvances(advanceMeasurement)); date.addEventListener(Events.ON_CHANGE, new EventListener() { @Override @@ -1166,6 +1175,11 @@ public class ManageOrderElementAdvancesController extends removeButton.setDisabled(true); removeButton .setTooltiptext(_("Calculated progress measurement can not be removed")); + } else if (manageOrderElementAdvancesModel + .hasConsolidatedAdvances(measure)) { + removeButton.setDisabled(true); + removeButton + .setTooltiptext(_("Consolidated progress measurement can not be removed")); } removeButton.addEventListener(Events.ON_CLICK, new EventListener() {