working day views, better debugging facilities

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

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index bf7d893a8a3f7211a2fb5bbe073bff1ad9781437..efc7a01a1b95130f99e48448fe9d2110ee3203c8 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -951,6 +951,24 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD88394906EF807D00981A3E = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoGroupAppointmentFolder.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD88394A06EF807D00981A3E = {
+                       fileEncoding = 5;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoGroupAppointmentFolder.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                ADCDE53106ADA8AC00BFCE2B = {
                        fileEncoding = 5;
                        indentWidth = 8;
@@ -1337,6 +1355,8 @@
                                E87206410692E3D00099CBBD,
                                E87206470692E3D00099CBBD,
                                E87206480692E3D00099CBBD,
+                               AD88394906EF807D00981A3E,
+                               AD88394A06EF807D00981A3E,
                                E87206490692E3D00099CBBD,
                                E872064A0692E3D00099CBBD,
                        );

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 24f5e5d1949506913e2b70636d9fbd87970e0fc3..60d3fefb71a9b7b8c4659713ad68202849bec700 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-09  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxPageFrame.wox: display clientObject and object traversal stack
+         if isUIxDebugEnabled is set (v0.9.23)
+
 2004-09-01  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile.preamble: removed dependency on libNGScripting (v0.9.22)

diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox
index 283cab063cc519a7f82deae4117f8c426ae65897..f868ee0ad47828e9c8c4df57b0fd64662274e9cd 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.wox
+++ b/SOGo/UI/Common/UIxPageFrame.wox
@@ -90,6 +90,19 @@
           <var:component-content/>
         </td>
       </tr>
+      <var:if condition="isUIxDebugEnabled">
+        <tr>
+          <td colspan="2">
+            <small>
+              <hr />
+              clientObject: <var:string value="clientObject" />
+              <p>
+              OTS: <var:string value="context.objectTraversalStack" />
+              </p>
+            </small>
+          </td>
+        </tr>
+      </var:if>
       <tr>
         <td colspan="2">
           <table cellpadding="0" cellspacing="0" border="0" width="100%">

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 78237daff645932d2dc39c82a83a2f6fffffed9c..8a19b3e3468cf58736fef0c8c36b3b6210ce79fe 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=22
+SUBMINOR_VERSION:=23

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index a6d376a4f28ab0565e4f62e8c88724a9ba07c557..f305ffe26ee41c11505fbc955fe810c9a29a539f 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-09  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.79
+
+       * UIxAppointmentEditor.wox: removed debug output of clientObject,
+         UIxPageFrame.wox is doing this now.
+
+       * UIxCalDayListView.[wox|m]: fixed some wrong assumptions of uid
+         handling, corrected to use the (now bugfixed) calendarUIDs of
+         clientObject.
+
 2004-09-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.78

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 4e95cc3deb77e62ce475c32f885d2be000cb5d5f..5dbfe13fc42039c734b6a8c8bd79a8bfa39c2f19 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -214,11 +214,4 @@
 
     <input type="hidden" name="ical" var:value="iCalString" />
   </form>
-
-  <var:if condition="isUIxDebugEnabled">
-    <small>
-      <hr />
-      clientObject: <var:string value="clientObject" />
-    </small>
-  </var:if>
 </var:component>

diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
index 839b0dcbac45fd470147de8298da2b64f0b930f8..f2b8d276ddf18da3e9f7a9314b3786e0c35b0419 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
@@ -209,13 +209,15 @@
                                              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>
+                              <span class="dayoverview_content_time_link">
+                                <a var:href="appointmentViewURL"
+                                   var:queryDictionary="currentDateQueryParameters"
+                                   var:title="tooltipForApt"
+                                   var:class="aptStyle"
+                                ><var:string value="shortTextForApt"
+                                             const:escapeHTML="NO"
+                                  /></a>
+                              </span>
                             </var:matrix-cell>
                           </var:vspan-matrix>
                         </td>

diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.m b/SOGo/UI/Scheduler/UIxCalDayListview.m
index 939331549745530e30f591293b5e3c20f48084a4..32dd4760f8f08b7a98450d646cbd9d823beb9ab7 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayListview.m
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.m
@@ -32,6 +32,7 @@
 @end
 
 #include "common.h"
+#include <SOGoLogic/AgenorUserManager.h>
 
 @implementation UIxCalDayListview
 
@@ -43,19 +44,37 @@
 
 - (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];
+    self->uids = [[[self clientObject] calendarUIDs] retain];
   }
   return self->uids;
 }
 
