visual changes and important bugfixes

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index afc2a82339df9a90b8d284f240506a8001e156a1..3ad8a30f2a0cc7b90d40540aaf005970c62fc5b1 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.106
+
+       * UIxCalScheduleOverview.wox: different visual representation for
+         actions (requested by Laurent)
+
+       * UIxCalScheduleOverview.m: bugfix for wrong sort orderings
+
 2004-12-18  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxCalScheduleOverview.[wox,m]: removed workaround for NGObjWeb bug,

diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
index 5c0b9ed318da85f850dd987499cfadd4538a911b..86396edea241beb45c2639904d1262e3cb7fb26c 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
@@ -97,6 +97,10 @@
   return self->participantIndex;
 }
 
+- (BOOL)isFirstParticipant {
+  return self->participantIndex == 0 ? YES : NO;
+}
+
 - (BOOL)hasUserAppointments {
   return [[self userAppointments] count] > 0;
 }
@@ -139,6 +143,28 @@
          ([self maxRenderedParticipantsCount] + 1) ? YES : NO;
 }
 
+- (unsigned)rowspan {
+  unsigned count;
+  
+  count = [self renderedParticipantsCount];
+  if ([self didTruncateParticipants])
+    count += 1;
+  return count;
+}
+
+- (NSString *)userParticipationStatus {
+  NSString *pms;
+  NSArray  *partmails;
+  unsigned idx;
+
+  pms       = [self->item valueForKey:@"partmails"];
+  partmails = [pms componentsSeparatedByString:@"\n"];
+  idx       = [partmails indexOfObject:[self emailForUser]];
+  if (idx == NSNotFound)
+    return @"";
+  return [self->partStates objectAtIndex:idx];
+}
+
 
 /* fetching */
 
@@ -179,7 +205,10 @@
   unsigned i, count;
 
   if (!orders) {
-    orders = [[NSArray alloc] initWithObjects:@"startDate", nil];
+    EOSortOrdering *so;
+    so     = [EOSortOrdering sortOrderingWithKey:@"startDate"
+                             selector:EOCompareAscending];
+    orders = [[NSArray alloc] initWithObjects:so, nil];
   }
 
   aptFolder = [self clientObject];
@@ -202,8 +231,8 @@
     else
       [self->foreignApts addObject:apt];
   }
-  [self->userApts sortedArrayUsingKeyOrderArray:orders];
-  [self->foreignApts sortedArrayUsingKeyOrderArray:orders];
+  [self->userApts    sortUsingKeyOrderArray:orders];
+  [self->foreignApts sortUsingKeyOrderArray:orders];
 }
 
 

diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox b/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
index 586c0f1682d71567609b1d8a8e6980da12189324..a7530b3f078f2abcb816378c7e60e09feba9bd27 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
@@ -61,7 +61,7 @@
                       <var:if condition="hasUserAppointments">
                         <tr>
                           <!-- meetings proposed by user -->
-                          <th colspan="4" class="schedoverview_title">
+                          <th colspan="5" class="schedoverview_title">
                             <var:string label:value="Meetings proposed by you" />
                           </th>
                         </tr>
@@ -71,59 +71,58 @@
                           <th class="schedoverview"
                           ><var:string label:value="Title" /></th>
                           <th class="schedoverview"
+                              colspan="2"
                           ><var:string label:value="participants"/></th>
                         </tr>
-                        <var:foreach list="userAppointments" item="item">
-                          <tr>
-                            <td class="schedoverview">
-                              <var:string value="item.startDate"
-                                          label:dateformat="sched_startDateFormat"
-                              />
-                            </td>
-                            <td class="schedoverview">
-                              <a var:href="appointmentViewURL"
-                                 class="schedoverview"
-                              ><var:string value="item.title"
-                                           const:escapeHTML="YES"
-                               /></a>
-                            </td>
-                            <td class="schedoverview" colspan="2">
-                              <table border="0"
-                                     width="100%"
-                                     cellpadding="0"
-                                     cellspacing="0"
-                                     class="schedoverview"
-                              >
-                                <var:foreach count="renderedParticipantsCount"
-                                             index="participantIndex"
+                        <var:foreach list="userAppointments"
+                                     item="item"
+                        >
+                          <var:foreach count="renderedParticipantsCount"
+                                       index="participantIndex"
+                          >
+                            <tr>
+                              <var:if condition="isFirstParticipant">  
+                                <td class="schedoverview"
+                                    var:rowspan="rowspan"
                                 >
-                                  <tr>
-                                    <td class="schedoverview">
-                                      <var:string value="participant" />
-                                    </td>
-                                    <td class="schedoverview">
-                                      <var:component className="UIxCalParticipationStatusView"
-                                                     partStat="participationStatus"
-                                      />
-                                    </td>
-                                  </tr>
-                                </var:foreach>
-                                <var:if condition="didTruncateParticipants">
-                                  <tr>
-                                    <td colspan="2" class="schedoverview">
-                                      <a var:href="appointmentViewURL"
-                                         class="schedoverview"
-                                      ><var:string value="truncatedParticipantsCount" />
-                                      <var:string label:value="more participants" />...
-                                      </a>
-                                    </td>
-                                  </tr>
-                                </var:if>
-                              </table>
-                            </td>
-                          </tr>
+                                  <var:string value="item.startDate"
+                                              label:dateformat="sched_startDateFormat"
+                                  />
+                                </td>
+                                <td class="schedoverview"
+                                    var:rowspan="rowspan"
+                                >
+                                  <a var:href="appointmentViewURL"
+                                     class="schedoverview"
+                                  ><var:string value="item.title"
+                                               const:escapeHTML="YES"
+                                   /></a>
+                                </td>
+                              </var:if>
+                              <td class="schedoverview">
+                                <var:string value="participant" />
+                              </td>
+                              <td class="schedoverview">
+                                <var:component className="UIxCalParticipationStatusView"
+                                               partStat="participationStatus"
+                                />
+                              </td>
+                            </tr>
+                          </var:foreach>
+                          <var:if condition="didTruncateParticipants">
+                            <tr>
+                              <td colspan="2" class="schedoverview">
+                                <a var:href="appointmentViewURL"
+                                   class="schedoverview"
+                                ><var:string value="truncatedParticipantsCount" />
+                                <var:string label:value="more participants" />...
+                                </a>
+                              </td>
+                            </tr>
+                          </var:if>
                         </var:foreach>
                       </var:if>
+
                       <var:if condition="hasForeignAppointments">
                         <var:if condition="hasUserAppointments">
                           <tr>
@@ -132,7 +131,7 @@
                         </var:if>
                         <tr>
                           <!-- meetings proposed to user -->
-                          <th colspan="4" class="schedoverview_title">
+                          <th colspan="5" class="schedoverview_title">
                             <var:string label:value="Meetings proposed to you" />
                           </th>
                         </tr>
@@ -142,67 +141,69 @@
                           <th class="schedoverview"
                           ><var:string label:value="Title" /></th>
                           <th class="schedoverview"
+                              colspan="2"
                           ><var:string label:value="participants" /></th>
                           <th class="schedoverview"
                           ><var:string label:value="action" /></th>
                         </tr>
-                        <var:foreach list="foreignAppointments" item="item">
-                          <tr>
-                            <td class="schedoverview">
-                              <var:string value="item.startDate"
-                                          label:dateformat="sched_startDateFormat"
-                              />
-                            </td>
-                            <td class="schedoverview">
-                              <a var:href="appointmentViewURL"
-                                 class="schedoverview"
-                              ><var:string value="item.title"
-                                           const:escapeHTML="YES"
-                               /></a>
-                            </td>
-                            <td class="schedoverview">
-                              <table border="0"
-                                     width="100%"
-                                     cellpadding="0"
-                                     cellspacing="2"
+                        <var:foreach list="foreignAppointments"
+                                     item="item"
+                        >
+                          <var:foreach count="renderedParticipantsCount"
+                                       index="participantIndex"
+                          >
+                            <tr>
+                              <var:if condition="isFirstParticipant">  
+                                <td class="schedoverview"
+                                    var:rowspan="rowspan"
+                                >
+                                  <var:string value="item.startDate"
+                                              label:dateformat="sched_startDateFormat"
+                                  />
+                                </td>
+                                <td class="schedoverview"
+                                    var:rowspan="rowspan"
+                                >
+                                  <a var:href="appointmentViewURL"
                                      class="schedoverview"
-                              >
-                                <var:foreach count="renderedParticipantsCount"
-                                             index="participantIndex"
+                                  ><var:string value="item.title"
+                                               const:escapeHTML="YES"
+                                   /></a>
+                                </td>
+                              </var:if>
+                              <td class="schedoverview">
+                                <var:string value="participant" />
+                              </td>
+                              <td class="schedoverview">
+                                <var:component className="UIxCalParticipationStatusView"
+                                               partStat="participationStatus"
+                                />
+                              </td>
+                              <var:if condition="isFirstParticipant">
+                                <td class="button_submit_env"
+                                    var:rowspan="rowspan"
                                 >
-                                  <tr>
-                                    <td class="schedoverview">
-                                      <var:string value="participant" />
-                                    </td>
-                                    <td class="schedoverview">
-                                      <var:component className="UIxCalParticipationStatusView"
-                                                     partStat="participationStatus"
-                                      />
-                                    </td>
-                                  </tr>
-                                </var:foreach>
-                                <var:if condition="didTruncateParticipants">
-                                  <tr>
-                                    <td colspan="2" class="schedoverview">
-                                      <a var:href="appointmentViewURL"
-                                         class="schedoverview"
-                                      ><var:string value="truncatedParticipantsCount" />
-                                      <var:string label:value="more participants" />...
-                                      </a>
-                                    </td>
-                                  </tr>
-                                </var:if>
-                              </table>
-                            </td>
-                            <td class="schedoverview">
-                              <a var:href="acceptAppointmentURL"
-                                 class="schedoverview"
-                              ><var:string label:value="accept" /></a><br />
-                              <a var:href="declineAppointmentURL"
-                                 class="schedoverview"
-                              ><var:string label:value="decline" /></a>
-                            </td>
-                          </tr>
+                                  <a var:href="acceptAppointmentURL"
+                                     class="button_auto"
+                                  ><var:string label:value="accept" /></a>
+                                  <a var:href="declineAppointmentURL"
+                                     class="button_auto"
+                                  ><var:string label:value="decline" /></a>
+                                </td>
+                              </var:if>
+                            </tr>
+                          </var:foreach>
+                          <var:if condition="didTruncateParticipants">
+                            <tr>
+                              <td colspan="3" class="schedoverview">
+                                <a var:href="appointmentViewURL"
+                                   class="schedoverview"
+                                ><var:string value="truncatedParticipantsCount" />
+                                <var:string label:value="more participants" />...
+                                </a>
+                              </td>
+                            </tr>
+                          </var:if>
                         </var:foreach>
                       </var:if>
                     </table>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 13b2c93d4fad612a354b115749a20f321a1ea8d0..af6dc912666cb61bb11fe79cbe386216a5ee2fb3 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=105
+SUBMINOR_VERSION:=106
 
 # v0.9.105 requires NGObjWeb     v4.5.102
 # v0.9.101 requires NGiCal       v4.5.36