holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Etemplate: add disable_autorefresh attribute to nextmatch to be able to disable autorefresh

Browse Source
This commit is contained in:
nathangray 2020-08-05 11:21:18 -06:00
parent 3b4d8071e9
commit fba4323765
2 changed files with 137 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -68,6 +68,14 @@ var et2_extension_nextmatch_controller_1 = require("./et2_extension_nextmatch_co
var et2_dataview_1 = require("./et2_dataview"); var et2_dataview_1 = require("./et2_dataview");
var et2_dataview_model_columns_1 = require("./et2_dataview_model_columns"); var et2_dataview_model_columns_1 = require("./et2_dataview_model_columns");
var et2_extension_customfields_1 = require("./et2_extension_customfields"); var et2_extension_customfields_1 = require("./et2_extension_customfields");
var et2_widget_link_1 = require("./et2_widget_link");
var et2_widget_dialog_1 = require("./et2_widget_dialog");
var et2_widget_grid_1 = require("./et2_widget_grid");
var et2_dataview_view_grid_1 = require("./et2_dataview_view_grid");
var et2_widget_taglist_1 = require("./et2_widget_taglist");
var et2_widget_selectAccount_1 = require("./et2_widget_selectAccount");
var et2_widget_dynheight_1 = require("./et2_widget_dynheight");
var et2_core_arrayMgr_1 = require("./et2_core_arrayMgr");
var et2_INextmatchHeader = "et2_INextmatchHeader"; var et2_INextmatchHeader = "et2_INextmatchHeader";
function implements_et2_INextmatchHeader(obj) { function implements_et2_INextmatchHeader(obj) {
return implements_methods(obj, ["setNextmatch"]); return implements_methods(obj, ["setNextmatch"]);
@ -134,7 +142,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
} }
_this.div = jQuery(document.createElement("div")) _this.div = jQuery(document.createElement("div"))
.addClass("et2_nextmatch"); .addClass("et2_nextmatch");
_this.header = et2_createWidget("nextmatch_header_bar", {}, _this); _this.header = et2_core_widget_1.et2_createWidget("nextmatch_header_bar", {}, _this);
_this.innerDiv = jQuery(document.createElement("div")) _this.innerDiv = jQuery(document.createElement("div"))
.appendTo(_this.div); .appendTo(_this.div);
// Create the dynheight component which dynamically scales the inner // Create the dynheight component which dynamically scales the inner
@ -650,10 +658,10 @@ var et2_nextmatch = /** @class */ (function (_super) {
// Find the parent container, either a tab or the main container // Find the parent container, either a tab or the main container
var tab = this.get_tab_info(); var tab = this.get_tab_info();
if (!tab) { if (!tab) {
return new et2_dynheight(this.getInstanceManager().DOMContainer, this.innerDiv, 100); return new et2_widget_dynheight_1.et2_dynheight(this.getInstanceManager().DOMContainer, this.innerDiv, 100);
} }
else if (tab && tab.contentDiv) { else if (tab && tab.contentDiv) {
return new et2_dynheight(tab.contentDiv, this.innerDiv, 100); return new et2_widget_dynheight_1.et2_dynheight(tab.contentDiv, this.innerDiv, 100);
} }
return false; return false;
}; };
@ -955,7 +963,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
// Make sure there's a widget - cols disabled in template can be missing them, and the header really likes to have a widget // Make sure there's a widget - cols disabled in template can be missing them, and the header really likes to have a widget
for (var x = 0; x < _row.length; x++) { for (var x = 0; x < _row.length; x++) {
if (!_row[x].widget) { if (!_row[x].widget) {
_row[x].widget = et2_createWidget("label", {}); _row[x].widget = et2_core_widget_1.et2_createWidget("label", {});
} }
} }
// Get column display preference // Get column display preference
@ -1120,7 +1128,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
var rowId = _data.content[this.options.settings.row_id]; var rowId = _data.content[this.options.settings.row_id];
// Create a new grid with the row as parent and the dataview grid as // Create a new grid with the row as parent and the dataview grid as
// parent grid // parent grid
var grid = new et2_dataview_grid(_row, this.dataview.grid); var grid = new et2_dataview_view_grid_1.et2_dataview_grid(_row, this.dataview.grid);
// Create a new controller for the grid // Create a new controller for the grid
var controller = new et2_extension_nextmatch_controller_1.et2_nextmatch_controller(_controller, this.egw(), this.getInstanceManager().etemplate_exec_id, this, rowId, grid, this.rowProvider, this.options.settings.action_links, _controller.getObjectManager()); var controller = new et2_extension_nextmatch_controller_1.et2_nextmatch_controller(_controller, this.egw(), this.getInstanceManager().etemplate_exec_id, this, rowId, grid, this.rowProvider, this.options.settings.action_links, _controller.getObjectManager());
controller.update(); controller.update();
@ -1191,7 +1199,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
} }
// Build the popup // Build the popup
if (!this.selectPopup) { if (!this.selectPopup) {
var select_1 = et2_createWidget("select", { var select_1 = et2_core_widget_1.et2_createWidget("select", {
multiple: true, multiple: true,
rows: 8, rows: 8,
empty_label: this.egw().lang("select columns"), empty_label: this.egw().lang("select columns"),
@ -1200,22 +1208,25 @@ var et2_nextmatch = /** @class */ (function (_super) {
}, this); }, this);
select_1.set_select_options(columns); select_1.set_select_options(columns);
select_1.set_value(columns_selected); select_1.set_value(columns_selected);
var autoRefresh_1 = et2_createWidget("select", { var autoRefresh_1;
"empty_label": "Refresh" if (!this.options.disable_autorefresh) {
}, this); autoRefresh_1 = et2_core_widget_1.et2_createWidget("select", {
autoRefresh_1.set_id("nm_autorefresh"); "empty_label": "Refresh"
autoRefresh_1.set_select_options({ }, this);
// Cause [unknown] problems with mail autoRefresh_1.set_id("nm_autorefresh");
//30: "30 seconds", autoRefresh_1.set_select_options({
//60: "1 Minute", // Cause [unknown] problems with mail
180: "3 Minutes", //30: "30 seconds",
300: "5 Minutes", //60: "1 Minute",
900: "15 Minutes", 180: "3 Minutes",
1800: "30 Minutes" 300: "5 Minutes",
}); 900: "15 Minutes",
autoRefresh_1.set_value(this._get_autorefresh()); 1800: "30 Minutes"
autoRefresh_1.set_statustext(egw.lang("Automatically refresh list")); });
var defaultCheck = et2_createWidget("select", { "empty_label": "Preference" }, this); autoRefresh_1.set_value(this._get_autorefresh());
autoRefresh_1.set_statustext(egw.lang("Automatically refresh list"));
}
var defaultCheck = et2_core_widget_1.et2_createWidget("select", { "empty_label": "Preference" }, this);
defaultCheck.set_id('nm_col_preference'); defaultCheck.set_id('nm_col_preference');
defaultCheck.set_select_options({ defaultCheck.set_select_options({
'default': { label: 'Default', title: 'Set these columns as the default' }, 'default': { label: 'Default', title: 'Set these columns as the default' },
@ -1223,7 +1234,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
'force': { label: 'Force', title: 'Force column preference so users cannot change it' } 'force': { label: 'Force', title: 'Force column preference so users cannot change it' }
}); });
defaultCheck.set_value(this.options.settings.columns_forced ? 'force' : ''); defaultCheck.set_value(this.options.settings.columns_forced ? 'force' : '');
var okButton = et2_createWidget("buttononly", { "background_image": true, image: "check" }, this); var okButton = et2_core_widget_1.et2_createWidget("buttononly", { "background_image": true, image: "check" }, this);
okButton.set_label(this.egw().lang("ok")); okButton.set_label(this.egw().lang("ok"));
okButton.onclick = function () { okButton.onclick = function () {
// Update visibility // Update visibility
@ -1299,7 +1310,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
self.selectPopup.toggle(); self.selectPopup.toggle();
self.dataview.updateColumns(); self.dataview.updateColumns();
// Auto refresh // Auto refresh
self._set_autorefresh(autoRefresh_1.get_value()); self._set_autorefresh(autoRefresh_1 ? autoRefresh_1.get_value() : 0);
// Set default or clear forced // Set default or clear forced
if (show_letters) { if (show_letters) {
self.activeFilters.selectcols.push('lettersearch'); self.activeFilters.selectcols.push('lettersearch');
@ -1307,7 +1318,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
self.getInstanceManager().submit(); self.getInstanceManager().submit();
self.selectPopup = null; self.selectPopup = null;
}; };
var cancelButton = et2_createWidget("buttononly", { "background_image": true, image: "cancel" }, this); var cancelButton = et2_core_widget_1.et2_createWidget("buttononly", { "background_image": true, image: "cancel" }, this);
cancelButton.set_label(this.egw().lang("cancel")); cancelButton.set_label(this.egw().lang("cancel"));
cancelButton.onclick = function () { cancelButton.onclick = function () {
self.selectPopup.toggle(); self.selectPopup.toggle();
@ -1352,7 +1363,9 @@ var et2_nextmatch = /** @class */ (function (_super) {
.append($footerWrap) .append($footerWrap)
.appendTo(this.innerDiv); .appendTo(this.innerDiv);
// Add autorefresh // Add autorefresh
$footerWrap.append(autoRefresh_1.getSurroundings().getDOMNode(autoRefresh_1.getDOMNode())); if (autoRefresh_1) {
$footerWrap.append(autoRefresh_1.getSurroundings().getDOMNode(autoRefresh_1.getDOMNode()));
}
// Add default checkbox for admins // Add default checkbox for admins
var apps = this.egw().user('apps'); var apps = this.egw().user('apps');
if (apps['admin']) { if (apps['admin']) {
@ -1383,7 +1396,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
// Initialize to false // Initialize to false
for (var i = 0; i < columnMgr.columns.length; i++) { for (var i = 0; i < columnMgr.columns.length; i++) {
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
if (col.caption && col.visibility != et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT) { if (col.caption && col.visibility != et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT) {
visibility[col.id] = { visible: false }; visibility[col.id] = { visible: false };
} }
} }
@ -1470,7 +1483,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
jQuery(this.getInstanceManager().DOMContainer.parentNode).one('show.et2_nextmatch', jQuery(this.getInstanceManager().DOMContainer.parentNode).one('show.et2_nextmatch',
// Important to use anonymous function instead of just 'this.refresh' because // Important to use anonymous function instead of just 'this.refresh' because
// of the parameters passed // of the parameters passed
jQuery.proxy(function () { this.refresh(); }, this)); jQuery.proxy(function () { this.refresh(null, 'edit'); }, this));
}, this), time * 1000); }, this), time * 1000);
}, this)); }, this));
jQuery(this.getInstanceManager().DOMContainer.parentNode).on('show.et2_nextmatch', jQuery.proxy(function (e) { jQuery(this.getInstanceManager().DOMContainer.parentNode).on('show.et2_nextmatch', jQuery.proxy(function (e) {
@ -1486,6 +1499,9 @@ var et2_nextmatch = /** @class */ (function (_super) {
* @return int Refresh period, in secods * @return int Refresh period, in secods
*/ */
et2_nextmatch.prototype._get_autorefresh = function () { et2_nextmatch.prototype._get_autorefresh = function () {
if (this.options.disable_autorefresh) {
return 0;
}
var refresh_preference = "nextmatch-" + this.options.settings.columnselection_pref + "-autorefresh"; var refresh_preference = "nextmatch-" + this.options.settings.columnselection_pref + "-autorefresh";
return this.egw().preference(refresh_preference, this._get_appname()); return this.egw().preference(refresh_preference, this._get_appname());
}; };
@ -1496,7 +1512,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
* @param {string} template_name Full template name in the form app.template[.template] * @param {string} template_name Full template name in the form app.template[.template]
*/ */
et2_nextmatch.prototype.set_template = function (template_name) { et2_nextmatch.prototype.set_template = function (template_name) {
var template = et2_createWidget("template", { "id": template_name }, this); var template = et2_core_widget_1.et2_createWidget("template", { "id": template_name }, this);
if (this.template) { if (this.template) {
// Stop early to prevent unneeded processing, and prevent infinite // Stop early to prevent unneeded processing, and prevent infinite
// loops if the server changes the template in get_rows // loops if the server changes the template in get_rows
@ -1538,7 +1554,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
this.template = template_name; this.template = template_name;
// Fetch the grid element and parse it // Fetch the grid element and parse it
var definitionGrid = template.getChildren()[0]; var definitionGrid = template.getChildren()[0];
if (definitionGrid && definitionGrid instanceof et2_grid) { if (definitionGrid && definitionGrid instanceof et2_widget_grid_1.et2_grid) {
this._parseGrid(definitionGrid); this._parseGrid(definitionGrid);
} }
else { else {
@ -1742,7 +1758,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
to_id: split.join('::') to_id: split.join('::')
}; };
// Create widget and mangle to our needs // Create widget and mangle to our needs
var link = et2_createWidget("link-to", { value: link_value }, this); var link = et2_core_widget_1.et2_createWidget("link-to", { value: link_value }, this);
link.loadingFinished(); link.loadingFinished();
link.file_upload.set_drop_target(false); link.file_upload.set_drop_target(false);
if (row.row.tr) { if (row.row.tr) {
@ -1852,17 +1868,17 @@ var et2_nextmatch = /** @class */ (function (_super) {
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
var widget = this.columns[i].widget; var widget = this.columns[i].widget;
var colName = this._getColumnName(widget); var colName = this._getColumnName(widget);
if (col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && if (col.caption && col.visibility !== et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) { col.visibility !== et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) {
columns[colName] = col.caption; columns[colName] = col.caption;
if (col.visibility === et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE) if (col.visibility === et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE)
columns_selected.push(colName); columns_selected.push(colName);
} }
// Custom fields get listed separately // Custom fields get listed separately
if (widget.instanceOf(et2_nextmatch_customfields)) { if (widget.instanceOf(et2_nextmatch_customfields)) {
delete (columns[colName]); delete (columns[colName]);
colName = widget.id; colName = widget.id;
if (col.visibility === et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE && !jQuery.isEmptyObject(widget.customfields)) { if (col.visibility === et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE && !jQuery.isEmptyObject(widget.customfields)) {
columns[colName] = col.caption; columns[colName] = col.caption;
for (var field_name in widget.customfields) { for (var field_name in widget.customfields) {
columns[et2_nextmatch_customfields.PREFIX + field_name] = " - " + widget.customfields[field_name].label; columns[et2_nextmatch_customfields.PREFIX + field_name] = " - " + widget.customfields[field_name].label;
@ -1878,7 +1894,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
this.set_columns(jQuery.extend([], this.egw().preference(pref, app))); this.set_columns(jQuery.extend([], this.egw().preference(pref, app)));
} }
var callback = jQuery.proxy(function (button, value) { var callback = jQuery.proxy(function (button, value) {
if (button === et2_dialog.CANCEL_BUTTON) { if (button === et2_widget_dialog_1.et2_dialog.CANCEL_BUTTON) {
// Give dialog a chance to close, or it will be in the print // Give dialog a chance to close, or it will be in the print
window.setTimeout(function () { window.setTimeout(function () {
defer.reject(); defer.reject();
@ -1912,7 +1928,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
rows = total; rows = total;
} }
// If they want the whole thing, style it as all // If they want the whole thing, style it as all
if (button === et2_dialog.OK_BUTTON && rows == this.controller._grid.getTotalCount()) { if (button === et2_widget_dialog_1.et2_dialog.OK_BUTTON && rows == this.controller._grid.getTotalCount()) {
// Add the class, gives more reliable sizing // Add the class, gives more reliable sizing
this.div.addClass('print'); this.div.addClass('print');
// Show it all // Show it all
@ -1924,7 +1940,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
var fetchedCount_1 = 0; var fetchedCount_1 = 0;
var cancel_1 = false; var cancel_1 = false;
var nm_1 = this; var nm_1 = this;
var dialog_1 = et2_dialog.show_dialog( var dialog_1 = et2_widget_dialog_1.et2_dialog.show_dialog(
// Abort the long task if they canceled the data load // Abort the long task if they canceled the data load
function () { function () {
count_1 = total; count_1 = total;
@ -1933,7 +1949,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
defer.reject(); defer.reject();
}, 0); }, 0);
}, egw.lang('Loading'), egw.lang('please wait...'), {}, [ }, egw.lang('Loading'), egw.lang('please wait...'), {}, [
{ "button_id": et2_dialog.CANCEL_BUTTON, "text": 'cancel', id: 'dialog[cancel]', image: 'cancel' } { "button_id": et2_widget_dialog_1.et2_dialog.CANCEL_BUTTON, "text": 'cancel', id: 'dialog[cancel]', image: 'cancel' }
]); ]);
// dataFetch() is asynchronous, so all these requests just get fired off... // dataFetch() is asynchronous, so all these requests just get fired off...
// 200 rows chosen arbitrarily to reduce requests. // 200 rows chosen arbitrarily to reduce requests.
@ -1973,7 +1989,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
dialog_1.destroy(); dialog_1.destroy();
// Should be OK to print now // Should be OK to print now
defer.resolve(); defer.resolve();
}, nm_1), et2_dataview_grid.ET2_GRID_INVALIDATE_TIMEOUT); }, nm_1), et2_dataview_view_grid_1.et2_dataview_grid.ET2_GRID_INVALIDATE_TIMEOUT);
} }
}, ctx); }, ctx);
count_1 += 200; count_1 += 200;
@ -2030,10 +2046,10 @@ var et2_nextmatch = /** @class */ (function (_super) {
var tab = this.get_tab_info(); var tab = this.get_tab_info();
// Get title for print dialog from settings or tab, if available // Get title for print dialog from settings or tab, if available
var title = this.options.settings.label ? this.options.settings.label : (tab ? tab.label : ''); var title = this.options.settings.label ? this.options.settings.label : (tab ? tab.label : '');
var dialog = et2_createWidget("dialog", { var dialog = et2_core_widget_1.et2_createWidget("dialog", {
// If you use a template, the second parameter will be the value of the template, as if it were submitted. // If you use a template, the second parameter will be the value of the template, as if it were submitted.
callback: callback, callback: callback,
buttons: et2_dialog.BUTTONS_OK_CANCEL, buttons: et2_widget_dialog_1.et2_dialog.BUTTONS_OK_CANCEL,
title: this.egw().lang('Print') + ' ' + this.egw().lang(title), title: this.egw().lang('Print') + ' ' + this.egw().lang(title),
template: this.egw().link(base_url + '/api/templates/default/nm_print_dialog.xet'), template: this.egw().link(base_url + '/api/templates/default/nm_print_dialog.xet'),
value: value value: value
@ -2119,6 +2135,12 @@ var et2_nextmatch = /** @class */ (function (_super) {
"description": "Hide the second filter", "description": "Hide the second filter",
"default": et2_no_init "default": et2_no_init
}, },
"disable_autorefresh": {
"name": "Disable autorefresh",
"type": "boolean",
"description": "Disable the ability to autorefresh the nextmatch on a regular interval. ",
"default": false
},
"view": { "view": {
"name": "View", "name": "View",
"type": "string", "type": "string",
@ -2237,7 +2259,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
fix: !egwIsMobile() fix: !egwIsMobile()
}; };
// searchbox widget // searchbox widget
this.et2_searchbox = et2_createWidget('searchbox', searchbox_options, this); this.et2_searchbox = et2_core_widget_1.et2_createWidget('searchbox', searchbox_options, this);
// Set activeFilters to current value // Set activeFilters to current value
this.nextmatch.activeFilters.search = settings.search; this.nextmatch.activeFilters.search = settings.search;
this.et2_searchbox.set_value(settings.search); this.et2_searchbox.set_value(settings.search);
@ -2326,7 +2348,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
if (settings.csv_fields === true) { if (settings.csv_fields === true) {
definition_1 = egw.preference('nextmatch-export-definition', this.nextmatch.egw().app_name()); definition_1 = egw.preference('nextmatch-export-definition', this.nextmatch.egw().app_name());
} }
var button_1 = et2_createWidget("buttononly", { id: "export", "statustext": "Export", image: "download", "background_image": true }, this); var button_1 = et2_core_widget_1.et2_createWidget("buttononly", { id: "export", "statustext": "Export", image: "download", "background_image": true }, this);
jQuery(button_1.getDOMNode()) jQuery(button_1.getDOMNode())
.click(this.nextmatch, function (event) { .click(this.nextmatch, function (event) {
// @ts-ignore // @ts-ignore
@ -2404,7 +2426,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
return; return;
// Load the template // Load the template
var self = this; var self = this;
var header = et2_createWidget("template", { "id": template_name }, this); var header = et2_core_widget_1.et2_createWidget("template", { "id": template_name }, this);
this.headers[id] = header; this.headers[id] = header;
var deferred = []; var deferred = [];
header.loadingFinished(deferred); header.loadingFinished(deferred);
@ -2481,7 +2503,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
widget_options.empty_label = this.egw().lang('All categories'); widget_options.empty_label = this.egw().lang('All categories');
} }
// Create widget // Create widget
var select = et2_createWidget(type, widget_options, this); var select = et2_core_widget_1.et2_createWidget(type, widget_options, this);
if (options) if (options)
select.set_select_options(options); select.set_select_options(options);
// Set value // Set value
@ -2531,7 +2553,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
filters: filters, filters: filters,
sidebox_target: 'favorite_sidebox_' + this.getInstanceManager().app sidebox_target: 'favorite_sidebox_' + this.getInstanceManager().app
}; };
this.favorites = et2_createWidget('favorites', widget_options, this); this.favorites = et2_core_widget_1.et2_createWidget('favorites', widget_options, this);
// Add into header // Add into header
jQuery(this.favorites.getDOMNode(this.favorites)).prependTo(egwIsMobile() ? this.search_box.find('.nm_favorites_div').show() : this.right_div); jQuery(this.favorites.getDOMNode(this.favorites)).prependTo(egwIsMobile() ? this.search_box.find('.nm_favorites_div').show() : this.right_div);
}; };
@ -2549,7 +2571,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
return; return;
this.update_in_progress = true; this.update_in_progress = true;
// Use an array mgr to hande non-simple IDs // Use an array mgr to hande non-simple IDs
var mgr = new et2_arrayMgr(filters); var mgr = new et2_core_arrayMgr_1.et2_arrayMgr(filters);
this.iterateOver(function (child) { this.iterateOver(function (child) {
// Skip favorites, don't want them in the filter // Skip favorites, don't want them in the filter
if (typeof child.id != "undefined" && child.id.indexOf("favorite") == 0) if (typeof child.id != "undefined" && child.id.indexOf("favorite") == 0)
@ -2686,7 +2708,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super) {
// Use an array mgr to hande non-simple IDs // Use an array mgr to hande non-simple IDs
var value = {}; var value = {};
value[_widget.id] = _widget._oldValue = _widget.getValue(); value[_widget.id] = _widget._oldValue = _widget.getValue();
var mgr = new et2_arrayMgr(value); var mgr = new et2_core_arrayMgr_1.et2_arrayMgr(value);
jQuery.extend(true, this.nextmatch.activeFilters, mgr.data); jQuery.extend(true, this.nextmatch.activeFilters, mgr.data);
}; };
if (sub_header.instanceOf(et2_core_inputWidget_1.et2_inputWidget)) { if (sub_header.instanceOf(et2_core_inputWidget_1.et2_inputWidget)) {
@ -2858,21 +2880,21 @@ var et2_nextmatch_customfields = /** @class */ (function (_super) {
if (field.values && typeof field.values[''] !== 'undefined') { if (field.values && typeof field.values[''] !== 'undefined') {
delete (field.values['']); delete (field.values['']);
} }
widget = et2_createWidget(field.type == 'select-account' ? 'nextmatch-accountfilter' : "nextmatch-filterheader", { widget = et2_core_widget_1.et2_createWidget(field.type == 'select-account' ? 'nextmatch-accountfilter' : "nextmatch-filterheader", {
id: cf_id, id: cf_id,
empty_label: field.label, empty_label: field.label,
select_options: field.values select_options: field.values
}, this); }, this);
} }
else if (apps[field.type]) { else if (apps[field.type]) {
widget = et2_createWidget("nextmatch-entryheader", { widget = et2_core_widget_1.et2_createWidget("nextmatch-entryheader", {
id: cf_id, id: cf_id,
only_app: field.type, only_app: field.type,
blur: field.label blur: field.label
}, this); }, this);
} }
else { else {
widget = et2_createWidget("nextmatch-sortheader", { widget = et2_core_widget_1.et2_createWidget("nextmatch-sortheader", {
id: cf_id, id: cf_id,
label: field.label label: field.label
}, this); }, this);
@ -3095,7 +3117,7 @@ var et2_nextmatch_accountfilterheader = /** @class */ (function (_super) {
if (!this.options.empty_label && !this.options.select_options[""]) { if (!this.options.empty_label && !this.options.select_options[""]) {
this.options.empty_label = this.options.label ? this.options.label : egw.lang("All"); this.options.empty_label = this.options.label ? this.options.label : egw.lang("All");
} }
_super.prototype.createInputWidget.call(this, this, arguments); _super.prototype.createInputWidget.call(this);
this.input.change(this, function (event) { this.input.change(this, function (event) {
if (typeof event.data.nextmatch == 'undefined') { if (typeof event.data.nextmatch == 'undefined') {
// Not fully set up yet // Not fully set up yet
@ -3129,7 +3151,7 @@ var et2_nextmatch_accountfilterheader = /** @class */ (function (_super) {
this.input.css("max-width", max + "px"); this.input.css("max-width", max + "px");
}; };
return et2_nextmatch_accountfilterheader; return et2_nextmatch_accountfilterheader;
}(et2_selectAccount)); }(et2_widget_selectAccount_1.et2_selectAccount));
exports.et2_nextmatch_accountfilterheader = et2_nextmatch_accountfilterheader; exports.et2_nextmatch_accountfilterheader = et2_nextmatch_accountfilterheader;
et2_core_widget_1.et2_register_widget(et2_nextmatch_accountfilterheader, ['nextmatch-accountfilter']); et2_core_widget_1.et2_register_widget(et2_nextmatch_accountfilterheader, ['nextmatch-accountfilter']);
/** /**
@ -3207,7 +3229,7 @@ var et2_nextmatch_taglistheader = /** @class */ (function (_super) {
class: { default: 'nm_filterheader_taglist' } class: { default: 'nm_filterheader_taglist' }
}; };
return et2_nextmatch_taglistheader; return et2_nextmatch_taglistheader;
}(et2_taglist)); }(et2_widget_taglist_1.et2_taglist));
et2_core_widget_1.et2_register_widget(et2_nextmatch_taglistheader, ['nextmatch-taglistheader']); et2_core_widget_1.et2_register_widget(et2_nextmatch_taglistheader, ['nextmatch-taglistheader']);
/** /**
* Nextmatch filter that can filter for a selected entry * Nextmatch filter that can filter for a selected entry
@ -3272,7 +3294,7 @@ var et2_nextmatch_entryheader = /** @class */ (function (_super) {
// Fire on lost focus, clear filter if user emptied box // Fire on lost focus, clear filter if user emptied box
}; };
return et2_nextmatch_entryheader; return et2_nextmatch_entryheader;
}(et2_link_entry)); }(et2_widget_link_1.et2_link_entry));
et2_core_widget_1.et2_register_widget(et2_nextmatch_entryheader, ['nextmatch-entryheader']); et2_core_widget_1.et2_register_widget(et2_nextmatch_entryheader, ['nextmatch-entryheader']);
/** /**
* @augments et2_nextmatch_filterheader * @augments et2_nextmatch_filterheader
@ -3304,7 +3326,7 @@ var et2_nextmatch_customfilter = /** @class */ (function (_super) {
jQuery.extend(_attrs.widget_options, { id: _this.id }); jQuery.extend(_attrs.widget_options, { id: _this.id });
_attrs.id = ''; _attrs.id = '';
_this = _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch_customfilter._attributes, _child || {})) || this; _this = _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch_customfilter._attributes, _child || {})) || this;
_this.real_node = et2_createWidget(_attrs.type, _attrs.widget_options, _this.getParent()); _this.real_node = et2_core_widget_1.et2_createWidget(_attrs.type, _attrs.widget_options, _this.getParent());
var select_options = []; var select_options = [];
var correct_type = _attrs.type; var correct_type = _attrs.type;
_this.real_node['type'] = _attrs.widget_type; _this.real_node['type'] = _attrs.widget_type;

88
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -44,7 +44,7 @@
import './et2_core_common'; import './et2_core_common';
import './et2_core_interfaces'; import './et2_core_interfaces';
import {ClassWithAttributes} from "./et2_core_inheritance"; import {ClassWithAttributes} from "./et2_core_inheritance";
import {et2_register_widget, et2_widget, WidgetConfig} from "./et2_core_widget"; import {et2_createWidget, et2_register_widget, et2_widget, WidgetConfig} from "./et2_core_widget";
import {et2_DOMWidget} from "./et2_core_DOMWidget"; import {et2_DOMWidget} from "./et2_core_DOMWidget";
import {et2_baseWidget} from "./et2_core_baseWidget"; import {et2_baseWidget} from "./et2_core_baseWidget";
import {et2_inputWidget} from "./et2_core_inputWidget"; import {et2_inputWidget} from "./et2_core_inputWidget";
@ -54,6 +54,17 @@ import {et2_nextmatch_controller} from "./et2_extension_nextmatch_controller";
import {et2_dataview} from "./et2_dataview"; import {et2_dataview} from "./et2_dataview";
import {et2_dataview_column} from "./et2_dataview_model_columns"; import {et2_dataview_column} from "./et2_dataview_model_columns";
import {et2_customfields_list} from "./et2_extension_customfields"; import {et2_customfields_list} from "./et2_extension_customfields";
import {et2_link_entry, et2_link_to} from "./et2_widget_link";
import {et2_dialog} from "./et2_widget_dialog";
import {et2_grid} from "./et2_widget_grid";
import {et2_dataview_grid} from "./et2_dataview_view_grid";
import {et2_taglist} from "./et2_widget_taglist";
import {et2_selectAccount} from "./et2_widget_selectAccount";
import {et2_dynheight} from "./et2_widget_dynheight";
import {et2_arrayMgr} from "./et2_core_arrayMgr";
import {et2_button} from "./et2_widget_button";
import {et2_searchbox} from "./et2_widget_textbox";
import {et2_template} from "./et2_widget_template";
//import {et2_selectAccount} from "./et2_widget_SelectAccount"; //import {et2_selectAccount} from "./et2_widget_SelectAccount";
@ -161,6 +172,12 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
"description": "Hide the second filter", "description": "Hide the second filter",
"default": et2_no_init "default": et2_no_init
}, },
"disable_autorefresh": {
"name": "Disable autorefresh",
"type": "boolean",
"description": "Disable the ability to autorefresh the nextmatch on a regular interval. ",
"default": false
},
"view": { "view": {
"name": "View", "name": "View",
"type": "string", "type": "string",
@ -289,7 +306,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
.addClass("et2_nextmatch"); .addClass("et2_nextmatch");
this.header = et2_createWidget("nextmatch_header_bar", {}, this); this.header = <et2_nextmatch_header_bar> et2_createWidget("nextmatch_header_bar", {}, this);
this.innerDiv = jQuery(document.createElement("div")) this.innerDiv = jQuery(document.createElement("div"))
.appendTo(this.div); .appendTo(this.div);
@ -843,7 +860,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
*/ */
protected refresh_add(uid:string, type = "add") protected refresh_add(uid:string, type = "add")
{ {
let index = 0; let index : boolean | number = 0;
let appname = this._get_appname(); let appname = this._get_appname();
if(appname && this.egw().window.app[appname] && typeof this.egw().window.app[appname].nm_refresh_index == "function") if(appname && this.egw().window.app[appname] && typeof this.egw().window.app[appname].nm_refresh_index == "function")
{ {
@ -1667,7 +1684,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
// Build the popup // Build the popup
if(!this.selectPopup) if(!this.selectPopup)
{ {
const select = et2_createWidget("select", { const select = <et2_selectbox> et2_createWidget("select", {
multiple: true, multiple: true,
rows: 8, rows: 8,
empty_label: this.egw().lang("select columns"), empty_label: this.egw().lang("select columns"),
@ -1677,23 +1694,27 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
select.set_select_options(columns); select.set_select_options(columns);
select.set_value(columns_selected); select.set_value(columns_selected);
const autoRefresh = et2_createWidget("select", { let autoRefresh;
"empty_label": "Refresh" if(!this.options.disable_autorefresh)
}, this); {
autoRefresh.set_id("nm_autorefresh"); autoRefresh = <et2_selectbox> et2_createWidget("select", {
autoRefresh.set_select_options({ "empty_label": "Refresh"
// Cause [unknown] problems with mail }, this);
//30: "30 seconds", autoRefresh.set_id("nm_autorefresh");
//60: "1 Minute", autoRefresh.set_select_options({
180: "3 Minutes", // Cause [unknown] problems with mail
300: "5 Minutes", //30: "30 seconds",
900: "15 Minutes", //60: "1 Minute",
1800: "30 Minutes" 180: "3 Minutes",
}); 300: "5 Minutes",
autoRefresh.set_value(this._get_autorefresh()); 900: "15 Minutes",
autoRefresh.set_statustext(egw.lang("Automatically refresh list")); 1800: "30 Minutes"
});
autoRefresh.set_value(this._get_autorefresh());
autoRefresh.set_statustext(egw.lang("Automatically refresh list"));
}
const defaultCheck = et2_createWidget("select", {"empty_label": "Preference"}, this); const defaultCheck = <et2_selectbox> et2_createWidget("select", {"empty_label": "Preference"}, this);
defaultCheck.set_id('nm_col_preference'); defaultCheck.set_id('nm_col_preference');
defaultCheck.set_select_options({ defaultCheck.set_select_options({
'default': {label: 'Default',title:'Set these columns as the default'}, 'default': {label: 'Default',title:'Set these columns as the default'},
@ -1702,7 +1723,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
}); });
defaultCheck.set_value(this.options.settings.columns_forced ? 'force': ''); defaultCheck.set_value(this.options.settings.columns_forced ? 'force': '');
const okButton = et2_createWidget("buttononly", {"background_image": true, image: "check"}, this); const okButton = <et2_button> et2_createWidget("buttononly", {"background_image": true, image: "check"}, this);
okButton.set_label(this.egw().lang("ok")); okButton.set_label(this.egw().lang("ok"));
okButton.onclick = function() { okButton.onclick = function() {
// Update visibility // Update visibility
@ -1799,7 +1820,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
self.dataview.updateColumns(); self.dataview.updateColumns();
// Auto refresh // Auto refresh
self._set_autorefresh(autoRefresh.get_value()); self._set_autorefresh(autoRefresh ? autoRefresh.get_value() : 0);
// Set default or clear forced // Set default or clear forced
if(show_letters) if(show_letters)
@ -1811,7 +1832,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
self.selectPopup = null; self.selectPopup = null;
}; };
const cancelButton = et2_createWidget("buttononly", {"background_image": true, image: "cancel"}, this); const cancelButton = <et2_button> et2_createWidget("buttononly", {"background_image": true, image: "cancel"}, this);
cancelButton.set_label(this.egw().lang("cancel")); cancelButton.set_label(this.egw().lang("cancel"));
cancelButton.onclick = function() { cancelButton.onclick = function() {
self.selectPopup.toggle(); self.selectPopup.toggle();
@ -1858,7 +1879,10 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
.appendTo(this.innerDiv); .appendTo(this.innerDiv);
// Add autorefresh // Add autorefresh
$footerWrap.append(autoRefresh.getSurroundings().getDOMNode(autoRefresh.getDOMNode())); if(autoRefresh)
{
$footerWrap.append(autoRefresh.getSurroundings().getDOMNode(autoRefresh.getDOMNode()));
}
// Add default checkbox for admins // Add default checkbox for admins
const apps = this.egw().user('apps'); const apps = this.egw().user('apps');
@ -2006,7 +2030,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
jQuery(this.getInstanceManager().DOMContainer.parentNode).one('show.et2_nextmatch', jQuery(this.getInstanceManager().DOMContainer.parentNode).one('show.et2_nextmatch',
// Important to use anonymous function instead of just 'this.refresh' because // Important to use anonymous function instead of just 'this.refresh' because
// of the parameters passed // of the parameters passed
jQuery.proxy(function() {this.refresh();},this) jQuery.proxy(function() {this.refresh(null, 'edit');},this)
); );
},this), time*1000); },this), time*1000);
},this)); },this));
@ -2025,6 +2049,10 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
*/ */
_get_autorefresh( ) _get_autorefresh( )
{ {
if(this.options.disable_autorefresh)
{
return 0;
}
const refresh_preference = "nextmatch-" + this.options.settings.columnselection_pref + "-autorefresh"; const refresh_preference = "nextmatch-" + this.options.settings.columnselection_pref + "-autorefresh";
return this.egw().preference(refresh_preference,this._get_appname()); return this.egw().preference(refresh_preference,this._get_appname());
} }
@ -2348,7 +2376,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
to_id: split.join('::') to_id: split.join('::')
}; };
// Create widget and mangle to our needs // Create widget and mangle to our needs
const link = et2_createWidget("link-to", {value: link_value}, this); const link = <et2_link_to> et2_createWidget("link-to", {value: link_value}, this);
link.loadingFinished(); link.loadingFinished();
link.file_upload.set_drop_target(false); link.file_upload.set_drop_target(false);
@ -2918,7 +2946,7 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
fix: !egwIsMobile() fix: !egwIsMobile()
}; };
// searchbox widget // searchbox widget
this.et2_searchbox = et2_createWidget('searchbox', searchbox_options,this); this.et2_searchbox = <et2_searchbox> et2_createWidget('searchbox', searchbox_options,this);
// Set activeFilters to current value // Set activeFilters to current value
this.nextmatch.activeFilters.search = settings.search; this.nextmatch.activeFilters.search = settings.search;
@ -3022,7 +3050,7 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
{ {
definition = egw.preference('nextmatch-export-definition', this.nextmatch.egw().app_name()); definition = egw.preference('nextmatch-export-definition', this.nextmatch.egw().app_name());
} }
let button = et2_createWidget("buttononly", {id: "export", "statustext": "Export", image: "download", "background_image": true}, this); let button = <et2_button> et2_createWidget("buttononly", {id: "export", "statustext": "Export", image: "download", "background_image": true}, this);
jQuery(button.getDOMNode()) jQuery(button.getDOMNode())
.click(this.nextmatch, function(event) { .click(this.nextmatch, function(event) {
// @ts-ignore // @ts-ignore
@ -3107,7 +3135,7 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
// Load the template // Load the template
const self = this; const self = this;
const header = et2_createWidget("template", {"id": template_name}, this); const header = <et2_template> et2_createWidget("template", {"id": template_name}, this);
this.headers[id] = header; this.headers[id] = header;
const deferred = []; const deferred = [];
header.loadingFinished(deferred); header.loadingFinished(deferred);
@ -3902,7 +3930,7 @@ export class et2_nextmatch_accountfilterheader extends et2_selectAccount impleme
{ {
this.options.empty_label = this.options.label ? this.options.label : egw.lang("All"); this.options.empty_label = this.options.label ? this.options.label : egw.lang("All");
} }
super.createInputWidget(this, arguments); super.createInputWidget();
this.input.change(this, function(event) { this.input.change(this, function(event) {
if(typeof event.data.nextmatch == 'undefined') if(typeof event.data.nextmatch == 'undefined')