dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26965
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13360: Code style
------------------------------------------------------------
revno: 13360
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-12-20 23:14:08 +0100
message:
Code style
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 2013-12-14 13:35:23 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2013-12-20 22:14:08 +0000
@@ -149,12 +149,13 @@
}
else
{
- if( emptyOrganisationUnits ) {
- setHeaderMessage(i18n_no_orgunits);
- } else {
- setHeaderDelayMessage(i18n_online_notification);
+ if ( emptyOrganisationUnits ) {
+ setHeaderMessage( i18n_no_orgunits );
+ }
+ else {
+ setHeaderDelayMessage( i18n_online_notification );
+ }
}
- }
}
else
{
@@ -175,10 +176,11 @@
$( document ).bind( 'dhis2.offline', function()
{
- if( emptyOrganisationUnits ) {
- setHeaderMessage(i18n_no_orgunits);
- } else {
- setHeaderMessage( i18n_offline_notification );
+ if ( emptyOrganisationUnits ) {
+ setHeaderMessage( i18n_no_orgunits );
+ }
+ else {
+ setHeaderMessage( i18n_offline_notification );
}
} );
@@ -596,7 +598,7 @@
{
multiOrganisationUnit = !!$('.formSection').data('multiorg');
- if( !multiOrganisationUnit )
+ if ( !multiOrganisationUnit )
{
if ( dataSets[dataSetId].renderAsTabs ) {
$( "#tabs" ).tabs();
@@ -868,7 +870,7 @@
{
var childrenDataSets = getSortedDataSetListForOrgUnits( children );
- if( childrenDataSets && childrenDataSets.length > 0 )
+ if ( childrenDataSets && childrenDataSets.length > 0 )
{
$( '#selectedDataSetId' ).append( '<optgroup label="' + i18n_childrens_forms + '">' );
@@ -894,7 +896,8 @@
showLoader();
loadDataValues();
}
- } else if ( multiOrganisationUnit && multiDataSetValid && dataSetId != null ) {
+ }
+ else if ( multiOrganisationUnit && multiDataSetValid && dataSetId != null ) {
$( '#selectedDataSetId' ).val( dataSetId );
dataSetSelected();
@@ -1653,7 +1656,7 @@
updateExistingLocalForms();
downloadRemoteForms();
- DAO.store.open().done(function() {
+ DAO.store.open().done( function() {
loadOptionSets();
});
}
@@ -2384,7 +2387,7 @@
}
function insertOptionSets() {
- $('.entryoptionset').each(function( idx, item ) {
+ $('.entryoptionset').each( function( idx, item ) {
var optionSetKey = splitFieldId(item.id);
if( multiOrganisationUnit ) {
@@ -2397,7 +2400,7 @@
optionSetKey = optionSetKey.dataElementId + '-' + optionSetKey.optionComboId;
autocompleteOptionSetField(item, optionSets[optionSetKey].uid);
- });
+ } );
}
function autocompleteOptionSetField( idField, optionSetUid ) {