Index: openacs-4/packages/logger/tcl/projection-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/projection-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/logger/tcl/projection-procs.tcl	1 May 2003 21:17:54 -0000	1.2
+++ openacs-4/packages/logger/tcl/projection-procs.tcl	2 May 2003 08:34:43 -0000	1.3
@@ -87,7 +87,7 @@
     Retrieve attributes of the projection with given id into an 
     array (using upvar) in the callers scope. The
     array will contain the keys projection_id, project_id, variable_id, start_time,
-    end_time, value.
+    end_time, value, name, and description.
 
     @param projection_id The id of the projection to retrieve information about
     @param array The name of the array in the callers scope where the information will
Index: openacs-4/packages/logger/tcl/projection-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/projection-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/logger/tcl/projection-procs.xql	1 May 2003 21:17:55 -0000	1.2
+++ openacs-4/packages/logger/tcl/projection-procs.xql	2 May 2003 08:34:43 -0000	1.3
@@ -48,9 +48,11 @@
         select projection_id, 
                project_id, 
                variable_id, 
-               start_time, 
-               end_time, 
-               value
+               to_char(start_time, 'YYYY-MM-DD') as start_time, 
+               to_char(end_time, 'YYYY-MM-DD') as end_time, 
+               value,
+               name,
+               description
         from logger_projections
         where projection_id = :projection_id
     </querytext>
Index: openacs-4/packages/logger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/logger/www/index.adp	1 May 2003 10:01:00 -0000	1.5
+++ openacs-4/packages/logger/www/index.adp	2 May 2003 08:35:10 -0000	1.6
@@ -77,6 +77,43 @@
           </table>
         </p>
 
+        <!-- Projection Section -->
+      <if @selected_project_id@ not nil and @selected_variable_id@ not nil>
+        <p>
+          <table border="0" cellspacing="0" cellpadding="2" width="100%">
+            <tr>
+              <td colspan="2">
+                <p class="logger_filter_bar_section_header">
+                  Projections
+                </p>
+              </td>
+            </tr>
+
+            <if @projections:rowcount@ ne 0>
+              <multiple name="projections">
+            <tr>
+              <td>
+                <if @selected_projection_id@ eq @projections.projection_id@>
+                  <span class="logger_filter_bar_selected_link">@projections.name@</span>
+                </if>
+                <else>
+                  <a href="@projections.url@" title="Show log entries for projection @projections.name@">@projections.name@</a>
+                </else>
+              </td>
+            </tr>
+              </multiple>
+            </if>
+            <else>
+            <tr>
+              <td class="no_items_text">             
+                No projections
+              </td>
+            </tr>
+            </else>
+          </table>        
+        </p>
+      </if>
+
         <!-- User Section -->
         <p> 
           <table border="0" cellspacing="0" cellpadding="2" width="100%">
@@ -141,6 +178,13 @@
               <br />
             </if>
 
+            <if @selected_projection_id@ not nil>
+              <span class="logger_explanation_text">Projection:</span> 
+              <span class="logger_emphasized_text">@selected_projection_name@</span>
+
+              <br />
+            </if>
+
             <if @selected_user_id@ not nil>
               <span class="logger_explanation_text">User:</span> 
               <span class="logger_emphasized_text">@selected_user_name@</span>
@@ -157,9 +201,10 @@
       </table>
 
       <hr />
-
+      
       <include src="lib/entries-table" selected_project_id="@selected_project_id@" 
-                                       selected_variable_id="@selected_variable_id@" 
+                                       selected_variable_id="@selected_variable_id@"
+                                       projection_value="@selected_projection_value@" 
                                        selected_user_id="@selected_user_id@" 
                                        start_date_ansi="@start_date_ansi@" 
                                        end_date_ansi="@end_date_plus_one_ansi@" 
