← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10885: minor fixes to offline anonymous entry

 

------------------------------------------------------------
revno: 10885
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-05-19 12:57:26 +0700
message:
  minor fixes to offline anonymous entry
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm
  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/anonymousRegistration.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js


--
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/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm	2013-05-17 09:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm	2013-05-19 05:57:26 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.12-SNAPSHOT V9
+# 2.12-SNAPSHOT V10
 NETWORK:
 *
 CACHE:
@@ -104,4 +104,5 @@
 images/representative.png
 images/rightarrow.png
 images/sms.png
+images/save.png
 style/style.css

=== 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	2013-05-15 06:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-19 05:57:26 +0000
@@ -40,7 +40,7 @@
 				<input type="text" class="{validate:{maxlength:160}} criteria" id="commentInput"
                         style="width:380px;#if($programStage.captureCoordinates=='false') margin-left:10px; #end "
                        onkeypress="keypressOnComment( event, this );">
-				<input type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( this )'>
+				<input id="commentButton" type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( this )'>
 			</th>
 		</tr>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2013-05-03 16:27:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2013-05-19 05:57:26 +0000
@@ -255,6 +255,7 @@
                 enableFiltering();
                 searchEvents( eval( getFieldValue( 'listAll' ) ) );
                 $('#commentInput').removeAttr('disabled');
+                $('#commentButton').removeAttr('disabled');
                 $('#validateBtn').removeAttr('disabled');
             });
 
@@ -281,6 +282,7 @@
     $( document ).bind( 'dhis2.offline', function () {
         setHeaderMessage( i18n_offline_notification );
         $('#commentInput').attr('disabled', true);
+        $('#commentButton').attr('disabled', true);
         $('#validateBtn').attr('disabled', true);
         disableFiltering();
         showOfflineEvents();

=== 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	2013-05-03 16:27:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-05-19 05:57:26 +0000
@@ -739,6 +739,7 @@
             if( always ) always();
 
             $('#commentInput').attr('disabled', true);
+            $('#commentButton').attr('disabled', true);
             $('#validateBtn').attr('disabled', true);
         } );
     } else {
@@ -816,6 +817,7 @@
             if( always ) always();
 
             $('#commentInput').removeAttr('disabled');
+            $('#commentButton').removeAttr('disabled');
             $('#validateBtn').removeAttr('disabled');
         } );
     }