odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Improved indentation. 

bzr revid: jra@tinyerp.com-20110928062519-9pqd1to80a0bwoye
This commit is contained in:
Jiten (OpenERP) 2011-09-28 11:55:19 +05:30
parent 7c9a8945f4
commit 5f59f67e83
4 changed files with 225 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/web_mobile/static/src/js/chrome_mobile.js
View File

@ -33,20 +33,16 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
openerp.web_mobile.Login = openerp.web.Widget.extend({
start: function() {
this.has_local_storage = typeof(localStorage) != 'undefined';
this.remember_creditentials = true;
this.selected_login = null;
this.selected_password = null;
if (this.has_local_storage && this.remember_creditentials) {
this.selected_login = localStorage.getItem('last_login_login_success');
this.selected_password = localStorage.getItem('last_password_login_success');
}
var self = this;
jQuery("#oe_header").children().remove();
this.rpc("/web/database/get_list", {}, function(result) {
self.db_list = result.db_list;
self.$element.html(QWeb.render("Login", self));
@ -66,7 +62,6 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
var db = $e.find("div select[name=database]").val();
var login = $e.find("div input[name=login]").val();
var password = $e.find("div input[name=password]").val();
//$e.hide();
// Should hide then call callback
this.session.session_login(db, login, password, function() {
@ -116,6 +111,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
});
}
});
openerp.web_mobile.Header = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
@ -142,7 +138,6 @@ openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({
var self = this;
this.rpc('/web/session/sc_list',{} ,function(res){
self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
self.$element.find("[data-role=header]").find('h1').html('Favourite');
self.$element.find("[data-role=header]").find('#home').click(function(){
$.mobile.changePage("#oe_menu", "slide", false, true);
@ -167,7 +162,6 @@ openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({
$shortcut = $(ev.currentTarget);
id = $shortcut.data('menu');
res_id = $shortcut.data('res');
if(!$('[id^="oe_list_'+res_id+'"]').html()){
$('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
@ -198,7 +192,6 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({
this.header.start();
this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
this.footer.start();
this.$element.html(QWeb.render("Menu", this.data));
this.$element.find("[data-role=header]").find('h1').html('Application');
this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
@ -235,7 +228,6 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({
this.$element
.removeClass("login_valid")
.addClass("secondary_menu");
if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
$('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
@ -245,6 +237,7 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({
}
}
});
openerp.web_mobile.Secondary = openerp.web.Widget.extend({
init: function(session, element_id, secondary_menu_id) {
this._super(session, element_id);
@ -314,13 +307,6 @@ openerp.web_mobile.Secondary = openerp.web.Widget.extend({
$.mobile.changePage('#oe_list_'+id, "slide", false, true);
}
}
/* if(!$('[id^="oe_list_'+id+'"]').html()){
$('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
this.listview.start();
}else{
$.mobile.changePage('#oe_list_'+id, "slide", false, true);
}*/
jQuery("#oe_header").find("h1").html($menu.data('name'));
}
});
@ -328,7 +314,6 @@ openerp.web_mobile.Secondary = openerp.web.Widget.extend({
openerp.web_mobile.Options = openerp.web.Widget.extend({
start: function() {
var self = this;
this.$element.html(QWeb.render("Options", this));
this.$element.find("[data-role=header]").find('h1').html('Preference');
this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){

14
addons/web_mobile/static/src/js/form_mobile.js
View File

@ -12,23 +12,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
this.head_title = head_title;
this.resmodel = resmodel;
this.viewid = viewid;
},
start: function() {
var self = this;
var id = this.list_id;
var model = this.action.res_model || this.resmodel;
if(this.action){
var view_id = this.action.views[1][0];
}else{
var view_id = this.viewid;
}
this.dataset = new openerp.web.DataSetSearch(this, model, null, null);
var context = new openerp.web.CompoundContext(this.dataset.get_context());
this.dataset.read_slice([],{}, function (result) {
for (var i = 0; i < result.length; i++) {
if (result[i].id == id) {
var data = result[i];
@ -44,10 +40,8 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
}
}
self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
for(var i=0;i<get_fields.length;i++)
{
if(get_fields[i].attrs.widget=="progressbar")
{
for(var i=0;i<get_fields.length;i++) {
if (get_fields[i].attrs.widget=="progressbar") {
$("#progress").progressbar({value:data[get_fields[i].attrs.name]})
}
}
@ -88,7 +82,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
}
});
self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
for (var k = 0; k < notebooks.children.length; k++) {
if (notebooks.children[k].attrs.string == $(this).attr('id')) {
get_fields = self.get_fields(notebooks.children[k].children);
@ -122,7 +115,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
}
}
});
}
});
self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(ev){
@ -202,7 +194,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
}
}
$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
$.mobile.changePage("#oe_menu", "slide", false, true);
@ -269,4 +260,5 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
return this.fields;
}
});
};

10
addons/web_mobile/static/src/js/list_mobile.js
View File

@ -10,8 +10,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
this.list_id = list_id;
},
start: function() {
this.rpc('/web/menu/action', {'menu_id': this.list_id},
this.on_menu_action_loaded);
this.rpc('/web/menu/action', {'menu_id': this.list_id}, this.on_menu_action_loaded);
},
on_menu_action_loaded: function(data) {
var self = this;
@ -33,8 +32,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
if (!$('#oe_shortcuts').html().length) {
this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
this.shortcuts.start();
}
else{
}else{
$.mobile.changePage("#oe_shortcuts", "slide", false, true);
}
});
@ -42,8 +40,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
if(!$('#oe_options').html().length){
this.options = new openerp.web_mobile.Options(self, "oe_options");
this.options.start();
}
else{
}else{
$.mobile.changePage("#oe_options", "slide", false, true);
}
});
@ -58,7 +55,6 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
ev.stopPropagation();
id = $record.data('id');
head_title = $.trim($record.text());
if(!$('[id^="oe_form_'+id+this.action.res_model+'"]').html()){
$('<div id="oe_form_'+id+this.action.res_model+'" data-role="page" data-url="oe_form_'+id+this.action.res_model+'"> </div>').appendTo('#moe');
this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');

16
addons/web_mobile/static/src/xml/web_mobile.xml
View File

@ -41,7 +41,6 @@
<div data-role="footer" data-theme="b" data-position="fixed">
<h1>Powered by openerp.com</h1>
</div>
</t>
<t t-name="Header">
@ -75,6 +74,7 @@
</div>
<t t-call="Footer" />
</t>
<t t-name="Menu">
<t t-call="Header" />
<div id="content" data-role="content">
@ -116,6 +116,7 @@
</div>
<t t-call="Footer" />
</t>
<t t-name="Options">
<t t-call="Header" />
<div data-role="content">
@ -141,11 +142,11 @@
</div>
<t t-call="Footer" />
</t>
<t t-name="FormView">
<t t-if="temp_flag">
<t t-call="Header" />
</t>
<div data-role="content">
<form>
<t t-foreach="get_fields" t-as="field">
@ -193,7 +194,6 @@
<input id="" type="text" value=""/>
</t>
</t>
<t t-if="fields[field.attrs.name].type == 'date'">
<label for="">
<t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
@ -281,18 +281,12 @@
<t t-foreach="notebooks.children" t-as="page">
<t t-if="page.attrs.invisible">
<div style="display:none;" data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
<h3>
<t t-esc="page.attrs.string"></t>
</h3>
<p></p>
<h3><t t-esc="page.attrs.string"></t></h3>
</div>
</t>
<t t-if="!page.attrs.invisible">
<div data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
<h3>
<t t-esc="page.attrs.string"></t>
</h3>
<p></p>
<h3><t t-esc="page.attrs.string"></t></h3>
</div>
</t>
</t>