started chartview

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@297 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog
index 81558b6997fa235f6c815cd0c2a1e6f9cb6daad3..3733b8046ded9973b25bbc48db0b0087c36053e9 100644 (file)
--- a/SOGo/UI/ChangeLog
+++ b/SOGo/UI/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * README: Update with information regarding localization
+
 2004-08-26  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * Added "Mailer" product.

diff --git a/SOGo/UI/README b/SOGo/UI/README
index d629ad9b57a40d695a8aa2246ebb8359452ea36b..687657ccf58b643788fb2549de4f3e1d79487bc9 100644 (file)
--- a/SOGo/UI/README
+++ b/SOGo/UI/README
@@ -4,3 +4,11 @@ UI
 ==
 
 The UI directory contains HTML view methods for the SOPE SoObjects.
+
+
+Localization
+============
+
+Each bundle has its own set of localization files, contained in a language
+project directory (i.e. English.lproj). Because of this fact it might be
+possible that you have to localize a certain label more than once.
\ No newline at end of file

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 2779666bc73ec4e58ef4d0b548222a744122efb7..a6d376a4f28ab0565e4f62e8c88724a9ba07c557 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.78
+
+       * UIxCalDayOverview.m, UIxCalDayChartview.m: minor cleanups
+
+       * UIxCalDayOverview.wox, UIxCalDayChartview.wox: added style
+         information for appointments, used for colorization (doesn't work
+         due to style problems - needs to get investigated later on)
+
+       * UIxCalDayListview.[m|wox]: started implementation of list view,
+         not quite finished.
+
 2004-09-06  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxAppointmentEditor.wox: fixed incorrect label (v0.9.77)

diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.m b/SOGo/UI/Scheduler/UIxCalDayChartview.m
index 7fd85aa9a61f3702ac653637dfc778ef8808d0b7..27243568c7b30cb6f3025842111518bda8ef0923 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayChartview.m
+++ b/SOGo/UI/Scheduler/UIxCalDayChartview.m
@@ -22,7 +22,6 @@
 
 
 #include "UIxCalDayView.h"
