extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate: Fix nextmatch printing failed after TypeScript conversion

Browse Source
This commit is contained in:
nathangray 2020-03-18 10:36:14 -06:00
parent a2d9e8cae0
commit c04915ae09
2 changed files with 66 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ var et2_INextmatchSortable = "et2_INextmatchSortable";
function implements_et2_INextmatchSortable(obj) { function implements_et2_INextmatchSortable(obj) {
return implements_methods(obj, ["setSortmode"]); return implements_methods(obj, ["setSortmode"]);
} }
;
/** /**
* Class which implements the "nextmatch" XET-Tag * Class which implements the "nextmatch" XET-Tag
* *
@ -103,17 +104,23 @@ var et2_nextmatch = /** @class */ (function (_super) {
* @memberOf et2_nextmatch * @memberOf et2_nextmatch
*/ */
function et2_nextmatch(_parent, _attrs, _child) { function et2_nextmatch(_parent, _attrs, _child) {
var _this = _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch._attributes, _child || {})) || this; var _this = _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch._attributes, _child || {})) || this;
_this.activeFilters = { col_filter: {} }; // When printing, we change the layout around. Keep some values so it can be restored after
_this.columns = []; _this.print = {
// keeps sorted columns old_height: 0,
_this.sortedColumnsList = []; row_selector: '',
// Directly set current col_filters from settings orientation_style: null
jQuery.extend(_this.activeFilters.col_filter, _this.options.settings.col_filter); };
/* _this.activeFilters = {col_filter: {}};
Process selected custom fields here, so that the settings are correctly _this.columns = [];
set before the row template is parsed // keeps sorted columns
*/ _this.sortedColumnsList = [];
// Directly set current col_filters from settings
jQuery.extend(_this.activeFilters.col_filter, _this.options.settings.col_filter);
/*
Process selected custom fields here, so that the settings are correctly
set before the row template is parsed
*/
var prefs = _this._getPreferences(); var prefs = _this._getPreferences();
var cfs = {}; var cfs = {};
for (var i = 0; i < prefs.visible.length; i++) { for (var i = 0; i < prefs.visible.length; i++) {
@ -986,16 +993,16 @@ var et2_nextmatch = /** @class */ (function (_super) {
this.controller.setPrefix(this.options.settings.dataStorePrefix); this.controller.setPrefix(this.options.settings.dataStorePrefix);
// Set the view // Set the view
this.controller._view = this.view; this.controller._view = this.view;
// Load the initial order // Load the initial order
/*this.controller.loadInitialOrder(this._getInitialOrder( /*this.controller.loadInitialOrder(this._getInitialOrder(
this.options.settings.rows, this.options.settings.row_id this.options.settings.rows, this.options.settings.row_id
));*/ ));*/
// Set the initial row count // Set the initial row count
var total = typeof this.options.settings.total != "undefined" ? var total = typeof this.options.settings.total != "undefined" ?
this.options.settings.total : 0; this.options.settings.total : 0;
// This triggers an invalidate, which updates the grid // This triggers an invalidate, which updates the grid
this.dataview.grid.setTotalCount(total); this.dataview.grid.setTotalCount(total);
// Insert any data sent from server, so invalidate finds data already // Insert any data sent from server, so invalidate finds data already
if (this.options.settings.rows && this.options.settings.num_rows) { if (this.options.settings.rows && this.options.settings.num_rows) {
this.controller.loadInitialData(this.options.settings.dataStorePrefix, this.options.settings.row_id, this.options.settings.rows); this.controller.loadInitialData(this.options.settings.dataStorePrefix, this.options.settings.row_id, this.options.settings.rows);
// Remove, to prevent duplication // Remove, to prevent duplication
@ -1094,16 +1101,16 @@ var et2_nextmatch = /** @class */ (function (_super) {
if (!this.selectPopup) { if (!this.selectPopup) {
var select_1 = et2_createWidget("select", { var select_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"),
selected_first: false, selected_first: false,
value_class: "selcolumn_sortable_" value_class: "selcolumn_sortable_"
}, 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 = et2_createWidget("select", {
"empty_label": "Refresh" "empty_label": "Refresh"
}, this); }, this);
autoRefresh_1.set_id("nm_autorefresh"); autoRefresh_1.set_id("nm_autorefresh");
autoRefresh_1.set_select_options({ autoRefresh_1.set_select_options({
// Cause [unknown] problems with mail // Cause [unknown] problems with mail
@ -1115,16 +1122,16 @@ var et2_nextmatch = /** @class */ (function (_super) {
1800: "30 Minutes" 1800: "30 Minutes"
}); });
autoRefresh_1.set_value(this._get_autorefresh()); autoRefresh_1.set_value(this._get_autorefresh());
autoRefresh_1.set_statustext(egw.lang("Automatically refresh list")); autoRefresh_1.set_statustext(egw.lang("Automatically refresh list"));
var defaultCheck = et2_createWidget("select", { "empty_label": "Preference" }, this); var defaultCheck = 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'},
'reset': { label: 'Reset', title: "Reset all user's column preferences" }, 'reset': {label: 'Reset', title: "Reset all user's column preferences"},
'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_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

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

@ -79,14 +79,24 @@ function implements_et2_INextmatchHeader(obj : et2_widget)
export interface et2_INextmatchSortable export interface et2_INextmatchSortable
{ {
setSortmode(_sort_mode) : void setSortmode(_sort_mode): void
} }
var et2_INextmatchSortable = "et2_INextmatchSortable"; var et2_INextmatchSortable = "et2_INextmatchSortable";
function implements_et2_INextmatchSortable(obj : et2_widget)
function implements_et2_INextmatchSortable(obj: et2_widget)
{ {
return implements_methods(obj, ["setSortmode"]); return implements_methods(obj, ["setSortmode"]);
} }
// For holding settings while whe print
interface PrintSettings
{
old_height: number,
row_selector: string,
orientation_style: HTMLStyleElement
};
/** /**
* Class which implements the "nextmatch" XET-Tag * Class which implements the "nextmatch" XET-Tag
* *
@ -227,10 +237,10 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
private _autorefresh_timer: number; private _autorefresh_timer: number;
// When printing, we change the layout around. Keep some values so it can be restored after // When printing, we change the layout around. Keep some values so it can be restored after
private print: { private print: PrintSettings = {
old_height: number, old_height: 0,
row_selector: string, row_selector: '',
orientation_style: HTMLStyleElement orientation_style: null
}; };
/** /**
@ -238,7 +248,8 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
* *
* @memberOf et2_nextmatch * @memberOf et2_nextmatch
*/ */
constructor(_parent?, _attrs? : WidgetConfig, _child? : object) { constructor(_parent?, _attrs?: WidgetConfig, _child?: object)
{
super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_nextmatch._attributes, _child || {})); super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_nextmatch._attributes, _child || {}));
this.activeFilters = {col_filter:{}}; this.activeFilters = {col_filter:{}};