Attachment 4279 Details for Bug 26546

[patch] Patch

umc_time_date_widgets.patch (text/plain), 5.09 KB, created by Alexander Kläser on 2012-03-16 18:02 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kläser

Created: 2012-03-16 18:02 CET

Size: 5.09 KB

patch

obsolete

>Index: umc/widgets/TimeBox.js
>===================================================================
>--- umc/widgets/TimeBox.js	(Revision 0)
>+++ umc/widgets/TimeBox.js	(Revision 0)
>@@ -0,0 +1,122 @@
>+/*
>+ * Copyright 2011 Univention GmbH
>+ *
>+ * http://www.univention.de/
>+ *
>+ * All rights reserved.
>+ *
>+ * The source code of this program is made available
>+ * under the terms of the GNU Affero General Public License version 3
>+ * (GNU AGPL V3) as published by the Free Software Foundation.
>+ *
>+ * Binary versions of this program provided by Univention to you as
>+ * well as other copyrighted, protected or trademarked materials like
>+ * Logos, graphics, fonts, specific documentations and configurations,
>+ * cryptographic keys etc. are subject to a license agreement between
>+ * you and Univention and not subject to the GNU AGPL V3.
>+ *
>+ * In the case you use this program under the terms of the GNU AGPL V3,
>+ * the program is provided in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+ * GNU Affero General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU Affero General Public
>+ * License with the Debian GNU/Linux or Univention distribution in file
>+ * /usr/share/common-licenses/AGPL-3; if not, see
>+ * <http://www.gnu.org/licenses/>.
>+ */
>+/*global dojo dijit dojox umc console */
>+
>+dojo.provide("umc.widgets.TimeBox");
>+
>+dojo.require("dijit.form.TimeTextBox");
>+//dojo.require("dojox.string.sprintf");
>+dojo.require("umc.widgets.ContainerWidget");
>+dojo.require("umc.widgets._FormWidgetMixin");
>+dojo.require("umc.widgets._WidgetsInWidgetsMixin");
>+dojo.require("umc.tools");
>+
>+dojo.declare("umc.widgets.TimeBox", [
>+	umc.widgets.ContainerWidget,
>+	umc.widgets._FormWidgetMixin,
>+	umc.widgets._WidgetsInWidgetsMixin
>+], {
>+	// the widget's class name as CSS class
>+	'class': 'umcTimeBox',
>+
>+	_timeBox: null,
>+
>+	sizeClass: null,
>+
>+	disabled: false,
>+
>+	postMixInProperties: function() {
>+		this.inherited(arguments);
>+
>+		this.sizeClass = null;
>+	},
>+
>+	buildRendering: function() {
>+		this.inherited(arguments);
>+
>+		this._timeBox = this.adopt(dijit.form.TimeTextBox, {
>+			name: this.name,
>+			disabled: this.disabled
>+		});
>+		this.addChild(this._timeBox);
>+
>+		// hook to the onChange event
>+		this.connect(this._timeBox, 'onChange', function(val) {
>+			this.onChange(this.get('value'));
>+		});
>+	},
>+
>+	_dateToTime: function(dateObj) {
>+		try {
>+			return dojox.string.sprintf('%02d:%02d', dateObj.getHours(), dateObj.getMinutes());
>+		} catch(e) {
>+			return '';
>+		}
>+	},
>+
>+	// return time in the format 'HH:MM'
>+	_getValueAttr: function() {
>+		return this._dateToTime(this._timeBox.get('value'));
>+	},
>+
>+	_setValueAttr: function(newVal) {
>+		if (newVal && newVal instanceof Date) {
>+			newVal = this._dateToTime(newVal);
>+		}
>+		try {
>+			var parts = newVal.split(':');
>+			this._timeBox.set('value', new Date(1970, 1, 1, parseInt(parts[0], 10) || 0, parseInt(parts[1], 10) || 0));
>+		} catch(e) {
>+			console.log('ERROR: invalid time format: ' + newVal);
>+			this._timeBox.set('value', null);
>+		}
>+	},
>+
>+	isValid: function() {
>+		// use the property 'valid' in case it has been set
>+		// otherwise fall back to the default
>+		if (null !== this.valid) {
>+			return this.get('valid');
>+		}
>+		return this._timeBox.isValid();
>+	},
>+
>+	_setBlockOnChangeAttr: function(/*Boolean*/ value) {
>+		// execute the inherited functionality in the widget's scope
>+		umc.tools.delegateCall(this, arguments, this._timeBox);
>+	},
>+
>+	_getBlockOnChangeAttr: function(/*Boolean*/ value) {
>+		// execute the inherited functionality in the widget's scope
>+		umc.tools.delegateCall(this, arguments, this._timeBox);
>+	}
>+});
>+
>+
>+
>Index: umc/widgets/DateBox.js
>===================================================================
>--- umc/widgets/DateBox.js	(Revision 31527)
>+++ umc/widgets/DateBox.js	(Arbeitskopie)
>@@ -37,8 +37,8 @@
> dojo.require("umc.widgets._WidgetsInWidgetsMixin");
> dojo.require("umc.tools");
> 
>-dojo.declare("umc.widgets.DateBox", [ 
>-	umc.widgets.ContainerWidget, 
>+dojo.declare("umc.widgets.DateBox", [
>+	umc.widgets.ContainerWidget,
> 	umc.widgets._FormWidgetMixin,
> 	umc.widgets._WidgetsInWidgetsMixin
> ], {
>@@ -70,16 +70,23 @@
> 		this.connect(this._dateBox, 'onChange', 'onChange');
> 	},
> 
>+	_dateToString: function(dateObj) {
>+		return dojox.string.sprintf('%04d-%02d-%02d', dateObj.getFullYear(), dateObj.getMonth() + 1, dateObj.getDate());
>+	},
>+
> 	// return ISO8601/RFC3339 format (yyyy-MM-dd) as string
> 	_getValueAttr: function() {
>-		var date = this._dateBox.get('value');
>-		if (date && date instanceof Date) {
>-			return dojox.string.sprintf('%04d-%02d-%02d', date.getFullYear(), date.getMonth() + 1, date.getDate());
>+		var dateObj = this._dateBox.get('value');
>+		if (dateObj && dateObj instanceof Date) {
>+			return this._dateToString(dateObj);
> 		}
>-		return date;
>+		return dateObj;
> 	},
> 
>-	_setValueAttr: function(newVal) {
>+	_setValueAttr: function(/*String|Date*/ newVal) {
>+		if (newVal && newVal instanceof Date) {
>+			newVal = this._dateToString(newVal);
>+		}
> 		this._dateBox.set('value', newVal);
> 	},
>

Actions: View | Diff

Attachments on bug 26546: 4279