From ffc542b732974ed344e77bf59d044c3e85839340 Mon Sep 17 00:00:00 2001
From: Thierry Brettnacher <tb@nexedi.com>
Date: Fri, 23 Jan 2004 15:26:07 +0000
Subject: [PATCH] transformation_correspondance_print improved
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@272 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...nsformedComponent_getCorrespondanceList.py | 19 ++++++++++++++-----
.../transformation_correspondances_print.pt | 2 +-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/product/Coramy/skins/coramy_pdm/TransformedComponent_getCorrespondanceList.py b/product/Coramy/skins/coramy_pdm/TransformedComponent_getCorrespondanceList.py
index f395c3bf04..9bf9d16efd 100755
--- a/product/Coramy/skins/coramy_pdm/TransformedComponent_getCorrespondanceList.py
+++ b/product/Coramy/skins/coramy_pdm/TransformedComponent_getCorrespondanceList.py
@@ -4,7 +4,7 @@
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
-##parameters=
+##parameters=transformation=None, quantities=1
##title=
##
transformed_component = context
@@ -14,8 +14,9 @@ variation_base_category_list = []
q_variation_base_category_list = transformed_component.getQVariationBaseCategoryList()
v_variation_base_category_list = transformed_component.getVVariationBaseCategoryList()
-for base_category in q_variation_base_category_list :
- variation_base_category_list.append(base_category)
+if quantities :
+ for base_category in q_variation_base_category_list :
+ variation_base_category_list.append(base_category)
for base_category in v_variation_base_category_list :
if not base_category in variation_base_category_list :
@@ -25,7 +26,7 @@ variation_base_category_list.sort()
variation_list_list = []
for base_category in variation_base_category_list :
- variation_list = context.aq_parent.getVariationCategoryList(base_category_list = base_category)
+ variation_list = transformation.getVariationCategoryList(base_category_list = base_category)
variation_list_list.append(variation_list)
cartesian_variation_list = context.cartesianProduct(variation_list_list)
@@ -54,6 +55,14 @@ for variation_list in cartesian_variation_list :
pretty_variation_2 = '- '
for my_variation in variation :
pretty_variation_2 += my_variation+' - '
- correspondance_list.append([pretty_variation_1, quantity, pretty_variation_2])
+ if pretty_variation_2 == '- ' :
+ try :
+ pretty_variation_2 += transformed_component.getVariationCategoryList()[0]
+ except :
+ pass
+ if quantities :
+ correspondance_list.append([pretty_variation_1, quantity, pretty_variation_2])
+ else :
+ correspondance_list.append([pretty_variation_1, '', pretty_variation_2])
return correspondance_list
diff --git a/product/Coramy/skins/coramy_pdm/transformation_correspondances_print.pt b/product/Coramy/skins/coramy_pdm/transformation_correspondances_print.pt
index 10897cfcd4..0e53f6df8f 100755
--- a/product/Coramy/skins/coramy_pdm/transformation_correspondances_print.pt
+++ b/product/Coramy/skins/coramy_pdm/transformation_correspondances_print.pt
@@ -90,7 +90,7 @@
<tr>
<td colspan="3" >
<table class="border" border="0" width="100%"
- tal:define="correspondances_list python:transformed_resource.TransformedComponent_getCorrespondanceList()">
+ tal:define="correspondances_list python:transformed_resource.TransformedComponent_getCorrespondanceList(transformation,quantities=0)">
<tr tal:condition="python:len(correspondances_list)==0">
<td>
<span tal:repeat="variation_item python:transformed_resource.getVariationCategoryList()">
--
2.30.9