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

Fix duration display format caused error

Browse Source
This commit is contained in:
nathangray 2020-02-07 09:30:43 -07:00
parent d8345d2178
commit 0249c1604b
2 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
api/js/etemplate/et2_widget_date.js
View File

@ -616,20 +616,6 @@ var et2_date_duration = /** @class */ (function (_super) {
.addClass('et2_date_duration') .addClass('et2_date_duration')
.attr({ type: 'number', size: 3, step: this.options.step, lang: this.egw().preference('number_format')[0] === "," ? "en-150" : "en-001" }); .attr({ type: 'number', size: 3, step: this.options.step, lang: this.egw().preference('number_format')[0] === "," ? "en-150" : "en-001" });
this.node.append(this.duration); this.node.append(this.duration);
if (this.options.display_format.length > 1) {
this.format = jQuery(document.createElement("select"))
.addClass('et2_date_duration');
this.node.append(this.format);
for (var i = 0; i < this.options.display_format.length; i++) {
this.format.append("<option value='" + this.options.display_format[i] + "'>" + this.time_formats[this.options.display_format[i]] + "</option>");
}
}
else if (this.time_formats[this.options.display_format]) {
this.format = jQuery("<span>" + this.time_formats[this.options.display_format] + "</span>").appendTo(this.node);
}
else {
this.format = jQuery("<span>" + this.time_formats["m"] + "</span>").appendTo(this.node);
}
var self = this; var self = this;
// seems the 'invalid' event doesn't work in all browsers, eg. FF therefore // seems the 'invalid' event doesn't work in all browsers, eg. FF therefore
// we use focusout event to check the valifdity of input right after user // we use focusout event to check the valifdity of input right after user
@ -707,6 +693,32 @@ var et2_date_duration = /** @class */ (function (_super) {
} }
} }
}; };
et2_date_duration.prototype.set_display_format = function (format)
{
if (format.length <= 1)
{
this.node.remove('select.et2_date_duration');
}
this.options.display_format = format;
if (this.options.display_format.length > 1)
{
this.format = jQuery(document.createElement("select"))
.addClass('et2_date_duration');
this.node.append(this.format);
for (var i = 0; i < this.options.display_format.length; i++)
{
this.format.append("<option value='" + this.options.display_format[i] + "'>" + this.time_formats[this.options.display_format[i]] + "</option>");
}
}
else if (this.time_formats[this.options.display_format])
{
this.format = jQuery("<span>" + this.time_formats[this.options.display_format] + "</span>").appendTo(this.node);
}
else
{
this.format = jQuery("<span>" + this.time_formats["m"] + "</span>").appendTo(this.node);
}
};
/** /**
* Converts the value in data format into value in display format. * Converts the value in data format into value in display format.
* *

47
api/js/etemplate/et2_widget_date.ts
View File

@ -754,24 +754,6 @@ export class et2_date_duration extends et2_date
.attr({type: 'number', size: 3, step:this.options.step, lang: this.egw().preference('number_format')[0] === "," ? "en-150": "en-001"}); .attr({type: 'number', size: 3, step:this.options.step, lang: this.egw().preference('number_format')[0] === "," ? "en-150": "en-001"});
this.node.append(this.duration); this.node.append(this.duration);
if(this.options.display_format.length > 1)
{
this.format = jQuery(document.createElement("select"))
.addClass('et2_date_duration');
this.node.append(this.format);
for(var i = 0; i < this.options.display_format.length; i++) {
this.format.append("<option value='"+this.options.display_format[i]+"'>"+this.time_formats[this.options.display_format[i]]+"</option>");
}
}
else if (this.time_formats[this.options.display_format])
{
this.format = jQuery("<span>"+this.time_formats[this.options.display_format]+"</span>").appendTo(this.node);
}
else
{
this.format = jQuery("<span>"+this.time_formats["m"]+"</span>").appendTo(this.node);
}
var self = this; var self = this;
// seems the 'invalid' event doesn't work in all browsers, eg. FF therefore // seems the 'invalid' event doesn't work in all browsers, eg. FF therefore
// we use focusout event to check the valifdity of input right after user // we use focusout event to check the valifdity of input right after user
@ -875,6 +857,33 @@ export class et2_date_duration extends et2_date
} }
} }
set_display_format(format)
{
if (format.length <= 1)
{
this.node.remove('select.et2_date_duration');
}
this.options.display_format = format;
if(this.options.display_format.length > 1)
{
this.format = jQuery(document.createElement("select"))
.addClass('et2_date_duration');
this.node.append(this.format);
for(var i = 0; i < this.options.display_format.length; i++) {
this.format.append("<option value='"+this.options.display_format[i]+"'>"+this.time_formats[this.options.display_format[i]]+"</option>");
}
}
else if (this.time_formats[this.options.display_format])
{
this.format = jQuery("<span>"+this.time_formats[this.options.display_format]+"</span>").appendTo(this.node);
}
else
{
this.format = jQuery("<span>"+this.time_formats["m"]+"</span>").appendTo(this.node);
}
}
/** /**
* Converts the value in data format into value in display format. * Converts the value in data format into value in display format.
* *
@ -1295,7 +1304,7 @@ export class et2_date_range extends et2_inputWidget
type: 'boolean', type: 'boolean',
description: 'Is the date range relative (this week) or absolute (2016-02-15 - 2016-02-21). This will affect the value returned.' description: 'Is the date range relative (this week) or absolute (2016-02-15 - 2016-02-21). This will affect the value returned.'
} }
} };
div: JQuery; div: JQuery;
from: et2_date; from: et2_date;