dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8333
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-02 12:09:19 +0700
message:
  Exception thrown when to delete a program.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm


--
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-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml	2012-06-12 03:38:24 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml	2012-10-02 05:09:19 +0000
@@ -39,18 +39,13 @@
 			<list-index column="sort_order" />
 			<element type="text" column="fixedAttribute" />
 		</list>
+		
+	    <list name="programStageDataElements" table="patienttabularreport_programstagedataelements">
+			<key column="programstagesectionid" />
+		    <list-index column="tabular_sort_order" base="1" />
+		    <one-to-many class="org.hisp.dhis.program.ProgramStageDataElement"/>
+        </list>
     
-		<list name="programStageDataElements"
-			table="patienttabularreport_programstagedataelements">
-			<key column="patienttabularreportid" />
-			<list-index column="sort_order" base="0" />
-			<many-to-many class="org.hisp.dhis.program.ProgramStageDataElement"
-				foreign-key="patienttabularreport_programstagedataelementid" >
-				  <column name="programstageid" />
-       			  <column name="dataelementid" />
-			</many-to-many>
-		</list>
-		
 	 	<set name="organisationUnits" table="patienttabularreport_organisationUnits">
 	      <cache usage="read-write" />
 	      <key column="patienttabularreportid" foreign-key="fk_patienttabularreport_organisationUnitid" />

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-07-24 08:07:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-10-02 05:09:19 +0000
@@ -1,3 +1,10 @@
+<script>
+	var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
+	var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
+	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_item" ) , "'" )';
+	var i18n_all = '[' + '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )' + ']';
+</script>
+
 <script type="text/javascript" src="javascript/addCaseAggregationForm.js"></script>
 															
 <h3>$i18n.getString( "create_new_case_aggregation_condition" )</h3>
@@ -36,7 +43,7 @@
 		<td><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>			
 			<input id="aggregationDataElementInput" name="aggregationDataElementInput" style='width:290px;'>
-			<button type='button' id='dataElementsButton' class='ui-icon-triangle-1-s' disabled>&nbsp;</button>
+			<button type='button' id='dataElementsButton' name='dataElementsButton' class='ui-icon-triangle-1-s' disabled>&nbsp;</button>
 			<input type='hidden' id="aggregationDataElementId" name="aggregationDataElementId" class="{validate:{required:true}}" >
 		</td>
 	</tr>
@@ -93,9 +100,4 @@
 	#if( $dataSetId )
 		getDataElementsByDataset();
 	#end
-	
-	var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
-	var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
-	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_item" ) , "'" )';
-	var i18n_all = '[' + '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )' + ']';
-</script>
+</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/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-07-24 08:07:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-10-02 05:09:19 +0000
@@ -1,3 +1,10 @@
+<script>
+	var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
+	var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
+	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_item" ) , "'" )';
+	var i18n_all = '[' + '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )' + ']';
+</script>
+
 <script type="text/javascript" src="javascript/updateCaseAggregationForm.js"></script>
 
 <h3>$i18n.getString( "edit_case_aggregation_condition" )</h3>
@@ -35,7 +42,7 @@
 		<td><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
 			<input id="aggregationDataElementInput" name="aggregationDataElementInput" value='$caseAggregation.aggregationDataElement.name $caseAggregation.optionCombo.name' style='width:290px'>
-			<button type='button' id='dataElementsButton' disabled>&nbsp;</button>
+			<button type='button' id='dataElementsButton' name='dataElementsButton' disabled>&nbsp;</button>
 			<input id="aggregationDataElementId" name="aggregationDataElementId" value="$caseAggregation.aggregationDataElement.id.$caseAggregation.optionCombo.id" class="{validate:{required:true}} hidden" >
 		</td>				
 	</tr>
@@ -92,9 +99,4 @@
 		var selectedValue = "$caseAggregation.aggregationDataElement.id" + "." + "$caseAggregation.optionCombo.id";
 		jQuery("#aggregationDataElementId").val( selectedValue );
 	#end	
-	
-	var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
-	var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
-	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_item" ) , "'" )';
-	var i18n_all = '[' + '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )' + ']';
-</script>
+</script>	
\ No newline at end of file