dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21108
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-11-18 13:44:19 +0100
message:
  bug fix: program incident date description is mandatory only when program has incident date
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.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-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js	2015-09-28 19:06:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js	2015-11-18 12:44:19 +0000
@@ -124,9 +124,9 @@
   // anonymous
   if( type == "WITHOUT_REGISTRATION" ) {
     disable('onlyEnrollOnce');
-    disable('dateOfEnrollmentDescription');
+    disable('enrollmentDateLabel');
     disable("displayIncidentDate");
-    disable("dateOfIncidentDescription");
+    disable("incidentDateLabel");
     disable("generatedByEnrollmentDate");
     disable("availablePropertyIds");
     disable('ignoreOverdueEvents');
@@ -146,7 +146,7 @@
     jQuery("[name=displayed]").prop("disabled", false);
     enable("availablePropertyIds");
     enable("generatedByEnrollmentDate");
-    enable('dateOfEnrollmentDescription');
+    enable('enrollmentDateLabel');
     enable("displayIncidentDate");
     enable('ignoreOverdueEvents');
     enable('trackedEntityId');
@@ -157,10 +157,10 @@
     jQuery("[name=nonAnonymous]").show();
     
     if( byId('displayIncidentDate').checked ) {
-      enable("dateOfIncidentDescription");
+      enable("incidentDateLabel");
     }
     else {
-      disable("dateOfIncidentDescription");
+      disable("incidentDateLabel");
     }
 	jQuery('.multiEvents').show();
   }