dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 15866 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-06-26 20:19:35 +0200
message:
  Codestyle
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-06-23 08:05:34 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-06-26 16:59:49 +0000
@@ -1019,7 +1019,7 @@
 
     if ( allowFuturePeriods == false )
     {
-      periods = dhis2.period.generator.filterFuturePeriods(periods);
+        periods = dhis2.period.generator.filterFuturePeriods( periods );
     }
 
     clearListById( 'selectedPeriodId' );
@@ -1141,14 +1141,15 @@
     if ( dhis2.de.currentCategories && dhis2.de.currentCategories.length != 0 )
     {
         var prefix = '(';
-        $.safeEach(dhis2.de.currentCategories, function (idx, category) {
+        $.safeEach( dhis2.de.currentCategories, function ( idx, category ) {
             var option = $('#category-' + category.id).val();
 
-            if (option && option != -1) {
+            if ( option && option != -1) {
                 var options = dhis2.de.categories[ category.id ].options;
                 var matching = $.grep(options, function (e) {
                     return e.id == option;
                 });
+                
                 html += prefix + matching[0].name;
                 prefix = ', ';
             }
@@ -1156,7 +1157,7 @@
         html += html.length == 0 ? '' : ')';
     }
 
-    $( '#currentOptionsSelection').html( html );
+    $( '#currentOptionsSelection' ).html( html );
 };
 
 /**
@@ -1203,8 +1204,7 @@
 
     var options = dhis2.de.getCurrentCategoryOptions();
 
-	if ( !dhis2.de.currentCategories || dhis2.de.currentCategories.length == 0
-		|| period.iso == "" ) {
+	if ( !dhis2.de.currentCategories || dhis2.de.currentCategories.length == 0 || period.iso == "" ) {
 		return html;
 	}