+- (void)setCurrentUid:(id)_currentUid {
+  ASSIGN(self->currentUid, _currentUid);
+}
+- (id)currentUid {
+  return self->currentUid;
+}
+
+- (NSString *)cnForCurrentUid {
+  return [[AgenorUserManager sharedUserManager] getCNForUID:self->currentUid];
+}
+
 - (NSString *)shortTextForApt {
   return [[self appointment] valueForKey:@"title"];
 }
 
+- (BOOL)isRowActive {
+  AgenorUserManager *um;
+  NSString *mailChunk;
+  NSString *currentMail;
+
+  um = [AgenorUserManager sharedUserManager];
+  currentMail = [um getEmailForUID:self->currentUid];
+  mailChunk = [self->appointment valueForKey:@"partmails"];
+  if([mailChunk rangeOfString:currentMail].length > 0)
+    return YES;
+  return NO;
+}
+
 @end

diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox
index 2412a8b8dd2785722316ddb0677f9a3f4c0f1ce6..6e79ec396ca8f30f5f3197e978245d1ff764c671 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox
@@ -114,45 +114,8 @@
                     </td>
                   </tr>
                 </table>
-                <table>
+                <table cellpadding="4" width="100%" cellspacing="2">
                   <tr valign="top">
-                    <td>
-                      <table>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="thisMonth"
-                                            const:showYear="1"
-                                            const:daySelectionHref="dayoverview"
-                                            const:showWeekColumn="0"
-                                            const:style="dayoverview_cal"
-                                            const:headerStyle="dayoverview_cal_title"
-                                            const:dayHeaderStyle="dayoverview_cal_day_header"
-                                            const:dayBodyStyle="dayoverview_cal_content"
-                                            const:todayBodyStyle="dayoverview_cal_content_hilite"
-                                            const:selectedDayExtraStyle="dayoverview_cal_content_selected"
-                                            const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="nextMonth"
-                                            const:showYear="1"
-                                            const:daySelectionHref="dayoverview"
-                                            const:showWeekColumn="0"
-                                            const:style="dayoverview_cal"
-                                            const:headerStyle="dayoverview_cal_title"
-                                            const:dayHeaderStyle="dayoverview_cal_day_header"
-                                            const:dayBodyStyle="dayoverview_cal_content"
-                                            const:todayBodyStyle="dayoverview_cal_content_hilite"
-                                            const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
                     <td width="100%">
                       <table class="dayoverview_content" width="100%">
                         <td width="100%" valign="top">
@@ -163,11 +126,11 @@
                                             columns="dateRange"
                                             column="currentDate"
                                             itemActive="isCurrentDateInApt"
-                                            const:isRowActive="YES"
+                                            isRowActive="isRowActive"
                                             const:rowHeight="8"
                                             const:width="100%"
                                             const:border="0"
-                                            const:cellpadding="0"
+                                            const:cellpadding="2"
                                             const:cellspacing="2"
                           >
                             <var:matrix-label const:elementName="td"
@@ -178,7 +141,7 @@
                               <span class="dayoverview_content_time_link">
                                 <var:string value="currentDate"
                                             const:dateformat="%H:%M"
-                                />
+                                /><br />
                                 [<a href="new"
                                     var:queryDictionary="currentDateQueryParameters"
                                  ><var:string label:value="new" /></a>]
@@ -187,9 +150,12 @@
                             
                             <var:matrix-label const:elementName="td"
                                               const:position="left"
-                                              const:bgcolor="#efefe7"
+                                              const:bgcolor="#d6d6ce"
+                                              const:width="100"
                             >
-                              <var:string value="currentUid" />
+                              <var:string value="cnForCurrentUid"
+                                          const:style="dayoverview_content_time_link"
+                              />
                             </var:matrix-label>
                             <!-- TODO: use css instead! -->
                             <var:matrix-empty const:elementName="td"
@@ -201,13 +167,15 @@
                                              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>
+                              <span class="dayoverview_content_time_link">
+                                <a var:href="appointmentViewURL"
+                                   var:queryDictionary="currentDateQueryParameters"
+                                   var:title="tooltipForApt"
+                                   var:class="aptStyle"
+                                ><var:string value="shortTextForApt"
+                                             const:escapeHTML="NO"
+                                  /></a>
+                              </span>
                             </var:matrix-cell>
                           </var:hspan-matrix>
                         </td>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 0070f1c70892fd74dc8fc07801f6cd9f10a784a1..1c73081602bc52a216ffd9b38b21ab1c6c57886a 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=77
+SUBMINOR_VERSION:=79
 
 # v0.9.70 requires libNGExtensions v4.3.107
 # v0.9.67 requires SOPE 4.3