[IMP] survey: clean in progress
bzr revid: chm@openerp.com-20130215111408-ggjm3vh3goqicy7y
This commit is contained in:
Christophe Matthieu
+1
-16
@@ -62,7 +62,6 @@ class survey(osv.osv):
|
||||
'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
|
||||
'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
|
||||
'note': fields.text('Description', size=128),
|
||||
'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
|
||||
'partner_id': fields.many2many('res.partner', 'survey_partner_rel', 'sid', 'partner_id', 'Partners'),
|
||||
'send_response': fields.boolean('Email Notification on Answer'),
|
||||
'type': fields.many2one('survey.type', 'Type'),
|
||||
@@ -95,7 +94,7 @@ class survey(osv.osv):
|
||||
current_rec = self.read(cr, uid, ids, context=context)
|
||||
title = _("%s (copy)") % (current_rec.get('title'))
|
||||
vals.update({'title':title})
|
||||
vals.update({'history':[],'tot_start_survey':0,'tot_comp_survey':0})
|
||||
vals.update({'tot_start_survey':0,'tot_comp_survey':0})
|
||||
return super(survey, self).copy(cr, uid, ids, vals, context=context)
|
||||
|
||||
def action_print_survey(self, cr, uid, ids, context=None):
|
||||
@@ -232,20 +231,6 @@ class survey(osv.osv):
|
||||
|
||||
survey()
|
||||
|
||||
class survey_history(osv.osv):
|
||||
_name = 'survey.history'
|
||||
_description = 'Survey History'
|
||||
_rec_name = 'date'
|
||||
_columns = {
|
||||
'survey_id': fields.many2one('survey', 'Survey'),
|
||||
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
|
||||
'date': fields.datetime('Date started', readonly=1),
|
||||
}
|
||||
_defaults = {
|
||||
'date': lambda * a: datetime.datetime.now()
|
||||
}
|
||||
survey_history()
|
||||
|
||||
class survey_page(osv.osv):
|
||||
_name = 'survey.page'
|
||||
_description = 'Survey Pages'
|
||||
|
||||
@@ -2914,20 +2914,6 @@
|
||||
|
||||
<!-- Survey Response -->
|
||||
|
||||
<data noupdate="1">
|
||||
<record id="survey_history_0" model="survey.history">
|
||||
<field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
|
||||
<field name="survey_id" ref="survey.survey_partner_feedback"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
</record>
|
||||
</data>
|
||||
<data noupdate="1">
|
||||
<record id="survey_history_1" model="survey.history">
|
||||
<field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
|
||||
<field name="survey_id" ref="survey.survey_odoo_feedback"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
</record>
|
||||
</data>
|
||||
<data noupdate="1">
|
||||
<record id="survey_response_0" model="survey.response">
|
||||
<field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.603599'"/>
|
||||
|
||||
@@ -228,16 +228,6 @@
|
||||
<field name="tot_comp_survey"/>
|
||||
</group>
|
||||
</group>
|
||||
<field name="history" colspan="4">
|
||||
<tree string="History">
|
||||
<field name="date"/>
|
||||
<field name="partner_id"/>
|
||||
</tree>
|
||||
<form string="History">
|
||||
<field name="date"/>
|
||||
<field name="partner_id"/>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -66,23 +66,17 @@ class survey_name_wiz(osv.osv_memory):
|
||||
"""
|
||||
survey_obj = self.pool.get('survey')
|
||||
search_obj = self.pool.get('ir.ui.view')
|
||||
if context is None: context = {}
|
||||
context = context or {}
|
||||
|
||||
this = self.browse(cr, uid, ids, context=context)[0]
|
||||
survey_id = this.survey_id.id
|
||||
context.update({'survey_id': survey_id, 'sur_name_id': this.id})
|
||||
cr.execute('select count(id) from survey_history where user_id=%s\
|
||||
and survey_id=%s' % (uid,survey_id))
|
||||
|
||||
res = cr.fetchone()[0]
|
||||
sur_rec = survey_obj.browse(cr,uid,survey_id,context=context)
|
||||
if sur_rec.response_user and res >= sur_rec.response_user:
|
||||
raise osv.except_osv(_('Warning!'),_("You cannot give response for this survey more than %s times.") % (sur_rec.response_user))
|
||||
sur_rec = survey_obj.browse(cr, uid, survey_id, context=context)
|
||||
|
||||
if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey:
|
||||
raise osv.except_osv(_('Warning!'),_("You cannot give more responses. Please contact the author of this survey for further assistance."))
|
||||
raise osv.except_osv(_('Warning!'), _("You cannot give more responses. Please contact the author of this survey for further assistance."))
|
||||
|
||||
search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
|
||||
search_id = search_obj.search(cr, uid, [('model', '=', 'survey.question.wiz'), ('name', '=', 'Survey Search')])
|
||||
return {
|
||||
'view_type': 'form',
|
||||
"view_mode": 'form',
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
Display Survey List
|
||||
-->
|
||||
|
||||
<record id="view_survey_name" model="ir.ui.view">
|
||||
<!--record id="view_survey_name" model="ir.ui.view">
|
||||
<field name="name">Survey</field>
|
||||
<field name="model">survey.name.wiz</field>
|
||||
<field name="arch" type="xml">
|
||||
@@ -23,14 +23,13 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_view_survey_name"
|
||||
model="ir.actions.act_window">
|
||||
<record id="action_view_survey_name" model="ir.actions.act_window">
|
||||
<field name="name">Give Survey Answer</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">survey.name.wiz</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
</record-->
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
Reference in New Issue
Block a user