Changeset 1707

Timestamp:

01/07/12 17:40:13 (4 months ago)

Author:

icare4

Message:

Ticket 199 resolution

Location:

trunk/src/org/rapla

Files:

• RaplaResources.xml (modified) (2 diffs)
• components/calendarview/swing/AbstractSwingCalendar.java (modified) (3 diffs)
• components/calendarview/swing/SwingCompactWeekView.java (modified) (5 diffs)
• gui/internal/view/ClassificationInfoUI.java (modified) (3 diffs)
• gui/internal/view/ReservationInfoUI.java (modified) (1 diff)
• plugin/compactweekview/SwingCompactWeekCalendar.java (modified) (4 diffs)

trunk/src/org/rapla/RaplaResources.xml

@@ -566 +566 @@
         <text lang="pl">Drukuj</text>
     </entry>
+    <entry key="printdocument">
+        <text lang="en">Print</text>
+        <text lang="de">Drucke</text>
+        <text lang="fr">Imprimer</text>
+        <text lang="es">Imprimir</text>
+        <text lang="cs">Tisknout</text>
+        <text lang="nl">Afdrukken</text>
+        <text lang="pl">Drukuj</text>
+    </entry>
     <entry key="print_to_file">
         <text lang="en">Print to File</text>
@@ -2084 +2093 @@
         <text lang="nl">Geregistreerd  door</text>
         <text lang="pl">Rezerwacja przez</text>
+    </entry>
+    <entry key="on">
+        <text lang="en">on</text>
+        <text lang="de">am</text>
+        <text lang="fr">Ã  la</text>
+        <text lang="es">en el</text>
+        <text lang="cs">na</text>
+        <text lang="nl">aan de</text>
+        <text lang="pl">na</text>
     </entry>
     <entry key="resource.owner">

trunk/src/org/rapla/components/calendarview/swing/AbstractSwingCalendar.java

@@ -72 +72 @@
     /** Calendar used by the put block method */
     protected Calendar blockCalendar;
+    /** Differing slot size for resource column */
+    private int resourceSlotSize;
 
     AbstractSwingCalendar(boolean showScrollPane) {
@@ -86 +88 @@
             scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
             scrollPane.setViewportView(jCenter);
-          
-            
-
             scrollPane.setColumnHeaderView(jTitlePanel);
             scrollPane.getVerticalScrollBar().setUnitIncrement(10);
@@ -360 +359 @@
     abstract Date createDate( DaySlot slot, int row, boolean startOfRow);
 
+        public int getResourceSlotSize() {
+                return resourceSlotSize;
+        }
+
+        public void setResourceSlotSize(int resourceSlotSize) {
+                this.resourceSlotSize = resourceSlotSize;
+        }
+
 
 }

trunk/src/org/rapla/components/calendarview/swing/SwingCompactWeekView.java

@@ -142 +142 @@
 
         if ( slotNames.length > 0) {
-                tableLayout.insertColumn(0, slotSize);
+                tableLayout.insertColumn(0, getResourceSlotSize());
                 jHeader.add( createSlotHeader( null ), "0,0,l,t" );
         } else {
@@ -151 +151 @@
         for (int column=0;column<COLUMNS;column++) {
             if ( !isExcluded(column) ) {
-                tableLayout.insertColumn(column + 1, slotSize );
+                int width = getSlotSize();                              
+                tableLayout.insertColumn(column + 1, width );
                 jHeader.add( createSlotHeader( calendar.getTime() ) );
             } else {
@@ -187 +188 @@
         if ( slot < slotNames.length ) {
             label.setText( slotNames[ slot ] );
+            label.setToolTipText(slotNames[ slot] );
         }
         return label;
@@ -202 +204 @@
             jLabel.setBorder(isEditable() ? SLOTHEADER_BORDER : null);
         }
-        Dimension dim = new Dimension(this.slotSize,20);
+        int width = -1;
+        if( date == null )
+        {
+            jLabel.setBorder(SLOTHEADER_BORDER);
+                width = getResourceSlotSize();
+        }
+        else
+        {
+                width = getSlotSize();
+        }
+        Dimension dim = new Dimension(width,20);
         jLabel.setPreferredSize( dim);
         jLabel.setMinimumSize( dim );
@@ -210 +222 @@
 
     private SmallDaySlot createField(List blocks, int column)  {
-        SmallDaySlot c= new SmallDaySlot("",slotSize, Color.BLACK);
+        int width = getSlotSize();                      
+        SmallDaySlot c= new SmallDaySlot("", width, Color.BLACK);
         c.setEditable(isEditable());
         c.setDraggingHandler(draggingHandler);

trunk/src/org/rapla/gui/internal/view/ClassificationInfoUI.java

@@ -20 +20 @@
 
 import org.rapla.entities.Timestamp;
+import org.rapla.entities.domain.Reservation;
 import org.rapla.entities.dynamictype.AttributeAnnotations;
 import org.rapla.entities.dynamictype.Attribute;
 import org.rapla.entities.dynamictype.Classifiable;
 import org.rapla.entities.dynamictype.Classification;
+import org.rapla.entities.storage.RefEntity;
+import org.rapla.entities.storage.internal.SimpleIdentifier;
 import org.rapla.framework.RaplaContext;
 import org.rapla.framework.RaplaException;
@@ -37 +40 @@
         Locale locale = getRaplaLocale().getLocale();
         encode( classification.getType().getName(locale), buf );
+        if ( classifiable instanceof RefEntity )
+        {               
+                int id = ((SimpleIdentifier)((RefEntity) classifiable).getId()).getKey();
+                buf.append(" (");
+                buf.append(Integer.valueOf(id));
+                buf.append(")");
+        }
         buf.append( "</strong>");
     }
@@ -100 +110 @@
         if ( lastChangeTime != null)
         {
-            buf.append("<div style=\"font-size:7px;margin-bottom:4px;\">");
+            buf.append("<div style=\"font-size:8px;margin-bottom:4px;\">");
             if ( createTime != null)
             {

trunk/src/org/rapla/gui/internal/view/ReservationInfoUI.java

@@ -89 +89 @@
         final Locale locale = getLocale();
         final String ownerName = owner.getName(locale);
-        String ownerText = encode(ownerName);
-        if (controller != null)
-            ownerText = controller.createLink(owner,ownerName);
-        
-        att.add( new Row(getString("reservation.owner"), ownerText));
+        StringBuilder ownerText = new StringBuilder();
+        if (controller == null)
+        {
+                ownerText.append( encode(ownerName) );
+        }
+        else
+        {
+            ownerText.append( controller.createLink(owner,ownerName) );
+        }
+        ownerText.append( " ");
+        ownerText.append( getI18n().getString("on") );
+        ownerText.append( " ");
+        ownerText.append( getRaplaLocale().formatDate(reservation.getCreateTime()) );        
+        att.add( new Row(getString("reservation.owner"), ownerText.toString() ));
         User lastChangeBy = reservation.getLastChangedBy();
         if ( lastChangeBy != null && (owner == null ||! lastChangeBy.equals(owner))) {

trunk/src/org/rapla/plugin/compactweekview/SwingCompactWeekCalendar.java

@@ -36 +36 @@
 import org.rapla.components.calendarview.swing.ViewListener;
 import org.rapla.components.util.DateTools;
+import org.rapla.components.xmlbundle.I18nBundle;
 import org.rapla.entities.NamedComparator;
 import org.rapla.entities.domain.Allocatable;
@@ -52 +53 @@
 public class SwingCompactWeekCalendar extends AbstractRaplaSwingCalendar
 {
+        /**
+         * Default slot size for each column of calendar view
+         * TODO: Make configurable
+         */
+        private static final int DEFAULTSLOTSIZE = 120;
+        /**
+         * Default slot size for resource column preceding day columns
+         */
+        private static final int DEFAULTRESOURCESLOTSIZE = 70;
+        
     public SwingCompactWeekCalendar(RaplaContext sm,CalendarModel settings, boolean editable) throws RaplaException {
         super( sm, settings, editable);
@@ -75 +86 @@
                         component.setToolTipText(toolTip);
                     }
+                }
+                else
+                {                       
+                        String text = getI18n().getString("resources");
+                        component.setText(text);
+                        component.setOpaque(true);                    
+                    component.setToolTipText(text);
                 }
                 return component;
@@ -159 +177 @@
         if ( !view.isEditable() ) {
             view.setSlotSize( model.getSize());
+            view.setResourceSlotSize(model.getSize());
         } else {
-            view.setSlotSize( 150 );
-        }
+            view.setSlotSize( DEFAULTSLOTSIZE );
+            view.setResourceSlotSize(DEFAULTRESOURCESLOTSIZE);
+        }        
     }