-#include "common.h"
 
 @interface UIxCalDayChartview : UIxCalDayView
 {
@@ -31,6 +30,7 @@
 
 @end
 
+#include "common.h"
 
 @implementation UIxCalDayChartview
 

diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
index 887e05d21e08e5e729a028770ce82ea210380d73..839b0dcbac45fd470147de8298da2b64f0b930f8 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
@@ -182,18 +182,18 @@
                                             const:rowHeight="8"
                                             const:width="100%"
                                             const:border="0"
-                                            const:cellpading="5"
+                                            const:cellpadding="5"
                                             const:cellspacing="2"
                           >
                             <var:matrix-label const:elementName="td"
                                               const:position="left"
-                                              const:bgcolor="#e8e8e0"
+                                              const:bgcolor="#d6d6ce"
                                               const:width="2"
                             >
-                              <var:string value="currentDate"
-                                          const:dateformat="%H:%M"
-                              />
                               <span class="dayoverview_content_time_link">
+                                <var:string value="currentDate"
+                                            const:dateformat="%H:%M"
+                                />
                                 [<a href="new"
                                     var:queryDictionary="currentDateQueryParameters"
                                  ><var:string label:value="new" /></a>]
@@ -212,6 +212,7 @@
                               <a var:href="appointmentViewURL"
                                  var:queryDictionary="currentDateQueryParameters"
                                  var:title="tooltipForApt"
+                                 var:class="aptStyle"
                               ><var:string value="shortTextForApt"
                                            const:escapeHTML="NO"
                                 /></a>

diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.m b/SOGo/UI/Scheduler/UIxCalDayListview.m
index c4a5b0114f6bd185859b3af9840486e5ce5bed26..939331549745530e30f591293b5e3c20f48084a4 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayListview.m
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.m
@@ -22,16 +22,40 @@
 
 
 #include "UIxCalDayView.h"
-#include "common.h"
 
 @interface UIxCalDayListview : UIxCalDayView
 {
-
+  NSArray *uids;
+  id currentUid;
 }
 
 @end
 
+#include "common.h"
 
 @implementation UIxCalDayListview
 
+- (void)dealloc {
+  [self->uids release];
+  [self->currentUid release];
+  [super dealloc];
+}
+
+- (NSArray *)uids {
+  if(!self->uids) {
+    NSArray *tmp;
+    NSSet *availUIDs;
+
+    tmp = [[self appointments] valueForKey:@"uid"];
+    availUIDs = [[NSSet alloc] initWithArray:tmp];
+    tmp = [[availUIDs allObjects] sortedArrayUsingSelector:@selector(compareAscending:)];
+    self->uids = [tmp retain];
+  }
+  return self->uids;
+}
+
+- (NSString *)shortTextForApt {
+  return [[self appointment] valueForKey:@"title"];
+}
+
 @end

diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox
index e390358723043cba9f6aa2aa4e803aa043d6b48b..2412a8b8dd2785722316ddb0677f9a3f4c0f1ce6 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox
@@ -7,7 +7,12 @@
                className="UIxPageFrame"
                title="name"
 >
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
+  <table id="skywintable"
+         class="wintable"
+         cellspacing="0"
+         cellpadding="5"
+         width="100%"
+  >
     <tr>
       <td class="wintitle">
         <table cellpadding="0" cellspacing="0" width="100%">
@@ -148,33 +153,64 @@
                         </tr>
                       </table>
                     </td>
-                    <td>
+                    <td width="100%">
                       <table class="dayoverview_content" width="100%">
-                        <var:foreach list="dateRange" item="currentDate">
-                          <tr>
-                            <td class="dayoverview_content_time">
-                              <var:string value="currentDate"
-                                          const:dateformat="%H:%M"
-                              />
-                              <br />
+                        <td width="100%" valign="top">
+                          <var:hspan-matrix list="appointments"
+                                            item="appointment"
+                                            rows="uids"
+                                            row="currentUid"
+                                            columns="dateRange"
+                                            column="currentDate"
+                                            itemActive="isCurrentDateInApt"
+                                            const:isRowActive="YES"
+                                            const:rowHeight="8"
+                                            const:width="100%"
+                                            const:border="0"
+                                            const:cellpadding="0"
+                                            const:cellspacing="2"
+                          >
+                            <var:matrix-label const:elementName="td"
+                                              const:position="top"
+                                              const:bgcolor="#d6d6ce"
+                                              const:align="center"
+                            >
                               <span class="dayoverview_content_time_link">
+                                <var:string value="currentDate"
+                                            const:dateformat="%H:%M"
+                                />
                                 [<a href="new"
                                     var:queryDictionary="currentDateQueryParameters"
                                  ><var:string label:value="new" /></a>]
                               </span>
-                            </td>
-                            <td class="dayoverview_content_apts">
-                              <var:foreach list="aptsForCurrentDate" item="appointment">
-                                <a var:href="appointmentViewURL"
-                                   var:queryDictionary="currentDateQueryParameters"
-                                ><var:string value="shortTextForApt"
-                                             const:escapeHTML="NO"
-                                 /></a>
-                                <br />
-                              </var:foreach>
-                            </td>
-                          </tr>
-                        </var:foreach>
+                            </var:matrix-label>
+                            
+                            <var:matrix-label const:elementName="td"
+                                              const:position="left"
+                                              const:bgcolor="#efefe7"
+                            >
+                              <var:string value="currentUid" />
+                            </var:matrix-label>
+                            <!-- TODO: use css instead! -->
+                            <var:matrix-empty const:elementName="td"
+                                              const:bgcolor="#efefe7"
+                            >
+                            </var:matrix-empty>
+                            <!-- TODO: use css instead! -->
+                            <var:matrix-cell const:elementName="td"
+                                             const:bgcolor="#d6d6ce"
+                                             const:valign="top"
+                            >
+                              <a var:href="appointmentViewURL"
+                                 var:queryDictionary="currentDateQueryParameters"
+                                 var:title="tooltipForApt"
+                                 var:class="aptStyle"
+                              ><var:string value="shortTextForApt"
+                                           const:escapeHTML="NO"
+                                /></a>
+                            </var:matrix-cell>
+                          </var:hspan-matrix>
+                        </td>
                       </table>
                     </td>
                   </tr>

diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
index cd1d0c237264b22ab093bfbba276f9d6bfa4fd27..d684a98657ff9324504d6026a65daf7ebcd3da64 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
@@ -167,6 +167,7 @@
                                 <a var:href="appointmentViewURL"
                                    var:queryDictionary="currentDateQueryParameters"
                                    var:title="tooltipForApt"
+                                   var:class="aptStyle"
                                 ><var:string value="shortTextForApt"
                                              const:escapeHTML="NO"
                                  /></a>
@@ -193,6 +194,7 @@
                                 <a var:href="appointmentViewURL"
                                    var:queryDictionary="currentDateQueryParameters"
                                    var:title="tooltipForApt"
+                                   var:class="aptStyle"
                                 ><var:string value="shortTextForApt"
                                              const:escapeHTML="NO"
                                  /></a>

diff --git a/SOGo/UI/Scheduler/UIxCalDayView.m b/SOGo/UI/Scheduler/UIxCalDayView.m
index 7d7c734a1bc53ce9d8b685ee8b91dcaeb971b1b2..f692bc92d54bb92927d273499acffd3b3522b502 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayView.m
+++ b/SOGo/UI/Scheduler/UIxCalDayView.m
@@ -23,13 +23,14 @@
 
 #import "UIxCalDayView.h"
 #include <EOControl/EOControl.h>
-#include "common.h"
 
 @interface UIxCalDayView (PrivateAPI)
 - (BOOL)isCurrentDateInApt:(id)_apt;
 - (NSArray *)_getDatesFrom:(NSCalendarDate *)_from to:(NSCalendarDate *)_to;
 @end
 
+#include "common.h"
+
 @implementation UIxCalDayView
 
 - (void)dealloc {