odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MOD] Changes in search view for report_document module 

bzr revid: vir@tinyerp.com-20091215101003-4z3b20zd92o62v30
This commit is contained in:
Vir (Open ERP) 2009-12-15 15:40:03 +05:30
parent 78c1d48949
commit e5972c83cd
2 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
addons/report_document/report_document.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -39,8 +39,9 @@ class report_document_user(osv.osv):
_description = "Files details by Users"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'month': fields.char('Month', size=24,readonly=True),
'name': fields.char('Year', size=64,readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'user_id':fields.integer('Owner', readonly=True),
'user':fields.char('User',size=64,readonly=True),
'file_title': fields.char('File Name',size=64,readonly=True),
@ -57,21 +58,21 @@ class report_document_user(osv.osv):
create or replace view report_document_user as (
select
min(f.id) as id,
to_char(f.create_date, 'YYYY') as name,
to_char(f.create_date, 'MM') as month,
f.user_id as user_id,
u.name as user,
count(*) as nbr,
to_char(f.create_date,'YYYY-MM')||'-'||'01' as name,
d.name as directory,
f.create_date as create_date,
f.file_size as file_size,
min(f.title) as file_title,
min(d.type) as type,
min(EXTRACT(MONTH FROM f.create_date)||'-'||to_char(f.create_date,'Month')) as month,
f.write_date as change_date
from ir_attachment f
left join document_directory d on (f.parent_id=d.id and d.name<>'')
inner join res_users u on (f.user_id=u.id)
group by d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date
group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date
)
""")
report_document_user()
@ -101,9 +102,9 @@ class report_files_partner(osv.osv):
to_char(f.create_date,'YYYY') as name,
min(to_char(f.create_date,'MM')) as month,
min(f.title) as file_title,
p.name as partner
from ir_attachment f
inner join res_partner p
p.name as partner
from ir_attachment f
inner join res_partner p
on (f.partner_id=p.id)
where f.datas_fname is not null
group by p.name, to_char(f.create_date,'YYYY')
@ -127,12 +128,12 @@ class report_document_file(osv.osv):
select min(f.id) as id,
count(*) as nbr,
min(EXTRACT(MONTH FROM f.create_date)||'-'||to_char(f.create_date,'Month')) as month,
sum(f.file_size) as file_size
from ir_attachment f
group by EXTRACT(MONTH FROM f.create_date)
sum(f.file_size) as file_size
from ir_attachment f
group by EXTRACT(MONTH FROM f.create_date)
)
""")
report_document_file()
class report_document_wall(osv.osv):
@ -147,7 +148,7 @@ class report_document_wall(osv.osv):
'file_name':fields.char('Last Posted File Name',size=64,readonly=True),
'last':fields.datetime('Last Posted Time', readonly=True),
}
def init(self, cr):
cr.execute("""
create or replace view report_document_wall as (
@ -155,13 +156,13 @@ class report_document_wall(osv.osv):
min(title) as file_name,
to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
f.user_id as user_id, f.user_id as user,
to_char(f.create_date,'Month') as month
from ir_attachment f
to_char(f.create_date,'Month') as month
from ir_attachment f
where f.create_date in (
select max(i.create_date)
from ir_attachment i
inner join res_users u on (i.user_id=u.id)
group by i.user_id) group by f.user_id,f.create_date
select max(i.create_date)
from ir_attachment i
inner join res_users u on (i.user_id=u.id)
group by i.user_id) group by f.user_id,f.create_date
having (CURRENT_DATE - to_date(to_char(f.create_date,'YYYY-MM-DD'),'YYYY-MM-DD')) > 30
)
""")

50
addons/report_document/report_document_view.xml
View File

@ -25,6 +25,7 @@
<field name="arch" type="xml">
<tree string="Files">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="file_title"/>
<field name="user" select="1"/>
<field name="directory" select="1"/>
@ -41,12 +42,11 @@
<field name="arch" type="xml">
<search string="All users files">
<group col="10" colspan="4">
<filter icon="terp-stock" string="My" domain="[('user','=',uid)]" help="My Files"/>
<separator orientation="vertical"/>
<filter icon="terp-stock" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Files"/>
<filter icon="terp-stock" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Files"/>
<filter icon="terp-stock" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
<filter icon="terp-stock" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="file_title" select="1"/>
<field name="user" select="1"/>
<field name="directory" select="1"/>
@ -65,9 +65,9 @@
<field name="view_mode">tree</field>
<field name="search_view_id" ref="view_report_document_user_search"/>
</record>
<menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>
<!-- -->
<record model="ir.ui.view" id="view_document_wall_form">
<field name="name">report.document.wall.form</field>
@ -97,14 +97,14 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_view_wall">
<field name="name">Wall of Shame</field>
<field name="res_model">report.document.wall</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>
<!--***************************************************************************************-->
@ -121,7 +121,7 @@
</graph>
</field>
</record>
<!-- <record model="ir.ui.view" id="view_document_by_resourcetype_tree">-->
<!-- <field name="name">report.document.resource.tree.view</field>-->
<!-- <field name="model">report.document.user</field>-->
@ -141,7 +141,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree</field>
</record>
<!--***************************************************************************************-->
<record model="ir.ui.view" id="view_size_month">
@ -155,7 +155,7 @@
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_size_month_tree">
<field name="name">report.document.user.tree</field>
<field name="model">report.document.file</field>
@ -173,11 +173,11 @@
<field name="view_id" ref="view_size_month"></field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
</record>
</record>
<!--***************************************************************************************-->
<record model="ir.ui.view" id="view_files_by_month_graph">
<field name="name">report.file.month.graph</field>
<field name="model">report.document.user</field>
@ -188,11 +188,11 @@
<field name="nbr" operator="+"/>
<!-- <field name="name" operator="+"/>-->
<!-- <field name="file_size" operator="+"/>-->
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_files_by_month_tree">
<field name="name">report.file.month.tree</field>
<field name="model">report.document.user</field>
@ -205,7 +205,7 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_view_files_by_month_graph">
<field name="name">Files by Month</field>
<field name="res_model">report.document.user</field>
@ -213,8 +213,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree</field>
</record>
<!--***************************************************************************************-->
<record model="ir.ui.view" id="view_user_graph">
@ -228,7 +228,7 @@
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_view_user_graph">
<field name="name">Files By Users</field>
<field name="res_model">report.document.user</field>
@ -236,8 +236,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree</field>
</record>
<!--***************************************************************************************-->
<record model="ir.ui.view" id="view_files_by_partner_graph">
@ -252,7 +252,7 @@
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_files_by_partner_tree">
<field name="name">view.files.partner.tree</field>
<field name="model">report.files.partner</field>
@ -266,7 +266,7 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_files_by_partner_form">
<field name="name">view.files.partner.form</field>
<field name="model">report.files.partner</field>
@ -280,7 +280,7 @@
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_view_files_by_partner">
<field name="name">Files Per Partner</field>
<field name="res_model">report.files.partner</field>