Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-survey-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-survey-bde/+merge/110247
Hello Sir,
I have added sheet tag on survey.page object.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-survey-bde/+merge/110247
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-survey-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-06-11 16:10:14 +0000
+++ survey/survey_view.xml 2012-06-14 07:02:19 +0000
@@ -302,150 +302,152 @@
<field name="model">survey.page</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Survey Page">
- <field name="title" colspan="4" select="1"/>
- <field name="survey_id" select="1"/>
- <field name="sequence"/>
- <separator string="Description" colspan="4"/>
- <field name="note" colspan="4" nolabel="1"/>
- <field name="question_ids" colspan="4" nolabel="1">
- <form string="Survey Question">
- <field name="question" colspan="4" select="1"/>
+ <form string="Survey Page" version="7.0">
+ <sheet>
+ <field name="title" colspan="4" select="1"/>
+ <field name="survey_id" select="1"/>
<field name="sequence"/>
- <field name="tot_resp"/>
- <field name="type" on_change="on_change_type(type)"/>
- <field name="in_visible_rating_weight" invisible="1"/>
- <field name="in_visible_menu_choice" invisible="1"/>
- <field name="in_visible_answer_type" invisible="1"/>
- <notebook colspan="4">
- <page string="Options">
- <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
- <separator string="Answer" colspan="4"/>
- <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
- <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
- <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
- <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
- <field name="no_of_rows"/>
- </group>
- </group>
- </group>
- <newline/>
- <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
- <separator string="Comment Field" colspan="4"/>
- <group colspan="4">
- <field name="is_comment_require"/>
- </group>
- <group attrs="{'invisible':[('is_comment_require','=',False)]}">
- <group col="4" colspan="4">
- <field name="comment_field_type" colspan="1"/>
- <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
- <field colspan="2" name="comment_label" />
- </group>
- </group>
- <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
- <field name="comment_valid_type" colspan="2"/>
- <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
- <field name="comment_minimum_no" string="Between"/>
- <field name="comment_maximum_no" string="and"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
- <field name="comment_minimum_float" string="Between"/>
- <field name="comment_maximum_float" string="and"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
- <field name="comment_minimum_date" string="Between"/>
- <field name="comment_maximum_date" string="and"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
- <label string="When the comment is an invalid format, display this error message" colspan="4"/>
- <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
- </group>
- </group>
- </group>
- </group>
- <newline/>
- <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
- <field name="comment_column"/>
- <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
- <field name="column_name" colspan="2"/>
- </group>
- </group>
- <newline/>
- <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
- <separator string="Validation" colspan="4"/>
- <group colspan="4">
- <field name="is_validation_require"/>
- </group>
- <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
- <field name="validation_type" colspan="2"/>
- <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
- <field name="validation_minimum_no" string="Between"/>
- <field name="validation_maximum_no" string="and"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
- <field name="validation_minimum_float" string="Between"/>
- <field name="validation_maximum_float" string="and"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
- <field name="validation_minimum_date" string="Between"/>
- <field name="validation_maximum_date" string="and"/>
- </group>
- </group>
- <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
- <label string="When the comment is an invalid format, display this error message" colspan="4"/>
- <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
- </group>
- </group>
- <newline/>
- <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
- <separator string="Required Answer" colspan="4"/>
- <newline/>
- <field name="is_require_answer"/>
- <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
- <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
- <field name="required_type"/>
- <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
- <field name="req_ans" />
- </group>
- <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
- <field name="minimum_req_ans"/>
- <field name="maximum_req_ans"/>
- </group>
- </group>
- <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
- <label string="When the question is not answered, display this error message:"/>
- <field name="req_error_msg" colspan="4" nolabel="1"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
- <group colspan="2" >
- <field name="numeric_required_sum"/>
- </group>
- <newline/>
- <label string="When the choices do not add up correctly, display this error message"/>
- <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
- <field name="rating_allow_one_column_require"/>
- </group>
- </group>
- </group>
- <newline/>
- <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
- <separator string="Descriptive Text" colspan="4"/>
- <field name="descriptive_text" colspan="4" nolabel="1"/>
- </group>
- </page>
- </notebook>
-
- </form>
- <tree string="Survey Question">
- <field name="sequence" string="Seq"/>
- <field name="question" colspan="4" select="1"/>
- <field name="answer_choice_ids"/>
- </tree>
- </field>
+ <separator string="Description" colspan="4"/>
+ <field name="note" colspan="4" nolabel="1"/>
+ <field name="question_ids" colspan="4" nolabel="1">
+ <form string="Survey Question">
+ <field name="question" colspan="4" select="1"/>
+ <field name="sequence"/>
+ <field name="tot_resp"/>
+ <field name="type" on_change="on_change_type(type)"/>
+ <field name="in_visible_rating_weight" invisible="1"/>
+ <field name="in_visible_menu_choice" invisible="1"/>
+ <field name="in_visible_answer_type" invisible="1"/>
+ <notebook colspan="4">
+ <page string="Options">
+ <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+ <separator string="Answer" colspan="4"/>
+ <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+ <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+ <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+ <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+ <field name="no_of_rows"/>
+ </group>
+ </group>
+ </group>
+ <newline/>
+ <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+ <separator string="Comment Field" colspan="4"/>
+ <group colspan="4">
+ <field name="is_comment_require"/>
+ </group>
+ <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+ <group col="4" colspan="4">
+ <field name="comment_field_type" colspan="1"/>
+ <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+ <field colspan="2" name="comment_label" />
+ </group>
+ </group>
+ <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+ <field name="comment_valid_type" colspan="2"/>
+ <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+ <field name="comment_minimum_no" string="Between"/>
+ <field name="comment_maximum_no" string="and"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+ <field name="comment_minimum_float" string="Between"/>
+ <field name="comment_maximum_float" string="and"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+ <field name="comment_minimum_date" string="Between"/>
+ <field name="comment_maximum_date" string="and"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+ <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+ <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+ </group>
+ </group>
+ </group>
+ </group>
+ <newline/>
+ <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+ <field name="comment_column"/>
+ <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+ <field name="column_name" colspan="2"/>
+ </group>
+ </group>
+ <newline/>
+ <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+ <separator string="Validation" colspan="4"/>
+ <group colspan="4">
+ <field name="is_validation_require"/>
+ </group>
+ <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+ <field name="validation_type" colspan="2"/>
+ <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+ <field name="validation_minimum_no" string="Between"/>
+ <field name="validation_maximum_no" string="and"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+ <field name="validation_minimum_float" string="Between"/>
+ <field name="validation_maximum_float" string="and"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+ <field name="validation_minimum_date" string="Between"/>
+ <field name="validation_maximum_date" string="and"/>
+ </group>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+ <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+ <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+ </group>
+ </group>
+ <newline/>
+ <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+ <separator string="Required Answer" colspan="4"/>
+ <newline/>
+ <field name="is_require_answer"/>
+ <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+ <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+ <field name="required_type"/>
+ <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+ <field name="req_ans" />
+ </group>
+ <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+ <field name="minimum_req_ans"/>
+ <field name="maximum_req_ans"/>
+ </group>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+ <label string="When the question is not answered, display this error message:"/>
+ <field name="req_error_msg" colspan="4" nolabel="1"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+ <group colspan="2" >
+ <field name="numeric_required_sum"/>
+ </group>
+ <newline/>
+ <label string="When the choices do not add up correctly, display this error message"/>
+ <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+ <field name="rating_allow_one_column_require"/>
+ </group>
+ </group>
+ </group>
+ <newline/>
+ <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+ <separator string="Descriptive Text" colspan="4"/>
+ <field name="descriptive_text" colspan="4" nolabel="1"/>
+ </group>
+ </page>
+ </notebook>
+
+ </form>
+ <tree string="Survey Question">
+ <field name="sequence" string="Seq"/>
+ <field name="question" colspan="4" select="1"/>
+ <field name="answer_choice_ids"/>
+ </tree>
+ </field>
+ </sheet>
</form>
</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
