-
+
+
=== modified file 'local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties'
--- local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties 2011-01-17 11:36:57 +0000
+++ local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties 2011-01-19 13:29:17 +0000
@@ -50,7 +50,7 @@
define_survey_associations = Define Survey Associations
value_must_integer = Value must be integer
none = NONE
-not_del_contain_data = Not Deleted Its Contains Data
+not_del_contain_data = Not Deleted Its Contain Data
confirm_delete_survey = Are you sure you want to Remove Survey?
number_of_dataelements = Number of DataElements
detarget_mamagement = DataElement Target Management
=== modified file 'local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties'
--- local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties 2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/survey/i18n_module.properties 2011-01-19 13:29:17 +0000
@@ -52,7 +52,7 @@
define_survey_associations = Define Survey Associations
value_must_integer = Value must be integer
none = NONE
-not_del_contain_data = Not Deleted Its Contains Data
+not_del_contain_data = Not Deleted Its Contain Data
confirm_delete_survey = Are you sure you want to Remove Survey?
detarget_data_entry = DeTarget Data Entry
de_target_mamagement = DataElement Target Management
@@ -63,5 +63,7 @@
available_dataElements = Available DataElements
selected_dataElements = Selected DataElements
group = Group
+detarget_dataentry = DataElement Target Data Entry
+sl_no = Sl. No.
=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/form.vm'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/form.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/form.vm 2011-01-19 13:29:17 +0000
@@ -8,7 +8,7 @@
- $i18n.getString( "nr" ) |
+ $i18n.getString( "sl_no" ) |
$i18n.getString( "indicator" ) |
$i18n.getString( "entry" ) |
=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.js'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.js 2011-01-17 11:36:57 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.js 2011-01-19 13:29:17 +0000
@@ -9,7 +9,8 @@
function removeDeTarget( deTargetId, deTargetName )
{
- var result = window.confirm( i18n_confirm_delete + '\n\n' + " DeTarget Id =" + deTargetId + '\n\n' + " DeTarget Name =" + deTargetName );
+ //var result = window.confirm( i18n_confirm_delete + '\n\n' + " DeTarget Id =" + deTargetId + '\n\n' + " DeTarget Name =" + deTargetName );
+ var result = window.confirm( i18n_confirm_delete + '\n\n' + " DeTarget Name =" + deTargetName );
if ( result )
{
@@ -289,7 +290,7 @@
// var indicatorList = indicators.getElementsByTagName( 'indicator' );
var availableList = document.getElementById( 'availableList' );
-
+ var selectedList = document.getElementById( 'selectedList' );
// var availableDataElements = document.getElementById("availableDataElements");
//var selectedDataElements = document.getElementById("selectedServices");
@@ -302,12 +303,14 @@
{
var id = dataElements[ i ].getElementsByTagName("id")[0].firstChild.nodeValue;
var dataElementName = dataElements[ i ].getElementsByTagName("name")[0].firstChild.nodeValue;
-
+ if ( listContains(selectedList, id) == false )
+ {
var option = document.createElement("option");
option.value = id;
option.text = dataElementName;
option.title = dataElementName;
availableList.add( option, null );
+ }
}
}
=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/general.js'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/general.js 2011-01-15 11:35:42 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/general.js 2011-01-19 13:29:17 +0000
@@ -217,7 +217,8 @@
function markValue( color )
{
- var element = document.getElementById( 'value[' + deOptionComboId + '].value' );
+ //var element = document.getElementById( 'value[' + deOptionComboId + '].value' );
+ var element = document.getElementById( 'value[' + optionComboId + '].value' );
element.style.backgroundColor = color;
}
}
=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js 2010-12-29 07:53:18 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/survey.js 2011-01-19 13:29:17 +0000
@@ -9,7 +9,8 @@
function removeSurvey( surveyId, surveyName )
{
- var result = window.confirm( i18n_confirm_delete + '\n\n' + " Survey Id =" + surveyId + '\n\n' + " Survey Name =" + surveyName );
+ //var result = window.confirm( i18n_confirm_delete + '\n\n' + " Survey Id =" + surveyId + '\n\n' + " Survey Name =" + surveyName );
+ var result = window.confirm( i18n_confirm_delete + '\n\n' + " Survey Name =" + surveyName );
if ( result )
{
=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/menuWithTreeForDeTarget.vm'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/menuWithTreeForDeTarget.vm 2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/menuWithTreeForDeTarget.vm 2011-01-19 13:29:17 +0000
@@ -1,8 +1,8 @@
-
DeTarget
+
$i18n.getString( "de_target" )
- - DeTarget Data Entry
+ - $i18n.getString( "detarget_dataentry" )