dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06695
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1855: Changed Calendar in Benificiary/Patient registration, updation forms, Program Enrollment As per N...
------------------------------------------------------------
revno: 1855
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-07-16 15:56:55 +0530
message:
Changed Calendar in Benificiary/Patient registration, updation forms, Program Enrollment As per New Calendar
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm
local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/util/ReportService.java
local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/DetailedValidationAnalysisResultAction.java
local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/ValidationByAverageActionIN.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-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-07-14 03:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-07-16 10:26:55 +0000
@@ -508,18 +508,12 @@
<action name="showProgramEnrollmentForm"
class="org.hisp.dhis.patient.action.patient.ProgramEnrollmentSelectAction">
<interceptor-ref name="organisationUnitTreeStack" />
- <result name="enrollmentform" type="chain">enrollmentform
- </result>
+ <result name="enrollmentform" type="chain">enrollmentform</result>
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param>
<param name="menuTreeHeight">321</param>
- <param name="page">/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js
- ,../dhis-web-commons/util/validate/jquery.validate.js
- ,../dhis-web-commons/util/validate/additional-methods.js
- ,../dhis-web-commons/validationMessages.action
- ,javascript/patient.js</param>
+ <param name="page">/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/util/date.js,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/validate/additional-methods.js,javascript/patient.js,../dhis-web-commons/validationMessages.action</param>
<param name="requiredAuthorities">F_PATIENT_UPDATE</param>
</action>
@@ -530,10 +524,12 @@
<param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param>
<param name="menuTreeHeight">321</param>
<param name="page">/dhis-web-maintenance-patient/programEnrollmentForm.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/util/date.js,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/validate/additional-methods.js,javascript/patient.js,../dhis-web-commons/validationMessages.action</param>
+ <!--<param name="javascripts">
+ ../dhis-web-commons/ouwt/ouwt.js,
+ ../dhis-web-commons/util/date.js,
javascript/patient.js
- </param>
+ </param>-->
<param name="requiredAuthorities">F_PATIENT_UPDATE</param>
</action>
@@ -555,7 +551,8 @@
<param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param>
<param name="menuTreeHeight">321</param>
<param name="page">/dhis-web-maintenance-patient/programEnrollmentForm.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param>-->
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/util/date.js,../dhis-web-commons/util/validate/jquery.validate.js,../dhis-web-commons/util/validate/additional-methods.js,javascript/patient.js,../dhis-web-commons/validationMessages.action</param>
</action>
<action name="removeEnrollment"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm 2010-07-14 03:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm 2010-07-16 10:26:55 +0000
@@ -1,6 +1,8 @@
+
<style>
-td.input-column { width : 30em;}
-td.input-column input, td.input-column select { width: 28.5em; float:right ;}
+.heading-column { width : 30.5em;}
+td.input-column { width : 30.5em;}
+td.input-column input, td.input-column select { width: 28.5em;}
td.error {padding-left:1em}
</style>
@@ -46,11 +48,11 @@
<tr>
- <th colspan="2">$i18n.getString( "name" )<em title="$i18n.getString( "required" )" class="required">*</em></th>
+ <th colspan="2" class="heading-column">$i18n.getString( "name" )<em title="$i18n.getString( "required" )" class="required">*</em></th>
</tr>
<tr>
<td><label for="firstName">$i18n.getString( "first_name" )</label></td>
- <td class="input-column" ><input type="text" id="firstName" name="firstName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30]}}" ></td>
+ <td class="input-column" ><input type="text" id="firstName" name="firstName" maxlength="30" class="required_group {validate:{required_group:true,rangelength:[2,30]}}" ></td>
</tr>
<tr>
<td><label for="middleName">$i18n.getString( "middle_name" ) </label></td>
@@ -62,7 +64,7 @@
</tr>
<tr><td> </td></tr>
<tr>
- <th colspan="2">$i18n.getString( "demographics" )</th>
+ <th colspan="2" class="heading-column">$i18n.getString( "demographics" )</th>
</tr>
<tr>
@@ -85,7 +87,7 @@
<label for="estimated">$i18n.getString( "estimated" )</label>
<input type="checkbox" id="birthDateEstimated" name="birthDateEstimated" value="true">
- </td>
+ </td>
<td></td>
</tr>
<tr>
@@ -119,7 +121,7 @@
<!--IDENTIFIERS -->
<tr><td colspan="2"> </td></tr>
- <tr><th colspan="2">$i18n.getString( "patient_identifiers" )</th></tr>
+ <tr><th colspan="2" class="heading-column">$i18n.getString( "patient_identifiers" )</th></tr>
#foreach ($identifierType in $identifierTypes)
<tr>
<td><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
@@ -150,7 +152,7 @@
#foreach ($attributeGroup in $attributeGroups )
<tr><td> </td></tr>
- <tr><th colspan="2">$attributeGroup.name</th></tr>
+ <tr><th colspan="2" class="heading-column">$attributeGroup.name</th></tr>
#foreach($attribute in $attributeGroup.attributes )
<tr>
<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
@@ -162,19 +164,13 @@
<option value="false" selected="selected">$i18n.getString( "no" )</option>
</select>
#elseif( $attribute.valueType == "DATE" )
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$attribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
<input type="text" id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default" $attribute.mandatory )'>
-
<script type="text/javascript">
- Calendar.setup({
- inputField : "attr$attribute.id", // id of the input field
- ifFormat : "$i18n.getString('format.date.label')", // format of the input field
- button : "getDateValue$attribute.id" // trigger for the calendar (button ID)
- });
+ datePickerValid( 'attr$attribute.id' );
</script>
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default" $attribute.mandatory )' >
- <option value="">[$i18n.getString( "please_select" )]</option>
+ <option value="">[$i18n.getString( "please_select" )]</option>
#foreach ($option in $attribute.attributeOptions )
<option value="$option.id" >$option.name</option>
#end
@@ -191,7 +187,7 @@
<tr><td> </td></tr>
#if ( $noGroupAttributes.size() > 0)
- <tr><th colspan="2">$i18n.getString( "other_details" )</th></tr>
+ <tr><th colspan="2" class="heading-column">$i18n.getString( "other_details" )</th></tr>
#foreach($attribute in $noGroupAttributes )
<tr>
<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
@@ -203,14 +199,9 @@
<option value="false" >$i18n.getString( "no" )</option>
</select>
#elseif( $attribute.valueType == "DATE" )
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$attribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
<input type="text" id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default" $attribute.mandatory )' >
<script type="text/javascript">
- Calendar.setup({
- inputField : "attr$attribute.id", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getDateValue$attribute.id" // trigger for the calendar (button ID)
- });
+ datePickerValid( 'attr$attribute.id' );
</script>
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default" $attribute.mandatory )'>
@@ -264,5 +255,5 @@
var i18n_patient_system_id = '$encoder.jsEscape( $i18n.getString( "patient_system_id" ) , "'")';
var i18n_child_representative = '$encoder.jsEscape( $i18n.getString( "child_representative" ) , "'")';
var checkedDuplicate = false;
- var i18n_oucode_must_have_9_digits = '$encoder.jsEscape( $i18n.getString( "oucode_must_be_valid" ) , "'")';
+ var i18n_oucode_must_have_9_digits = '$encoder.jsEscape( $i18n.getString( "oucode_must_be_valid" ) , "'")';
</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js 2010-06-23 19:59:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js 2010-07-16 10:26:55 +0000
@@ -69,7 +69,7 @@
function saveDueDate( programStageInstanceId, programStageInstanceName )
{
- var field = document.getElementById( 'value[' + programStageInstanceId + '].date' );
+ var field = document.getElementById( 'value_' + programStageInstanceId + '_date' );
var dateOfIncident = new Date(byId('dateOfIncident').value);
var dueDate = new Date(field.value);
@@ -133,7 +133,7 @@
function markValue( color )
{
- var element = document.getElementById( 'value[' + programStageInstanceId + '].date' );
+ var element = document.getElementById( 'value_' + programStageInstanceId + '_date' );
element.style.backgroundColor = color;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm 2010-05-17 02:59:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentForm.vm 2010-07-16 10:26:55 +0000
@@ -1,8 +1,8 @@
+
<script>
-//-----------------------------------------------------------------------
-//init jQuery validation for addUserForm
-//
-//-----------------------------------------------------------------------
+ //-----------------------------------------------------------------------
+ //init jQuery validation for programEnrollmentForm
+ //-----------------------------------------------------------------------
jQuery(document).ready(
function()
{
@@ -11,12 +11,12 @@
,errorElement:"td"
,submitHandler: function(form)
{
- validateAddUser();
+ validateProgramEnrollment();
}
});
- jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
- jQuery("#username").focus();
- selectionTree.buildSelectionTree();
+
+ datePickerValid( 'enrollmentDate' );
+ datePickerValid( 'dateOfIncident' );
}
);
@@ -30,28 +30,12 @@
<tr>
<td style="width:180px"><label for="enrollmentDate" #if($selectedProgram) title="$!selectedProgram.dateOfEnrollmentDescription" #end>$i18n.getString( "date_of_enrollment" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="enrollmentDate" name="enrollmentDate" #if( $programInstance ) value="$!format.formatDate( $programInstance.enrollmentDate )" #end>
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getEnrollmentDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date_of_enrollment" )"></td>
- <script type="text/javascript">
- Calendar.setup({
- inputField : "enrollmentDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getEnrollmentDate" // trigger for the calendar (button ID)
- });
- </script>
<td> <i>( $!selectedProgram.dateOfEnrollmentDescription )</i></td>
</tr>
<tr>
<td style="width:180px"><label for="dateOfIncident" #if($selectedProgram) title="$!selectedProgram.dateOfIncidentDescription" #end>$i18n.getString( "date_of_incident" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="dateOfIncident" name="dateOfIncident" #if( $programInstance ) value="$!format.formatDate( $programInstance.dateOfIncident )" #end>
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateOfIncident" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date_of_incident" )"></td>
- <script type="text/javascript">
- Calendar.setup({
- inputField : "dateOfIncident", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getDateOfIncident" // trigger for the calendar (button ID)
- });
- </script>
<td> <i>( $!selectedProgram.dateOfIncidentDescription )</i></td>
</tr>
<tr>
@@ -68,7 +52,7 @@
</tr>
</table>
-</form>
+
#if( $programInstance )
@@ -103,23 +87,20 @@
</span>
</td>
- ##entry
+ ##entry
+ #set( $duedateId = "value_"+$programStageInstance.id+"_date" )
<td>
- <input type="text" id="value[$programStageInstance.id].date" name="entryfield" value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" tabindex="$tabIndex" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="get$programStageInstance.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "due_date" )">
- <script type="text/javascript">
- Calendar.setup({
- inputField : "value[$programStageInstance.id].date", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "get$programStageInstance.id" // trigger for the calendar (button ID)
- });
- </script>
- </td>
+ <input type="text" id="$duedateId" name="entryfield" value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" tabindex="$tabIndex" >
+ </td>
+ <script type="text/javascript">
+ datePickerValid( '$duedateId' );
+ </script>
</tr>
#set( $tabIndex = $tabIndex + 1 )
#end
</table>
+</form>
#end
@@ -130,5 +111,5 @@
var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
- var i18n_due_date_invalid = '$encoder.jsEscape( $i18n.getString( "due_date_invalid" ) , "'")';
+ var i18n_due_date_invalid = '$encoder.jsEscape( $i18n.getString( "due_date_invalid" ) , "'")';
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm 2010-07-14 03:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm 2010-07-16 10:26:55 +0000
@@ -24,6 +24,8 @@
jQuery("#birthDate").rules("add",{required:true,dateISO:true,datelessthanequaltoday:true});
jQuery("#firstName").focus();
jQuery("#btnRepresentativeInfo").cluetip({local:"#representativeInfo"});
+
+ datePickerValid( 'birthDate' );
});
</script>
<input type="hidden" id="curLocaleCode" value="$locale.getLanguage()_$locale.getCountry()"/>
@@ -72,7 +74,7 @@
<td><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( "required" )" class="required">*</em> </label></td>
<td>
<input type="text" id="birthDate" name="birthDate" value="$format.formatDate( $patient.birthDate )" style="width:10em">
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getBirthDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date_of_birth" )">
+ <!--<img src="../images/calendar_icon.gif" width="16" height="16" id="getBirthDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date_of_birth" )">-->
<label for="estimated">$i18n.getString( "estimated" )</label>
<input type="checkbox" id="birthDateEstimated" name="birthDateEstimated" value="true" #if( $patient.birthDateEstimated ) checked="checked" #end>
@@ -146,14 +148,9 @@
</select>
#elseif( $attribute.valueType == "DATE" )
<input type="text" id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue" #validate( "date" $attribute.mandatory ) style="width:30em" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$attribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
- <script type="text/javascript">
- Calendar.setup({
- inputField : "attr$attribute.id", // id of the input field
- ifFormat : "$i18n.getString('format.date.label')", // format of the input field
- button : "getDateValue$attribute.id" // trigger for the calendar (button ID)
- });
- </script>
+ <script type="text/javascript">
+ datePickerValid( 'attr$attribute.id' );
+ </script>
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" #validate( "default" $attribute.mandatory ) style="width:30em" >
<option value="">[$i18n.getString( "please_select" )]</option>
@@ -188,14 +185,9 @@
</select>
#elseif( $attribute.valueType == "DATE" )
<input type="text" id="attr$attribute.id" style="width:30em" name="attr$attribute.id" value="$!attributeValue" #validate( "" $attribute.mandatory )>
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$attribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
- <script type="text/javascript">
- Calendar.setup({
- inputField : "attr$attribute.id", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getDateValue$attribute.id" // trigger for the calendar (button ID)
- });
- </script>
+ <script type="text/javascript">
+ datePickerValid( 'attr$attribute.id' );
+ </script>
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" style="width:30em" #validate( "default" $attribute.mandatory ) >
<option value="">[$i18n.getString( "please_select" )]</option>
@@ -233,11 +225,7 @@
<div id="thickboxContainer"></div>
</div>
<script type="text/javascript">
- Calendar.setup({
- inputField : "birthDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getBirthDate" // trigger for the calendar (button ID)
- });
+
var i18n_patient_identifiers = '$encoder.jsEscape( $i18n.getString( "patient_identifiers" ) , "'")';
var i18n_patient_attributes = '$encoder.jsEscape( $i18n.getString( "patient_attributes" ) , "'")';
var i18n_patient_fullName = '$encoder.jsEscape( $i18n.getString( "full_name" ) , "'")';
=== modified file 'local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/util/ReportService.java'
--- local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/util/ReportService.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/util/ReportService.java 2010-07-16 10:26:55 +0000
@@ -393,9 +393,9 @@
}
if ( dataElement.getType().equalsIgnoreCase( "int" ) )
{
- double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo,
+ Double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo,
startDate, endDate, organisationUnit );
- if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
+ if ( aggregatedValue == null )
{
replaceString = NULL_REPLACEMENT;
}
@@ -777,9 +777,9 @@
}
else
{
- double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo,
+ Double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo,
startDate, endDate, organisationUnit );
- if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
+ if ( aggregatedValue == null )
{
replaceString = NULL_REPLACEMENT;
}
@@ -867,10 +867,10 @@
}
- double aggregatedValue = aggregationService.getAggregatedIndicatorValue( indicator, startDate, endDate,
+ Double aggregatedValue = aggregationService.getAggregatedIndicatorValue( indicator, startDate, endDate,
organisationUnit );
- if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
+ if ( aggregatedValue == null )
{
replaceString = NULL_REPLACEMENT;
}
=== modified file 'local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/DetailedValidationAnalysisResultAction.java'
--- local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/DetailedValidationAnalysisResultAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/DetailedValidationAnalysisResultAction.java 2010-07-16 10:26:55 +0000
@@ -503,9 +503,9 @@
}
if(dataElement.getType().equalsIgnoreCase( "int" ))
{
- double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo, startDate, endDate, organisationUnit );
+ Double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo, startDate, endDate, organisationUnit );
//System.out.println(aggregatedValue+" ---- "+dataElement.getName());
- if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
+ if ( aggregatedValue == null )
{
replaceString = NULL_REPLACEMENT;
}
=== modified file 'local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/ValidationByAverageActionIN.java'
--- local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/ValidationByAverageActionIN.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-validationrule-in/src/main/java/org/hisp/dhis/validationrule/action/ValidationByAverageActionIN.java 2010-07-16 10:26:55 +0000
@@ -541,9 +541,9 @@
}
if(dataElement.getType().equalsIgnoreCase( "int" ))
{
- double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo, startDate, endDate, organisationUnit );
+ Double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo, startDate, endDate, organisationUnit );
System.out.println(aggregatedValue+" ---- "+dataElement.getName());
- if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
+ if ( aggregatedValue == null )
{
replaceString = NULL_REPLACEMENT;
}
