et2_widget_date.js

nathangray 2016-03-21 23:50:23 UTC #1

Author: nathangray
New Revision: 55477

URL: http://svn.stylite.de/viewvc/egroupware?rev=55477&view=rev
Log:
Change some inconsistent relative dates

Modified:
trunk/egroupware/api/js/etemplate/et2_widget_date.js

Modified: trunk/egroupware/api/js/etemplate/et2_widget_date.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_date.js?rev=55477&r1=55476&r2=55477&view=diff

— trunk/egroupware/api/js/etemplate/et2_widget_date.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_date.js Tue Mar 22 00:50:21 2016
@@ -1303,15 +1303,12 @@
// Show description
this.select.set_value(_value);

```
  var now = new Date();
```

  now.setUTCMinutes(-now.getTimezoneOffset());

```
  now.setUTCHours(0);
```
```
  now.setUTCSeconds(0);
```

```
  var tempDate = new Date();
```

  var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);

  // Use strings to avoid references

```
  this.from.set_value(now.toJSON());
```
```
  this.to.set_value(now.toJSON());
```

```
  this.from.set_value(today.toJSON());
```

  this.to.set_value(today.toJSON());

  var relative = null;
  for(var index in et2_date_range.relative_dates)

@@ -1325,7 +1322,7 @@
if(relative)
{
var dates = [“from”,“to”];

```
  	var value = now.toJSON();
```

  	var value = today.toJSON();
  	for(var i = 0; i < dates.length; i++)
  	{
  		var date = dates[i];

@@ -1353,13 +1350,16 @@
{
value: ‘Today’,
label: ‘Today’,

```
  	from: '',
```
```
  	to: '+1d'
```

  	from: function(date) {return date;},

  	to: function(date) {return date;}
  },
  {
  	label: 'Yesterday',
  	value: 'Yesterday',

```
  	from: '-1d',
```

```
  	from: function(date) {
```

  		date.setUTCDate(date.getUTCDate() - 1);

```
  		return date;
```
```
  	},
  	to: ''
  },
  {
```

@@ -1387,20 +1387,49 @@
{
label: ‘This month’,
value: ‘This month’,

```
  	from: '',
```
```
  	to: '+1m'
```

```
  	from: function(date)
```
```
  	{
```
```
  		date.setUTCDate(1);
```
```
  		return date;
```
```
  	},
```
```
  	to: function(date)
```
```
  	{
```

  		date.setUTCMonth(date.getUTCMonth()+1);

```
  		date.setUTCDate(0);
```
```
  		return date;
```

  	}
  },
  {
  	label: 'Last month',
  	value: 'Last month',

```
  	from: '-1m',
```
```
  	to: ''
```

```
  	from: function(date)
```
```
  	{
```

  		date.setUTCMonth(date.getUTCMonth() - 1);

```
  		date.setUTCDate(1);
```
```
  		return date;
```
```
  	},
```
```
  	to: function(date)
```
```
  	{
```

  		date.setUTCMonth(date.getUTCMonth()+1);

```
  		date.setUTCDate(0);
```
```
  		return date;
```

  	}
  },
  {
  	label: 'Last 3 months',
  	value: 'Last 3 months',

```
  	from: '-3m',
```
```
  	to: ''
```

```
  	from: function(date)
```
```
  	{
```

  		date.setUTCMonth(date.getUTCMonth() - 2);

```
  		date.setUTCDate(1);
```
```
  		return date;
```
```
  	},
```
```
  	to: function(date)
```
```
  	{
```

  		date.setUTCMonth(date.getUTCMonth()+3);

```
  		date.setUTCDate(0);
```
```
  		return date;
```

  	}
  },
  /*
  'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs