dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11046
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3078: js cleanup in module dhis-web-maintenance-datadictionary
------------------------------------------------------------
revno: 3078
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-18 15:14:32 +0100
message:
js cleanup in module dhis-web-maintenance-datadictionary
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.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-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2011-03-18 14:14:32 +0000
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addDataDictionaryForm', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'selectedDataElements' );
@@ -6,11 +6,9 @@
} );
checkValueIsExist( "name", "validateDataDictionary.action");
-
});
</script>
-
<h3>$i18n.getString( "create_new_data_dictionary" )</h3>
<form id="addDataDictionaryForm" action="addDataDictionary.action" method="post" >
@@ -109,4 +107,4 @@
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataDictionary.action'" style="width:10em"/>
</p>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2011-03-14 20:16:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2011-03-18 14:14:32 +0000
@@ -1,5 +1,5 @@
-<script>
- jQuery(document).ready( function(){
+<script type="text/javascript">
+ jQuery(document).ready( function() {
validation( 'addDataElementForm', function( form ){
form.submit();
},function(){
@@ -12,9 +12,11 @@
checkValueIsExist( "name", "validateDataElement.action");
checkValueIsExist( "shortName", "validateDataElement.action");
checkValueIsExist( "alternativeName", "validateDataElement.action");
+
toggleCDEForm();
- }
- );
+ });
+
+ var previousName = '';
</script>
<h3>$i18n.getString( "create_new_data_element" )</h3>
@@ -230,9 +232,3 @@
</p>
</form>
-
-<script type="text/javascript">
-
- var previousName = '';
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2011-03-02 08:19:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2011-03-18 14:14:32 +0000
@@ -1,10 +1,8 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addDataElementGroupForm', function( form ){ form.submit()}, beforeSubmit );
checkValueIsExist( "name", "validateDataElementGroup.action");
});
-
</script>
<h3>$i18n.getString( "create_new_data_element_group" )</h3>
@@ -65,4 +63,4 @@
<p><input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroup.action'" style="width:10em"/></p>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2011-03-18 14:14:32 +0000
@@ -1,11 +1,10 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addDataElementGroupSet', function( form ){ form.submit()}, beforeSubmit );
checkValueIsExist( "name", "validateDataElementGroupSet.action");
});
-
</script>
+
<h3>$i18n.getString( "add_dataelementgroupset" )</h3>
<form id="addDataElementGroupSet" action="addDataElementGroupSet.action" method="post">
@@ -64,4 +63,4 @@
<p><input type="submit" value="$i18n.getString( 'add' )" style="width:10em" /><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroupSet.action'" style="width:10em"/></p>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2011-01-21 03:15:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2011-03-18 14:14:32 +0000
@@ -1,23 +1,24 @@
-<script>
- jQuery(document).ready( function(){
+<script type="text/javascript">
+ jQuery(document).ready( function() {
validation( 'addIndicatorForm',
function( form )
{
form.submit()
}
);
+
checkValueIsExist( "name", "validateIndicator.action" );
checkValueIsExist( "shortName", "validateIndicator.action" );
checkValueIsExist( "alternativeName", "validateIndicator.action" );
checkValueIsExist( "code", "validateIndicator.action" );
});
+
var previousName = '';
</script>
<h3>$i18n.getString( "create_new_indicator" )</h3>
<form id="addIndicatorForm" action="addIndicator.action" method="post" >
-
<div>
<input type="hidden" id="numeratorDescription" name="numeratorDescription"/>
@@ -102,4 +103,3 @@
</form>
#parse( "/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm" )
-
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm 2011-03-18 14:14:32 +0000
@@ -1,14 +1,15 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addIndicatorGroupForm', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'groupMembers' );
} );
checkValueIsExist( "name", "validateIndicatorGroup.action");
-
+
+ var nameField = document.getElementById( 'name' );
+ nameField.select();
+ nameField.focus();
});
-
</script>
<h3>$i18n.getString( "create_new_indicator_group" )</h3>
@@ -66,11 +67,3 @@
<p><input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorGroup.action'" style="width:10em"/></p>
</form>
-
-<script type="text/javascript">
-
- var nameField = document.getElementById( 'name' );
- nameField.select();
- nameField.focus();
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2011-03-18 14:14:32 +0000
@@ -1,17 +1,13 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addIndicatorGroupSet', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'groupMembers' );
} );
checkValueIsExist( "name", "validateIndicatorGroupSet.action");
-
});
-
</script>
-
<h3>$i18n.getString( "add_indicatorgroupset" )</h3>
<form id="addIndicatorGroupSet" action="addIndicatorGroupSet.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm 2010-12-16 04:38:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm 2011-03-18 14:14:32 +0000
@@ -1,13 +1,10 @@
-<script>
-
- jQuery(document).ready( function(){
+<script type="text/javascript">
+ jQuery(document).ready( function() {
validation( 'addIndicatorTypeForm', function( form ){ form.submit()} );
-
checkValueIsExist( "name", "validateIndicatorType.action");
-
});
-
</script>
+
<h3>$i18n.getString( "create_new_indicator_type" )</h3>
<form id="addIndicatorTypeForm" action="addIndicatorType.action" method="post" >
@@ -38,4 +35,4 @@
</tr>
</table>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2010-12-03 12:31:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_adding_datadictionary_failed = '$encoder.jsEscape( $i18n.getString( "adding_datadictionary_failed" ), "'")';
+ var i18n_updating_datadictionary_failed = '$encoder.jsEscape( $i18n.getString( "updating_datadictionary_failed" ), "'")';
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_dictionary" ), "'")';
+ var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
+</script>
+
<h3>$i18n.getString( "data_dictionary_management" ) #openHelp( "dataDictionary" )</h3>
<table class="mainPageTable">
@@ -56,14 +67,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_adding_datadictionary_failed = '$encoder.jsEscape( $i18n.getString( "adding_datadictionary_failed" ), "'")';
- var i18n_updating_datadictionary_failed = '$encoder.jsEscape( $i18n.getString( "updating_datadictionary_failed" ), "'")';
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_dictionary" ), "'")';
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
-
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-03-01 02:12:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,28 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'dataElementList' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element" ) , "'")';
+ var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
+ var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
+ var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
+ var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
+ var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
+ var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
+ var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
+ var i18n_sum = '$encoder.jsEscape( $i18n.getString( "sum" ) , "'")';
+ var i18n_average = '$encoder.jsEscape( $i18n.getString( "average" ) , "'")';
+ var i18n_aggregate = '$encoder.jsEscape( $i18n.getString( "aggregate" ) , "'")';
+ var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
+ var i18n_translation_translate = '$encoder.jsEscape( $i18n.getString( "translation_translate" ) , "'")';
+ var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
+ var i18n_remove = '$encoder.jsEscape( $i18n.getString( "remove" ) , "'")';
+ var i18n_show_details = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
+ var i18n_name = '$encoder.jsEscape( $i18n.getString( "name" ) , "'")';
+ var i18n_operations = '$encoder.jsEscape( $i18n.getString( "operations" ) , "'")';
+</script>
+
<h3>$i18n.getString( "data_element_management" ) #openHelp( "dataElement" )</h3>
<table class="mainPageTable" >
@@ -84,29 +109,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element" ) , "'")';
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
- var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
- var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
- var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
- var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
- var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
- var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
- var i18n_sum = '$encoder.jsEscape( $i18n.getString( "sum" ) , "'")';
- var i18n_average = '$encoder.jsEscape( $i18n.getString( "average" ) , "'")';
- var i18n_aggregate = '$encoder.jsEscape( $i18n.getString( "aggregate" ) , "'")';
- var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
- var i18n_translation_translate = '$encoder.jsEscape( $i18n.getString( "translation_translate" ) , "'")';
- var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
- var i18n_remove = '$encoder.jsEscape( $i18n.getString( "remove" ) , "'")';
- var i18n_show_details = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
- var i18n_name = '$encoder.jsEscape( $i18n.getString( "name" ) , "'")';
- var i18n_operations = '$encoder.jsEscape( $i18n.getString( "operations" ) , "'")';
-
- jQuery(document).ready(function(){
- tableSorter( 'dataElementList' );
- });
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,13 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'dataElementGroupList' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
+ var i18n_adding_data_element_group_failed = '$encoder.jsEscape( $i18n.getString( "adding_data_element_group_failed" ) , "'")';
+ var i18n_saving_data_element_group_failed = '$encoder.jsEscape( $i18n.getString( "saving_data_element_group_failed" ) , "'")';
+</script>
+
<h3>$i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroup" )</h3>
<table class="mainPageTable">
@@ -58,13 +68,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
- var i18n_adding_data_element_group_failed = '$encoder.jsEscape( $i18n.getString( "adding_data_element_group_failed" ) , "'")';
- var i18n_saving_data_element_group_failed = '$encoder.jsEscape( $i18n.getString( "saving_data_element_group_failed" ) , "'")';
-
- jQuery(document).ready(function(){
- tableSorter( 'dataElementGroupList' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm 2011-03-14 07:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm 2011-03-18 14:14:32 +0000
@@ -1,142 +1,12 @@
-<h3>
- $i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroupEditor" )
-</h3>
-<script>
- jQuery(function(){
- jQuery("#tabs").tabs();
- });
-</script>
-
-<div id="tabs" style="position:absolute">
- <ul>
- <li><a href="#view_1">$i18n.getString( "view_1" )</a></li>
- <li><a href="#view_2">$i18n.getString( "view_2" )</a></li>
- </ul>
- <div id="view_1">
- <table >
- <tr>
- <th>$i18n.getString( "data_element_group" )</th>
- <th></th>
- <td rowspan="2"></td>
- <th>$i18n.getString( "available_dataelements" )</th>
-
- </tr>
-
- <tr>
- <td><input id="dataElementGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'dataElementGroups');"/></td>
- <td><input id="selecteDataElementsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'selectedDataElements');"/></td>
- <td><input id="availableDataElementsFilter" type="text" style="width:300px;" onkeyup="loadAvailableDataElements()"/></td>
- </tr>
-
- <tr>
- <td>
- <select class="select" id="dataElementGroups" size="30" onchange="getDataElementsByGroup()"/>
- </td>
- <td>
- <select class="select" id="selectedDataElements" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'availableDataElements');" />
- </td>
-
- <td>
- <input type="button" value="<" onclick="moveSelectedById('availableDataElements', 'selectedDataElements');" style="width:42px"/><br/><br/>
- <input type="button" value=">" onclick="moveSelectedById('selectedDataElements', 'availableDataElements');" style="width:42px"/>
- </td>
- <td>
- <select class="select" id="availableDataElements" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'selectedDataElements');"/>
- </td>
- </tr>
- <tr>
- <td>
- <a href="javascript:sortList( 'dataElementGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'dataElementGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroup()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroup()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteDataElemenGroup()" style="width:70px"/>
- </td>
- <td>
- <a href="javascript:sortList( 'selectedDataElements', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'selectedDataElements', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <input type="button" value="$i18n.getString( 'update_dataelement_group_members' )" onclick="updateGroupMembers()"/>
- </td>
- <td></td>
- <td>
- <a href="javascript:sortList( 'availableDataElements', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'availableDataElements', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- </td>
-
-
- </tr>
- </table>
- </div>
- <div id="view_2">
- <table>
- <tr>
- <th>$i18n.getString( "available_dataelements" )</th>
- <th></th>
- <td rowspan="2"></td>
- <th>$i18n.getString( "available_groups" )</th>
- </tr>
-
- <tr>
- <td><input id="availableDataElementsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableDataElements');"/></td>
- <td><input id="assignedGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'assignedGroups');"/></td>
- <td><input id="availableGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableGroups');"/></td>
- </tr>
-
- <tr>
- <td>
- <select class="select" id="availableDataElements2" size="30" onclick="getAssignedDataElementGroups()"/>
- </td>
- <td>
- <select class="select" id="assignedGroups" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'availableGroups');"/>
- </td>
- <td>
- <input type="button" value="<" onclick="moveSelectedById('availableGroups', 'assignedGroups');" style="width:42px"/><br/><br/>
- <input type="button" value=">" onclick="moveSelectedById('assignedGroups', 'availableGroups');" style="width:42px"/>
- </td>
- <td>
- <select name="select" size="30" multiple="multiple" class="select" id="availableGroups" ondblclick="moveSelectedById(this.id, 'assignedGroups');"/>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <input type="button" value="$i18n.getString( 'assign_groups_for_dataelement' )" onclick="assignGroupsForDataElement()"/>
- </td>
- <td></td>
- <td>
- <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroupView2()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroupView2()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteDataElemenGroupView2()" style="width:70px"/>
- </td>
- </tr>
- </table>
- </div>
-</div>
-
-<div id="addDataElementGroupForm">
- <label>$i18n.getString( "name" )</label>
- <input type="text" id="name" name="name" style="width:20em" class="{validate:{required:true}}"/>
-</div>
-
-<style>
-#addDataElementGroupForm{
- width:300px;
-}
-#addDataElementGroupForm div{
- float:left;
-}
-.select{
- min-width:300px;
-}
-</style>
-
-
-
<script type="text/javascript">
- var i18n_select_dataelement_group = '$encoder.jsEscape( $i18n.getString( "select_dataelement_group" ) , "'")';
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
- var i18n_member_of = '$encoder.jsEscape( $i18n.getString( "member_of" ) , "'")';
- var i18n_update_success = '$encoder.jsEscape( $i18n.getString( "update_success" ) , "'")';
+ jQuery(document).ready(function() {
+ loadAvailableGroups();
+ getDataElementsByGroup();
+ loadAvailableDataElements();
+ getAssignedDataElementGroups();
+
+ jQuery( "#addDataElementGroupForm" ).dialog({autoOpen:false, modal:true});
+ });
var dataElementGroups = new Array();
#foreach( $dataElementGroup in $dataElementGroups )
@@ -149,15 +19,10 @@
#end
var selectedDataElements = new Array();
-
- jQuery(function(){
- loadAvailableGroups();
- getDataElementsByGroup();
- loadAvailableDataElements();
- getAssignedDataElementGroups();
-
- jQuery( "#addDataElementGroupForm" ).dialog({autoOpen:false, modal:true});
- });
+ var i18n_select_dataelement_group = '$encoder.jsEscape( $i18n.getString( "select_dataelement_group" ) , "'")';
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
+ var i18n_member_of = '$encoder.jsEscape( $i18n.getString( "member_of" ) , "'")';
+ var i18n_update_success = '$encoder.jsEscape( $i18n.getString( "update_success" ) , "'")';
function loadAvailableDataElements()
{
@@ -271,8 +136,8 @@
});
}
}]);
+
jQuery( '#addDataElementGroupForm' ).dialog('open');
-
}
function showAddGroupView2()
@@ -300,7 +165,6 @@
}
}]);
jQuery( '#addDataElementGroupForm' ).dialog('open');
-
}
function showUpdateGroup()
@@ -336,7 +200,6 @@
jQuery( '#addDataElementGroupForm' ).dialog('option', 'title', '$encoder.jsEscape( $i18n.getString( "rename" ) , "'")');
jQuery( '#addDataElementGroupForm' ).dialog('open');
-
}
function showUpdateGroup2()
@@ -372,7 +235,6 @@
jQuery( '#addDataElementGroupForm' ).dialog('option', 'title', '$encoder.jsEscape( $i18n.getString( "rename" ) , "'")');
jQuery( '#addDataElementGroupForm' ).dialog('open');
-
}
function deleteDataElemenGroup()
@@ -471,8 +333,137 @@
function( json ){
showSuccessMessage( i18n_update_success );
});
-
}
-
-
-</script>
\ No newline at end of file
+</script>
+
+<style type="text/javascript">
+#addDataElementGroupForm{
+ width:300px;
+}
+#addDataElementGroupForm div{
+ float:left;
+}
+.select{
+ min-width:300px;
+}
+</style>
+
+<h3>
+ $i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroupEditor" )
+</h3>
+<script>
+ jQuery(function(){
+ jQuery("#tabs").tabs();
+ });
+</script>
+
+<div id="tabs" style="position:absolute">
+ <ul>
+ <li><a href="#view_1">$i18n.getString( "view_1" )</a></li>
+ <li><a href="#view_2">$i18n.getString( "view_2" )</a></li>
+ </ul>
+ <div id="view_1">
+ <table >
+ <tr>
+ <th>$i18n.getString( "data_element_group" )</th>
+ <th></th>
+ <td rowspan="2"></td>
+ <th>$i18n.getString( "available_dataelements" )</th>
+
+ </tr>
+
+ <tr>
+ <td><input id="dataElementGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'dataElementGroups');"/></td>
+ <td><input id="selecteDataElementsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'selectedDataElements');"/></td>
+ <td><input id="availableDataElementsFilter" type="text" style="width:300px;" onkeyup="loadAvailableDataElements()"/></td>
+ </tr>
+
+ <tr>
+ <td>
+ <select class="select" id="dataElementGroups" size="30" onchange="getDataElementsByGroup()"/>
+ </td>
+ <td>
+ <select class="select" id="selectedDataElements" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'availableDataElements');" />
+ </td>
+
+ <td>
+ <input type="button" value="<" onclick="moveSelectedById('availableDataElements', 'selectedDataElements');" style="width:42px"/><br/><br/>
+ <input type="button" value=">" onclick="moveSelectedById('selectedDataElements', 'availableDataElements');" style="width:42px"/>
+ </td>
+ <td>
+ <select class="select" id="availableDataElements" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'selectedDataElements');"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="javascript:sortList( 'dataElementGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'dataElementGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroup()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroup()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteDataElemenGroup()" style="width:70px"/>
+ </td>
+ <td>
+ <a href="javascript:sortList( 'selectedDataElements', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'selectedDataElements', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <input type="button" value="$i18n.getString( 'update_dataelement_group_members' )" onclick="updateGroupMembers()"/>
+ </td>
+ <td></td>
+ <td>
+ <a href="javascript:sortList( 'availableDataElements', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'availableDataElements', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ </td>
+
+
+ </tr>
+ </table>
+ </div>
+ <div id="view_2">
+ <table>
+ <tr>
+ <th>$i18n.getString( "available_dataelements" )</th>
+ <th></th>
+ <td rowspan="2"></td>
+ <th>$i18n.getString( "available_groups" )</th>
+ </tr>
+
+ <tr>
+ <td><input id="availableDataElementsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableDataElements');"/></td>
+ <td><input id="assignedGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'assignedGroups');"/></td>
+ <td><input id="availableGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableGroups');"/></td>
+ </tr>
+
+ <tr>
+ <td>
+ <select class="select" id="availableDataElements2" size="30" onclick="getAssignedDataElementGroups()"/>
+ </td>
+ <td>
+ <select class="select" id="assignedGroups" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'availableGroups');"/>
+ </td>
+ <td>
+ <input type="button" value="<" onclick="moveSelectedById('availableGroups', 'assignedGroups');" style="width:42px"/><br/><br/>
+ <input type="button" value=">" onclick="moveSelectedById('assignedGroups', 'availableGroups');" style="width:42px"/>
+ </td>
+ <td>
+ <select name="select" size="30" multiple="multiple" class="select" id="availableGroups" ondblclick="moveSelectedById(this.id, 'assignedGroups');"/>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'assign_groups_for_dataelement' )" onclick="assignGroupsForDataElement()"/>
+ </td>
+ <td></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroupView2()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroupView2()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteDataElemenGroupView2()" style="width:70px"/>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div id="addDataElementGroupForm">
+ <label>$i18n.getString( "name" )</label>
+ <input type="text" id="name" name="name" style="width:20em" class="{validate:{required:true}}"/>
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'groupSetList' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
+ var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
+ var i18n_delete = '$encoder.jsEscape( $i18n.getString( "delete" ) , "'")';
+ var i18n_information = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
+</script>
+
<h3>$i18n.getString( "data_element_group_set" ) #openHelp( "dataElementGroupSet" )</h3>
<table class="mainPageTable">
@@ -57,14 +68,3 @@
</tr>
</table>
-
-<script>
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
- var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
- var i18n_delete = '$encoder.jsEscape( $i18n.getString( "delete" ) , "'")';
- var i18n_information = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
-
- jQuery(document).ready(function(){
- tableSorter( 'groupSetList' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2011-01-17 17:03:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,17 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_indicator" ) , "'")';
+ // Are you sure you want to delete this?
+ var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
+ var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
+ var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
+ var i18n_adding_indicator_failed = '$encoder.jsEscape( $i18n.getString( "adding_indicator_failed" ) , "'")';
+ var i18n_saving_indicator_failed = '$encoder.jsEscape( $i18n.getString( "saving_indicator_failed" ) , "'")';
+</script>
+
<h3>$i18n.getString( "indicator_management" ) #openHelp( "indicator" )</h3>
<table class="mainPageTable">
@@ -82,16 +96,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_indicator" ) , "'")';
- // Are you sure you want to delete this?
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
- var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
- var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
- var i18n_adding_indicator_failed = '$encoder.jsEscape( $i18n.getString( "adding_indicator_failed" ) , "'")';
- var i18n_saving_indicator_failed = '$encoder.jsEscape( $i18n.getString( "saving_indicator_failed" ) , "'")';
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2011-01-22 22:12:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2011-03-18 14:14:32 +0000
@@ -1,79 +1,7 @@
-<div id="indicator-expression-container">
-<form id="indicator-expression-form">
-<table width="800" style="text-align:left">
- <colgroup>
- <col width="250"/>
- <col width="50"/>
- <col width="500"/>
- </colgroup>
- <tr>
- <th colspan="2">$i18n.getString( "description" )</th>
- <th>$i18n.getString( "aggregation_operator" )</th>
- </tr>
- <tr>
- <td>
- <input type="text" id="description" name="description" style="width:250px" class="{validate:{required:true}}"/>
- </td>
- <td></td>
- <td>
- <input type="radio" name="aggregationOperator" checked="true" value="sum" onclick="getOperandsPage()"/>
- $i18n.getString( "sum" )<br/>
- <input type="radio" name="aggregationOperator" value="average" onclick="getOperandsPage()"/>
- $i18n.getString( "average" )
- </td>
- </tr>
- <tr>
- <td colspan="3"></td>
- </tr>
- <tr>
- <th colspan="2">$i18n.getString( "formula" )</th>
- <th>$i18n.getString( "list_of_data_elements" )</th>
- </tr>
- <tr>
- <td valign="top">
- <textarea id="expression" name="expression" style="width:250px; height:150px" wrap="virtual" onchange="cleanExpression()" class="{validate:{required:true}}"></textarea><br/>
- <a href="javascript:insertText( 'expression', '(', 'aggregationOperator' )"><img src="../images/left_parent.png" alt="$i18n.getString( 'left_brackets' )"/></a>
- <a href="javascript:insertText( 'expression', ')', 'aggregationOperator' )"><img src="../images/right_parent.png" alt="$i18n.getString( 'right_brackets' )"/></a>
- <a href="javascript:insertText( 'expression', '*', 'aggregationOperator' )"><img src="../images/multiply.png" alt="$i18n.getString( 'multiply' )"/></a>
- <a href="javascript:insertText( 'expression', '/', 'aggregationOperator' )"><img src="../images/divide.png" alt="$i18n.getString( 'divide' )"/></a>
- <a href="javascript:insertText( 'expression', '+', 'aggregationOperator' )"><img src="../images/plus.png" alt="$i18n.getString( 'plus' )"/></a>
- <a href="javascript:insertText( 'expression', '-', 'aggregationOperator' )"><img src="../images/minus.png" alt="$i18n.getString( 'minus' )"/></a>
- </td>
- <td></td>
- <td valign="top">
- <label>$encoder.htmlEncode( $i18n.getString( "filter_by_name" ) )</label><br/>
- <input type="text" id="filter" name="filter" style="width:380px">
- <input type="button" value="$i18n.getString( 'filter' )" onclick="getOperandsPage()" style="width:60px"><br/>
-
- <select id="dataElementId" name="dataElementId" size="7" style="min-width:450px" ondblclick="insertText( 'expression', this.value, 'aggregationOperator' )">
- </select>
- </td>
- </tr>
- <tr>
- <th colspan="3">$i18n.getString( "description" )</th>
- </tr>
- <tr>
- <td colspan="3"><div id="formulaText" style="width:740px;height:100px;overflow:auto"></div></td>
- </tr>
- <tr>
- <td colspan="3"></td>
- </tr>
- <tr>
- <td colspan="3">
- <input type="submit" value="$i18n.getString( 'save' )" style="width:125px"/>
- <input type="button" value="$i18n.getString( 'cancel' )" style="width:125px" onclick="closeExpressionBuilder()"/>
- </td>
- </tr>
-</table>
-</form>
-</div>
-
-<script>
- var numerator = false;
- var validator = null;
- var dialog = null;
-
- jQuery(function(){
+<script type="text/javascript">
+ jQuery( document ).ready( function(){
+ validator = validation( 'indicator-expression-form', insertExpression );
+
dialog = jQuery("#indicator-expression-container").dialog({
modal: true,
autoOpen: false,
@@ -84,8 +12,12 @@
});
getOperandsPage();
- });
+ });
+ var numerator = false;
+ var validator = null;
+ var dialog = null;
+
function indicatorNumeratorForm()
{
numerator = true;
@@ -194,7 +126,7 @@
jQuery.postJSON( '../dhis-web-commons-ajax-json/getExpressionText.action',
{expression: expression},
- function( json ){
+ function( json ) {
if( json.response == 'error') markInvalid( 'indicator-expression-container textarea[id=expression]' , json.message );
else {
if( numerator ){
@@ -209,10 +141,77 @@
closeExpressionBuilder();
}
- });
+ }
+ );
}
-
- jQuery( document ).ready( function(){
- validator = validation( 'indicator-expression-form', insertExpression );
- });
</script>
+
+<div id="indicator-expression-container">
+<form id="indicator-expression-form">
+<table width="800" style="text-align:left">
+ <colgroup>
+ <col width="250"/>
+ <col width="50"/>
+ <col width="500"/>
+ </colgroup>
+ <tr>
+ <th colspan="2">$i18n.getString( "description" )</th>
+ <th>$i18n.getString( "aggregation_operator" )</th>
+ </tr>
+ <tr>
+ <td>
+ <input type="text" id="description" name="description" style="width:250px" class="{validate:{required:true}}"/>
+ </td>
+ <td></td>
+ <td>
+ <input type="radio" name="aggregationOperator" checked="true" value="sum" onclick="getOperandsPage()"/>
+ $i18n.getString( "sum" )<br/>
+ <input type="radio" name="aggregationOperator" value="average" onclick="getOperandsPage()"/>
+ $i18n.getString( "average" )
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3"></td>
+ </tr>
+ <tr>
+ <th colspan="2">$i18n.getString( "formula" )</th>
+ <th>$i18n.getString( "list_of_data_elements" )</th>
+ </tr>
+ <tr>
+ <td valign="top">
+ <textarea id="expression" name="expression" style="width:250px; height:150px" wrap="virtual" onchange="cleanExpression()" class="{validate:{required:true}}"></textarea><br/>
+ <a href="javascript:insertText( 'expression', '(', 'aggregationOperator' )"><img src="../images/left_parent.png" alt="$i18n.getString( 'left_brackets' )"/></a>
+ <a href="javascript:insertText( 'expression', ')', 'aggregationOperator' )"><img src="../images/right_parent.png" alt="$i18n.getString( 'right_brackets' )"/></a>
+ <a href="javascript:insertText( 'expression', '*', 'aggregationOperator' )"><img src="../images/multiply.png" alt="$i18n.getString( 'multiply' )"/></a>
+ <a href="javascript:insertText( 'expression', '/', 'aggregationOperator' )"><img src="../images/divide.png" alt="$i18n.getString( 'divide' )"/></a>
+ <a href="javascript:insertText( 'expression', '+', 'aggregationOperator' )"><img src="../images/plus.png" alt="$i18n.getString( 'plus' )"/></a>
+ <a href="javascript:insertText( 'expression', '-', 'aggregationOperator' )"><img src="../images/minus.png" alt="$i18n.getString( 'minus' )"/></a>
+ </td>
+ <td></td>
+ <td valign="top">
+ <label>$encoder.htmlEncode( $i18n.getString( "filter_by_name" ) )</label><br/>
+ <input type="text" id="filter" name="filter" style="width:380px">
+ <input type="button" value="$i18n.getString( 'filter' )" onclick="getOperandsPage()" style="width:60px"><br/>
+
+ <select id="dataElementId" name="dataElementId" size="7" style="min-width:450px" ondblclick="insertText( 'expression', this.value, 'aggregationOperator' )">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th colspan="3">$i18n.getString( "description" )</th>
+ </tr>
+ <tr>
+ <td colspan="3"><div id="formulaText" style="width:740px;height:100px;overflow:auto"></div></td>
+ </tr>
+ <tr>
+ <td colspan="3"></td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <input type="submit" value="$i18n.getString( 'save' )" style="width:125px"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" style="width:125px" onclick="closeExpressionBuilder()"/>
+ </td>
+ </tr>
+</table>
+</form>
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( "confirm_delete_indicator_group" ) , "'")';
+ // Are you sure you want to delete this?
+ var i18n_adding_indicator_group_failed = '$encoder.jsEscape($i18n.getString( "adding_indicator_group_failed" ) , "'")';
+ var i18n_saving_indicator_group_failed = '$encoder.jsEscape($i18n.getString( "saving_indicator_group_failed" ) , "'")';
+</script>
+
<h3>$i18n.getString( "indicator_group_management" ) #openHelp( "indicatorGroup" )</h3>
<table class="mainPageTable">
@@ -34,8 +45,8 @@
</table>
<p></p>
#parse( "/dhis-web-commons/paging/paging.vm" )
+ </td>
- </td>
<td style="width:20em; padding-left:2em; vertical-align:top">
<div id="detailsArea" style="display:none">
@@ -56,14 +67,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( "confirm_delete_indicator_group" ) , "'")';
- // Are you sure you want to delete this?
- var i18n_adding_indicator_group_failed = '$encoder.jsEscape($i18n.getString( "adding_indicator_group_failed" ) , "'")';
- var i18n_saving_indicator_group_failed = '$encoder.jsEscape($i18n.getString( "saving_indicator_group_failed" ) , "'")';
-
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm 2011-03-14 07:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm 2011-03-18 14:14:32 +0000
@@ -1,152 +1,12 @@
-<h3>$i18n.getString( "indicator_group_editor" ) #openHelp( "indicatorGroupEditor" )</h3>
-<script>
- jQuery(function(){
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ loadAvailableGroups();
+ getIndicatorsByGroup();
+ getAssignedIndicatorGroups();
+ jQuery( "#addIndicatorGroupForm" ).dialog({autoOpen:false, modal:true});
jQuery("#tabs").tabs();
});
-</script>
-
-<div id="tabs" style="position:absolute">
- <ul>
- <li><a href="#view_1">$i18n.getString( "view_1" )</a></li>
- <li><a href="#view_2">$i18n.getString( "view_2" )</a></li>
- </ul>
- <div id="view_1">
- <table>
- <tr>
- <th>$i18n.getString( "indicator_group" )</th>
- <th></th>
- <td rowspan="2"></td>
- <th>$i18n.getString( "available_indicators" )</th>
- </tr>
-
- <tr>
- <td><input id="indicatorGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'indicatorGroups');"/></td>
- <td><input id="selectedIndicatorsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'selectedIndicators');"/></td>
- <td><input id="availableIndicatorsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableIndicators');"/></td>
- </tr>
-
- <tr>
- <td>
- <select class="select" id="indicatorGroups" size="30" onchange="getIndicatorsByGroup();"/>
- </td>
- <td>
- <select class="select" id="selectedIndicators" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'availableIndicators');"/>
- </td>
-
- <td>
- <input type="button" value="<" onclick="moveSelectedById('availableIndicators', 'selectedIndicators');" style="width:30px"/><br/><br/>
- <input type="button" value=">" onclick="moveSelectedById('selectedIndicators', 'availableIndicators');" style="width:30px"/>
- </td>
- <td>
- <select class="select" id="availableIndicators" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'selectedIndicators');"/>
- </td>
- </tr>
- <tr>
- <td>
- <a href="javascript:sortList( 'indicatorGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'indicatorGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroup()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroup()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteIndicatorGroup()" style="width:70px"/>
- </td>
- <td>
- <a href="javascript:sortList( 'selectedIndicators', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'selectedIndicators', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <input type="button" value="$i18n.getString( 'update_indicator_group_member' )" onclick="updateGroupMembers()"/>
- </td>
- <td></td>
- <td>
- <a href="javascript:sortList( 'availableIndicators', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'availableIndicators', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- </td>
- </tr>
- </table>
- </div>
- <div id="view_2">
- <table>
- <tr>
- <th>$i18n.getString( "available_indicators" )</th>
- <th></th>
- <td rowspan="2"></td>
- <th>$i18n.getString( "available_groups" )</th>
-
- </tr>
-
- <tr>
- <td><input id="availableIndicatorsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableIndicators2');"/></td>
- <td><input id="assignedGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'assignedGroups');"/></td>
- <td><input id="availableGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableGroups');"/></td>
- </tr>
-
- <tr>
- <td>
- <select class="select" id="availableIndicators2" size="30" onclick="getAssignedIndicatorGroups()">
- </select>
- </td>
- <td>
- <select class="select" id="assignedGroups" multiple="multiple" size="30" ondblclick="moveSelectedById('assignedGroups', 'availableGroups');">
- </select>
- </td>
-
- <td>
- <input type="button" value="<" onclick="moveSelectedById('availableGroups', 'assignedGroups');" style="width:30px"/><br/><br/>
- <input type="button" value=">" onclick="moveSelectedById('assignedGroups', 'availableGroups');" style="width:30px"/>
- </td>
-
- <td>
- <select class="select" id="availableGroups" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'assignedGroups');">
- </select>
- </td>
-
- </tr>
- <tr>
- <td>
- <a href="javascript:sortList( 'availableIndicators2', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'availableIndicators2', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- </td>
- <td>
- <a href="javascript:sortList( 'assignedGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'assignedGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <input type="button" value="$i18n.getString( 'update_indicator_group_member' )" onclick="assignGroupsForIndicator()"/>
- </td>
- <td></td>
- <td>
- <a href="javascript:sortList( 'availableGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <a href="javascript:sortList( 'availableGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
- <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroup2()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroup2()" style="width:70px"/>
- <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteIndicatorGroup2()" style="width:70px"/>
- </td>
-
- </tr>
- </table>
- </div>
-</div>
-
-<div id="addIndicatorGroupForm">
- <label>$i18n.getString( "name" )</label>
- <input type="text" id="name" name="name" style="width:20em" class="{validate:{required:true}}"/>
-</div>
-
-<style>
-#addIndicatorGroupForm{
- width:300px;
-}
-#addIndicatorGroupForm div{
- float:left;
-}
-.select{
- min-width:300px;
-}
-</style>
-
-<script type="text/javascript">
-
- var i18n_select_indicator_group = '$encoder.jsEscape( $i18n.getString( "select_indicator_group" ) , "'")';
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_indicator_group" ) , "'")';
- var i18n_member_of = '$encoder.jsEscape( $i18n.getString( "member_of" ) , "'")';
- var i18n_update_success = '$encoder.jsEscape( $i18n.getString( "update_success" ) , "'")';
-
+
var indicatorGroups = new Array();
#foreach( $indicatorGroup in $indicatorGroups )
indicatorGroups['$indicatorGroup.id'] = '$encoder.jsEscape( $indicatorGroup.name, "'" )';
@@ -157,13 +17,11 @@
availableIndicators['$indicator.id'] = '$encoder.jsEscape( $indicator.name, "'" )';
#end
var selectedIndicators = new Array();
-
- jQuery(function(){
- loadAvailableGroups();
- getIndicatorsByGroup();
- getAssignedIndicatorGroups();
- jQuery( "#addIndicatorGroupForm" ).dialog({autoOpen:false, modal:true});
- });
+
+ var i18n_select_indicator_group = '$encoder.jsEscape( $i18n.getString( "select_indicator_group" ) , "'")';
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_indicator_group" ) , "'")';
+ var i18n_member_of = '$encoder.jsEscape( $i18n.getString( "member_of" ) , "'")';
+ var i18n_update_success = '$encoder.jsEscape( $i18n.getString( "update_success" ) , "'")';
function loadAvailableIndicators()
{
@@ -362,7 +220,6 @@
}
// View2
-
function getAssignedIndicatorGroups()
{
loadAvailableGroups();
@@ -391,7 +248,6 @@
function showAddGroup2()
{
-
jQuery( '#addIndicatorGroupForm' ).dialog('option', 'title', '$encoder.jsEscape( $i18n.getString( "new" ) , "'")');
jQuery( '#addIndicatorGroupForm' ).dialog('option', 'buttons', [{
text: '$encoder.jsEscape( $i18n.getString( "save" ) , "'")',
@@ -414,9 +270,8 @@
}
}]);
jQuery( '#addIndicatorGroupForm' ).dialog('open');
-
}
-
+
function showUpdateGroup2()
{
var id = jQuery( "#view_2 #availableGroups" ).val()[0];
@@ -446,12 +301,11 @@
});
}
}]);
-
+
jQuery( '#addIndicatorGroupForm' ).dialog('option', 'title', '$encoder.jsEscape( $i18n.getString( "rename" ) , "'")');
jQuery( '#addIndicatorGroupForm' ).dialog('open');
-
}
-
+
function deleteIndicatorGroup2()
{
var id = jQuery( "#view_2 #availableGroups" ).val()[0];
@@ -473,7 +327,7 @@
});
}
}
-
+
function assignGroupsForIndicator()
{
var id = jQuery( "#view_2 #availableIndicators2" ).val();
@@ -483,7 +337,142 @@
showSuccessMessage( i18n_update_success );
});
}
-
-
-
-</script>
\ No newline at end of file
+</script>
+
+<style type="text/css">
+#addIndicatorGroupForm{
+ width:300px;
+}
+#addIndicatorGroupForm div{
+ float:left;
+}
+.select{
+ min-width:300px;
+}
+</style>
+
+
+<h3>$i18n.getString( "indicator_group_editor" ) #openHelp( "indicatorGroupEditor" )</h3>
+
+<div id="tabs" style="position:absolute">
+ <ul>
+ <li><a href="#view_1">$i18n.getString( "view_1" )</a></li>
+ <li><a href="#view_2">$i18n.getString( "view_2" )</a></li>
+ </ul>
+ <div id="view_1">
+ <table>
+ <tr>
+ <th>$i18n.getString( "indicator_group" )</th>
+ <th></th>
+ <td rowspan="2"></td>
+ <th>$i18n.getString( "available_indicators" )</th>
+ </tr>
+
+ <tr>
+ <td><input id="indicatorGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'indicatorGroups');"/></td>
+ <td><input id="selectedIndicatorsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'selectedIndicators');"/></td>
+ <td><input id="availableIndicatorsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableIndicators');"/></td>
+ </tr>
+
+ <tr>
+ <td>
+ <select class="select" id="indicatorGroups" size="30" onchange="getIndicatorsByGroup();"/>
+ </td>
+ <td>
+ <select class="select" id="selectedIndicators" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'availableIndicators');"/>
+ </td>
+
+ <td>
+ <input type="button" value="<" onclick="moveSelectedById('availableIndicators', 'selectedIndicators');" style="width:30px"/><br/><br/>
+ <input type="button" value=">" onclick="moveSelectedById('selectedIndicators', 'availableIndicators');" style="width:30px"/>
+ </td>
+ <td>
+ <select class="select" id="availableIndicators" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'selectedIndicators');"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="javascript:sortList( 'indicatorGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'indicatorGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroup()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroup()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteIndicatorGroup()" style="width:70px"/>
+ </td>
+ <td>
+ <a href="javascript:sortList( 'selectedIndicators', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'selectedIndicators', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <input type="button" value="$i18n.getString( 'update_indicator_group_member' )" onclick="updateGroupMembers()"/>
+ </td>
+ <td></td>
+ <td>
+ <a href="javascript:sortList( 'availableIndicators', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'availableIndicators', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="view_2">
+ <table>
+ <tr>
+ <th>$i18n.getString( "available_indicators" )</th>
+ <th></th>
+ <td rowspan="2"></td>
+ <th>$i18n.getString( "available_groups" )</th>
+
+ </tr>
+
+ <tr>
+ <td><input id="availableIndicatorsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableIndicators2');"/></td>
+ <td><input id="assignedGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'assignedGroups');"/></td>
+ <td><input id="availableGroupsFilter" type="text" style="width:300px;" onkeyup="filterList(this.value, 'availableGroups');"/></td>
+ </tr>
+
+ <tr>
+ <td>
+ <select class="select" id="availableIndicators2" size="30" onclick="getAssignedIndicatorGroups()">
+ </select>
+ </td>
+ <td>
+ <select class="select" id="assignedGroups" multiple="multiple" size="30" ondblclick="moveSelectedById('assignedGroups', 'availableGroups');">
+ </select>
+ </td>
+
+ <td>
+ <input type="button" value="<" onclick="moveSelectedById('availableGroups', 'assignedGroups');" style="width:30px"/><br/><br/>
+ <input type="button" value=">" onclick="moveSelectedById('assignedGroups', 'availableGroups');" style="width:30px"/>
+ </td>
+
+ <td>
+ <select class="select" id="availableGroups" multiple="multiple" size="30" ondblclick="moveSelectedById(this.id, 'assignedGroups');">
+ </select>
+ </td>
+
+ </tr>
+ <tr>
+ <td>
+ <a href="javascript:sortList( 'availableIndicators2', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'availableIndicators2', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ </td>
+ <td>
+ <a href="javascript:sortList( 'assignedGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'assignedGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <input type="button" value="$i18n.getString( 'update_indicator_group_member' )" onclick="assignGroupsForIndicator()"/>
+ </td>
+ <td></td>
+ <td>
+ <a href="javascript:sortList( 'availableGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <a href="javascript:sortList( 'availableGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"/></a>
+ <input type="button" value="$i18n.getString( 'new' )" onclick="showAddGroup2()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'rename' )" onclick="showUpdateGroup2()" style="width:70px"/>
+ <input type="button" value="$i18n.getString( 'delete' )" onclick="deleteIndicatorGroup2()" style="width:70px"/>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div id="addIndicatorGroupForm">
+ <label>$i18n.getString( "name" )</label>
+ <input type="text" id="name" name="name" style="width:20em" class="{validate:{required:true}}"/>
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
+ var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
+ var i18n_delete = '$encoder.jsEscape( $i18n.getString( "delete" ) , "'")';
+ var i18n_information = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
+</script>
+
<h3>$i18n.getString( "indicator_group_set" ) #openHelp( "indicatorGroupSet" )</h3>
<table class="mainPageTable">
@@ -57,14 +68,3 @@
</tr>
</table>
-
-
-<script>
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_group" ) , "'")';
- var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")';
- var i18n_delete = '$encoder.jsEscape( $i18n.getString( "delete" ) , "'")';
- var i18n_information = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")';
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- });
-</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,40 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_indicator_type" ) , "'")';
+ var i18n_adding_indicator_type_failed = '$encoder.jsEscape( $i18n.getString( "adding_indicator_type_failed" ) , "'")';
+ var i18n_saving_indicator_type_failed = '$encoder.jsEscape( $i18n.getString( "saving_indicator_type_failed" ) , "'")';
+
+ // -----------------------------------------------------------------------------
+ // View details
+ // -----------------------------------------------------------------------------
+ function showIndicatorTypeDetails( indicatorTypeId )
+ {
+ var request = new Request();
+ request.setResponseTypeXML( 'indicatorType' );
+ request.setCallbackSuccess( indicatorTypeReceived );
+ request.send( 'getIndicatorType.action?id=' + indicatorTypeId );
+ }
+
+ function indicatorTypeReceived( indicatorTypeElement )
+ {
+ setInnerHTML( 'nameField', getElementValue( indicatorTypeElement, 'name' ) );
+ setInnerHTML( 'factorField', getElementValue( indicatorTypeElement, 'factor' ) );
+
+ showDetails();
+ }
+
+ // -----------------------------------------------------------------------------
+ // Remove indicator type
+ // -----------------------------------------------------------------------------
+ function removeIndicatorType( indicatorTypeId, indicatorTypeName )
+ {
+ removeItem( indicatorTypeId, indicatorTypeName, i18n_confirm_delete, 'removeIndicatorType.action' );
+ }
+</script>
+
<h3>$i18n.getString( "indicator_type_management" ) #openHelp( "indicatorType" )</h3>
<table class="mainPageTable">
@@ -56,44 +93,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_indicator_type" ) , "'")';
-
- var i18n_adding_indicator_type_failed = '$encoder.jsEscape( $i18n.getString( "adding_indicator_type_failed" ) , "'")';
- var i18n_saving_indicator_type_failed = '$encoder.jsEscape( $i18n.getString( "saving_indicator_type_failed" ) , "'")';
-
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- });
-
- // -----------------------------------------------------------------------------
- // View details
- // -----------------------------------------------------------------------------
-
- function showIndicatorTypeDetails( indicatorTypeId )
- {
- var request = new Request();
- request.setResponseTypeXML( 'indicatorType' );
- request.setCallbackSuccess( indicatorTypeReceived );
- request.send( 'getIndicatorType.action?id=' + indicatorTypeId );
- }
-
- function indicatorTypeReceived( indicatorTypeElement )
- {
- setInnerHTML( 'nameField', getElementValue( indicatorTypeElement, 'name' ) );
- setInnerHTML( 'factorField', getElementValue( indicatorTypeElement, 'factor' ) );
-
- showDetails();
- }
-
- // -----------------------------------------------------------------------------
- // Remove indicator type
- // -----------------------------------------------------------------------------
-
- function removeIndicatorType( indicatorTypeId, indicatorTypeName )
- {
- removeItem( indicatorTypeId, indicatorTypeName, i18n_confirm_delete, 'removeIndicatorType.action' );
- }
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2010-09-04 07:26:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2011-03-18 14:14:32 +0000
@@ -1,6 +1,6 @@
<h2>$i18n.getString( "data_element" ) </h2>
- <ul>
+<ul>
<li><a href="dataElement.action">$i18n.getString( "data_element" ) </a></li>
<li><a href="dataElementGroup.action">$i18n.getString( "data_element_group" ) </a></li>
<li><a href="dataElementGroupEditor.action">$i18n.getString( "data_element_group_editor" ) </a></li>
@@ -8,18 +8,18 @@
<li><a href="category.action">$i18n.getString( "data_element_category" ) </a></li>
<li><a href="categoryCombo.action">$i18n.getString( "data_element_category_combo" ) </a></li>
<li><a href="concept.action">$i18n.getString( "concept" ) </a></li>
- </ul>
+</ul>
<h2>$i18n.getString( "indicator" ) </h2>
- <ul>
+<ul>
<li><a href="indicator.action">$i18n.getString( "indicator" ) </a></li>
<li><a href="indicatorType.action">$i18n.getString( "indicator_type" ) </a></li>
<li><a href="indicatorGroup.action">$i18n.getString( "indicator_group" ) </a></li>
- <li><a href="indicatorGroupEditor.action">$i18n.getString( "indicator_group_editor" ) </a></li>
+ <li><a href="indicatorGroupEditor.action">$i18n.getString( "indicator_group_editor" ) </a></li>
<li><a href="indicatorGroupSet.action">$i18n.getString( "indicator_group_set" ) </a></li>
- </ul>
+</ul>
<h2>$i18n.getString( "data_dictionary" ) </h2>
- <ul>
- <li><a href="dataDictionary.action">$i18n.getString( "data_dictionary" ) </a></li>
- </ul>
\ No newline at end of file
+<ul>
+ <li><a href="dataDictionary.action">$i18n.getString( "data_dictionary" ) </a></li>
+</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 2011-03-18 14:14:32 +0000
@@ -1,10 +1,10 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addConceptForm', function( form ){ form.submit() } );
checkValueIsExist( "name", "validateAddUpdateConcept.action");
});
-
</script>
+
<h3>$i18n.getString( "create_new_concept" )</h3>
<form id="addConceptForm" action="addConcept.action" method="post" >
@@ -25,4 +25,4 @@
</tr>
</table>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm 2010-09-28 04:02:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm 2011-03-18 14:14:32 +0000
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addDataElementCategoryComboForm', function( form ){
validateSelectedCategories( form );
@@ -7,8 +7,8 @@
} );
checkValueIsExist( "name", "validateDataElementCategoryCombo.action");
});
-
</script>
+
<h3>$i18n.getString( "create_new_data_element_category_combo" )</h3>
<form id="addDataElementCategoryComboForm" name="addDataElementCategoryComboForm" action="addDataElementCategoryCombo.action" method="post" >
@@ -74,4 +74,4 @@
<input type="button" name="cancel" onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( 'cancel' )" style="width:10em"/>
</p>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2010-09-23 12:02:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2011-03-18 14:14:32 +0000
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'addDataElementCategoryForm', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'categoryOptionNames' );
@@ -6,24 +6,33 @@
checkValueIsExist( "name", "validateDataElementCategory.action");
});
+
+ var i18n_specify_category_option_name = '$encoder.jsEscape( $i18n.getString( "specify_category_option_name" ) , "'")';
+ var i18n_category_option_name_already_exists = '$encoder.jsEscape( $i18n.getString( "category_option_name_already_exists" ) , "'")';
+ var i18n_must_include_category_option = '$encoder.jsEscape( $i18n.getString( "must_include_category_option" ) , "'")';
+ function removeDataElementCategory( categoryId, categoryName )
+ {
+ removeItem( categoryId, categoryName, i18n_confirm_delete, 'removeDataElementCategory.action' );
+ }
+
function addCategoryOption()
{
var value = getFieldValue( 'categoryOptionName' );
- if( value.length == 0 ) markInvalid( 'categoryOptionName', i18n_specify_category_option_name );
- else if( listContainsById( 'categoryOptionNames', value ) ) markInvalid( 'categoryOptionName', i18n_category_option_name_already_exists );
- else{
+ if( value.length == 0 ) {
+ markInvalid( 'categoryOptionName', i18n_specify_category_option_name );
+ } else if( listContainsById( 'categoryOptionNames', value ) ) {
+ markInvalid( 'categoryOptionName', i18n_category_option_name_already_exists );
+ } else {
jQuery.postJSON( 'validateDataElementCategoryOption.action',
- {name: value }, function(json){
+ {name: value }, function(json) {
if( json.response == 'success' ){
addOption( 'categoryOptionNames', value, value );
}else{
markInvalid( 'categoryOptionName', i18n_category_option_name_already_exists );
}
});
-
}
-
}
</script>
@@ -99,15 +108,3 @@
</tr>
</table>
</form>
-
-<script type="text/javascript">
- var i18n_specify_category_option_name = '$encoder.jsEscape( $i18n.getString( "specify_category_option_name" ) , "'")';
- var i18n_category_option_name_already_exists = '$encoder.jsEscape( $i18n.getString( "category_option_name_already_exists" ) , "'")';
- var i18n_must_include_category_option = '$encoder.jsEscape( $i18n.getString( "must_include_category_option" ) , "'")';
-
- function removeDataElementCategory( categoryId, categoryName )
- {
- removeItem( categoryId, categoryName, i18n_confirm_delete, 'removeDataElementCategory.action' );
- }
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2010-12-20 17:34:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,32 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'categoryList' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_category" ) , "'" )';
+
+ function showDataElementCategoryDetails( categoryId )
+ {
+ var request = new Request();
+ request.setResponseTypeXML( 'dataElementCategory' );
+ request.setCallbackSuccess( dataElementCategoryReceived );
+ request.send( 'getDataElementCategory.action?id=' + categoryId );
+ }
+
+ function dataElementCategoryReceived( categoryElement )
+ {
+ setInnerHTML( 'nameField', getElementValue( categoryElement, 'name' ) );
+ setInnerHTML( 'categoryOptionsCountField', getElementValue( categoryElement, 'categoryOptionCount' ) );
+
+ showDetails();
+ }
+
+ function removeDataElementCategory( categoryId, categoryName )
+ {
+ removeItem( categoryId, categoryName, i18n_confirm_delete, 'removeDataElementCategory.action' );
+ }
+</script>
+
<h3>$i18n.getString( "data_element_category_management" ) #openHelp( "dataElementCategory" )</h3>
<table class="mainPageTable">
@@ -57,35 +86,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
-
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_category" ) , "'" )';
-
- jQuery(document).ready(function(){
- tableSorter( 'categoryList' );
- });
-
- function showDataElementCategoryDetails( categoryId )
- {
- var request = new Request();
- request.setResponseTypeXML( 'dataElementCategory' );
- request.setCallbackSuccess( dataElementCategoryReceived );
- request.send( 'getDataElementCategory.action?id=' + categoryId );
- }
-
- function dataElementCategoryReceived( categoryElement )
- {
- setInnerHTML( 'nameField', getElementValue( categoryElement, 'name' ) );
- setInnerHTML( 'categoryOptionsCountField', getElementValue( categoryElement, 'categoryOptionCount' ) );
-
- showDetails();
- }
-
- function removeDataElementCategory( categoryId, categoryName )
- {
- removeItem( categoryId, categoryName, i18n_confirm_delete, 'removeDataElementCategory.action' );
- }
-
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2010-12-20 17:34:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,11 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'categoryComboList' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_category_combo" ) , "'" )';
+</script>
+
<h3>$i18n.getString( "data_element_category_combo_management" ) #openHelp( "dataElementCategoryCombo" )</h3>
<table class="mainPageTable">
@@ -57,10 +65,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element_category_combo" ) , "'" )';
- jQuery(document).ready(function(){
- tableSorter( 'categoryComboList' );
- });
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2010-12-20 17:34:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,43 @@
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_concept" ) , "'")';
+ // Are you sure you want to delete this?
+ var i18n_adding_concept_failed = '$encoder.jsEscape( $i18n.getString( "adding_concept_failed" ) , "'")';
+ var i18n_saving_concept_failed = '$encoder.jsEscape( $i18n.getString( "saving_concept_failed" ) , "'")';
+
+
+ // -----------------------------------------------------------------------------
+ // View details
+ // -----------------------------------------------------------------------------
+
+ function showConceptDetails( conceptId )
+ {
+ var request = new Request();
+ request.setResponseTypeXML( 'concept' );
+ request.setCallbackSuccess( conceptReceived );
+ request.send( 'getConcept.action?id=' + conceptId );
+ }
+
+ function conceptReceived( conceptElement )
+ {
+ setInnerHTML( 'nameField', getElementValue( conceptElement, 'name' ) );
+
+ showDetails();
+ }
+
+ // -----------------------------------------------------------------------------
+ // Remove category concept
+ // -----------------------------------------------------------------------------
+
+ function removeConcept( conceptId, conceptName )
+ {
+ removeItem( conceptId, conceptName, i18n_confirm_delete, 'removeConcept.action' );
+ }
+</script>
+
<h3>$i18n.getString( "concept_management" ) #openHelp( "concept" )</h3>
<table class="mainPageTable">
@@ -55,45 +95,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
-
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_concept" ) , "'")';
- // Are you sure you want to delete this?
- var i18n_adding_concept_failed = '$encoder.jsEscape( $i18n.getString( "adding_concept_failed" ) , "'")';
- var i18n_saving_concept_failed = '$encoder.jsEscape( $i18n.getString( "saving_concept_failed" ) , "'")';
-
- jQuery(document).ready(function() {
- tableSorter( 'listTable' );
- });
-
- // -----------------------------------------------------------------------------
- // View details
- // -----------------------------------------------------------------------------
-
- function showConceptDetails( conceptId )
- {
- var request = new Request();
- request.setResponseTypeXML( 'concept' );
- request.setCallbackSuccess( conceptReceived );
- request.send( 'getConcept.action?id=' + conceptId );
- }
-
- function conceptReceived( conceptElement )
- {
- setInnerHTML( 'nameField', getElementValue( conceptElement, 'name' ) );
-
- showDetails();
- }
-
- // -----------------------------------------------------------------------------
- // Remove category concept
- // -----------------------------------------------------------------------------
-
- function removeConcept( conceptId, conceptName )
- {
- removeItem( conceptId, conceptName, i18n_confirm_delete, 'removeConcept.action' );
- }
-
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 2011-03-18 14:14:32 +0000
@@ -1,9 +1,8 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'updateConceptForm', function( form ){ form.submit() } );
checkValueIsExist( "name", "validateAddUpdateConcept.action", {id: $concept.id});
});
-
</script>
<h3>$i18n.getString( "edit_concept" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm 2010-09-28 04:02:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm 2011-03-18 14:14:32 +0000
@@ -1,13 +1,13 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'editDataElementCategoryComboForm', function( form ){
validateSelectedCategories( form );
}, function(){
listValidator( 'selectedCategories', 'selectedList' );
} );
+
checkValueIsExist( "name", "validateDataElementCategoryCombo.action", {id: $dataElementCategoryCombo.id});
});
-
</script>
<h3>$i18n.getString( "edit_data_element_category_combo" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2011-03-18 14:14:32 +0000
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'editDataElementCategoryForm', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'categoryOptions' );
@@ -6,6 +6,11 @@
checkValueIsExist( "name", "validateDataElementCategory.action", {id: $dataElementCategory.id});
});
+
+ var i18n_specify_category_option_name = '$encoder.jsEscape( $i18n.getString( "specify_category_option_name" ) , "'")';
+ var i18n_category_option_name_already_exists = '$encoder.jsEscape( $i18n.getString( "category_option_name_already_exists" ) , "'")';
+ var i18n_option_rename_successfully = '$encoder.jsEscape( $i18n.getString( "option_rename_successfully" ) , "'")';
+ var mode = 'update';
function updateCategoryOption()
{
@@ -28,6 +33,27 @@
}
} catch(e) { markInvalid( 'categoryOptionName', i18n_specify_category_option_name ); }
}
+
+ function getSelectedCategoryOption(){
+ var categoryOptions = byId('categoryOptions');
+ byId('categoryOptionName').value=categoryOptions[categoryOptions.selectedIndex].text;
+ }
+
+ function updateCategoryOptionName(){
+ var request = new Request();
+ request.setResponseTypeXML( 'xmlObject' );
+ request.setCallbackSuccess( updateCategoryOptionNameReceived );
+ var params = "id=" + byId('categoryOptions').value;
+ params += '&name=' + byId('categoryOptionName').value;
+ request.sendAsPost(params);
+ request.send('updateDataElementCategoryOption.action');
+ }
+
+ function updateCategoryOptionNameReceived(xmlObject){
+ var categoryOptions = byId('categoryOptions');
+ categoryOptions[categoryOptions.selectedIndex].text = byId('categoryOptionName').value;
+ showSuccessMessage( i18n_option_rename_successfully );
+ }
</script>
<h3>$i18n.getString( "edit_data_element_category" )</h3>
@@ -109,32 +135,3 @@
</tr>
</table>
</form>
-
-<script type="text/javascript">
- var i18n_specify_category_option_name = '$encoder.jsEscape( $i18n.getString( "specify_category_option_name" ) , "'")';
- var i18n_category_option_name_already_exists = '$encoder.jsEscape( $i18n.getString( "category_option_name_already_exists" ) , "'")';
- var i18n_option_rename_successfully = '$encoder.jsEscape( $i18n.getString( "option_rename_successfully" ) , "'")';
- var mode = 'update';
-
- function getSelectedCategoryOption(){
- var categoryOptions = byId('categoryOptions');
- byId('categoryOptionName').value=categoryOptions[categoryOptions.selectedIndex].text;
- }
-
- function updateCategoryOptionName(){
- var request = new Request();
- request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( updateCategoryOptionNameReceived );
- var params = "id=" + byId('categoryOptions').value;
- params += '&name=' + byId('categoryOptionName').value;
- request.sendAsPost(params);
- request.send('updateDataElementCategoryOption.action');
- }
-
- function updateCategoryOptionNameReceived(xmlObject){
- var categoryOptions = byId('categoryOptions');
- categoryOptions[categoryOptions.selectedIndex].text = byId('categoryOptionName').value;
- showSuccessMessage( i18n_option_rename_successfully );
- }
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortDataElementForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortDataElementForm.vm 2011-03-18 14:14:32 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+ function submitForm()
+ {
+ selectAllById( "dataElements" );
+ document.getElementById( "sortOrderForm" ).submit();
+ }
+</script>
<h3>$i18n.getString( "data_element_sort_order" )</h3>
@@ -19,16 +26,8 @@
</p>
<p>
-<input type="button" value="$i18n.getString( 'save' )" style="width:130px" onclick="submitForm()"/><input
-type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='dataElement.action'"/>
+ <input type="button" value="$i18n.getString( 'save' )" style="width:130px" onclick="submitForm()"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='dataElement.action'"/>
</p>
</form>
-
-<script type="text/javascript">
- function submitForm()
- {
- selectAllById( "dataElements" );
- document.getElementById( "sortOrderForm" ).submit();
- }
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortIndicatorForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortIndicatorForm.vm 2011-03-18 14:14:32 +0000
@@ -1,8 +1,14 @@
+<script type="text/javascript">
+ function submitForm()
+ {
+ selectAllById( "indicators" );
+ document.getElementById( "sortOrderForm" ).submit();
+ }
+</script>
<h3>$i18n.getString( "indicator_sort_order" )</h3>
<form id="sortOrderForm" action="saveIndicatorSortOrder.action" method="post">
-
<p>
<input type="button" value="$i18n.getString( 'move_up' )" style="width:130px" onclick="moveUpSelectedOption( 'indicators' )"/><input
type="button" value="$i18n.getString( 'move_down' )" style="width:130px" onclick="moveDownSelectedOption( 'indicators' )"/><input
@@ -19,16 +25,8 @@
</p>
<p>
-<input type="button" value="$i18n.getString( 'save' )" style="width:130px" onclick="submitForm()"/><input
-type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='indicator.action'"/>
+ <input type="button" value="$i18n.getString( 'save' )" style="width:130px" onclick="submitForm()"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='indicator.action'"/>
</p>
</form>
-
-<script type="text/javascript">
- function submitForm()
- {
- selectAllById( "indicators" );
- document.getElementById( "sortOrderForm" ).submit();
- }
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2010-09-25 19:37:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2011-03-18 14:14:32 +0000
@@ -1,15 +1,12 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
- validation( 'updateDataDictionaryForm', function( form ){ form.submit()}, function(){
+ validation( 'updateDataDictionaryForm', function( form ) { form.submit()}, function() {
listValidator( 'memberValidator', 'selectedDataElements' );
listValidator( 'memberValidatorIn', 'selectedIndicators' );
- } );
-
+ } );
+
checkValueIsExist( "name", "validateDataDictionary.action", {id: $dataDictionary.id});
-
});
-
</script>
<h3>$i18n.getString( "edit_data_dictionary" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2011-03-14 20:16:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2011-03-18 14:14:32 +0000
@@ -1,5 +1,5 @@
-<script>
- jQuery(document).ready( function(){
+<script type="text/javascript">
+ jQuery(document).ready( function() {
validation( 'updateDataElementForm', function( form ){
form.submit();
},function(){
@@ -8,18 +8,19 @@
setFieldValue( 'submitCategoryComboId', getFieldValue( 'selectedCategoryComboId' ) );
setFieldValue( 'submitValueType', getFieldValue( 'valueType' ) );
});
-
+
checkValueIsExist( "name", "validateDataElement.action", {id:getFieldValue('id')});
checkValueIsExist( "shortName", "validateDataElement.action", {id:getFieldValue('id')});
checkValueIsExist( "alternativeName", "validateDataElement.action", {id:getFieldValue('id')});
-
+
#if ( $calculatedDataElement )
toggleCDEForm();
#else
updateAggreationOperation( getFieldValue('valueType') );
#end
- }
- );
+ });
+
+ var previousName = '$encoder.jsEscape( $dataElement.name, "'" )';
</script>
<h3>$i18n.getString( "edit_data_element" )</h3>
@@ -267,5 +268,4 @@
<script type="text/javascript">
- var previousName = '$encoder.jsEscape( $dataElement.name, "'" )';
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2011-03-18 14:14:32 +0000
@@ -1,5 +1,5 @@
-<script>
- jQuery(document).ready( function(){
+<script type="text/javascript">
+ jQuery(document).ready( function(){
validation( 'updateDataElementGroupForm', function( form ){ form.submit()}, beforeSubmit );
checkValueIsExist( "name", "validateDataElementGroup.action", {id: getFieldValue( 'id' )});
});
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2011-03-18 14:14:32 +0000
@@ -1,11 +1,14 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'updateDataElementGroupSet', function( form ){ form.submit()}, beforeSubmit );
checkValueIsExist( "name", "validateDataElementGroupSet.action", {id: getFieldValue('id')});
+
+ var nameField = document.getElementById( 'name' );
+ nameField.select();
+ nameField.focus();
});
</script>
-
<h3>$i18n.getString( "update_dataelementgroupset" ) : $dataElementGroupSet.name</h3>
<form id="updateDataElementGroupSet" action="updateDataElementGroupSet.action" method="post">
@@ -67,15 +70,6 @@
</table>
<p><input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroupSet.action'" style="width:10em"/></p>
-
</form>
<span id='message'></span>
-
-<script type="text/javascript">
-
- var nameField = document.getElementById( 'name' );
- nameField.select();
- nameField.focus();
-
-</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2011-01-21 03:15:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2011-03-18 14:14:32 +0000
@@ -1,8 +1,9 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'updateIndicatorForm',
function( form ){ form.submit()}
);
+
checkValueIsExist( "name", "validateIndicator.action", {id:getFieldValue('id')});
checkValueIsExist( "shortName", "validateIndicator.action" , {id:getFieldValue('id')});
checkValueIsExist( "alternativeName", "validateIndicator.action" , {id:getFieldValue('id')});
@@ -94,9 +95,6 @@
<td><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicator.action'" style="width:10em"/></td>
</tr>
</table>
-
</form>
-
#parse( "/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm" )
-
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm 2011-03-18 14:14:32 +0000
@@ -1,14 +1,11 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'updateIndicatorGroupForm', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'groupMembers' );
} );
checkValueIsExist( "name", "validateIndicatorGroup.action", {id: $indicatorGroup.id});
-
});
-
</script>
<h3>$i18n.getString( "edit_indicator_group" )</h3>
@@ -71,4 +68,4 @@
<p><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorGroup.action'" style="width:10em"/></p>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2011-03-18 14:14:32 +0000
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'updateIndicatorGroupSet', function( form ){ form.submit()}, function(){
listValidator( 'memberValidator', 'groupMembers' );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm 2011-03-18 14:14:32 +0000
@@ -1,13 +1,14 @@
-<script>
-
+<script type="text/javascript">
jQuery(document).ready( function(){
validation( 'updateIndicatorTypeForm', function( form ){ form.submit()} );
-
checkValueIsExist( "name", "validateIndicatorType.action", {id: $indicatorType.id});
-
+
+ var nameField = document.getElementById( 'name' );
+ nameField.select();
+ nameField.focus();
});
+</script>
-</script>
<h3>$i18n.getString( "edit_indicator_type" )</h3>
<form id="updateIndicatorTypeForm" action="updateIndicatorType.action" method="post" >
@@ -41,13 +42,4 @@
<td><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorType.action'" style="width:10em"/></td>
</tr>
</table>
-
</form>
-
-<script type="text/javascript">
-
- var nameField = document.getElementById( 'name' );
- nameField.select();
- nameField.focus();
-
-</script>
