Index: openacs-4/packages/logger/www/lib/entries-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.adp,v
diff -u -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/logger/www/lib/entries-table.adp	13 May 2003 15:42:42 -0000	1.4.2.2
+++ openacs-4/packages/logger/www/lib/entries-table.adp	15 May 2003 08:49:36 -0000	1.4.2.3
@@ -14,46 +14,135 @@
       <th class="logger_listing_narrow">Description</th>
       <th class="logger_listing_narrow">&nbsp;</th>
     </tr>
-  <multiple name="entries">
-    <if @entries.selected_p@ true>
+
+    <if @group_by@ not nil>
+      <multiple name="entries">
+        <tr class="logger_listing_spacer">
+          <td colspan="7">
+            &nbsp;
+          </td>
+        </tr>
         <tr class="logger_listing_subheader">
+          <td colspan="7">
+            <switch @group_by@>
+              <case value="user_id">
+                User: @entries.user_chunk@
+              </case>
+              <case value="project_name">
+                Project: @entries.project_name@
+              </case>
+              <case value="time_stamp">
+                Date: @entries.time_stamp_pretty@
+              </case>
+              <case value="time_stamp_week">
+                Week: @entries.time_stamp_week@
+              </case>
+              <default>
+                Unknown group by column @group_by@
+              </default>
+            </switch>
+          </td>
+        </tr>
+        <group column="@group_by@">
+          <if @entries.selected_p@ true>
+              <tr class="logger_listing_subheader">
+          </if>
+          <else>
+            <if @entries.rownum@ odd>
+              <tr class="logger_listing_odd">
+            </if>
+            <else>
+              <tr class="logger_listing_even">
+            </else>
+          </else>
+            <td class="logger_listing_narrow">
+              <if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
+                <a href="@entries.edit_url@" title="Edit this log entry"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
+              </if>
+            </td>
+            <td class="logger_listing_narrow">@entries.project_name@</td>
+            <td class="logger_listing_narrow">@entries.user_chunk@</td>
+            <td class="logger_listing_narrow" align="left">@entries.time_stamp_pretty@</td>
+            <td class="logger_listing_narrow" align="right" nowrap>
+              <if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
+                <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
+              </if>
+              <else>
+                <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
+              </else>
+            </td>
+            <td class="logger_listing_narrow">
+              <a href="@entries.view_url@" title="View this log entry">@entries.description@</a>
+            </td>
+            <td class="logger_listing_narrow">
+              <if @entries.delete_url@ not nil>
+                <a href="@entries.delete_url@" onclick="@entries.delete_onclick@" title="Delete this log entry"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
+              </if>
+            </td>
+          </tr>
+          <if @entries.groupnum_last_p@ true>
+            <tr class="logger_listing_subheader">
+              <td class="logger_listing_narrow" align="center">&nbsp;</td>
+              <td class="logger_listing_narrow" colspan="3">
+                <b>Subtotal</b>
+              </td>
+              <td class="logger_listing_narrow" align="right" nowrap>
+                <b>@entries.subtotal@</b>
+              </td>
+              <td class="logger_listing_narrow">&nbsp;</td>
+              <td class="logger_listing_narrow" align="center">&nbsp;</td>
+            </tr>
+          </if>
+        </group>
+      </multiple>
     </if>
-    <else>
-      <if @entries.rownum@ odd>
-        <tr class="logger_listing_odd">
+  <else>
+    <multiple name="entries">
+      <if @entries.selected_p@ true>
+          <tr class="logger_listing_subheader">
       </if>
       <else>
-        <tr class="logger_listing_even">
-      </else>
-    </else>
-      <td class="logger_listing_narrow">
-        <if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
-          <a href="@entries.edit_url@" title="Edit this log entry"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
+        <if @entries.rownum@ odd>
+          <tr class="logger_listing_odd">
         </if>
