Index: openacs-4/packages/logger/logger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/logger.info,v
diff -u -r1.9.2.11 -r1.9.2.12
--- openacs-4/packages/logger/logger.info 10 Feb 2006 18:14:55 -0000 1.9.2.11
+++ openacs-4/packages/logger/logger.info 14 Feb 2006 20:54:59 -0000 1.9.2.12
@@ -7,18 +7,18 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="1.2" url="http://openacs.org/repository/download/apm/logger-1.2.apm">
- <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
- <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
+ <version name="1.3" url="http://openacs.org/repository/download/apm/logger-1.3.apm">
<owner url="mailto:jade@rubick.com">Jade Rubick</owner>
+ <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
+ <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
<summary>Time and expenses reporting.</summary>
- <release-date>2006-02-10</release-date>
+ <release-date>2006-02-14</release-date>
<vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
<description format="text/html">Logger lets you keep track of measurements over time. The primary use case is time and expenses reporting, an area where we are being guided by the HR-XML Time Expense Reporting 2.0 standard. However, the intention is to allow for reporting of arbitrary types of numerical data such as financial results - account balance, revenue etc. You could even use this application to monitor your weight. The full specification is here: <a href="http://www.collaboraid.biz/developer/logger-spec">http://www.collaboraid.biz/developer/logger-spec<a>
Logger can be optionally integrated with project-manager, for logging of time against projects and tasks.</description>
- <provides url="logger" version="1.2"/>
+ <provides url="logger" version="1.3"/>
<requires url="acs-tcl" version="4.6.2"/>
<requires url="categories" version="1.0d3"/>
Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -r1.10.2.7 -r1.10.2.8
--- openacs-4/packages/logger/lib/entries.tcl 10 Feb 2006 00:47:23 -0000 1.10.2.7
+++ openacs-4/packages/logger/lib/entries.tcl 14 Feb 2006 20:54:59 -0000 1.10.2.8
@@ -164,6 +164,7 @@
<if @entries.project_url@ not nil><a href="@entries.project_url@">@entries.project_name@</a></if><else>@entries.project_name@</else>
}
label "[_ logger.Project]"
+ csv_col project_name
hide_p {[ad_decode [exists_and_not_null project_id] 1 1 0]}
}
user_id {
Index: openacs-4/packages/logger/lib/entries.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.xql,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/logger/lib/entries.xql 27 Jun 2005 20:38:10 -0000 1.4.2.3
+++ openacs-4/packages/logger/lib/entries.xql 14 Feb 2006 20:54:59 -0000 1.4.2.4
@@ -20,24 +20,15 @@
<fullquery name="select_projects">
<querytext>
- SELECT
- lp.name as label,
- lp.project_id as project_id,
- count(e.project_id) as count
- FROM
- logger_projects lp,
- logger_project_pkg_map lppm,
- logger_entries e
- WHERE
- lp.project_id = lppm.project_id and
- e.project_id = lp.project_id and
- e.variable_id = :variable_id and
- lppm.package_id = :package_id
- $project_where
- GROUP BY
- lp.name, lp.project_id
- ORDER BY
- lp.name
+ select lp.name as label, e.project_id, e.count from
+ (select project_id, count(*) as count
+ from logger_entries
+ where variable_id = :variable_id
+ group by project_id ) e
+ join logger_projects lp on (e.project_id = lp.project_id)
+ join logger_project_pkg_map lppm on (e.project_id = lppm.project_id)
+ where lppm.package_id = :package_id
+ order by lp.name
</querytext>
</fullquery>
Index: openacs-4/packages/logger/tcl/package-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/package-procs.xql,v
diff -u -r1.3.8.1 -r1.3.8.2
--- openacs-4/packages/logger/tcl/package-procs.xql 27 Jun 2005 20:38:11 -0000 1.3.8.1
+++ openacs-4/packages/logger/tcl/package-procs.xql 14 Feb 2006 20:54:59 -0000 1.3.8.2
@@ -27,20 +27,13 @@
<fullquery name="logger::package::select_users_not_cached.select_users">
<querytext>
- select submitter.first_names || ' ' || submitter.last_name as label,
- submitter.person_id as user_id
- from acs_objects ao,
- logger_entries le,
- persons submitter
- where ao.object_id = le.entry_id
- and submitter.person_id = ao.creation_user
- and exists (select 1
- from logger_project_pkg_map
- where project_id = le.project_id
- and package_id = :package_id)
- group by submitter.person_id, submitter.first_names,
- submitter.last_name
- order by submitter.first_names, submitter.last_name
+select submitter.first_names || ' ' || submitter.last_name as label, e.user_id from persons submitter join
+ (select distinct creation_user as user_id
+ from acs_objects ao join
+ (select entry_id
+ from logger_entries le join logger_project_pkg_map ppm on (le.project_id = ppm.project_id)
+ where ppm.package_id = :package_id) x on (ao.object_id = x.entry_id)) e on (e.user_id = submitter.person_id)
+ order by submitter.first_names, submitter.last_name
</querytext>
</fullquery>
</queryset>