dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1997
committer: Tran Ng Minh Luan <Luan@MinhLuan-PC>
branch nick: dhis2
timestamp: Thu 2010-11-04 16:49:46 +0700
message:
  Save value with PeriodType "Quarterly" from mobile
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultPeriodService.java


--
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-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java	2010-11-02 03:53:54 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java	2010-11-04 09:49:46 +0000
@@ -74,7 +74,8 @@
 			if( dataSet.getPeriodType().getName().equals( "Daily") ||
 					dataSet.getPeriodType().getName().equals( "Weekly") ||
 					dataSet.getPeriodType().getName().equals( "Monthly") ||
-					dataSet.getPeriodType().getName().equals( "Yearly") )
+					dataSet.getPeriodType().getName().equals( "Yearly") || 
+					dataSet.getPeriodType().getName().equals("Quarterly") )
 			{
 				datasets.add(getDataSetForLocale(dataSet.getId(),locale));
 			}

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultPeriodService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultPeriodService.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultPeriodService.java	2010-11-04 09:49:46 +0000
@@ -12,6 +12,7 @@
 import org.hisp.dhis.period.DailyPeriodType;
 import org.hisp.dhis.period.MonthlyPeriodType;
 import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.QuarterlyPeriodType;
 import org.hisp.dhis.period.WeeklyPeriodType;
 import org.hisp.dhis.period.YearlyPeriodType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,8 +100,33 @@
 			cal.set( Calendar.YEAR, Integer.parseInt(periodName) );
 			
 			YearlyPeriodType yearlyPeriodType = new YearlyPeriodType();
+			
 			period = yearlyPeriodType.createPeriod( cal.getTime() );			
-		}	
+		}else if(dataSet.getPeriodType().getName().equals("Quarterly")){
+			Calendar cal = Calendar.getInstance();
+			
+			int month = 0;
+			if(periodName.substring(0,periodName.indexOf(" ")).equals("Jan")){
+				month = 1;
+			}else if(periodName.substring(0,periodName.indexOf(" ")).equals("Apr")){
+				month = 4;
+			}else if(periodName.substring(0,periodName.indexOf(" ")).equals("Jul")){
+				month = 6;
+			}else if(periodName.substring(0,periodName.indexOf(" ")).equals("Oct")){
+				month = 10;
+			}
+				
+			int year = Integer.parseInt(periodName.substring(periodName.lastIndexOf(" ")+1));
+			
+			cal.set(Calendar.MONTH, month);
+			cal.set(Calendar.YEAR, year);
+			
+			QuarterlyPeriodType quarterlyPeriodType = new QuarterlyPeriodType();
+			if(month != 0){
+				period =  quarterlyPeriodType.createPeriod(cal.getTime());
+			}
+			
+		}
 		
 		if( period != null )
 		{