audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX]: Formal license and Travis LINT errors

Browse Source 
[FIX]: Renaming files according to OCA standards
[FIX]: Change internal persistance form char to float
[FIX]: Reorder jquery plugin to lib directory
[ADD]: Form field record defintion can override timepicker plugin options
This commit is contained in:
docmfried
2016-05-18 17:44:21 +02:00
parent bc468c2506
commit 4d70b99df9
9 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web_widget_timepicker/static/src/css/timepicker.css → web_widget_timepicker/static/src/css/web_widget_timepicker.css
View File

@@ -1,3 +1,3 @@
.oe_form_editable .oe_form .oe_form_field_time input {
width: 7em;
width: 6em;
}

52
web_widget_timepicker/static/src/js/timepicker_widget.js → web_widget_timepicker/static/src/js/web_widget_timepicker.js
View File

@@ -1,21 +1,22 @@
odoo.define('timepicker.form_widgets', function (require) {
odoo.define('web_widget_timepicker.form_widgets', function (require) {
"use strict";
var core = require('web.core');
var formats = require('web.formats');
var common = require('web.form_common');
var _t = core._t;
var TimePicker = common.AbstractField.extend(common.ReinitializeFieldMixin, {
is_field_number: true,
template: "TimePickerField",
internal_format: 'float_time',
widget_class: 'oe_form_field_time',
events: {
'change input': 'store_dom_value',
},
init: function (field_manager, node) {
this._super(field_manager, node);
this.internal_set_value(0);
this.options = _.defaults( {}, {
disableTextInput: true,
@@ -29,14 +30,45 @@ odoo.define('timepicker.form_widgets', function (require) {
initialize_content: function() {
if(!this.get("effective_readonly")) {
this.$input = this.$el.find('input');
this.$input.timepicker(this.options);
var effective_options = this.options;
if(typeof this.node.attrs.options !== 'undefined' && this.node.attrs.options.length > 0 ) {
var custom_options = eval('('+ this.node.attrs.options +')')
// for(var key in custom_options) {
// console.log('attr key : ' + key);
// console.log('attr value : ' + custom_options[key] );
// }
// if(typeof effective_options === 'object') {
// for(var key in effective_options) {
// console.log('def key : ' + key);
// console.log('def value : ' + effective_options[key] );
// }
// }
if(typeof custom_options === 'object') {
effective_options = $.extend({}, this.options, custom_options );
}
// if(typeof effective_options === 'object') {
// for(var key in effective_options) {
// console.log('merge key : ' + key);
// console.log('merge value : ' + effective_options[key] );
// }
// }
}
this.$input.timepicker(effective_options);
this.setupFocus(this.$('input'));
}
},
is_syntax_valid: function() {
if (!this.get("effective_readonly") && this.$("input").size() > 0) {
try {
this.parse_value(this.$('input').val(), '');
this.parse_value(this.$('input').val(),'');
return true;
} catch(e) {
return false;
@@ -62,17 +94,17 @@ odoo.define('timepicker.form_widgets', function (require) {
if (!this.get('effective_readonly')) {
this.internal_set_value(
this.parse_value(
this.$('input').val()));
this.$('input').val(),''));
}
},
parse_value: function(val, def) {
return formats.parse_value(val, this, def);
return formats.parse_value(val, {"widget": this.internal_format}, def);
},
format_value: function(val, def) {
return formats.format_value(val, this, def);
return formats.format_value(val, {"widget": this.internal_format}, def);
},
render_value: function() {
var show_value = this.format_value(this.get('value'), '');
var show_value = this.format_value(this.get('value'),'');
if (!this.get("effective_readonly")) {
this.$input = this.$el.find('input');

0
web_widget_timepicker/static/src/css/jquery.timepicker.css → web_widget_timepicker/static/src/lib/jquery.timepicker/jquery.timepicker.css
View File

0
web_widget_timepicker/static/src/js/jquery.timepicker.js → web_widget_timepicker/static/src/lib/jquery.timepicker/jquery.timepicker.js
View File

3
web_widget_timepicker/static/src/xml/time_picker.xml → web_widget_timepicker/static/src/xml/web_widget_timepicker.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<templates id="template" xml:space="preserve">
<t t-name="TimePickerField">
<span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.node.attrs.style">
@@ -18,4 +17,4 @@
</t>
</span>
</t>
</templates>
</templates>