Index: openacs-4/packages/logger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/logger/www/index.tcl	1 May 2003 10:01:00 -0000	1.5
+++ openacs-4/packages/logger/www/index.tcl	2 May 2003 08:35:10 -0000	1.6
@@ -7,6 +7,7 @@
 } {
     {selected_project_id:integer ""}
     {selected_variable_id:integer ""}
+    {selected_projection_id:integer ""}
     {selected_user_id:integer ""}
     {start_date:array {}}
     {end_date:array {}}
@@ -18,39 +19,10 @@
 
 ###########
 #
-# Date handling
+# Initialize project, variable, projection, and user names
 #
 ###########
 
-# Set default values for start and end date if the form hasn't been submitted yet
-if { [array size start_date] == 0 } {
-    # Default end date is now (today)
-    set default_end_date_seconds [clock seconds]
-
-    set end_date(year) [clock format $default_end_date_seconds -format "%Y"]
-    set end_date(month) [clock format $default_end_date_seconds -format "%m"]
-    set end_date(day) [clock format $default_end_date_seconds -format "%d"]
-
-    # Default start date is N days back
-    set number_of_days_back 31
-    set seconds_per_day [expr 60*60*24]
-    set default_start_date_seconds [expr $default_end_date_seconds - 31 * $seconds_per_day]
-
-    set start_date(year) [clock format $default_start_date_seconds -format "%Y"]
-    set start_date(month) [clock format $default_start_date_seconds -format "%m"]
-    set start_date(day) [clock format $default_start_date_seconds -format "%d"]
-}
-
-# Get the ANSI representations of the dates
-set start_date_ansi "$start_date(year)-$start_date(month)-$start_date(day)"
-set end_date_ansi "$end_date(year)-$end_date(month)-$end_date(day)"
-
-###########
-#
-# Project and variable default values and names
-#
-###########
-
 # We need the name of the selected project in the adp
 if { ![empty_string_p $selected_project_id] } {
     logger::project::get -project_id $selected_project_id -array project_array
@@ -59,11 +31,6 @@
     set selected_project_name ""
 }
 
-# Likewise, need the name of the selected user in the adp
-if { ![empty_string_p $selected_user_id] } {
-    set selected_user_name [person::name -person_id $selected_user_id]
-}
-
 # Find a suitable default variable_id
 # No more than one variable will be selected on this page
 # Under unusual circumstances no variable will be selected
@@ -116,12 +83,69 @@
     set selected_variable_unit ""
 }
 
+if { ![empty_string_p $selected_projection_id] } {
+    # Projection selected - use the date range of that projection
+
+    logger::projection::get -projection_id $selected_projection_id -array projection_array
+
+    set selected_projection_name $projection_array(name)
+    set selected_projection_value $projection_array(value)
+} else {
+    set selected_projection_name ""
+    set selected_projection_value ""
+}
+
+# Need the name of the selected user in the adp
+if { ![empty_string_p $selected_user_id] } {
+    set selected_user_name [person::name -person_id $selected_user_id]
+}
+
 ###########
 #
-# Time Filter
+# Initialize dates
 #
 ###########
 
+if { [array size start_date] == 0 } {
+    # Form was not submitted
+
+    if { ![empty_string_p $selected_projection_id] } {
+        # Projection selected - use the date range of that projection
+
+        set start_date_seconds [clock scan $projection_array(start_time)]
+        set end_date_seconds [clock scan $projection_array(end_time)]
+    } else {
+        # Use default date range
+
+        # Default end date is now (today)
+        set end_date_seconds [clock seconds]
+
+        # Default start date is N days back
+        set number_of_days_back 31
+        set seconds_per_day [expr 60*60*24]
+        set start_date_seconds [expr $end_date_seconds - 31 * $seconds_per_day]
+    }
+
+    # Initialize the start and end date arrays
+    set end_date(year) [clock format $end_date_seconds -format "%Y"]
+    set end_date(month) [clock format $end_date_seconds -format "%m"]
+    set end_date(day) [clock format $end_date_seconds -format "%d"]
+
+    set start_date(year) [clock format $start_date_seconds -format "%Y"]
+    set start_date(month) [clock format $start_date_seconds -format "%m"]
+    set start_date(day) [clock format $start_date_seconds -format "%d"]
+}
+
+# Get the ANSI representations of the dates
+set start_date_ansi "$start_date(year)-$start_date(month)-$start_date(day)"
+set end_date_ansi "$end_date(year)-$end_date(month)-$end_date(day)"
+
+###########
+#
+# Date Filter
+#
+###########
+
 # Create the form
 template::form create time_filter -method GET
 # Export the other filter variables
@@ -131,6 +155,10 @@
 template::element create time_filter selected_variable_id \
     -widget hidden \
     -value $selected_variable_id
