dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13496
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4353: small changes to js
------------------------------------------------------------
revno: 4353
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-08-18 14:04:09 +0200
message:
small changes to js
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/periodType.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/periodType.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/periodType.js 2011-07-21 12:37:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/periodType.js 2011-08-18 12:04:09 +0000
@@ -1,212 +1,211 @@
-
function PeriodType()
{
- var dateFormat = 'yyyy-MM-dd';
-
- var periodTypes = [];
- periodTypes['Daily'] = new DailyPeriodType( dateFormat );
- periodTypes['Weekly'] = new WeeklyPeriodType( dateFormat );
- periodTypes['Monthly'] = new MonthlyPeriodType( dateFormat );
- periodTypes['Quarterly'] = new QuarterlyPeriodType( dateFormat );
- periodTypes['SixMonthly'] = new SixMonthlyPeriodType( dateFormat );
- periodTypes['Yearly'] = new YearlyPeriodType( dateFormat );
-
- this.get = function( key )
- {
- return periodTypes[key];
- }
-
- this.reverse = function( array )
- {
- var reversed = [];
- var i = 0;
-
- for ( var j = array.length - 1; j >= 0; j-- )
- {
- reversed[i++] = array[j];
- }
-
- return reversed;
- }
-
- this.filterFuturePeriods = function( periods )
- {
- var array = [];
- var i = 0;
-
- var now = new Date().getTime();
-
- for ( var j = 0; j < periods.length; j++ )
- {
- if ( $.date( periods[j]['startDate'], dateFormat ).date().getTime() < now )
- {
- array[i++] = periods[j];
- }
- }
-
- return array;
- }
+ var dateFormat = 'yyyy-MM-dd';
+
+ var periodTypes = [];
+ periodTypes['Daily'] = new DailyPeriodType( dateFormat );
+ periodTypes['Weekly'] = new WeeklyPeriodType( dateFormat );
+ periodTypes['Monthly'] = new MonthlyPeriodType( dateFormat );
+ periodTypes['Quarterly'] = new QuarterlyPeriodType( dateFormat );
+ periodTypes['SixMonthly'] = new SixMonthlyPeriodType( dateFormat );
+ periodTypes['Yearly'] = new YearlyPeriodType( dateFormat );
+
+ this.get = function( key )
+ {
+ return periodTypes[key];
+ };
+
+ this.reverse = function( array )
+ {
+ var reversed = [];
+ var i = 0;
+
+ for ( var j = array.length - 1; j >= 0; j-- )
+ {
+ reversed[i++] = array[j];
+ }
+
+ return reversed;
+ };
+
+ this.filterFuturePeriods = function( periods )
+ {
+ var array = [];
+ var i = 0;
+
+ var now = new Date().getTime();
+
+ for ( var j = 0; j < periods.length; j++ )
+ {
+ if ( $.date( periods[j]['startDate'], dateFormat ).date().getTime() < now )
+ {
+ array[i++] = periods[j];
+ }
+ }
+
+ return array;
+ };
}
function DailyPeriodType( dateFormat )
{
- this.generatePeriods = function( offset )
- {
- var periods = [];
- var year = new Date().getFullYear() + offset;
- var startDate = $.date( year + '-01-01', dateFormat );
- var i = 0;
-
- while ( startDate.date().getFullYear() <= year )
- {
- var period = [];
- period['startDate'] = startDate.format( dateFormat );
- period['name'] = startDate.format( dateFormat );
- period['id'] = 'Daily_' + period['startDate'];
- periods[i]= period;
-
- startDate.adjust( 'D', +1 );
- i++;
- }
-
- return periods;
- }
+ this.generatePeriods = function( offset )
+ {
+ var periods = [];
+ var year = new Date().getFullYear() + offset;
+ var startDate = $.date( year + '-01-01', dateFormat );
+ var i = 0;
+
+ while ( startDate.date().getFullYear() <= year )
+ {
+ var period = [];
+ period['startDate'] = startDate.format( dateFormat );
+ period['name'] = startDate.format( dateFormat );
+ period['id'] = 'Daily_' + period['startDate'];
+ periods[i] = period;
+
+ startDate.adjust( 'D', +1 );
+ i++;
+ }
+
+ return periods;
+ };
}
function WeeklyPeriodType( dateFormat )
{
- this.generatePeriods = function( offset )
- {
- var periods = [];
- var year = new Date().getFullYear() + offset;
- var startDate = $.date( year + '-01-01', dateFormat );
- var day = startDate.date().getDay();
- var i = 0;
-
- if ( day == 0 ) // Sunday, forward to Monday
- {
- startDate.adjust( 'D', +1 );
- }
- else if ( day <= 4 ) // Monday - Thursday, rewind to Monday
- {
- startDate.adjust( 'D', ( ( day - 1 ) * -1 ) );
- }
- else // Friday - Saturday, forward to Monday
- {
- startDate.adjust( 'D', ( 8 - day ) );
- }
-
- while ( startDate.date().getFullYear() <= year )
- {
- var period = [];
- period['startDate'] = startDate.format( dateFormat );
- period['name'] = 'W' + ( i + 1 ) + ' - ' + startDate.format( dateFormat );
- period['id'] = 'Weekly_' + period['startDate'];
- periods[i] = period;
-
- startDate.adjust( 'D', +7 );
- i++;
- }
-
- return periods;
- }
+ this.generatePeriods = function( offset )
+ {
+ var periods = [];
+ var year = new Date().getFullYear() + offset;
+ var startDate = $.date( year + '-01-01', dateFormat );
+ var day = startDate.date().getDay();
+ var i = 0;
+
+ if ( day == 0 ) // Sunday, forward to Monday
+ {
+ startDate.adjust( 'D', +1 );
+ }
+ else if ( day <= 4 ) // Monday - Thursday, rewind to Monday
+ {
+ startDate.adjust( 'D', ( ( day - 1 ) * -1 ) );
+ }
+ else
+ // Friday - Saturday, forward to Monday
+ {
+ startDate.adjust( 'D', ( 8 - day ) );
+ }
+
+ while ( startDate.date().getFullYear() <= year )
+ {
+ var period = [];
+ period['startDate'] = startDate.format( dateFormat );
+ period['name'] = 'W' + ( i + 1 ) + ' - ' + startDate.format( dateFormat );
+ period['id'] = 'Weekly_' + period['startDate'];
+ periods[i] = period;
+
+ startDate.adjust( 'D', +7 );
+ i++;
+ }
+
+ return periods;
+ };
}
function MonthlyPeriodType( dateFormat )
{
- this.generatePeriods = function( offset )
- {
- var periods = [];
- var year = new Date().getFullYear() + offset;
- var startDate = $.date( year + '-01-01', dateFormat );
- var i = 0;
-
- while ( startDate.date().getFullYear() == year )
- {
- var period = [];
- period['startDate'] = startDate.format( dateFormat );
- period['name'] = monthNames[i] + ' ' + year;
- period['id'] = 'Monthly_' + period['startDate'];
- periods[i] = period;
-
- startDate.adjust( 'M', +1 );
- i++;
- }
-
- return periods;
- }
+ this.generatePeriods = function( offset )
+ {
+ var periods = [];
+ var year = new Date().getFullYear() + offset;
+ var startDate = $.date( year + '-01-01', dateFormat );
+ var i = 0;
+
+ while ( startDate.date().getFullYear() == year )
+ {
+ var period = [];
+ period['startDate'] = startDate.format( dateFormat );
+ period['name'] = monthNames[i] + ' ' + year;
+ period['id'] = 'Monthly_' + period['startDate'];
+ periods[i] = period;
+
+ startDate.adjust( 'M', +1 );
+ i++;
+ }
+
+ return periods;
+ };
}
function QuarterlyPeriodType( dateFormat )
{
- this.generatePeriods = function( offset )
- {
- var periods = [];
- var year = new Date().getFullYear() + offset;
- var startDate = $.date( year + '-01-01', dateFormat );
- var i = 0;
- var j = 0;
-
- while ( startDate.date().getFullYear() == year )
- {
- var period = [];
- period['startDate'] = startDate.format( dateFormat );
- period['name'] = monthNames[i] + ' - ' + monthNames[i+2] + ' ' + year;
- period['id'] = 'Quarterly_' + period['startDate'];
- periods[j] = period;
-
- startDate.adjust( 'M', +3 );
- i += 3;
- j++;
- }
-
- return periods;
- }
+ this.generatePeriods = function( offset )
+ {
+ var periods = [];
+ var year = new Date().getFullYear() + offset;
+ var startDate = $.date( year + '-01-01', dateFormat );
+ var i = 0;
+ var j = 0;
+
+ while ( startDate.date().getFullYear() == year )
+ {
+ var period = [];
+ period['startDate'] = startDate.format( dateFormat );
+ period['name'] = monthNames[i] + ' - ' + monthNames[i + 2] + ' ' + year;
+ period['id'] = 'Quarterly_' + period['startDate'];
+ periods[j] = period;
+
+ startDate.adjust( 'M', +3 );
+ i += 3;
+ j++;
+ }
+
+ return periods;
+ };
}
function SixMonthlyPeriodType( dateFormat )
{
- this.generatePeriods = function( offset )
- {
- var periods = [];
- var year = new Date().getFullYear() + offset;
-
- var period = [];
- period['startDate'] = year + '-01-01';
- period['name'] = monthNames[0] + ' - ' + monthNames[5] + ' ' + year;
- period['id'] = 'SixMonthly_' + period['startDate'];
- periods[0] = period;
-
- period = [];
- period['startDate'] = year + '-06-01';
- period['name'] = monthNames[6] + ' - ' + monthNames[11] + ' ' + year;
- period['id'] = 'SixMonthly_' + period['startDate'];
- periods[1] = period;
-
- return periods;
- }
+ this.generatePeriods = function( offset )
+ {
+ var periods = [];
+ var year = new Date().getFullYear() + offset;
+
+ var period = [];
+ period['startDate'] = year + '-01-01';
+ period['name'] = monthNames[0] + ' - ' + monthNames[5] + ' ' + year;
+ period['id'] = 'SixMonthly_' + period['startDate'];
+ periods[0] = period;
+
+ period = [];
+ period['startDate'] = year + '-06-01';
+ period['name'] = monthNames[6] + ' - ' + monthNames[11] + ' ' + year;
+ period['id'] = 'SixMonthly_' + period['startDate'];
+ periods[1] = period;
+
+ return periods;
+ };
}
function YearlyPeriodType( dateFormat )
-{
- this.generatePeriods = function( offset )
- {
- var periods = [];
- var year = new Date().getFullYear() + offset;
- var startDate = $.date( year + '-01-01', dateFormat ).adjust( 'Y', -5 );
- var i = 0;
-
- for ( var i = 0; i < 11; i++ )
- {
- var period = [];
- period['startDate'] = startDate.format( dateFormat );
- period['name'] = startDate.date().getFullYear();
- period['id'] = 'Yearly_' + period['startDate'];
- periods[i] = period;
-
- startDate.adjust( 'Y', +1 );
- }
-
- return periods;
- }
+{
+ this.generatePeriods = function( offset )
+ {
+ var periods = [];
+ var year = new Date().getFullYear() + offset;
+ var startDate = $.date( year + '-01-01', dateFormat ).adjust( 'Y', -5 );
+
+ for ( var i = 0; i < 11; i++ )
+ {
+ var period = [];
+ period['startDate'] = startDate.format( dateFormat );
+ period['name'] = startDate.date().getFullYear();
+ period['id'] = 'Yearly_' + period['startDate'];
+ periods[i] = period;
+
+ startDate.adjust( 'Y', +1 );
+ }
+
+ return periods;
+ };
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-08-15 08:17:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-08-18 12:04:09 +0000
@@ -393,4 +393,4 @@
"alphanumericwithbasicpuncspaces" : true
}
}
-}
+};