-      </td>
-      <td class="logger_listing_narrow">@entries.project_name@</td>
-      <td class="logger_listing_narrow">@entries.user_chunk@</td>
-      <td class="logger_listing_narrow" align="left">@entries.time_stamp_pretty@</td>
-      <td class="logger_listing_narrow" align="right" nowrap>
-        <if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
-          <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
-        </if>
         <else>
-          <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
+          <tr class="logger_listing_even">
         </else>
-      </td>
-      <td class="logger_listing_narrow">
-        <a href="@entries.view_url@" title="View this log entry">@entries.description@</a>
-      </td>
-      <td class="logger_listing_narrow">
-        <if @entries.delete_url@ not nil>
-          <a href="@entries.delete_url@" onclick="@entries.delete_onclick@" title="Delete this log entry"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
-        </if>
-      </td>
-    </tr>
-  </multiple>
+      </else>
+        <td class="logger_listing_narrow">
+          <if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
+            <a href="@entries.edit_url@" title="Edit this log entry"><img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0"></a>
+          </if>
+        </td>
+        <td class="logger_listing_narrow">@entries.project_name@</td>
+        <td class="logger_listing_narrow">@entries.user_chunk@</td>
+        <td class="logger_listing_narrow" align="left">@entries.time_stamp_pretty@</td>
+        <td class="logger_listing_narrow" align="right" nowrap>
+          <if @entries.edit_p@ or @current_user_id@ eq @entries.user_id@>
+            <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
+          </if>
+          <else>
+            <a href="@entries.view_url@" title="View this log entry">@entries.value@</a>
+          </else>
+        </td>
+        <td class="logger_listing_narrow">
+          <a href="@entries.view_url@" title="View this log entry">@entries.description@</a>
+        </td>
+        <td class="logger_listing_narrow">
+          <if @entries.delete_url@ not nil>
+            <a href="@entries.delete_url@" onclick="@entries.delete_onclick@" title="Delete this log entry"><img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0"></a>
+          </if>
+        </td>
+      </tr>
+    </multiple>
+  </else>
 
     <!-- Row for the grand total -->
+    <tr class="logger_listing_spacer">
+      <td colspan="7">
+        &nbsp;
+      </td>
+    </tr>
     <tr class="logger_listing_subheader">
       <td class="logger_listing_narrow" align="center">&nbsp;</td>
       <td class="logger_listing_narrow" colspan="3">
@@ -88,6 +177,11 @@
 
     <!-- Row for projected value -->
   <if @projection_value@ not nil>
+    <tr class="logger_listing_spacer">
+      <td colspan="7">
+        &nbsp;
+      </td>
+    </tr>
     <tr class="logger_listing_odd">
       <td class="logger_listing_narrow" align="center">&nbsp;</td>
       <td class="logger_listing_narrow" colspan="3"><b>Projection</b></td>
@@ -97,15 +191,16 @@
     </tr>
   </if>
 
-    <tr class="logger_listing_even">
-      <th class="logger_listing_narrow">&nbsp;</th>
-      <th class="logger_listing_narrow">&nbsp;</th>  
-      <th class="logger_listing_narrow">&nbsp;</th>  
-      <th class="logger_listing_narrow">&nbsp;</th>
-      <th class="logger_listing_narrow">@variable.unit@</th>
-      <th class="logger_listing_narrow">&nbsp;</th>
-      <th class="logger_listing_narrow">&nbsp;</th>
-    </tr>
+  <!-- Unit -->
+  <tr class="logger_listing_even">
+    <th class="logger_listing_narrow">&nbsp;</th>
+    <th class="logger_listing_narrow">&nbsp;</th>  
+    <th class="logger_listing_narrow">&nbsp;</th>  
+    <th class="logger_listing_narrow">&nbsp;</th>
+    <th class="logger_listing_narrow">@variable.unit@</th>
+    <th class="logger_listing_narrow">&nbsp;</th>
+    <th class="logger_listing_narrow">&nbsp;</th>
+  </tr>
 
   </table>
 </else>