[Erp5-report] r7462 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: CatalogMethodTempla...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue May 23 18:06:08 CEST 2006
Author: aurel
Date: Tue May 23 18:06:02 2006
New Revision: 7462
URL: http://svn.erp5.org?rev=7462&view=rev
Log:
2006-05-23 aurel
* add simulation_state column in item and fix Resource_zGetTrackingList
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_item.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml?rev=7462&r1=7461&r2=7462&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml Tue May 23 18:06:02 2006
@@ -57,6 +57,12 @@
</value>
</item>
<item>
+ <key> <string>getSimulationState</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>getStopDate</string> </key>
<value>
<dictionary/>
@@ -101,6 +107,7 @@
<string>getDestinationSectionUid</string>
<string>getResourceUid</string>
<string>getVariationText</string>
+<string>getSimulationState</string>
<string>getAggregateUidList</string>
</list>
</value>
@@ -118,14 +125,15 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>isMovement\n
-isAccountable\n
-uid\n
-getStopDate\n
-getDestinationUid\n
-getDestinationSectionUid\n
-getResourceUid\n
-getVariationText\n
+ <value> <string>isMovement\r\n
+isAccountable\r\n
+uid\r\n
+getStopDate\r\n
+getDestinationUid\r\n
+getDestinationSectionUid\r\n
+getResourceUid\r\n
+getVariationText\r\n
+getSimulationState\r\n
getAggregateUidList</string> </value>
</item>
<item>
@@ -195,7 +203,8 @@
<dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar sequence-item type="int" optional>,\n
- <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
+ <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
@@ -271,7 +280,8 @@
<dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
<dtml-sqlvar sequence-item type="int" optional>,\n
- <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
+ <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_item.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_item.xml?rev=7462&r1=7461&r2=7462&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_item.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_item.xml Tue May 23 18:06:02 2006
@@ -103,6 +103,7 @@
`resource_uid` BIGINT UNSIGNED default \'0\',\n
`aggregate_uid` BIGINT UNSIGNED default \'0\',\n
`variation_text` VARCHAR(255),\n
+ `simulation_state` VARCHAR(255) default \'\',\n
KEY `uid` (`uid`),\n
KEY `node_uid` (`node_uid`),\n
KEY `section_uid` (`section_uid`),\n
@@ -156,6 +157,7 @@
`resource_uid` BIGINT UNSIGNED default \'0\',\n
`aggregate_uid` BIGINT UNSIGNED default \'0\',\n
`variation_text` VARCHAR(255),\n
+ `simulation_state` VARCHAR(255) default \'\',\n
KEY `uid` (`uid`),\n
KEY `node_uid` (`node_uid`),\n
KEY `section_uid` (`section_uid`),\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml?rev=7462&r1=7461&r2=7462&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml Tue May 23 18:06:02 2006
@@ -109,6 +109,17 @@
<key> <string>selection_report</string> </key>
<value>
<dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state_list</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -143,6 +154,7 @@
<string>group_by_expression</string>
<string>join_on_item</string>
<string>date_condition_in_join</string>
+<string>simulation_state_list</string>
</list>
</value>
</item>
@@ -340,7 +352,8 @@
order_by_expression\r\n
group_by_expression\r\n
join_on_item\r\n
-date_condition_in_join</string> </value>
+date_condition_in_join\r\n
+simulation_state_list:list</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -414,6 +427,17 @@
<dtml-else>\n
next_item.date > item.date\n
</dtml-if>\n
+ <dtml-if simulation_state_list>\n
+ AND (\n
+ <dtml-in simulation_state_list>\n
+ next_item.simulation_state = <dtml-sqlvar sequence-item type="string"> \n
+ <dtml-if sequence-end>\n
+ <dtml-else>\n
+ OR \n
+ </dtml-if>\n
+ </dtml-in>\n
+ )\n
+ </dtml-if>\n
)\n
</dtml-if>\n
\n
@@ -522,6 +546,17 @@
<dtml-else>\n
next_item.date > item.date\n
</dtml-if>\n
+ <dtml-if simulation_state_list>\n
+ AND (\n
+ <dtml-in simulation_state_list>\n
+ next_item.simulation_state = <dtml-sqlvar sequence-item type="string"> \n
+ <dtml-if sequence-end>\n
+ <dtml-else>\n
+ OR \n
+ </dtml-if>\n
+ </dtml-in>\n
+ )\n
+ </dtml-if>\n
)\n
</dtml-if>\n
\n
More information about the Erp5-report
mailing list