Skip to content

Hide notebooks and groups when they are empty [PREVIEW] #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 21, 2024
Merged

Hide notebooks and groups when they are empty [PREVIEW] #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8834599
Support group attribute on O2M [CUSTOM]
nicoe Mar 7, 2024
b53d1c9
Hide notebooks and groups when they are empty [PREVIEW]
nicoe Mar 4, 2024
eeacf5b
Set grid template and states when synchronizing groups [CUSTOM]
nicoe Mar 7, 2024
32530f7
Merge remote-tracking branch 'origin/master' into PCLAS-660/collapse_…
JCavallo Mar 8, 2024
6e630b2
Merge branch 'master' into PCLAS-660/collapse_group
nicoe Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions sao/src/screen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,6 +1309,7 @@
if (this.switch_callback) {
this.switch_callback();
}
this._sync_group();
if (this.has_update_resources()) {
if (record) {
record.get_resources().always(
Expand All @@ -1317,10 +1318,6 @@
this.update_resources();
}
}
// [Coog specific] multi_mixed_view
if (this.parent) {
this.parent.group_sync(this, this.current_record);
}
},
load: function(ids, set_cursor=true, modified=false, position=-1) {
this.group.load(ids, modified, position);
Expand All @@ -1332,6 +1329,48 @@
}
});
},
_sync_group: function() {
if (!this._multiview_form || (this.current_view.view_type != 'tree')) {
return;
}
if (!this.current_record) {
return;
}

var [tree, ...forms] = this._multiview_form.widget_groups[
this._multiview_group];
// Get unknown fields
for (const widget of forms) {
if (widget.screen.current_view.view_type != 'form') {
continue;
}
widget.screen.current_record = this.current_record;
widget.display();
}

// Recompute states and grid templates of the containing view
var form = this._multiview_form;
var promesses = [];
// We iterate in the reverse order so that the most nested
// widgets are computed first
for (const state_widget of form.state_widgets.toReversed()) {
var prm = state_widget.set_state(form.screen.current_record);
if (prm) {
promesses.push(prm);
}
}
for (const container of form.containers) {
container.set_grid_template();
}
// re-set the grid templates for the StateWidget that are
// asynchronous
jQuery.when.apply(jQuery, promesses).done(() => {
for (const container of form.containers) {
container.set_grid_template();
}
});

},
display: function(set_cursor) {
var deferreds = [];
if (this.current_record &&
Expand Down
11 changes: 5 additions & 6 deletions sao/src/tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,14 +481,13 @@
};

Sao.Tab.set_view_type = function(tab) {
var tabcontent = jQuery('#tabcontent');
if (tab === undefined) {
if (!tab) {
return;
} else if (tab.view_type == 'tree') {
tabcontent.css('display', 'flex');
} else if (tab.view_type == 'form') {
tabcontent.css('display', 'block');
}
var tabcontent = jQuery('#tabcontent');
tabcontent.css(
'display',
tab.current_view_type == 'form' ? 'block' : 'flex');
};

Sao.Tab.Form = Sao.class_(Sao.Tab, {
Expand Down
186 changes: 69 additions & 117 deletions sao/src/view/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ function eval_pyson(value){
});
this.notebooks = [];
this.expandables = [];
this.widget_groups = {};
this.containers = [];
this.widget_id = 0;
Sao.View.Form._super.init.call(this, view_id, screen, xml);
Expand Down Expand Up @@ -363,8 +364,9 @@ function eval_pyson(value){
}
}
var promesses = [];
for (const j in this.state_widgets) {
var state_widget = this.state_widgets[j];
// We iterate in the reverse order so that the most nested
// widgets are computed first
for (const state_widget of this.state_widgets.toReversed()) {
var prm = state_widget.set_state(record);
if (prm) {
promesses.push(prm);
Expand Down Expand Up @@ -864,6 +866,24 @@ function eval_pyson(value){
},
get_nth_page: function(page_index) {
return jQuery(this.panes.find("div[role='tabpanel']")[page_index]);
},
set_state: function(record) {
if (this.get_n_pages() > 0) {
var to_collapse = true;
for (const page of this.panes.find("div[role='tabpanel']")) {
if (jQuery(page).css('display') != 'none') {
to_collapse = false;
break;
}
}
if (to_collapse) {
this.hide();
} else {
Sao.View.Form.Notebook._super.set_state.call(this, record);
}
} else {
this.hide();
}
}
});

Expand Down Expand Up @@ -893,6 +913,28 @@ function eval_pyson(value){
},
add: function(widget) {
this.el.append(widget.el);
},
set_state: function(record) {
var to_collapse = false;
if (!this.attributes.string) {
to_collapse = true;
for (const form_item of this.el.children().first().children()) {
for (const child of jQuery(form_item).children(':not(.tooltip)')) {
if (jQuery(child).css('display') != 'none') {
to_collapse = false;
break;
}
}
if (!to_collapse) {
break;
}
}
}
if (to_collapse) {
this.hide();
} else {
Sao.View.Form.Group._super.set_state.call(this, record);
}
}
});

Expand Down Expand Up @@ -3656,15 +3698,30 @@ function eval_pyson(value){
pre_validate: attributes.pre_validate,
breadcrumb: breadcrumb,
});
// [Coog specific]
// > multi_mixed_view see tryton/8fa02ed59d03aa52600fb8332973f6a88d46d8c0
if (attributes.group)
this.screen.parent = this;
this.screen.pre_validate = attributes.pre_validate == 1;

this.screen.windows.push(this);
this.prm = this.screen.switch_view().done(() => {
this.content.append(this.screen.screen_container.el);
// [Coog specific]
// > multi_mixed_view see tryton/8fa02ed59d03aa52600fb8332973f6a88d46d8c0
if (attributes.group) {
this.screen._multiview_form = view;
this.screen._multiview_group = attributes.group;
if (!Object.hasOwn(view.widget_groups, attributes.group)) {
view.widget_groups[attributes.group] = [];
}
var wgroup = view.widget_groups[attributes.group];
if (this.screen.current_view.view_type == 'tree') {
if ((wgroup.length > 0) &&
(wgroup[0].screen.current_view.view_type == 'tree')) {
throw new Error("Wrong definition");
}
wgroup.unshift(this);
} else {
wgroup.push(this);
}
}
});

if (attributes.add_remove) {
Expand All @@ -3674,113 +3731,6 @@ function eval_pyson(value){

this.but_switch.prop('disabled', this.screen.number_of_views <= 0);
},
// [Coog specific]
// > multi_mixed_view see tryton/8fa02ed59d03aa52600fb8332973f6a88d46d8c0
group_sync: function(screen, current_record){
if (this.attributes.mode == 'form')
return;
if (!this.view || !this.view.widgets)
return;

function is_compatible(screen, record){
if (!screen.current_view)
return false;

return (!(screen.current_view.view_type == 'form' &&
record &&
screen.model_name != record.model.name));
}

var key;
var record;
var widget;
var widgets = this.view.widgets[this.field_name];
var to_sync = [];

// !!!> get a list of widgets affected by the new record
for (var j = 0; j < widgets.length; j++){
widget = widgets[j];
if (!widget.hasOwnProperty('attributes')){
return;
}

if (widget == this ||
widget.attributes.group != this.attributes.group ||
!widget.hasOwnProperty('screen')){
continue;
}

if (widget.screen.current_record == current_record){
continue;
}

record = current_record;
if (!is_compatible(widget.screen, record))
record = null;
if (!widget.validate())
return;

to_sync.push({'widget': widget, 'record': record});
}
widget = null;
var to_display = null;
var to_display_prm = jQuery.when();
var record_load_promises, display_prm;

function display_form(widget, record) {
return function () {
widget.display(widget.record, widget.field);
};
}

// !!!> add fields; change widget's record; display widgets
for (var i = 0; i < to_sync.length; i++){
widget = to_sync[i].widget;
record = to_sync[i].record;
record_load_promises = [];

if (!widget.screen.current_view)
continue;

// !!!> add widget's fields to the record
if (widget.screen.current_view.view_type == 'form' &&
record &&
widget.screen.group.model.name == record.group.model.name){
var fields = widget.screen.group.model.fields;
// !!!> format fields for method "add_fields"
var ret = [];
for(var name in fields){
ret[name] = fields[name].description;
}
// !!!> initiate and add new fields
record.group.model.add_fields(ret);

for (var field_name in fields) {
if (!fields.hasOwnProperty(field_name)) {
continue;
}
record_load_promises.push(record.load(field_name));
}
}

widget.screen.current_record = record;
display_prm = jQuery.when.apply(jQuery, record_load_promises);
display_prm.done(display_form(widget, record).bind(this));
if (record){
to_display = widget;
to_display_prm = display_prm;
}
}
if (to_display) {
to_display_prm.done(function() {
for (var j in to_display.view.containers) {
var container = widget.view.containers[j];
container.set_grid_template();
}
to_display.display(to_display.record, to_display.field);
});
}
},
get_access: function(type) {
var model = this.attributes.relation;
if (model) {
Expand Down Expand Up @@ -3917,10 +3867,12 @@ function eval_pyson(value){

// [Coog specific]
// > multi_mixed_view see tryton/8fa02ed59d03aa52600fb8332973f6a88d46d8c0
if (this.attributes.group && this.attributes.mode == 'form'){
if (!this.screen.current_record)
this.set_invisible(true);
}else if (new_group && new_group != this.screen.group) {
if (this.attributes.group && this.attributes.mode == 'form') {
if (!this.screen.current_record) {
this.set_invisible(this.visible);
}
}
if (new_group && new_group != this.screen.group) {
this.screen.set_group(new_group);
if ((this.screen.current_view.view_type == 'tree') &&
this.screen.current_view.editable) {
Expand Down