+# Reset projection choice if the dates are changed
+template::element create time_filter selected_projection_id \
+    -widget hidden \
+    -value ""
 template::element create time_filter selected_user_id \
     -widget hidden \
     -value $selected_user_id
@@ -151,7 +179,7 @@
 
 ###########
 #
-# Log entries
+# Select log entries
 #
 ###########
 
@@ -166,7 +194,7 @@
 
 ###########
 #
-# Projects
+# Select projects
 #
 ###########
 
@@ -193,7 +221,7 @@
 
 ###########
 #
-# Variables
+# Select variables
 #
 ###########
 
@@ -233,7 +261,7 @@
 
 ###########
 #
-# Users
+# Select users
 #
 ###########
 
@@ -270,3 +298,22 @@
 " {
     set url "index?[export_vars {{selected_user_id $user_id} {selected_project_id $selected_project_id} {selected_variable_id $selected_variable_id}}]"
 }
+
+###########
+#
+# Select projections
+#
+###########
+
+# Only makes sense to show projections for a selected project and variable
+if { ![empty_string_p $selected_project_id] && ![empty_string_p $selected_variable_id] } {
+    db_multirow -extend { url } projections select_projections {
+        select lpe.projection_id,
+               lpe.name
+        from logger_projections lpe
+        where lpe.project_id = :selected_project_id
+          and lpe.variable_id = :selected_variable_id
+    } {
+        set url "index?[export_vars {{selected_projection_id $projection_id} {selected_user_id $selected_user_id} {selected_project_id $selected_project_id} {selected_variable_id $selected_variable_id}}]"        
+    }
+}
Index: openacs-4/packages/logger/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/logger/www/admin/index.adp	1 May 2003 21:50:38 -0000	1.5
+++ openacs-4/packages/logger/www/admin/index.adp	2 May 2003 08:35:23 -0000	1.6
@@ -42,7 +42,7 @@
 </else>
 
 <p>
-  <a href="project">Add new project</a>
+  [ <a href="project">add new project</a> ]
 </p>
 
 <h2>Variables</h2>
@@ -78,11 +78,11 @@
 </else>
 
 <p>
-  <a href="variable">Add new variable</a>
+  [ <a href="variable">add new variable</a> ]
 </p>
 
 <h2>Package</h2>
 <p>
-  <a href="@package_permissions_url@">Set permissions of this package</a>
+  [ <a href="@package_permissions_url@">set permissions of this package</a> ]
 </p>
 </div>
Index: openacs-4/packages/logger/www/admin/project.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/logger/www/admin/project.adp	1 May 2003 21:50:38 -0000	1.3
+++ openacs-4/packages/logger/www/admin/project.adp	2 May 2003 08:35:23 -0000	1.4
@@ -6,7 +6,7 @@
   <formtemplate id="project_form" style="standard-lars"></formtemplate>
 </blockquote>
 
-<if @project_exists_p@>
+<if @project_exists_p@ and @edit_mode_p@ eq 0>
   <h2>Variables</h2>
 
   <if @variables:rowcount@ gt 0>
@@ -40,8 +40,6 @@
     </p>
   </if>
 
-</if>
-
 <h2>Projections</h2>
 
 <if @projections:rowcount@ ne 0>
@@ -81,4 +79,6 @@
 
 <p>
   [ <a href="projection?project_id=@project_id@">add projection</a> ]
-</p>
\ No newline at end of file
+</p>
+
+</if>
Index: openacs-4/packages/logger/www/admin/project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/logger/www/admin/project.tcl	1 May 2003 21:50:38 -0000	1.6
+++ openacs-4/packages/logger/www/admin/project.tcl	2 May 2003 08:35:23 -0000	1.7
@@ -11,10 +11,18 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-if { [string equal [form get_action project_form] "done"] } {
-    # User is done editing - redirect back to index page
-    ad_returnredirect .
-    ad_script_abort
+switch -- [form get_action project_form] {
+    "done" {
+        # User is done editing - redirect back to index page
+        ad_returnredirect .
+        ad_script_abort
+    }
+    "formbuilder::edit" {
+        set edit_mode_p 1
+    }
+    default {
+        set edit_mode_p 0
+    }
 }
 
 if { [exists_and_not_null project_id] } {
@@ -148,4 +156,4 @@
           and lpe.variable_id = lv.variable_id
     }   
 
-} 
+}