=== modified file 'local/in/dhis-in-api/pom.xml' --- local/in/dhis-in-api/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-api/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-api === modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml' --- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-configuration === modified file 'local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml' --- local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-dataentrystatus === modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml' --- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-dbmanager === modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml' --- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-linelisting === modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml' --- local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-reports === modified file 'local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml' --- local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-scheduler === modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml' --- local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-service-survey === modified file 'local/in/dhis-in-services/pom.xml' --- local/in/dhis-in-services/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-in-services/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-in-services === modified file 'local/in/dhis-mobile/dhis-service-mobile/pom.xml' --- local/in/dhis-mobile/dhis-service-mobile/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-mobile/dhis-service-mobile/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-service-mobile === modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml' --- local/in/dhis-mobile/dhis-web-mobile/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-mobile/dhis-web-mobile/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-mobile === modified file 'local/in/dhis-mobile/pom.xml' --- local/in/dhis-mobile/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-mobile/pom.xml 2011-10-24 11:27:50 +0000 @@ -5,7 +5,7 @@ org.hisp.dhis dhis-sms - 2.4-SNAPSHOT + 2.6-SNAPSHOT pom Mobile SMS Modules === modified file 'local/in/dhis-web-dashboard/pom.xml' --- local/in/dhis-web-dashboard/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-dashboard/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-dashboard === modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java' --- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java 2011-06-15 06:01:50 +0000 +++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java 2011-10-24 11:27:50 +0000 @@ -516,9 +516,9 @@ List dsResults = new ArrayList(); - String criteria = "ratio"; + // String criteria = "ratio"; - DataSetCompletenessService completenessService = serviceProvider.provide( criteria ); + // DataSetCompletenessService completenessService = serviceProvider.provide( criteria ); while ( orgUnitListIterator.hasNext() ) { @@ -541,7 +541,7 @@ */ periodIterator = periodList.iterator(); - Period p; + // Period p; // double dataStatusPercentatge; @@ -555,7 +555,7 @@ while ( periodIterator.hasNext() ) { //System.out.println("Inside period Iterator Loop"); - p = (Period) periodIterator.next(); + // p = (Period) periodIterator.next(); //periodInfo = "" + p.getId(); //dataElementCount = 0; @@ -634,12 +634,12 @@ { //System.out.println( "Inside Not includeZeros " ); - dsResults = new ArrayList( completenessService.getDataSetCompleteness( p.getId(), o.getId(), selDataSet.getId() ) ); + // dsResults = new ArrayList( completenessService.getDataSetCompleteness( p.getId(), o.getId(), selDataSet.getId() ) ); } else { // System.out.println( "Inside includeZeros " ); - dsResults = new ArrayList( completenessService.getDataSetCompleteness( p.getId(), o.getId(), selDataSet.getId() ) ); + // dsResults = new ArrayList( completenessService.getDataSetCompleteness( p.getId(), o.getId(), selDataSet.getId() ) ); } /* === modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java' --- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java 2011-09-03 09:46:15 +0000 +++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java 2011-10-24 11:27:50 +0000 @@ -47,7 +47,6 @@ import org.hisp.dhis.period.DailyPeriodType; import org.hisp.dhis.period.FinancialAprilPeriodType; import org.hisp.dhis.period.MonthlyPeriodType; -import org.hisp.dhis.period.OnChangePeriodType; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; @@ -282,7 +281,8 @@ { String pTName = ptIterator.next().getName(); // if ( pTName.equalsIgnoreCase( FinancialAprilPeriodType.NAME ) || pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) - if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) + //if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) + if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) ) { ptIterator.remove(); } === modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java' --- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java 2011-09-03 09:46:15 +0000 +++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java 2011-10-24 11:27:50 +0000 @@ -43,7 +43,6 @@ import org.hisp.dhis.period.DailyPeriodType; import org.hisp.dhis.period.FinancialAprilPeriodType; import org.hisp.dhis.period.MonthlyPeriodType; -import org.hisp.dhis.period.OnChangePeriodType; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; @@ -230,7 +229,8 @@ { String pTName = ptIterator.next().getName(); // if ( pTName.equalsIgnoreCase( FinancialAprilPeriodType.NAME ) || pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) - if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) + //if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) + if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) ) { ptIterator.remove(); } === modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java' --- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java 2011-09-03 09:46:15 +0000 +++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java 2011-10-24 11:27:50 +0000 @@ -52,7 +52,6 @@ import org.hisp.dhis.period.DailyPeriodType; import org.hisp.dhis.period.FinancialAprilPeriodType; import org.hisp.dhis.period.MonthlyPeriodType; -import org.hisp.dhis.period.OnChangePeriodType; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; @@ -306,7 +305,8 @@ { String pTName = ptIterator.next().getName(); // if ( pTName.equalsIgnoreCase( FinancialAprilPeriodType.NAME ) || pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) - if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) + //if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) || pTName.equalsIgnoreCase( OnChangePeriodType.NAME ) ) + if ( pTName.equalsIgnoreCase( TwoYearlyPeriodType.NAME ) ) { ptIterator.remove(); } === modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml' --- local/in/dhis-web-dataentry-linelisting/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-dataentry-linelisting/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-dataentry-national === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java' --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java 2011-10-14 13:44:18 +0000 +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java 2011-10-24 11:27:50 +0000 @@ -1005,7 +1005,7 @@ LLDataSets.LLIDSPL_OUTCOME }; - for(int i = 0; i < 7; i++ ) + for( int i = 0; i < 7; i++ ) { LLDataValue llDv = tempLLDVList2.get(i); if(tempLLDVList2.get(i).getDataElement() == null || tempLLDVList2.get(i).getDataElement().getId() != llbDes[i]) === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/general.js' --- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/general.js 2011-10-13 09:13:08 +0000 +++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/general.js 2011-10-24 11:27:50 +0000 @@ -71,21 +71,488 @@ return stringToTrim.replace(/^\s+|\s+$/g,""); } + +//----------------------------------------------------------------------------- +//Linelisting ColdChain Related Methods for Validation +//----------------------------------------------------------------------------- +function isColdChainRemarksFieldEntered( ) +{ + if(lastRecordNo == -1) return true; + + var dataElementId = 5732; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + lastRecordNo + '].value' ); + var resVal = field.selectedIndex; + + if( resVal <= 0 ) + { + alert("Please enter Remarks Field in Previous Record" ); + return false; + } + else + { + return true; + } +} + +function validateColdChainEquipmentField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.selectedIndex; + + if( isColdChainRemarksFieldEntered( recordNo ) ) + { + if(resVal <= 0 || resVal == "---") + { + alert("Please Select Equipment"); + field.options[0].selected = true; + + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + } + else + { + field.options[0].selected = true; + return false; + } +} + +function isColdChainEquipmentFieldEntered( recordNo ) +{ + var dataElementId = 5726; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + alert( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.selectedIndex; + + if(resVal <= 0 || resVal == "---") + { + alert("Please select Equipment"); + field.focus(); + return false + } + + return true; +} + +function validateColdChainMachineNumberField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + resVal = resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); + + if( isColdChainEquipmentFieldEntered( recordNo ) ) + { + if(resVal == null || resVal == "" ) + { + alert("Please enter Machine Number"); + field.value = ""; + //field.focus(); + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + } + else + { + field.value = ""; + + return false; + } +} + +function isColdChainMachineNumberFieldEntered( recordNo ) +{ + var dataElementId = 5727; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Machine Number"); + field.focus(); + field.select(); + return false; + } + else + { + return true; + } +} + +function validateColdChainMachineWorkingField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.selectedIndex; + + if( isColdChainMachineNumberFieldEntered( recordNo ) ) + { + if(resVal <= 0 || resVal == "---") + { + alert("Please Select Whether Working?"); + field.options[0].selected = true; + + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + } + else + { + field.options[0].selected = true; + return false; + } +} + +function isColdChainMachineWorkingFieldEntered( recordNo ) +{ + var dataElementId = 5728; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.selectedIndex; + + if( resVal <= 0 ) + { + alert("Please select Whether Working?"); + field.focus(); + return false + } + + return true; +} + +function validateColdChainDateOfBreakdownField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + resVal = resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Date of BreakDown"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + + var currentDate= new Date(); + var mm = currentDate.getMonth()+1; + var dd = currentDate.getDate(); + ms = new String(mm); + ds = new String(dd); + if ( ms.length == 1 ) ms = "0" + ms; + if ( ds.length == 1 ) ds = "0" + ds; + var dateString = currentDate.getFullYear() + "-" + ms + "-" + ds; + + var startDateObj = document.getElementById('selStartDate'); + var endDateObj = document.getElementById('selEndDate'); + var startDate = startDateObj.value; + var endDate = endDateObj.value; + + if( isColdChainMachineWorkingFieldEntered( recordNo ) ) + { + if(isDate(resVal) ) + { + if(resVal > dateString) + { + alert("The Selected date is greater than Today's Date"); + field.value = ""; + return false; + } + if(resVal < startDate || resVal > endDate) + { + alert("The Selected Calendar date is not between Dataentry Month"); + field.value = ""; + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + } + else + { + field.value = ""; + field.focus(); + } + } + else + { + field.value = ""; + return false; + } +} + +function isColdChainDateOfBreakdownFieldEntered( recordNo ) +{ + var dataElementId = 5729; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Breakdown date"); + field.focus(); + field.select(); + return false; + } + + return true; +} + +function validateColdChainDateOfIntimationField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + resVal = resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Date of Intimation"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + + var currentDate= new Date(); + var mm = currentDate.getMonth()+1; + var dd = currentDate.getDate(); + ms = new String(mm); + ds = new String(dd); + if ( ms.length == 1 ) ms = "0" + ms; + if ( ds.length == 1 ) ds = "0" + ds; + var dateString = currentDate.getFullYear() + "-" + ms + "-" + ds; + + var startDateObj = document.getElementById('selStartDate'); + var endDateObj = document.getElementById('selEndDate'); + var startDate = startDateObj.value; + var endDate = endDateObj.value; + + if( isColdChainDateOfBreakdownFieldEntered( recordNo ) ) + { + if(isDate(resVal) ) + { + if(resVal > dateString) + { + alert("The Selected date is greater than Today's Date"); + field.value = ""; + return false; + } + if(resVal < startDate || resVal > endDate) + { + alert("The Selected Calendar date is not between Dataentry Month"); + field.value = ""; + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + } + else + { + field.value = ""; + field.focus(); + } + } + else + { + field.value = ""; + return false; + } +} + +function isColdChainDateOfIntimationFieldEntered( recordNo ) +{ + var dataElementId = 5730; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Intimation date"); + field.focus(); + field.select(); + return false; + } + + return true; +} + +function validateColdChainDateOfRepairField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + resVal = resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Date of Intimation"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + + var currentDate= new Date(); + var mm = currentDate.getMonth()+1; + var dd = currentDate.getDate(); + ms = new String(mm); + ds = new String(dd); + if ( ms.length == 1 ) ms = "0" + ms; + if ( ds.length == 1 ) ds = "0" + ds; + var dateString = currentDate.getFullYear() + "-" + ms + "-" + ds; + + var startDateObj = document.getElementById('selStartDate'); + var endDateObj = document.getElementById('selEndDate'); + var startDate = startDateObj.value; + var endDate = endDateObj.value; + + if( isColdChainDateOfIntimationFieldEntered( recordNo ) ) + { + if(isDate(resVal) ) + { + if(resVal > dateString) + { + alert("The Selected date is greater than Today's Date"); + field.value = ""; + return false; + } + if(resVal < startDate || resVal > endDate) + { + alert("The Selected Calendar date is not between Dataentry Month"); + field.value = ""; + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + } + else + { + field.value = ""; + field.focus(); + } + } + else + { + field.value = ""; + return false; + } +} + +function isColdChainDateOfRepairFieldEntered( recordNo ) +{ + var dataElementId = 5731; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + if(resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Repair date"); + field.focus(); + field.select(); + return false; + } + + return true; +} + +function validateColdChainRemarksField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + resVal = resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); + + if( isColdChainDateOfRepairFieldEntered( recordNo ) ) + { + if(resVal == null || resVal == "" ) + { + alert("Please enter Remarks"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + if (isInteger(resVal)) + { + alert("For Remarks field Only Digits are not Allowed"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + if(havingSpecialChar(resVal)) + { + alert("For Remarks field special characters are not allowed"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + if(isFirstLetter(resVal)) + { + alert("Remarks field should start with Letter"); + field.value = ""; + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + } + addLLColdChainNewRow( resVal, 5726, recordNo ); + } + else + { + field.value = ""; + return false; + } +} + //----------------------------------------------------------------------------- //Linelisting IDSP Form L Related Methods for Validation //----------------------------------------------------------------------------- -function isIDSPLDaignosisFieldEntered( ) +function isIDSPLOutcomeFieldEntered( ) { if(lastRecordNo == -1) return true; - var dataElementId = 1058; + var dataElementId = 3120; var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + lastRecordNo + '].value' ); var resVal = field.selectedIndex; if( resVal <= 0 ) { - alert("Please enter Diagnosis Field in Previous Record" ); + alert("Please enter Outcome Field in Previous Record" ); return false; } else @@ -100,7 +567,7 @@ var resVal = field.value; resVal = resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); - if( isIDSPLDaignosisFieldEntered() ) + if( isIDSPLOutcomeFieldEntered() ) { if(resVal == null || resVal == "" ) { @@ -256,8 +723,6 @@ else { saveLLbirthValue( dataElementId, recordNo ); - document.getElementById(recordNo).style.display = 'block'; - document.getElementById('actions').style.display = 'block'; } } else @@ -324,8 +789,6 @@ else { saveLLbirthValue( dataElementId, recordNo ); - document.getElementById(recordNo).style.display = 'block'; - document.getElementById('actions').style.display = 'block'; } } else @@ -479,10 +942,8 @@ else { saveLLbirthValue( dataElementId, recordNo ); - //document.getElementById(recordNo).style.display = 'block'; - // document.getElementById('actions').style.display = 'block'; } - addLLIDSPLNewRow( resVal, 1053, recordNo ); + } else { @@ -491,6 +952,56 @@ } } +function isIDSPLDaignosisFieldEntered( recordNo ) +{ + var dataElementId = 1058; + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + //alert( field + '---' + 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.value; + + + if( resVal == null || resVal.replace(/^\s\s*/, '').replace(/\s\s*$/, '') == "" ) + { + alert("Please enter Diagnosis Field" ); + return false; + } + else + { + return true; + } +} + +function validateIDSPLOutcomeField( dataElementId, recordNo ) +{ + var field = document.getElementById( 'value[' + dataElementId + '].value:value[' + recordNo + '].value' ); + var resVal = field.selectedIndex; + + if( isIDSPLDaignosisFieldEntered( recordNo ) ) + { + if( resVal <= 0 ) + { + alert("Please Select Outcome"); + field.options[0].selected = false; + + setTimeout(function(){ + field.focus();field.select(); + },2); + return false; + } + else + { + saveLLbirthValue( dataElementId, recordNo ); + addLLIDSPLNewRow( resVal, 1053, recordNo ); + } + } + else + { + field.options[0].selected = true; + + return false; + } +} + // ----------------------------------------------------------------------------- // Linelisting LiveBirth Related Methods for Validation // ----------------------------------------------------------------------------- @@ -1981,7 +2492,8 @@ if(dataElementId == 1022 || dataElementId == 1025 || dataElementId == 1029 || dataElementId == 1030 || dataElementId == 1031 || dataElementId == 1035 || dataElementId == 1036 || dataElementId == 1037 || dataElementId == 1038 || dataElementId == 1039 || dataElementId == 1040 || dataElementId == 1043 || dataElementId == 1046 || - dataElementId == 1050 || dataElementId == 1051 || dataElementId == 1052 || dataElementId == 1054 + dataElementId == 1050 || dataElementId == 1051 || dataElementId == 1052 || dataElementId == 1054 || + dataElementId == 5726 || dataElementId == 5728 || dataElementId == 3120 ) { resVal = field.options[field.selectedIndex].value; === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llidspl.vm' --- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llidspl.vm 2011-10-14 13:44:18 +0000 +++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llidspl.vm 2011-10-24 11:27:50 +0000 @@ -123,7 +123,7 @@ #end - #set($count1 = $count1+1) + #set( $count1 = $count1+1 ) #set( $lastRecord = $llDataValue.getRecordNo() ) #end #set( $slno = $slno + 1 ) === modified file 'local/in/dhis-web-excelimport/pom.xml' --- local/in/dhis-web-excelimport/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-excelimport/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-excelimport === modified file 'local/in/dhis-web-leprosy/pom.xml' --- local/in/dhis-web-leprosy/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-leprosy/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-leprosy === modified file 'local/in/dhis-web-linelisting-in/pom.xml' --- local/in/dhis-web-linelisting-in/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-linelisting-in/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-linelisting-in === modified file 'local/in/dhis-web-maintenance-in/pom.xml' --- local/in/dhis-web-maintenance-in/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-maintenance-in/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-maintenance-in === modified file 'local/in/dhis-web-reports-in/pom.xml' --- local/in/dhis-web-reports-in/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-reports-in/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-reports-in === modified file 'local/in/dhis-web-reports-national/pom.xml' --- local/in/dhis-web-reports-national/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-reports-national/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-reports-national === modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/AddMultipleUserAction.java' --- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/AddMultipleUserAction.java 2011-04-27 17:15:13 +0000 +++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/AddMultipleUserAction.java 2011-10-24 11:27:50 +0000 @@ -2,6 +2,7 @@ import java.io.File; import java.util.Collection; +import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -74,8 +75,9 @@ WritableSheet sheet0 = outputReportWorkbook.getSheet( sheetNo ); Integer rowStart = Integer.parseInt( sheet0.getCell( 8, 0 ).getContents() ); Integer rowEnd = Integer.parseInt( sheet0.getCell( 8, 1 ).getContents() ); + System.out.println( "User Creation Start Time is : " + new Date() ); System.out.println( "Row Start : " + rowStart + " ,Row End : " + rowEnd ); - + int orgunitcount = 0; for( int i = rowStart ; i <= rowEnd ; i++ ) { Integer orgUnitId = Integer.parseInt( sheet0.getCell( 0, i ).getContents() ); @@ -123,14 +125,16 @@ userStore.addUser( user ); userStore.addUserCredentials( userCredentials ); System.out.println( orgUnitname + " Created" ); + orgunitcount++; } outputReportWorkbook.close(); System.out.println( "**********************************************" ); System.out.println( "MULTIPLE USER CREATION IS FINISHED" ); + System.out.println( "Total No of User Created : -- " + orgunitcount ); System.out.println( "**********************************************" ); - + System.out.println( "User Creation End Time is : " + new Date() ); return SUCCESS; } } === modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java' --- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java 2011-10-13 08:00:58 +0000 +++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java 2011-10-24 11:27:50 +0000 @@ -1109,6 +1109,16 @@ CellFormat cellFormat = cell.getCellFormat(); + String tstr1 = tempStr.trim(); + if ( tstr1.equalsIgnoreCase( "UT" ) ) + { + tempStr = "Under Treatment"; + } + if ( tstr1.equalsIgnoreCase( "EXP" ) ) + { + tempStr = "Expired"; + } + if ( sType.equalsIgnoreCase( "llidsplabdataelement" ) ) { //System.out.println( ",Inside LL IDSP Lab Test values" ); === modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java' --- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java 2011-10-14 12:26:01 +0000 +++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java 2011-10-24 11:27:50 +0000 @@ -195,7 +195,8 @@ { this.incID = incID; } - + + @SuppressWarnings("unused") private String raFolderName; // ------------------------------------------------------------------------- @@ -1372,10 +1373,11 @@ .addCell( new Label( colStart + 6, rowStart, indicator.getNumeratorDescription(), wCellformat ) ); sheet0.addCell( new Label( colStart + 7, rowStart, indicator.getDenominatorDescription(), wCellformat ) ); - sheet0.addCell( new Label( colStart + 8, rowStart, indicator.getNumeratorAggregationOperator(), - wCellformat ) ); - sheet0.addCell( new Label( colStart + 9, rowStart, indicator.getDenominatorAggregationOperator(), - wCellformat ) ); + //sheet0.addCell( new Label( colStart + 8, rowStart, indicator.getNumeratorAggregationOperator(),wCellformat ) ); + sheet0.addCell( new Label( colStart + 8, rowStart, indicator.getNumeratorDescription(), + wCellformat ) ); + //sheet0.addCell( new Label( colStart + 9, rowStart, indicator.getDenominatorAggregationOperator(),wCellformat ) ); + sheet0.addCell( new Label( colStart + 9, rowStart, indicator.getDenominatorDescription(),wCellformat ) ); sheet0.addCell( new Label( colStart + 10, rowStart, indicator.getDescription(), wCellformat ) ); sheet0.addCell( new Label( colStart + 11, rowStart, indicator.getShortName(), wCellformat ) ); sheet0.addCell( new Label( colStart + 12, rowStart, indicator.getUrl(), wCellformat ) ); @@ -1514,10 +1516,10 @@ wCellformat ) ); sheet0.addCell( new Label( colStart + 7, rowStart, indicator.getDenominatorDescription(), wCellformat ) ); - sheet0.addCell( new Label( colStart + 8, rowStart, indicator.getNumeratorAggregationOperator(), - wCellformat ) ); - sheet0.addCell( new Label( colStart + 9, rowStart, indicator - .getDenominatorAggregationOperator(), wCellformat ) ); + // sheet0.addCell( new Label( colStart + 8, rowStart, indicator.getNumeratorAggregationOperator(),wCellformat ) ); + sheet0.addCell( new Label( colStart + 8, rowStart, indicator.getNumeratorDescription(),wCellformat ) ); + //sheet0.addCell( new Label( colStart + 9, rowStart, indicator.getDenominatorAggregationOperator(), wCellformat ) ); + sheet0.addCell( new Label( colStart + 9, rowStart, indicator.getDenominatorDescription(), wCellformat ) ); sheet0.addCell( new Label( colStart + 10, rowStart, indicator.getDescription(), wCellformat ) ); sheet0.addCell( new Label( colStart + 11, rowStart, indicator.getShortName(), wCellformat ) ); sheet0.addCell( new Label( colStart + 12, rowStart, indicator.getUrl(), wCellformat ) ); === modified file 'local/in/dhis-web-sandbox/pom.xml' --- local/in/dhis-web-sandbox/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-sandbox/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-linelisting-in === modified file 'local/in/dhis-web-sandboxbk/pom.xml' --- local/in/dhis-web-sandboxbk/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-sandboxbk/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-sandbox-bk === modified file 'local/in/dhis-web-survey/pom.xml' --- local/in/dhis-web-survey/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-survey/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-survey === modified file 'local/in/dhis-web-validationrule-in/pom.xml' --- local/in/dhis-web-validationrule-in/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/dhis-web-validationrule-in/pom.xml 2011-10-24 11:27:50 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4-SNAPSHOT + 2.6-SNAPSHOT dhis-web-validationrule-in === modified file 'local/in/pom.xml' --- local/in/pom.xml 2011-06-24 07:27:57 +0000 +++ local/in/pom.xml 2011-10-24 11:27:50 +0000 @@ -5,7 +5,7 @@ org.hisp.dhis dhis-local - 2.4-SNAPSHOT + 2.6-SNAPSHOT pom Local India Modules