Skip to content

erp5
erp5
Commit b341140d authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

Improve the ods reports on project : 

- use a dialog in order to select wich ods report we want
- make sure that ods_style exist, if not, call the report in html style instead

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19885 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 14761d3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1319 additions and 187 deletions
bt5/erp5_project/ActionTemplateItem/portal_types/Project/ods_summary_file.xml deleted 100644 → 0
View file @ 14761d3f
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ods_summary_file</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>26.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ODS Summary File</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Project_viewSummaryList?portal_skin=ODS</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/ActionTemplateItem/portal_types/Project/ods_task_report_file.xml deleted 100644 → 0
View file @ 14761d3f
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ods_task_report_file</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>25.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ODS Tasks Report File</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Project_viewTaskReportList?portal_skin=ODS</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/ActionTemplateItem/portal_types/Project/ods_task_file.xml → bt5/erp5_project/ActionTemplateItem/portal_types/Project/project_task_report.xml
View file @ b341140d
......@@ -39,7 +39,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ods_task_file</string> </value>
<value> <string>project_task_report</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -51,11 +51,11 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>24.0</float> </value>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ODS Tasks File</string> </value>
<value> <string>Project Tasks Reports</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -75,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Project_viewTaskList?portal_skin=ODS</string> </value>
<value> <string>string:${object_url}/Project_viewTaskReportListDialog</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_callTaskReport.xml 0 → 100644
View file @ b341140d
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>use_ods_style = 1\n
if getattr(context.portal_skins, \'erp5_ods_style\', None) is None:\n
use_ods_style = 0\n
\n
request = container.REQUEST\n
if use_ods_style:\n
context.getPortalObject().portal_skins.changeSkin(\'ODS\')\n
request.set(\'portal_skin\', \'ODS\') # Some TALES expressions checks this\n
\n
if target_language:\n
request[\'AcceptLanguage\'].set(target_language, 10)\n
\n
form_report = getattr(context, print_mode)\n
return form_report()\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>form_id=\'\', target_language=\'\', print_mode=\'\', **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>form_id</string>
<string>target_language</string>
<string>print_mode</string>
<string>kw</string>
<string>use_ods_style</string>
<string>getattr</string>
<string>_getattr_</string>
<string>context</string>
<string>None</string>
<string>container</string>
<string>request</string>
<string>_getitem_</string>
<string>form_report</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<string></string>
<string></string>
<string></string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Project_callTaskReport</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getExportModeItemList.xml 0 → 100644
View file @ b341140d
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Message import Message\n
N_ = lambda msg: Message(\'erp5_ui\', msg)\n
\n
return [\n
( N_(\'Tasks\'), \'Project_viewTaskList\'),\n
( N_(\'Tasks Reports\'), \'Project_viewTaskReportList\' ),\n
( N_(\'Tasks Summary\'), \'Project_viewSummaryList\'),\n
]\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>N_</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Project_getExportModeItemList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList.xml
View file @ b341140d
......@@ -90,8 +90,6 @@
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_int_index</string>
<string>listbox_quantity</string>
<string>listbox_start_date</string>
<string>listbox_stop_date</string>
</list>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList.xml
View file @ b341140d
......@@ -90,8 +90,6 @@
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_int_index</string>
<string>listbox_quantity</string>
<string>listbox_start_date</string>
<string>listbox_stop_date</string>
</list>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog.xml 0 → 100644
View file @ b341140d
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Project_callTaskReport</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>your_format</string>
<string>your_print_mode</string>
<string>your_target_language</string>
</list>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Project_viewTaskReportListDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>BusinessTemplate_viewExportBusinessTemplateDialo</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_dialog</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Export to Spreadsheet</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
View file @ b341140d
......@@ -90,7 +90,7 @@
<value> <int>0</int> </value>
</item>
<item>
<key> <string>all_columns</string> </key>
<key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
......@@ -143,7 +143,7 @@
</value>
</item>
<item>
<key> <string>columns</string> </key>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
......@@ -190,7 +190,7 @@
</value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
......@@ -201,11 +201,11 @@
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<key> <string>domain_tree</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
......@@ -228,7 +228,7 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<key> <string>portal_types</string> </key>
<value>
<list>
<tuple>
......@@ -239,7 +239,7 @@
</value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<key> <string>report_root_list</string> </key>
<value>
<list>
<tuple>
......@@ -250,11 +250,11 @@
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
<key> <string>report_tree</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
......@@ -293,11 +293,11 @@
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<key> <string>selection_name</string> </key>
<value> <string>task_report_module_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<key> <string>sort</string> </key>
<value>
<list>
<tuple>
......@@ -312,7 +312,7 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<key> <string>title</string> </key>
<value> <string>Task Reports</string> </value>
</item>
</dictionary>
......
bt5/erp5_project/bt/revision
View file @ b341140d
416
\ No newline at end of file
417
\ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7