Commit 01f6927b authored by Jean-Paul Smets's avatar Jean-Paul Smets

Listbox now provides statistics in report mode for each report section


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1285 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e9d21af7
...@@ -1065,6 +1065,8 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')"> ...@@ -1065,6 +1065,8 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
current_section_size = current_section[4] current_section_size = current_section[4]
object_list = current_section[3] object_list = current_section[3]
is_summary = current_section[1] # Update summary type
list_body = list_body + '<tr>' list_body = list_body + '<tr>'
o = object_list[i - current_section_base_index] # FASTER PERFORMANCE o = object_list[i - current_section_base_index] # FASTER PERFORMANCE
real_o = None real_o = None
...@@ -1081,8 +1083,9 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')"> ...@@ -1081,8 +1083,9 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
section_char = '' section_char = ''
if render_format == 'list': list_result_item = [] # Start a new item for list render format if render_format == 'list': list_result_item = [] # Start a new item for list render format
if report_tree: if report_tree:
if current_section[1]: if is_summary:
# This is a summary
section_name = current_section[0] section_name = current_section[0]
else: else:
section_name = '' section_name = ''
...@@ -1116,7 +1119,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')"> ...@@ -1116,7 +1119,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
<input type="checkbox" %s value="%s" id="cb_%s" name="uids:list"/></td> <input type="checkbox" %s value="%s" id="cb_%s" name="uids:list"/></td>
""" % (td_css, selected, o.uid , o.uid) """ % (td_css, selected, o.uid , o.uid)
error_list = [] error_list = []
for cname in extended_columns: for cname in extended_columns:
sql = cname[0] # (sql, title, alias) sql = cname[0] # (sql, title, alias)
alias = cname[2] # (sql, title, alias) alias = cname[2] # (sql, title, alias)
if '.' in sql: if '.' in sql:
...@@ -1126,7 +1129,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')"> ...@@ -1126,7 +1129,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
# attribute_value = getattr(o, cname_id) # FUTURE WAY OF DOING TGW Brains # attribute_value = getattr(o, cname_id) # FUTURE WAY OF DOING TGW Brains
my_field = None my_field = None
tales_expr = None tales_expr = None
if form.has_field('%s_%s' % (field.id, alias) ): if form.has_field('%s_%s' % (field.id, alias) ) and not is_summary:
my_field_id = '%s_%s' % (field.id, alias) my_field_id = '%s_%s' % (field.id, alias)
my_field = form.get_field(my_field_id) my_field = form.get_field(my_field_id)
tales_expr = my_field.tales.get('default', "") tales_expr = my_field.tales.get('default', "")
...@@ -1138,9 +1141,28 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')"> ...@@ -1138,9 +1141,28 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
field_kw = {'cell':real_o} field_kw = {'cell':real_o}
attribute_value = my_field.__of__(real_o).get_value('default',**field_kw) attribute_value = my_field.__of__(real_o).get_value('default',**field_kw)
else: else:
if hasattr(aq_self(o),alias): # Block acquisition to reduce risks # Prepare stat_column is this is a summary
if is_summary:
# Use stat method to find value
for stat_column in stat_columns:
if stat_column[0] == sql:
break
else:
stat_column = None
if hasattr(aq_self(o),alias) and (not is_summary or stat_column is None or stat_column[0] == stat_column[1]): # Block acquisition to reduce risks
# First take the indexed value # First take the indexed value
attribute_value = getattr(o,alias) # We may need acquisition in case of method call attribute_value = getattr(o,alias) # We may need acquisition in case of method call
elif is_summary:
attribute_value = getattr(here, stat_column[1])
#LOG('ListBox', 0, 'column = %s, value = %s' % (repr(column), repr(value)))
if callable(attribute_value):
try:
params = dict(kw)
#params['operator'] = stats[n]
attribute_value=attribute_value(**params)
except:
LOG('ListBox', 0, 'WARNING: Could not call %s with %s: ' % (repr(attribute_value), repr(params)), error=sys.exc_info())
pass
else: else:
# MUST IMPROVE FOR PERFORMANCE REASON # MUST IMPROVE FOR PERFORMANCE REASON
# attribute_value = 'Does not exist' # attribute_value = 'Does not exist'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment