From 0ef6c979485f771fe2f08fe3a69ea3fafe3c3b53 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Thu, 14 Jul 2011 12:41:48 +0200
Subject: [PATCH] fix the layout in exceptions and work weeks table.

FEA: ItEr75S05CalendarAdminInterfaceItEr74S06
---
 .../BaseCalendarEditionController.java        | 11 +++-----
 .../webapp/calendars/_createNewVersion.zul    |  3 +--
 .../src/main/webapp/calendars/_edition.zul    | 26 +++++++++----------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
index 67f220c73..c335cd4e2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
@@ -300,8 +300,6 @@ public abstract class BaseCalendarEditionController extends
     }
 
     private String getCurrentExpiringDateLabel() {
-        System.out.println("expiringDate "
-                + baseCalendarModel.getCurrentStartDate());
         Date date = baseCalendarModel.getCurrentExpiringDate();
         String label = "";
         if (date != null) {
@@ -311,8 +309,6 @@ public abstract class BaseCalendarEditionController extends
     }
 
     private String getCurrentStartDateLabel() {
-        System.out.println("expiringDate "
-                + baseCalendarModel.getCurrentStartDate());
         Date date = baseCalendarModel.getCurrentStartDate();
         String label = "";
         if (date != null) {
@@ -986,7 +982,8 @@ public abstract class BaseCalendarEditionController extends
             Combobox parentCalendars = (Combobox) createNewVersionWindow
                     .getFellow("parentCalendars");
             if (parentCalendars.getSelectedItem() == null) {
-                return;
+                throw new WrongValueException(parentCalendars,
+                        _("cannot be null or empty"));
             }
             selected = (BaseCalendar) parentCalendars.getSelectedItem()
                     .getValue();
@@ -1077,8 +1074,8 @@ public abstract class BaseCalendarEditionController extends
             item.setValue(calendar);
 
             Combobox combobox = (Combobox) item.getParent();
-            if (combobox.getSelectedItem() == null) {
-                combobox.setSelectedItem(item);
+            if (combobox.getSelectedIndex() != 0) {
+                combobox.setSelectedIndex(0);
             }
         }
     }
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul b/navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul
index 7db21ec14..405ce49fc 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul
@@ -27,7 +27,7 @@
     <grid id="gridProjectDetails">
         <columns>
             <column width="150px" />
-            <column width="300px" />
+            <column width="280px" />
         </columns>
         <rows>
             <row>
@@ -35,7 +35,6 @@
                 <hbox align="right">
                       <label value="${i18n:_('Type')}:"/>
                       <combobox id="parentCalendars"
-                        constraint="no empty:${i18n:_('cannot be null or empty')}"
                         model="@{calendarController.editionController.parentCalendars}"
                         disabled="@{calendarController.editionController.isNotDerived}"
                         itemRenderer = "@{calendarController.editionController.parentCalendarsComboitemRenderer}" />
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index ee6879745..ba83b64d5 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -170,13 +170,14 @@
                       model="@{calendarController.editionController.calendarExceptions}"
                       itemRenderer="@{calendarController.editionController.calendarExceptionRenderer}"
                       onSelect="calendarController.editionController.onSelectException(event)"
-                      rows="4" width="400px">
+                      rows="4">
                       <listhead>
                         <listheader label="${i18n:_('Day')}" />
-                        <listheader label="${i18n:_('Exception Type')}" width="150px" />
+                        <listheader label="${i18n:_('Exception Type')}" width="180px" />
                         <listheader label="${i18n:_('Normal Effort')}" width="100px" />
                         <listheader label="${i18n:_('Extra Effort')}" width="100px" />
                         <listheader label="${i18n:_('Code')}"
+                          width="200px"
                           visible="@{calendarController.editionController.notResourceCalendar}" />
                         <listheader label="${i18n:_('Origin')}" />
                         <listheader label="${i18n:_('Op.')}" />
@@ -196,17 +197,15 @@
                   <listbox id="hoursPerDay"
                     style="margin-right: 5px;margin-left:5px;"
                     model="@{calendarController.editionController.getHoursPerDay}"
-                    itemRenderer="@{calendarController.editionController.hoursPerDayRenderer}"
-                    sizedByContent="true">
+                    itemRenderer="@{calendarController.editionController.hoursPerDayRenderer}">
                     <listhead>
-                      <listheader label="${i18n:_('Day of week')}"
-                        width="80px" />
+                      <listheader label="${i18n:_('Day of week')}"/>
                       <listheader label="${i18n:_('Normal Effort')}"
-                        width="100px" />
+                        width="200px" />
                       <listheader label="${i18n:_('Extra Effort')}"
-                        width="180px" />
+                        width="200px" />
                       <listheader label="${i18n:_('Inherited')}"
-                        width="30px"
+                        width="80px"
                         tooltiptext="${i18n:_('Inherited from parent calendar')}" />
                     </listhead>
                   </listbox>
@@ -224,15 +223,14 @@
 
                     <listbox id="historyInformation"
                       model="@{calendarController.editionController.historyVersions}"
-                      itemRenderer="@{calendarController.editionController.historyVersionsRenderer}"
-                      sizedByContent="true">
+                      itemRenderer="@{calendarController.editionController.historyVersionsRenderer}">
                       <listhead>
-                        <listheader label="${i18n:_('Parent')}" width="80px"
+                        <listheader label="${i18n:_('Parent')}" width="180px"
                             visible="@{calendarController.editionController.isDerived}"/>
                         <listheader label="${i18n:_('Valid from')}"
-                          width="80px" />
+                          width="120px" />
                         <listheader label="${i18n:_('Valid until')}"
-                          width="80px" />
+                          width="120px" />
                         <listheader label="${i18n:_('Summary')}" />
                         <listheader label="${i18n:_('Op.')}"
                           tooltiptext="${i18n:_('Operations')}" width="40px" />