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

[MERGE] Kanban add/edit/delete groups 

bzr revid: fme@openerp.com-20120816161804-yw4h0tfbe3e4vj04
This commit is contained in:
Fabien Meghazi 2012-08-16 18:18:04 +02:00
parent a9ad90fa67 b859f629bf
commit 91e8503f21
7 changed files with 210 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web/controllers/main.py
View File

@ -1141,6 +1141,15 @@ class DataSet(openerpweb.Controller):
def exec_workflow(self, req, model, id, signal):
return req.session.exec_workflow(model, id, signal)
@openerpweb.jsonrequest
def resequence(self, req, model, ids):
m = req.session.model(model)
if not len(m.fields_get(['sequence'])):
return False
for i in range(len(ids)):
m.write([ids[i]], { 'sequence': i })
return True
class DataGroup(openerpweb.Controller):
_cp_path = "/web/group"
@openerpweb.jsonrequest

2
addons/web/static/src/js/chrome.js
View File

@ -948,7 +948,7 @@ instance.web.Client = instance.web.Widget.extend({
instance.web.bus.on('click', this, function(ev) {
$.fn.tipsy.clear();
if (!$(ev.target).is('input[type=file]')) {
self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened');
self.$element.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened');
}
});
},

16
addons/web/static/src/js/data.js
View File

@ -805,6 +805,22 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend( /** @lends openerp.
alter_ids: function(n_ids) {
this.ids = n_ids;
},
/**
* Resequence records.
*
* @param {Array} ids identifiers of the records to resequence
* @returns {$.Deferred}
*/
resequence: function (ids, options) {
options = options || {};
return instance.session.rpc('/web/dataset/resequence', {
model: this.model,
ids: ids,
context: this._model.context(options.context),
}).pipe(function (results) {
return results;
});
},
});
instance.web.DataSetStatic = instance.web.DataSet.extend({
init: function(parent, model, context, ids) {

37
addons/web_kanban/static/src/css/kanban.css
View File

@ -1,3 +1,4 @@
@charset "utf-8";
.openerp .oe_kanban_view {
height: inherit;
}
@ -44,8 +45,17 @@
.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_groups {
width: 100%;
}
.openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
display: inline-block;
.openerp .oe_kanban_view.oe_kanban_grouped_by_m2o .oe_kanban_group_title {
cursor: move;
}
.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban {
float: right;
}
.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban > span {
visibility: hidden;
}
.openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban > span {
visibility: visible;
}
.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
font-weight: normal;
@ -93,6 +103,9 @@
.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical {
display: block;
}
.openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
left: -5px;
}
.openerp .oe_kanban_view .oe_kanban_group_title_undefined {
color: #666666;
}
@ -104,20 +117,11 @@
-ms-transform: rotate(90deg);
transform: rotate(90deg);
width: 30px;
height: 20px;
font-size: 24px;
white-space: nowrap;
display: none;
position: absolute;
top: 10px;
}
.openerp .oe_kanban_view .oe_kanban_fold_icon {
cursor: pointer;
float: left;
padding: 2px;
width: 16px;
height: 16px;
background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
position: relative;
top: 5px;
}
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
margin-left: 4px;
@ -462,13 +466,10 @@
top: 28px;
min-width: 160px;
}
.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban {
display: none;
}
.openerp .oe_kanban_view .oe_kanban_column .oe_dropdown_kanban.oe_opened > span {
.openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
visibility: visible;
}
.openerp .oe_kanban_view .oe_kanban_column .oe_dropdown_kanban > span {
.openerp .oe_kanban_view .oe_dropdown_kanban > span {
visibility: hidden;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker {

38
addons/web_kanban/static/src/css/kanban.sass
View File

@ -66,10 +66,16 @@
height: inherit
&.oe_kanban_ungrouped .oe_kanban_groups
width: 100%
&.oe_kanban_grouped_by_m2o .oe_kanban_group_title
cursor: move
.oe_kanban_header
.oe_dropdown_kanban
float: right
.oe_dropdown_kanban > span
visibility: hidden
&:hover
.oe_dropdown_kanban
display: inline-block
.oe_dropdown_kanban > span
visibility: visible
.oe_dropdown_menu
font-weight: normal
font-size: 13px
@ -111,6 +117,8 @@
display: none
.oe_kanban_group_title_vertical
display: block
.oe_dropdown_kanban
left: -5px
.oe_kanban_group_title_undefined
color: #666666
.oe_kanban_group_title_vertical
@ -121,19 +129,11 @@
-ms-transform: rotate(90deg)
transform: rotate(90deg)
width: 30px
height: 20px
font-size: 24px
white-space: nowrap
display: none
position: absolute
top: 10px
.oe_kanban_fold_icon
cursor: pointer
float: left
padding: 2px
width: 16px
height: 16px
background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat
position: relative
top: 5px
// }}}
// KanbanQuickCreate {{{
.oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@ -388,15 +388,11 @@
left: 0
top: 28px
min-width: 160px
.oe_kanban_header
.oe_dropdown_kanban
display: none
.oe_kanban_column
.oe_dropdown_kanban
&.oe_opened > span
visibility: visible
> span
visibility: hidden
.oe_dropdown_kanban
&.oe_opened > span
visibility: visible
> span
visibility: hidden
// }}}
// KanbanColorPicker {{{
.oe_kanban_colorpicker

153
addons/web_kanban/static/src/js/kanban.js
View File

@ -24,6 +24,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.fields_view = {};
this.fields_keys = [];
this.group_by = null;
this.group_by_field = {};
this.grouped_by_m2o = false;
this.state = {
groups : {},
records : {}
@ -54,7 +56,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.$element.find('.oe_kanban_buttons').replaceWith(this.$buttons);
}
this.$buttons
.on('click','button.oe_kanban_button_new', this.do_add_record);
.on('click', 'button.oe_kanban_button_new', this.do_add_record)
.on('click', '.oe_kanban_add_column', this.do_add_group);
this.$groups = this.$element.find('.oe_kanban_groups tr');
this.fields_keys = _.keys(this.fields_view.fields);
this.add_qweb_template();
@ -157,6 +160,39 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.dataset.index = null;
this.do_switch_view('form');
},
do_add_group: function() {
var self = this;
self.do_action({
name: _t("Add column"),
res_model: self.group_by_field.relation,
views: [[false, 'form']],
type: 'ir.actions.act_window',
target: "new",
flags: {
action_buttons: true,
}
});
var am = instance.webclient.action_manager;
var form = am.dialog_widget.views.form.controller;
form.on_button_cancel.add_last(am.dialog.on_close);
form.on_created.add_last(function(r) {
(new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r.result]).then(function(new_record) {
am.dialog.on_close();
var domain = self.dataset.domain.slice(0);
domain.push([self.group_by, '=', new_record[0][0]]);
var dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context(), domain);
var datagroup = {
value: new_record[0],
length: 0,
aggregates: {},
};
var new_group = new instance.web_kanban.KanbanGroup(self, [], datagroup, dataset);
self.do_add_groups([new_group]).then(function() {
$(window).scrollTo(self.groups.slice(-1)[0].$element, { axis: 'x' });
});
});
});
},
do_search: function(domain, context, group_by) {
var self = this;
this.$element.find('.oe_view_nocontent').remove();
@ -165,6 +201,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.search_group_by = group_by;
$.when(this.has_been_loaded).then(function() {
self.group_by = group_by.length ? group_by[0] : self.fields_view.arch.attrs.default_group_by;
self.group_by_field = self.fields_view.fields[self.group_by] || {};
self.grouped_by_m2o = (self.group_by_field.type === 'many2one');
self.$buttons.find('.oe_alternative').toggle(self.grouped_by_m2o);
self.$element.toggleClass('oe_kanban_grouped_by_m2o', self.grouped_by_m2o);
self.datagroup = new instance.web.DataGroup(self, self.dataset.model, domain, context, self.group_by ? [self.group_by] : []);
self.datagroup.list(self.fields_keys, self.do_process_groups, self.do_process_dataset);
});
@ -227,7 +267,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
self.groups[group.undefined_title ? 'unshift' : 'push'](group);
});
var groups_started = _.map(this.groups, function(group) {
return group.insertBefore(self.$element.find('.oe_kanban_groups_headers td:last'));
if (!group.is_started) {
return group.insertBefore(self.$element.find('.oe_kanban_groups_headers td:last'));
}
});
return $.when.apply(null, groups_started).then(function () {
self.on_groups_started();
@ -237,6 +279,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
var self = this;
this.compute_groups_width();
if (this.group_by) {
// Kanban cards drag'n'drop
this.$element.find('.oe_kanban_column').sortable({
connectWith: '.oe_kanban_column',
handle : '.oe_kanban_draghandle',
@ -245,17 +288,50 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
self.currently_dragging.group = ui.item.parents('.oe_kanban_column:first').data('widget');
},
stop: function(event, ui) {
var record = ui.item.data('widget'),
old_index = self.currently_dragging.index,
new_index = ui.item.index(),
old_group = self.currently_dragging.group,
new_group = ui.item.parents('.oe_kanban_column:first').data('widget');
var record = ui.item.data('widget');
var old_index = self.currently_dragging.index;
var new_index = ui.item.index();
var old_group = self.currently_dragging.group;
var new_group = ui.item.parents('.oe_kanban_column:first').data('widget');
if (!(old_group.title === new_group.title && old_group.value === new_group.value && old_index == new_index)) {
self.on_record_moved(record, old_group, old_index, new_group, new_index);
}
},
scroll: false
});
// Kanban groups drag'n'drop
var start_index;
if (this.grouped_by_m2o) {
this.$('.oe_kanban_groups_headers').sortable({
items: '.oe_kanban_group_header',
helper: 'clone',
axis: 'x',
opacity: 0.5,
scroll: false,
start: function(event, ui) {
start_index = ui.item.index();
self.$('.oe_kanban_record').css({ visibility: 'hidden' });
},
stop: function(event, ui) {
var stop_index = ui.item.index();
if (start_index !== stop_index) {
var $start_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter';
$start_column[method]($stop_column);
var tmp_group = self.groups.splice(start_index, 1)[0];
self.groups.splice(stop_index, 0, tmp_group);
var new_sequence = _.pluck(self.groups, 'value');
(new instance.web.DataSet(self, self.group_by_field.relation)).resequence(new_sequence).then(function(r) {
if (r === false) {
console.error("Kanban: could not resequence model '%s'. Probably no 'sequence' field.", self.group_by_field.relation);
}
});
}
self.$('.oe_kanban_record').css({ visibility: 'visible' });
}
});
}
} else {
this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle');
}
@ -289,7 +365,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
var self = this;
_.each(this.groups, function(group) {
unfolded += group.state.folded ? 0 : 1;
group.$element.css('width', '');
group.$element.children(':first').css('width', '');
});
_.each(this.groups, function(group) {
if (!group.state.folded) {
@ -362,8 +438,8 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
this.title = this.value[1];
this.value = this.value[0];
}
var field = this.view.fields_view.fields[this.view.group_by];
if (field) {
var field = this.view.group_by_field;
if (!_.isEmpty(field)) {
try {
this.title = instance.web.format_value(group.value, field, false);
} catch(e) {}
@ -402,11 +478,14 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
}
this.$records = $(QWeb.render('KanbanView.group_records_container', { widget : this}));
this.$records.insertBefore(this.view.$element.find('.oe_kanban_groups_records td:last'));
this.$element.find(".oe_kanban_fold_icon").click(function() {
self.do_toggle_fold();
self.view.compute_groups_width();
return false;
this.$element.on('click', '.oe_kanban_group_dropdown li a', function(ev) {
var fn = 'do_action_' + $(ev.target).data().action;
if (typeof(self[fn]) === 'function') {
self[fn]($(ev.target));
}
});
this.$element.find('.oe_kanban_add').click(function () {
if (self.quick) { return; }
var ctx = {};
@ -433,10 +512,11 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
this.$records.click(function (ev) {
if (ev.target == ev.currentTarget) {
if (!self.state.folded) {
add_btn.effect('bounce', {distance: 18, times: 5}, 150)
}
add_btn.effect('bounce', {distance: 18, times: 5}, 150);
}
}
});
this.is_started = true;
return def;
},
compute_cards_auto_height: function() {
@ -493,13 +573,46 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
do_toggle_fold: function(compute_width) {
this.$element.add(this.$records).toggleClass('oe_kanban_group_folded');
this.state.folded = this.$element.is('.oe_kanban_group_folded');
this.$("ul.oe_kanban_group_dropdown li a[data-action=toggle_fold]").text((this.state.folded) ? _t("Unfold") : _t("Fold"));
},
do_action_toggle_fold: function() {
this.do_toggle_fold();
this.view.compute_groups_width();
},
do_action_edit: function() {
var self = this;
self.do_action({
res_id: this.group.value[0],
name: _t("Edit column"),
res_model: self.view.group_by_field.relation,
views: [[false, 'form']],
type: 'ir.actions.act_window',
target: "new",
flags: {
action_buttons: true,
}
});
var am = instance.webclient.action_manager;
var form = am.dialog_widget.views.form.controller;
form.on_button_cancel.add_last(am.dialog.on_close);
form.on_saved.add_last(function() {
am.dialog.on_close();
self.view.do_reload();
});
},
do_action_delete: function() {
var self = this;
if (confirm(_t("Are you sure to remove this column ?"))) {
(new instance.web.DataSet(self, self.view.group_by_field.relation)).unlink([self.group.value[0]]).then(function(r) {
self.view.do_reload();
});
}
},
do_save_sequences: function() {
var self = this;
if (_.indexOf(this.view.fields_keys, 'sequence') > -1) {
_.each(this.records, function(record, index) {
self.view.dataset.write(record.id, { sequence : index });
});
var new_sequence = _.pluck(this.records, 'id');
self.view.dataset.resequence(new_sequence);
}
},
/**
@ -715,7 +828,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).then(function(records) {
if (records.length) {
self.set_record(records[0]);
self.replaceElement($(self.render()));
self.renderElement();
self.$element.data('widget', self);
self.bind_events();
self.group.compute_cards_auto_height();

24
addons/web_kanban/static/src/xml/web_kanban.xml
View File

@ -18,6 +18,10 @@
<button type="button" class="oe_kanban_button_new oe_highlight">
<t t-esc="widget.options.create_text || _t('Create')"/>
</button>
<span class="oe_alternative" style="display: none">
<span class="oe_fade">or</span>
<a href="#" class="oe_bold oe_kanban_add_column">Add a new column</a>
</span>
</t>
</t>
</div>
@ -28,18 +32,20 @@
<t t-if="widget.view._is_quick_create_enabled()">
<div class="oe_kanban_add oe_e">]</div>
</t>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu oe_kanban_group_dropdown">
<li><a data-action="toggle_fold" href="#">Fold</a></li>
<t t-if="widget.view.grouped_by_m2o and widget.value">
<li><a data-action="edit" href="#">Edit</a></li>
<li><a data-action="delete" href="#">Delete</a></li>
</t>
</ul>
</div>
<div class="oe_fold_column">
<div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">
<span><t t-esc="widget.title"/></span>
<span class="oe_kanban_group_length">(<t t-esc="widget.group.length"/>)</span>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu">
<li><a data-type="fold" href="#" class="">Fold</a></li>
<li><a data-type="edit" href="#" class="">Edit</a></li>
<li><a data-type="delete" href="#" class="">Delete</a></li>
</ul>
</div>
</div>
<div class="oe_clear"/>
<ul class="oe_kanban_aggregates">
@ -48,7 +54,7 @@
</li>
</ul>
</div>
<p t-if="widget.title" class="oe_kanban_group_title_vertical"><t t-esc="widget.title"/></p>
<span t-if="widget.title" class="oe_kanban_group_title_vertical"><t t-esc="widget.title"/></span>
</div>
</t>
<t t-if="! widget.view.group_by &amp;&amp; widget.view._is_quick_create_enabled()">