[Erp5-report] r24497 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Nov  5 16:57:48 2008
New Revision: 24497

URL: http://svn.erp5.org?rev=24497&view=rev
Log:
Fix report in period range

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml?rev=24497&r1=24496&r2=24497&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml [utf8] Wed Nov  5 16:57:48 2008
@@ -55,6 +55,7 @@
             <key> <string>_body</string> </key>
             <value> <string>from Products.PythonScripts.standard import Object\n
 from Products.ZSQLCatalog.SQLCatalog import Query\n
+from Products.ERP5Type.DateUtils import atTheEndOfPeriod\n
 request = container.REQUEST\n
 from_date = request.get(\'from_date\', None)\n
 to_date = request.get(\'at_date\', None)\n
@@ -76,17 +77,19 @@
   sql_format = "%Y-%u"\n
 elif aggregation_level == "day":\n
   sql_format = "%Y-%m-%d"\n
+if to_date is not None:\n
+  to_date = atTheEndOfPeriod(to_date, period=aggregation_level)\n
 params = {"creation_date":(from_date, to_date)}\n
 query=None\n
-if from_date is not None and to_date is not None:  \n
+if from_date is not None and to_date is not None:\n
   params = {"creation_date":(from_date, to_date)}\n
-  query = Query(range="minngt", **params)\n
+  query = Query(range="minmax", **params)\n
 elif from_date is not None:\n
   params = {"creation_date":from_date}\n
   query = Query(range="min", **params)\n
 elif to_date is not None:\n
   params = {"creation_date":to_date}\n
-  query = Query(range="ngt", **params)\n
+  query = Query(range="max", **params)\n
 select_expression = \'DATE_FORMAT(creation_date, "%s") as date, portal_type\' %sql_format\n
 group_by = \'DATE_FORMAT(creation_date, "%s"), portal_type\' %sql_format\n
 \n
@@ -191,6 +194,8 @@
                             <string>Object</string>
                             <string>Products.ZSQLCatalog.SQLCatalog</string>
                             <string>Query</string>
+                            <string>Products.ERP5Type.DateUtils</string>
+                            <string>atTheEndOfPeriod</string>
                             <string>_getattr_</string>
                             <string>container</string>
                             <string>request</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=24497&r1=24496&r2=24497&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Nov  5 16:57:48 2008
@@ -1,1 +1,1 @@
-458
+461