Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-customer_portal-atp-include-survey-bde
into lp:~openerp-dev/openobject-addons/trunk-customer_portal-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-customer_portal-atp-include-survey-bde/+merge/102622
Hello Sir,
I have added kanban view for survey module
and also added the functionality in portal_customer module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-customer_portal-atp-include-survey-bde/+merge/102622
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-customer_portal-atp-include-survey-bde
into lp:~openerp-dev/openobject-addons/trunk-customer_portal-atp.
=== modified file 'portal_customer/__openerp__.py'
--- portal_customer/__openerp__.py 2012-04-17 12:38:49 +0000
+++ portal_customer/__openerp__.py 2012-04-19 05:13:24 +0000
@@ -22,7 +22,7 @@
{
'name' : "Portal Customer",
'version' : "1.0",
- 'depends' : ["sale","portal"],
+ 'depends' : ["sale","portal","event","survey"],
'author' : "OpenERP SA",
'category': 'Portal',
'description': """
@@ -40,6 +40,7 @@
"update_xml" : [
"security/portal_customer_security.xml",
"security/ir.model.access.csv",
+ "board_portal_customer_view.xml",
"portal_customer_view.xml",
"portal_customer_menu.xml",
],
=== added file 'portal_customer/board_portal_customer_view.xml'
--- portal_customer/board_portal_customer_view.xml 1970-01-01 00:00:00 +0000
+++ portal_customer/board_portal_customer_view.xml 2012-04-19 05:13:24 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+ <data>
+
+ <record model="ir.actions.act_window" id="action_event_view_main">
+ <field name="name">Events</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">event.event</field>
+ <field name="view_type">tree</field>
+ <field name="view_mode">kanban</field>
+ <field name="view_id" ref="event.view_event_kanban"/>
+ <field name="context">{"search_default_upcoming":1}</field>
+ </record>
+
+ <record id="action_mail_my_feeds" model="ir.actions.client">
+ <field name="name">My Feeds</field>
+ <field name="tag">mail.all_feeds</field>
+ </record>
+
+ <record id="board_customer_portal_form" model="ir.ui.view">
+ <field name="name">board.customer.portal.form</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Events">
+ <board style="2-1">
+ <column>
+ <action name="%(action_event_view_main)d" string="Upcoming Events"/>
+ <action name="%(mail.action_mail_my_feeds)d" string="My Wall"/>
+ </column>
+ <column>
+ <!--action name="" string="Latest News"/-->
+ </column>
+ </board>
+ </form>
+ </field>
+ </record>
+
+ <record id="open_customer_portal" model="ir.actions.act_window">
+ <field name="name">Customer Portal Dashboard</field>
+ <field name="res_model">board.board</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ <field name="usage">menu</field>
+ <field name="view_id" ref="board_customer_portal_form"/>
+ </record>
+
+ </data>
+</openerp>
=== modified file 'portal_customer/portal_customer_menu.xml'
--- portal_customer/portal_customer_menu.xml 2012-04-17 12:10:51 +0000
+++ portal_customer/portal_customer_menu.xml 2012-04-19 05:13:24 +0000
@@ -50,6 +50,7 @@
<field name="action" ref="mail.action_mail_all_feeds"/>
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
</record>
+ <menuitem name="Events" id="event.menu_event_event" action="event.action_event_view" parent="base.menu_event_main" groups="event.group_event_user"/>
</data>
</openerp>
=== modified file 'portal_customer/security/ir.model.access.csv'
--- portal_customer/security/ir.model.access.csv 2012-04-11 07:09:10 +0000
+++ portal_customer/security/ir.model.access.csv 2012-04-19 05:13:24 +0000
@@ -13,3 +13,16 @@
access_account_move,account.move,account.model_account_move,portal_customer.group_sales_portal,1,0,0,0
access_account_move_line,account.move.line,account.model_account_move_line,portal_customer.group_sales_portal,1,0,0,0
access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,portal_customer.group_sales_portal,1,0,0,0
+access_event_event,event.event,event.model_event_event,portal_customer.group_sales_portal,1,1,0,0
+access_event_registration,event.registration,event.model_event_registration,portal_customer.group_sales_portal,1,1,0,0
+access_event_event,event.event,event.model_event_event,portal_customer.group_sales_portal,1,1,0,0
+access_event_registration,event.registration,event.model_event_registration,portal_customer.group_sales_portal,1,1,0,0
+access_survey_survey,survey_survey,survey.model_survey,portal_customer.group_sales_portal,1,1,0,0
+access_survey_page,survey_page,survey.model_survey_page,portal_customer.group_sales_portal,1,1,0,0
+access_survey_question,survey_question,survey.model_survey_question,portal_customer.group_sales_portal,1,0,0,0
+access_survey_answer,survey_answer,survey.model_survey_answer,portal_customer.group_sales_portal,1,1,0,0
+access_survey_response,survey_response,survey.model_survey_response,portal_customer.group_sales_portal,1,1,1,0
+access_survey_history,survey_history,survey.model_survey_history,portal_customer.group_sales_portal,1,1,1,0
+access_survey_question_column_heading,survey_question_column_heading,survey.model_survey_question_column_heading,portal_customer.group_sales_portal,1,0,0,0
+access_survey_response_line,survey_response_line,survey.model_survey_response_line,portal_customer.group_sales_portal,1,1,1,0
+access_survey_response_answer,survey_response_answer,survey.model_survey_response_answer,portal_customer.group_sales_portal,1,1,1,0
\ No newline at end of file
=== modified file 'portal_customer/security/portal_customer_security.xml'
--- portal_customer/security/portal_customer_security.xml 2012-04-19 04:51:16 +0000
+++ portal_customer/security/portal_customer_security.xml 2012-04-19 05:13:24 +0000
@@ -52,5 +52,12 @@
<field name="groups" eval="[(4, ref('group_sales_portal'))]"/>
</record>
+ <record id="portal_personal_event_registration" model="ir.rule">
+ <field name="name">Personal Event Registration</field>
+ <field ref="event.model_event_registration" name="model_id"/>
+ <field name="domain_force">[('email','=',user.login)]</field>
+ <field name="groups" eval="[(4, ref('group_sales_portal'))]"/>
+ </record>
+
</data>
</openerp>
=== modified file 'survey/__openerp__.py'
--- survey/__openerp__.py 2012-01-31 13:36:57 +0000
+++ survey/__openerp__.py 2012-04-19 05:13:24 +0000
@@ -53,6 +53,7 @@
'test/survey_question_type.yml',
'test/survey_report.yml',
],
+ 'css': ['static/src/css/survey.css'],
'installable': True,
'auto_install': False,
'certificate' : '001131639736864143245',
=== added directory 'survey/static'
=== added directory 'survey/static/src'
=== added directory 'survey/static/src/css'
=== added file 'survey/static/src/css/survey.css'
--- survey/static/src/css/survey.css 1970-01-01 00:00:00 +0000
+++ survey/static/src/css/survey.css 2012-04-19 05:13:24 +0000
@@ -0,0 +1,37 @@
+.oe_module_survey{
+ font-size: 12px;
+ border: 1px solid #ababab;
+ text-align: left;
+ height:135px;
+ width:210px;
+}
+
+.oe_survey_title{
+ font-size: 15px;
+ height: auto;
+ color: #FFFFFF;
+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ background-color: #8A89BA;
+ width: 205px;
+}
+
+.oe_survey_responsible{
+ height: auto;
+ width: 200px;
+ font-size: 14px;
+}
+
+.oe_survey_start_date{
+ height: auto;
+ width: 200px;
+ font-size: 14px;
+}
+
+.oe_survey_fill{
+ align:right;
+ padding: 1px 165px;
+}
+
+.oe_survey_rate{
+ font-size: 14px;
+}
=== modified file 'survey/survey.py'
--- survey/survey.py 2012-02-13 15:27:55 +0000
+++ survey/survey.py 2012-04-19 05:13:24 +0000
@@ -142,6 +142,17 @@
'nodestroy':True,
}
return report
+
+ def fill_survey(self, cr, uid, ids, context=None):
+ return {
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'survey.question.wiz',
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ 'context': {'survey_id': ids[0]}
+ }
+
survey()
class survey_history(osv.osv):
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-03-05 13:29:15 +0000
+++ survey/survey_view.xml 2012-04-19 05:13:24 +0000
@@ -279,13 +279,52 @@
</search>
</field>
</record>
+
+ <record model="ir.ui.view" id="view_survey_kanban">
+ <field name="name">event.survey.kanban</field>
+ <field name="model">survey</field>
+ <field name="type">kanban</field>
+ <field name="arch" type="xml">
+ <kanban>
+ <field name="title"/>
+ <field name="date_open"/>
+ <templates>
+ <t t-name="kanban-box">
+ <div class="oe_module_survey">
+ <a class="oe_module_icon">
+ <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
+ <div class="oe_survey_responsible">
+ <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+ </div><br/>
+ <div class="oe_survey_start_date">
+ <t t-if="record.date_open.raw_value">Open From:
+ <t t-esc="record.date_open.raw_value.getDate()"/>
+ <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
+ <t t-esc="record.date_open.raw_value.getFullYear()"/>
+ </t>
+ </div><br/>
+ <div class="oe_survey_rate">
+ Rate:
+ </div>
+ <div class="oe_survey_fill">
+ <button type="object" name="fill_survey" class="">
+ <span>Fill</span>
+ </button>
+ </div>
+ </a>
+ </div>
+ </t>
+ </templates>
+ </kanban>
+ </field>
+ </record>
<record model="ir.actions.act_window" id="action_survey_form1">
<field name="name">Surveys</field>
<field name="res_model">survey</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="survey_tree"></field>
+ <field name="view_mode">kanban,tree,form</field>
+ <field name="view_id" ref="view_survey_kanban"></field>
<field name="search_view_id" ref="survey_search"/>
<field name="help">You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface.</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
