From 77307a0351686243a06e3f6ccb0362ae1e70eefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 19 Jan 2011 11:19:17 +0100 Subject: [PATCH] When creating the default calendar make weekend days not overassignable The already created calendar data are modified too using a liquibase changeset. FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios --- .../business/common/entities/ConfigurationBootstrap.java | 4 ++-- .../src/main/resources/db.changelog-1.0.xml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java index 1e2b6e77d..3d8007688 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java @@ -114,8 +114,8 @@ public class ConfigurationBootstrap implements IConfigurationBootstrap { Capacity eightHours = Capacity.create(EffortDuration.hours(8)) .overAssignableWithoutLimit(true); - Capacity zeroCapacity = Capacity.zero() - .overAssignableWithoutLimit(true); + Capacity zeroCapacity = Capacity.zero().overAssignableWithoutLimit( + false); calendar.setCapacityAt(Days.MONDAY, eightHours); calendar.setCapacityAt(Days.TUESDAY, eightHours); calendar.setCapacityAt(Days.WEDNESDAY, eightHours); diff --git a/navalplanner-business/src/main/resources/db.changelog-1.0.xml b/navalplanner-business/src/main/resources/db.changelog-1.0.xml index eef760ba7..a57bfe7ef 100644 --- a/navalplanner-business/src/main/resources/db.changelog-1.0.xml +++ b/navalplanner-business/src/main/resources/db.changelog-1.0.xml @@ -56,4 +56,11 @@ newColumnName="standard_effort" columnDataType="INTEGER"/> + + By default weekends are not over assignable + + update capacity_per_day SET allowed_extra_effort = 0 + where day_id IN (5, 6) AND allowed_extra_effort IS NULL + +