dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5521
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-12-21 17:18:17 +0700
message:
  Remove Dragdiv into dataentry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css


--
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-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2011-12-20 02:45:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2011-12-21 10:18:17 +0000
@@ -29,18 +29,10 @@
 <div id='entryForm' style="display: #if($!programStageInstance.executionDate) block #else none #end;">
 	#if( $customDataEntryFormCode )
 		<div id="customEntryScreenContainer">
-			<div id="dragDiv">
-				<table id="listInfo">
-					<tr><td style="text-align:left" class="bold">$i18n.getString("org_unit_name") :</td> <td id="orgUnitNameField" style="text-align:right"></td></tr>
-					<tr><td style="text-align:left" class="bold">$i18n.getString("program_stage_name") :</td> <td  id="programStageName" style="text-align:right">$programStageInstance.programStage.name</td></tr>
-					<tr><td style="text-align:left" class="bold">$i18n.getString("datae_element_name") :</td> <td id="dataelementName" style="text-align:right"></td></tr>
-				</table>
-			</div>
 		   $customDataEntryFormCode
 
 			<script type="text/javascript"> 
 				initCustomCheckboxes();
-				DRAG_DIV.init();
 			</script>
 		</div>
 	#else

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2011-12-21 09:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2011-12-21 10:18:17 +0000
@@ -685,39 +685,11 @@
 //
 //-----------------------------------------------------------------
 
-
 function initCustomCheckboxes()
 {
     jQuery('input[type=checkbox][name="providedByAnotherFacility"]').prettyCheckboxes();
 }
 
-DRAG_DIV = {
-    init : function()
-    {
-        var dragDiv = jQuery("#dragDiv");
-        dragDiv.show();
-        var left = screen.width - 500 ;
-        var top = Math.round(jQuery("#entryFormContainer").position().top )  ;
-        dragDiv.css({
-            'left': left+'px',
-            'top': top+'px'
-        });
-        dragDiv.draggable();
-    },
-		
-    showData : function(data)
-    {
-        jQuery("#dataelementName").text(data.deName);
-		jQuery("#orgUnitNameField").text(data.provided);
-    },
-		
-    resetData : function()
-    {
-        jQuery("#orgUnitNameField").text("");
-        jQuery("#programStageName").text("");
-        jQuery("#dataelementName").text("");
-    }
-};
 function toggleContentForReportDate(show)
 {
     if( show ){

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-12-21 07:16:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-12-21 10:18:17 +0000
@@ -85,14 +85,6 @@
 
 <hr style="clear:both">
 
-<div id="dragDiv">
-    <table id="listInfo">
-        <tr><td style="text-align:left" class="bold">$i18n.getString("org_unit_name") :</td> <td style="text-align:right">$!patient.organisationUnit.name</td></tr>
-        <tr><td style="text-align:left" class="bold">$i18n.getString("program_stage_name") :</td> <td style="text-align:right">$!programStageInstance.programStage.name</td></tr>
-        <tr><td style="text-align:left" class="bold">$i18n.getString("datae_element_name") :</td> <td id="dataelementName" style="text-align:right"></td></tr>
-    </table>
-</div>
-
 <div id="entryFormContainer" #if( $programStageInstance.executionDate ) #else style='display:none;' #end>
 
 #if( $customDataEntryFormCode ) 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2011-12-15 04:13:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2011-12-21 10:18:17 +0000
@@ -21,7 +21,6 @@
   font-size: 12px; 
 
 }
-#dragDiv{  display:none;border : 1px solid red;  background: yellow; color:black; z-index: 9999999; position: fixed; }
 
 .focusCell{background-color: #AFCCFF}
 .errorCell{background-color: #FFCFCF}