← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #09741

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2640: Bug fixed in DeTarget /Survey Module

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2640
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2011-01-19 18:59:17 +0530
message:
  Bug fixed in DeTarget /Survey Module
modified:
  dhis-2/dhis-web/pom.xml
  local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm
  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/survey/i18n_module.properties
  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/form.vm
  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/general.js
  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/menuWithTreeForDeTarget.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/pom.xml'
--- dhis-2/dhis-web/pom.xml	2011-01-19 11:13:53 +0000
+++ dhis-2/dhis-web/pom.xml	2011-01-19 13:29:17 +0000
@@ -24,7 +24,7 @@
     <module>dhis-web-dashboard-integration</module>
     <module>dhis-web-caseentry</module>
     <module>dhis-web-api</module>
-    <!-- <module>dhis-web-portal</module> -->
+    <module>dhis-web-portal</module>
   </modules>
   <build>
     <plugins>

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm	2010-11-12 11:12:37 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm	2011-01-19 13:29:17 +0000
@@ -32,40 +32,11 @@
 </div>
 
 <form id="selectForm" name="selectForm" method="post" action="select.action">
-<!--
-<div id="actions" style="width:200px text-align:right">
-	<input type="button" value="$i18n.getString( "generate_min_max" )" onclick="javascript:generateMinMaxValues();" style="width:100% text-align:right" #if( !$selectedPeriodIndex || !$auth.hasAccess( "dhis-web-dataentry-national", "minMaxGeneration" )) disabled="disabled" #end >
-	<input type="button" value="$i18n.getString( "run_validation" )" onclick="javascript:validate();" style="width:100% text-align:right" #if( !$selectedPeriodIndex ) disabled="disabled" #end>
-	<input type="button" id="calculateCDEs" value="$i18n.getString( "save_calculated" )" name="calculateCDEs" onclick="calculateAndSaveCDEs();" style="width:100% text-align:right" #if( !$selectedPeriodIndex ) disabled="disabled" #end>
-	<br><label for="useShortName">$i18n.getString( "use_short_names" )</label>&nbsp;
-	<input type="checkbox" id="useShortName" name="useShortName" #if( $useShortName ) checked="checked" #end onchange="document.getElementById( 'selectForm' ).submit();">	
-			
-</div>	
--->	
 
 
 <div id="actions" style="width:200px text-align:right; display : none;">
-<!--
-<input type="button" value="$i18n.getString( "change_order" )" onclick="changeOrder()" style="width:100% text-align:right" #if( !$selectedDataSetId || !$auth.hasAccess( "dhis-web-dataentry-national", "getDataElementOrder" ) || ($customDataEntryFormExists && !$useDefaultForm)) disabled="disabled" #end>
-
-<input type="button" value="$i18n.getString( "generate_min_max" )" onclick="javascript:generateMinMaxValues();" style="width:100% text-align:right" #if( !$selectedPeriodIndex || !$auth.hasAccess( "dhis-web-dataentry-national", "minMaxGeneration" )) disabled="disabled" #end >
-
-<input type="button" value="$i18n.getString( "run_validation" )" onclick="javascript:validate();" style="width:100% text-align:right" #if( !$selectedPeriodIndex ) disabled="disabled" #end>
-
-<input type="button" id="calculateCDEs" value="$i18n.getString( "save_calculated" )" name="calculateCDEs" onclick="calculateAndSaveCDEs();" style="width:100% text-align:right" #if( !$selectedPeriodIndex ) disabled="disabled" #end>
-
-<br>
-
-<label>$i18n.getString( "use_default_form" )</label>
-	<input type="checkbox" id="useDefaultForm" name="useDefaultForm" #if( $useDefaultForm || !$customDataEntryFormExists ) checked="checked" #end #if( !$customDataEntryFormExists ) disabled="disabled" #end onchange="document.getElementById( 'selectForm' ).submit();">
-<br>
-<label>$i18n.getString( "use_secction_form" )</label>
-	<input type="checkbox" id="useSectionForm" name="useSectionForm" #if($useSectionForm) checked="checked" #end  #if(!$haveSection) disabled="disabled" #end onchange="document.getElementById( 'selectForm' ).submit();">
-<br>
-<label for="useShortName">$i18n.getString( "use_short_names" )</label>
-	##<input type="checkbox" id="useShortName" name="useShortName" #if( $useShortName ) checked="checked" #end #if( !$selectedDataSetId || !$selectedPeriodIndex || !$useDefaultForm ) disabled="disabled" #end onchange="document.getElementById( 'selectForm' ).submit();">
-	<input type="checkbox" id="useShortName" name="useShortName" #if( $useShortName ) checked="checked" #end  #if( $customDataEntryFormExists && !$useDefaultForm ) disabled="disabled" #end onchange="document.getElementById( 'selectForm' ).submit();">			
--->
+
+<br>
 
 <br><br><br><br><br>
 <input type="button" value="SAVE" onclick="saveLineListingAggData()" #if( $isLineListing.equals("no") ) disabled="disabled" #end>

=== 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 @@
     <col id="entryCol" width="75">
 		
 	<tr>
-		<th>$i18n.getString( "nr" )</th>
+		<th>$i18n.getString( "sl_no" )</th>
 		<th>$i18n.getString( "indicator" )</th>		
 		<th>$i18n.getString( "entry" )</th>		
 	</tr>

=== 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 @@
 
-<h2>DeTarget</h2>
+<h2>$i18n.getString( "de_target" )</h2>
 
 <ul>
-    <li>DeTarget Data Entry</a></li>
+    <li>$i18n.getString( "detarget_dataentry" )</a></li>
 </ul>
 <div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
     <a href="deTargetManagement.action"><img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
  Thread Previous • Date Previous • • Thread Next