[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation
bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc
This commit is contained in:
parent
1e643d4ce5
commit
d538a02c0e
|
@ -124,9 +124,9 @@ class MassMailingCampaign(osv.Model):
|
||||||
'bounced': len([s for s in stats if not s.bounced is False]),
|
'bounced': len([s for s in stats if not s.bounced is False]),
|
||||||
}
|
}
|
||||||
results[cid]['delivered'] = results[cid]['sent'] - results[cid]['bounced']
|
results[cid]['delivered'] = results[cid]['sent'] - results[cid]['bounced']
|
||||||
results[cid]['received_ratio'] = 100.0 * results[cid]['delivered'] / (results[cid]['sent'] or 1)
|
results[cid]['received_ratio'] = 100.0 * results[cid]['delivered'] / (results[cid]['total'] or 1)
|
||||||
results[cid]['opened_ratio'] = 100.0 * results[cid]['opened'] / (results[cid]['sent'] or 1)
|
results[cid]['opened_ratio'] = 100.0 * results[cid]['opened'] / (results[cid]['total'] or 1)
|
||||||
results[cid]['replied_ratio'] = 100.0 * results[cid]['replied'] / (results[cid]['sent'] or 1)
|
results[cid]['replied_ratio'] = 100.0 * results[cid]['replied'] / (results[cid]['total'] or 1)
|
||||||
return results
|
return results
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
|
@ -294,9 +294,9 @@ class MassMailing(osv.Model):
|
||||||
'bounced': len([s for s in stats if not s.bounced is False]),
|
'bounced': len([s for s in stats if not s.bounced is False]),
|
||||||
}
|
}
|
||||||
results[mid]['delivered'] = results[mid]['sent'] - results[mid]['bounced']
|
results[mid]['delivered'] = results[mid]['sent'] - results[mid]['bounced']
|
||||||
results[mid]['received_ratio'] = 100.0 * results[mid]['delivered'] / (results[mid]['sent'] or 1)
|
results[mid]['received_ratio'] = 100.0 * results[mid]['delivered'] / (results[mid]['total'] or 1)
|
||||||
results[mid]['opened_ratio'] = 100.0 * results[mid]['opened'] / (results[mid]['sent'] or 1)
|
results[mid]['opened_ratio'] = 100.0 * results[mid]['opened'] / (results[mid]['total'] or 1)
|
||||||
results[mid]['replied_ratio'] = 100.0 * results[mid]['replied'] / (results[mid]['sent'] or 1)
|
results[mid]['replied_ratio'] = 100.0 * results[mid]['replied'] / (results[mid]['total'] or 1)
|
||||||
return results
|
return results
|
||||||
|
|
||||||
def _get_mailing_model(self, cr, uid, context=None):
|
def _get_mailing_model(self, cr, uid, context=None):
|
||||||
|
|
|
@ -206,16 +206,6 @@
|
||||||
type="action" class="oe_stat_button">
|
type="action" class="oe_stat_button">
|
||||||
<field name="replied_ratio" string="Replied" widget="percentpie"/>
|
<field name="replied_ratio" string="Replied" widget="percentpie"/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
<div class="oe_button_box" attrs="{'invisible': [('state', 'in', ('draft','test'))]}" style="margin-bottom: 32px">
|
|
||||||
<button name="%(action_view_mass_mailing_contacts)d" type="action"
|
|
||||||
icon="fa-envelope-o" class="oe_stat_button">
|
|
||||||
<field name="total" string="Emails" widget="statinfo"/>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="oe_button_box"
|
|
||||||
style="margin-top: 8px;"
|
|
||||||
attrs="{'invisible': [('total', '=', 0)]}">
|
|
||||||
<button name="%(action_view_mass_mailing_contacts)d"
|
<button name="%(action_view_mass_mailing_contacts)d"
|
||||||
type="action" class="oe_stat_button oe_inline">
|
type="action" class="oe_stat_button oe_inline">
|
||||||
<field name="opened_dayly" string="Opened Daily" widget="barchart"/>
|
<field name="opened_dayly" string="Opened Daily" widget="barchart"/>
|
||||||
|
@ -225,6 +215,12 @@
|
||||||
<field name="replied_dayly" string="Replied Daily" widget="barchart"/>
|
<field name="replied_dayly" string="Replied Daily" widget="barchart"/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="oe_button_box" attrs="{'invisible': [('total', '=', 0)]}" style="margin-bottom: 32px">
|
||||||
|
<button name="%(action_view_mass_mailing_contacts)d" type="action"
|
||||||
|
icon="fa-envelope-o" class="oe_stat_button">
|
||||||
|
<field name="total" string="Emails" widget="statinfo"/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<field name="email_from"/>
|
<field name="email_from"/>
|
||||||
|
|
Loading…
Reference in New Issue