diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index 4614d70e70b..1a71236e6f4 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -84,7 +84,19 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({ }); } }); - +openerp.web_mobile.Notepage = openerp.web.Widget.extend({ + init: function(session, element_id) { + this._super(session, element_id); + this.get_fields = this.widget_parent.get_fields; + this.page_fields = this.widget_parent.page_fields; + this.values = this.widget_parent.values; + this.til = this.widget_parent.til; + }, + start: function() { + console.log(this.get_fields,this.page_fields,this.values,this.til,this.$element); + this.$element.html(QWeb.render("NotePage", {'get_fields1': this.get_fields,'fields1' : this.page_fields, 'values1' : this.values,'til1': this.til })); + } +}); openerp.web_mobile.Header = openerp.web.Widget.extend({ init: function(session, element_id) { this._super(session, element_id); diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 5fd206655f5..1699824ce77 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -39,7 +39,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ var notebooks = view_fields[j]; } } - self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data })); + self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'})); self.$element.find("[data-role=header]").find('h1').html(self.action.name); self.$element.find("[data-role=header]").find('#home').click(function(){ @@ -66,85 +66,35 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({ self.$element.find('select').change(function(ev){ selection.on_select_option(ev); }); - /*self.$element.find('a').click(function(){ - for (var k = 0; k < notebooks.children.length; k++) { - var text = $(this).find('.ui-btn-text').text(); - var next = $(this).next(); - var span = $(this).find('span .ui-icon'); - if (notebooks.children[k].attrs.string == $.trim(text)) { - get_fields = self.get_fields(notebooks.children[k].children); - $(this).parents().find('form').find('div').each( function() { - var prev = $(this).prev(); - var trim_class = $.trim($(this).attr('class')); - if (trim_class == self.content_expanded_class || trim_class == self.content_collapsed_class) { - prev.removeClass('ui-btn-active'); - if ($.trim(prev.find('.ui-btn-text').text()) != notebooks.children[k].attrs.string) { - self.expanded($(this),prev.find('span .ui-icon')); - } - } - }); - if (next.hasClass(self.content_collapsed_class)) { - self.collapsed(next,span); - } - else if (next.hasClass(self.content_expanded_class)) { - self.expanded(next,span); - } - if (!next.find('.detail').html().length) { - for (var i = 0; i < get_fields.length; i++) { - if (fields[get_fields[i].attrs.name].type == 'one2many'){ - if(fields[get_fields[i].attrs.name].views.form){ - var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children); - var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields; - var notebook=fields[get_fields[i].attrs.name].views.form.arch; - } - var relational = get_fields[i].attrs.name; - } - } - if(notebook){ - next.find('.detail').append(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string })); - }else{ - next.find('.detail').append(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data })); - } - } */ - //$.mobile.changePage($("#oe_form"), "slide", true, true); - /*next.find('.detail').find('li').click(function(){ - if(data[relational]){ - var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context); - dataset.domain=[['id', 'in', data[relational]]]; - dataset.name_search('', dataset.domain, 'in',false ,function(res){ - for(var i=0;i