From 261371e18162396e61fb8098e4dab95d27292b6d Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Sat, 27 Jul 2013 22:54:41 +0530
Subject: [PATCH] CRM-13078, whitespace fixes and template cleanup

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078
---
 templates/CRM/Batch/Form/Entry.tpl | 655 +++++++++++++++--------------
 1 file changed, 347 insertions(+), 308 deletions(-)

diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
index 423c0288f3..03f5135a97 100644
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -24,41 +24,53 @@
  +--------------------------------------------------------------------+
 *}
 <div class="batch-entry form-item">
-<div id="help">
+  <div id="help">
     {ts}Click Validate & Process below when you've entered all items for the batch. You can also Save & Continue Later at any time. Go to Administer > Customize Data and Screens > Profiles > Reserved Profiles > to add, remove or change the order of columns.{/ts}
-</div>
-{if $batchAmountMismatch}
-  <div class="status message status-warning">
-    <div class="icon alert-icon"></div> {ts}Total for amounts entered below does not match the expected batch total.{/ts}
-  </div>
-  <div class="crm-button crm-button_qf_Entry_upload_force-save">
-    {$form._qf_Entry_upload_force.html}
   </div>
-  <div class="clear"></div>
-{/if}
-<table class="form-layout-compressed batch-totals">
-    <tr><td class="label">{ts}Total amount expected{/ts}</td><td class="right"><span class="batch-expected-total">{$batchTotal|crmMoney}</span></td></tr>
-    <tr><td class="label">{ts}Total amount entered{/ts}</td><td class="right">{$config->defaultCurrencySymbol} <span class="batch-actual-total"></span></td></tr>
-</table>
-
-<div class="crm-copy-fields crm-grid-table" id="crm-batch-entry-table">
-      <div class="crm-grid-header">
+  {if $batchAmountMismatch}
+    <div class="status message status-warning">
+      <div
+        class="icon alert-icon"></div> {ts}Total for amounts entered below does not match the expected batch total.{/ts}
+    </div>
+    <div class="crm-button crm-button_qf_Entry_upload_force-save">
+      {$form._qf_Entry_upload_force.html}
+    </div>
+    <div class="clear"></div>
+  {/if}
+  <table class="form-layout-compressed batch-totals">
+    <tr>
+      <td class="label">{ts}Total amount expected{/ts}</td>
+      <td class="right"><span class="batch-expected-total">{$batchTotal|crmMoney}</span></td>
+    </tr>
+    <tr>
+      <td class="label">{ts}Total amount entered{/ts}</td>
+      <td class="right">{$config->defaultCurrencySymbol} <span class="batch-actual-total"></span></td>
+    </tr>
+  </table>
+
+  <div class="crm-copy-fields crm-grid-table" id="crm-batch-entry-table">
+    <div class="crm-grid-header">
+      <div class="crm-grid-cell">&nbsp;</div>
+      <div class="crm-grid-cell">{ts}Contact{/ts}</div>
+      {if $batchType eq 2 }
         <div class="crm-grid-cell">&nbsp;</div>
-        <div class="crm-grid-cell">{ts}Contact{/ts}</div>
-        {if $batchType eq 2 }
-          <div class="crm-grid-cell">&nbsp;</div>
-        {/if}
-        {foreach from=$fields item=field key=fieldName}
-          <div class="crm-grid-cell"><img src="{$config->resourceBase}i/copy.png" alt="{ts 1=$field.title}Click to copy %1 from row one to all rows.{/ts}" fname="{$field.name}" class="action-icon" title="{ts}Click here to copy the value in row one to ALL rows.{/ts}" />{$field.title}</div>
-        {/foreach}
-      </div>
+      {/if}
+      {foreach from=$fields item=field key=fieldName}
+        <div class="crm-grid-cell">
+          <img src="{$config->resourceBase}i/copy.png"
+               alt="{ts 1=$field.title}Click to copy %1 from row one to all rows.{/ts}"
+               fname="{$field.name}" class="action-icon"
+               title="{ts}Click here to copy the value in row one to ALL rows.{/ts}"/>{$field.title}
+        </div>
+      {/foreach}
+    </div>
     {section name='i' start=1 loop=$rowCount}
-    {assign var='rowNumber' value=$smarty.section.i.index}
-    <div class="{cycle values="odd-row,even-row"} selector-rows crm-grid-row" entity_id="{$rowNumber}">
+      {assign var='rowNumber' value=$smarty.section.i.index}
+      <div class="{cycle values="odd-row,even-row"} selector-rows crm-grid-row" entity_id="{$rowNumber}">
         <div class="compressed crm-grid-cell"><span class="batch-edit"></span></div>
         {* contact select/create option*}
         <div class="compressed crm-grid-cell">
-            {include file="CRM/Contact/Form/NewContact.tpl" blockNo = $rowNumber noLabel=true prefix="primary_" newContactCallback="updateContactInfo($rowNumber, 'primary_')"}
+          {include file="CRM/Contact/Form/NewContact.tpl" blockNo = $rowNumber noLabel=true prefix="primary_" newContactCallback="updateContactInfo($rowNumber, 'primary_')"}
         </div>
 
         {if $batchType eq 2 }
@@ -66,251 +78,270 @@
         {/if}
 
         {foreach from=$fields item=field key=fieldName}
-        {assign var=n value=$field.name}
-        {if ( $fields.$n.data_type eq 'Date') or ( in_array( $n, array( 'thankyou_date', 'cancel_date', 'receipt_date', 'receive_date', 'join_date', 'membership_start_date', 'membership_end_date' ) ) ) }
-            <div class="compressed crm-grid-cell"><span class="crm-batch-{$n}-{$rowNumber}">{include file="CRM/common/jcalendar.tpl" elementName=$n elementIndex=$rowNumber batchUpdate=1}</span></div>
-        {elseif $n eq 'soft_credit'}
-            <div class="compressed crm-grid-cell">{include file="CRM/Contact/Form/NewContact.tpl" blockNo = $rowNumber noLabel=true prefix="soft_credit_"}</div>
-        {elseif in_array( $fields.$n.html_type, array('Radio', 'CheckBox'))}
+          {assign var=n value=$field.name}
+          {if ( $fields.$n.data_type eq 'Date') or ( in_array( $n, array( 'thankyou_date', 'cancel_date', 'receipt_date', 'receive_date', 'join_date', 'membership_start_date', 'membership_end_date' ) ) ) }
+            <div class="compressed crm-grid-cell">
+              <span class="crm-batch-{$n}-{$rowNumber}">
+                {include file="CRM/common/jcalendar.tpl" elementName=$n elementIndex=$rowNumber batchUpdate=1}
+              </span>
+            </div>
+          {elseif $n eq 'soft_credit'}
+            <div class="compressed crm-grid-cell">
+              {include file="CRM/Contact/Form/NewContact.tpl" blockNo = $rowNumber noLabel=true prefix="soft_credit_"}
+            </div>
+          {elseif in_array( $fields.$n.html_type, array('Radio', 'CheckBox'))}
             <div class="compressed crm-grid-cell">&nbsp;{$form.field.$rowNumber.$n.html}</div>
-        {else}
+          {else}
             <div class="compressed crm-grid-cell">{$form.field.$rowNumber.$n.html}</div>
-        {/if}
+          {/if}
         {/foreach}
-    </div>
+      </div>
     {/section}
-</div>
-<div class="crm-submit-buttons">{if $fields}{$form._qf_Batch_refresh.html}{/if} &nbsp; {$form.buttons.html}</div>
+  </div>
+  <div class="crm-submit-buttons">{if $fields}{$form._qf_Batch_refresh.html}{/if} &nbsp; {$form.buttons.html}</div>
 </div>
 {literal}
 <script type="text/javascript">
-   cj(function(){
-      cj('.selector-rows').change(function(){
-          var options = {
-              'url' : {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
-          };
+cj(function () {
+  cj('.selector-rows').change(function () {
+    var options = {
+      'url': {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
+    };
 
-          cj("#Entry").ajaxSubmit(options);
+    cj("#Entry").ajaxSubmit(options);
 
-          // validate rows
-          checkColumns( cj(this) );
-      });
+    // validate rows
+    checkColumns(cj(this));
+  });
 
-      // validate rows
-      validateRow( );
+  // validate rows
+  validateRow();
 
-      //calculate the actual total for the batch
-      calculateActualTotal();
+  //calculate the actual total for the batch
+  calculateActualTotal();
 
-      cj('input[id*="_total_amount"]').bind('keyup change', function(){
-          calculateActualTotal();
-      });
+  cj('input[id*="_total_amount"]').bind('keyup change', function () {
+    calculateActualTotal();
+  });
 
-      {/literal}{if $batchType eq 1 }{literal}
-        // hide all dates if send receipt is checked
-        hideSendReceipt();
+  {/literal}{if $batchType eq 1 }{literal}
+  // hide all dates if send receipt is checked
+  hideSendReceipt();
 
-        // hide the receipt date if send receipt is checked
-        cj( 'input[id*="][send_receipt]"]').change( function() {
-          showHideReceipt( cj(this) );
-        });
+  // hide the receipt date if send receipt is checked
+  cj('input[id*="][send_receipt]"]').change(function () {
+    showHideReceipt(cj(this));
+  });
 
-      {/literal}{else}{literal}
-        cj('select[id^="member_option_"]').each( function() {
-          if ( cj(this).val() == 1 ) {
-            cj(this).attr('disabled', true);
-          }
-        });
+  {/literal}{else}{literal}
+  cj('select[id^="member_option_"]').each(function () {
+    if (cj(this).val() == 1) {
+      cj(this).attr('disabled', true);
+    }
+  });
 
-        // set payment info accord to membership type
-        cj( 'select[id*="_membership_type_0"]').change( function() {
-          setPaymentBlock( cj(this), null );
-        });
+  // set payment info accord to membership type
+  cj('select[id*="_membership_type_0"]').change(function () {
+    setPaymentBlock(cj(this), null);
+  });
 
-        cj( 'select[id*="_membership_type_1"]').change( function() {
-          setPaymentBlock( cj(this), cj(this).val() );
-        });
+  cj('select[id*="_membership_type_1"]').change(function () {
+    setPaymentBlock(cj(this), cj(this).val());
+  });
 
-      {/literal}{/if}{literal}
+  {/literal}{/if}{literal}
 
-      // line breaks between radio buttons and checkboxes
-      cj('input.form-radio').next().after('<br />');
-      cj('input.form-checkbox').next().after('<br />');
-
-      //set the focus on first element
-      cj('#primary_contact_1').focus();
-
-   });
-
-   function setPaymentBlock( form, memType ) {
-     var rowID = form.closest('div.crm-grid-row').attr('entity_id');
-     var dataUrl = {/literal}"{crmURL p='civicrm/ajax/memType' h=0}"{literal};
-
-     if ( !memType ) {
-      memType = cj( 'select[id="field_'+ rowID+'_membership_type_1"]').val();
-     }
-
-     cj.post( dataUrl, {mtype: memType}, function( data ) {
-         cj('#field_' + rowID + '_financial_type').val( data.financial_type_id );            
-         cj('#field_' + rowID + '_total_amount').val( data.total_amount ).change();
-     }, 'json');
-   }
-
-   function hideSendReceipt() {
-     cj( 'input[id*="][send_receipt]"]').each( function() {
-       showHideReceipt( cj(this) );
-     });
-   }
-
-   function showHideReceipt( elem ) {
-     var rowID = elem.closest('div.crm-grid-row').attr('entity_id');
-     var element = 'field_' + rowID + '_receipt_date';
-     if ( elem.prop('checked') ) {
-       cj('.crm-batch-receipt_date-'+ rowID ).hide();
-     } else {
-       cj('.crm-batch-receipt_date-'+ rowID ).show();
-     }
-   }
-
-   function validateRow( ) {
-      cj('.selector-rows').each(function(){
-           checkColumns( cj(this) );
-      });
-   }
-
-   function checkColumns( parentRow ) {
-       // show valid row icon if all required data is field
-       var validRow   = 0;
-       var inValidRow = 0;
-       var errorExists = false;
-       var rowID = parentRow.closest('div.crm-grid-row').attr('entity_id');
-
-       parentRow.find('div .required').each(function(){
-         //special case to handle contact autocomplete select
-         var fieldId = cj(this).attr('id');
-         if (fieldId.substring(0, 16) == 'primary_contact_') {
-           // if display value is set then make sure we also check if contact id is set
-           if ( !cj(this).val( ) ) {
-             inValidRow++;
-           }
-           else if (cj(this).val( ) && !cj('input[name="primary_contact_select_id[' + rowID + ']"]').val()) {
-             inValidRow++;
-             errorExists = true;
-           }
-         } else if ( !cj(this).val( ) ) {
-            inValidRow++;
-         } else if ( cj(this).hasClass('error') && !cj(this).hasClass('valid') ) {
-            errorExists = true;
-         } else {
-            validRow++;
-         }
-       });
-
-       // this means user has entered some data
-       if ( errorExists ) {
-         parentRow.find("div:first span").prop('class', 'batch-invalid');
-       } else if ( inValidRow == 0 && validRow > 0 ) {
-         parentRow.find("div:first span").prop('class', 'batch-valid');
-       } else {
-         parentRow.find("div:first span").prop('class', 'batch-edit');
-       }
-   }
-
-   function calculateActualTotal() {
-     var total = 0;
-     cj('input[id*="_total_amount"]').each(function(){
-      if ( cj(this).val() ) {
-        total += parseFloat(cj(this).val());
-      }
-     });
+  // line breaks between radio buttons and checkboxes
+  cj('input.form-radio').next().after('<br />');
+  cj('input.form-checkbox').next().after('<br />');
 
-     cj('.batch-actual-total').html(formatMoney(total));
-   }
+  //set the focus on first element
+  cj('#primary_contact_1').focus();
 
-  //money formatting/localization
-  function formatMoney ( amount ) {
-    var c = 2;
-    var t = '{/literal}{$config->monetaryThousandSeparator}{literal}';
-    var d = '{/literal}{$config->monetaryDecimalPoint}{literal}';
+});
 
-    var n = amount,
-        c = isNaN(c = Math.abs(c)) ? 2 : c,
-        d = d == undefined ? "," : d,
-        t = t == undefined ? "." : t, s = n < 0 ? "-" : "",
-        i = parseInt(n = Math.abs(+n || 0).toFixed(c)) + "",
-        j = (j = i.length) > 3 ? j % 3 : 0;
+function setPaymentBlock(form, memType) {
+  var rowID = form.closest('div.crm-grid-row').attr('entity_id');
+  var dataUrl = {/literal}"{crmURL p='civicrm/ajax/memType' h=0}"{literal};
 
-    return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c ? d + Math.abs(n - i).toFixed(c).slice(2) : "");
+  if (!memType) {
+    memType = cj('select[id="field_' + rowID + '_membership_type_1"]').val();
   }
 
-  function updateContactInfo( blockNo, prefix ) {
-    var contactHiddenElement = 'input[name="' + prefix + 'contact_select_id[' + blockNo +']"]';
-    var contactId = cj( contactHiddenElement ).val();;
-
-    var returnProperties = '';
-    var profileFields = new Array();
-    {/literal}
-    {if $contactFields}
-      {foreach from=$contactFields item=val key=fldName}
-        var fldName = "{$fldName}";
-        {literal}
-          if ( returnProperties ) {
-            returnProperties = returnProperties + ',';
-          }
-          var fld = fldName.split('-');
-          returnProperties = returnProperties + fld[0];
-          profileFields[fld[0]] = fldName;
-        {/literal}
-      {/foreach}
-    {/if}
-    {literal}
+  cj.post(dataUrl, {mtype: memType}, function (data) {
+    cj('#field_' + rowID + '_financial_type').val(data.financial_type_id);
+    cj('#field_' + rowID + '_total_amount').val(data.total_amount).change();
+  }, 'json');
+}
+
+function hideSendReceipt() {
+  cj('input[id*="][send_receipt]"]').each(function () {
+    showHideReceipt(cj(this));
+  });
+}
 
-    CRM.api('Contact','get',{
-      'sequential' :'1',
+function showHideReceipt(elem) {
+  var rowID = elem.closest('div.crm-grid-row').attr('entity_id');
+  if (elem.prop('checked')) {
+    cj('.crm-batch-receipt_date-' + rowID).hide();
+  }
+  else {
+    cj('.crm-batch-receipt_date-' + rowID).show();
+  }
+}
+
+function validateRow() {
+  cj('.selector-rows').each(function () {
+    checkColumns(cj(this));
+  });
+}
+
+function checkColumns(parentRow) {
+  // show valid row icon if all required data is field
+  var validRow = 0;
+  var inValidRow = 0;
+  var errorExists = false;
+  var rowID = parentRow.closest('div.crm-grid-row').attr('entity_id');
+
+  parentRow.find('div .required').each(function () {
+    //special case to handle contact autocomplete select
+    var fieldId = cj(this).attr('id');
+    if (fieldId.substring(0, 16) == 'primary_contact_') {
+      // if display value is set then make sure we also check if contact id is set
+      if (!cj(this).val()) {
+        inValidRow++;
+      }
+      else {
+        if (cj(this).val() && !cj('input[name="primary_contact_select_id[' + rowID + ']"]').val()) {
+          inValidRow++;
+          errorExists = true;
+        }
+      }
+    }
+    else {
+      if (!cj(this).val()) {
+        inValidRow++;
+      }
+      else {
+        if (cj(this).hasClass('error') && !cj(this).hasClass('valid')) {
+          errorExists = true;
+        }
+        else {
+          validRow++;
+        }
+      }
+    }
+  });
+
+  // this means user has entered some data
+  if (errorExists) {
+    parentRow.find("div:first span").prop('class', 'batch-invalid');
+  }
+  else {
+    if (inValidRow == 0 && validRow > 0) {
+      parentRow.find("div:first span").prop('class', 'batch-valid');
+    }
+    else {
+      parentRow.find("div:first span").prop('class', 'batch-edit');
+    }
+  }
+}
+
+function calculateActualTotal() {
+  var total = 0;
+  cj('input[id*="_total_amount"]').each(function () {
+    if (cj(this).val()) {
+      total += parseFloat(cj(this).val());
+    }
+  });
+
+  cj('.batch-actual-total').html(formatMoney(total));
+}
+
+//money formatting/localization
+function formatMoney(amount) {
+  var c = 2;
+  var t = '{/literal}{$config->monetaryThousandSeparator}{literal}';
+  var d = '{/literal}{$config->monetaryDecimalPoint}{literal}';
+
+  var n = amount,
+    c = isNaN(c = Math.abs(c)) ? 2 : c,
+    d = d == undefined ? "," : d,
+    t = t == undefined ? "." : t, s = n < 0 ? "-" : "",
+    i = parseInt(n = Math.abs(+n || 0).toFixed(c)) + "",
+    j = (j = i.length) > 3 ? j % 3 : 0;
+
+  return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c ? d + Math.abs(n - i).toFixed(c).slice(2) : "");
+}
+
+function updateContactInfo(blockNo, prefix) {
+  var contactHiddenElement = 'input[name="' + prefix + 'contact_select_id[' + blockNo + ']"]';
+  var contactId = cj(contactHiddenElement).val();
+
+  var returnProperties = '';
+  var profileFields = new Array();
+  {/literal}
+  {if $contactFields}
+  {foreach from=$contactFields item=val key=fldName}
+  var fldName = "{$fldName}";
+  {literal}
+  if (returnProperties) {
+    returnProperties = returnProperties + ',';
+  }
+  var fld = fldName.split('-');
+  returnProperties = returnProperties + fld[0];
+  profileFields[fld[0]] = fldName;
+  {/literal}
+  {/foreach}
+  {/if}
+  {literal}
+
+  CRM.api('Contact', 'get', {
+      'sequential': '1',
       'contact_id': contactId,
       'return': returnProperties },
-      { success: function (data) {
-        cj.each ( data.values[0], function( key, value ) {
-          // set the values
-          var actualFldName = profileFields[key];
-          if ( key == 'country' || key == 'state_province' ) {
-            idFldName = key + '_id';
-            value = data.values[0][idFldName];
-          }
-          setFieldValue( actualFldName, value, blockNo )
-        });
+    { success: function (data) {
+      cj.each(data.values[0], function (key, value) {
+        // set the values
+        var actualFldName = profileFields[key];
+        if (key == 'country' || key == 'state_province') {
+          idFldName = key + '_id';
+          value = data.values[0][idFldName];
+        }
+        setFieldValue(actualFldName, value, blockNo)
+      });
 
-        // for membership batch entry based on contact we need to enable / disable
-        // add membership select
-        {/literal}{if $batchType eq 2}{literal}
-        CRM.api('Membership','get',{
-            'sequential' :'1',
-            'contact_id': contactId,
-          },
-          { success: function (data) {
-            if ( data.count > 0 ) {
-              //get the information on membership type
-              var membershipTypeId   = data.values[0].membership_type_id;
-              var membershipJoinDate = data.values[0].join_date;
-              CRM.api('MembershipType','get',{
-                  'sequential' :'1',
-                  'id' : membershipTypeId
-                },
-                { success: function (data){
-                  var memTypeContactId = data.values[0].member_of_contact_id;
-                  cj('select[id="member_option_' + blockNo + '"]').removeAttr('disabled').val(2);
-                  cj('select[id="field_' + blockNo + '_membership_type_0"]').val( memTypeContactId ).change();
-                  cj('select[id="field_' + blockNo + '_membership_type_1"]').val( membershipTypeId ).change();
-                  setDateFieldValue( 'join_date', membershipJoinDate, blockNo )
-                }
+      // for membership batch entry based on contact we need to enable / disable
+      // add membership select
+      {/literal}{if $batchType eq 2}{literal}
+      CRM.api('Membership', 'get', {
+          'sequential': '1',
+          'contact_id': contactId,
+        },
+        { success: function (data) {
+          if (data.count > 0) {
+            //get the information on membership type
+            var membershipTypeId = data.values[0].membership_type_id;
+            var membershipJoinDate = data.values[0].join_date;
+            CRM.api('MembershipType', 'get', {
+                'sequential': '1',
+                'id': membershipTypeId
+              },
+              { success: function (data) {
+                var memTypeContactId = data.values[0].member_of_contact_id;
+                cj('select[id="member_option_' + blockNo + '"]').removeAttr('disabled').val(2);
+                cj('select[id="field_' + blockNo + '_membership_type_0"]').val(memTypeContactId).change();
+                cj('select[id="field_' + blockNo + '_membership_type_1"]').val(membershipTypeId).change();
+                setDateFieldValue('join_date', membershipJoinDate, blockNo)
+              }
               });
-            }
           }
+        }
         });
-        {/literal}{/if}{literal}
-      }
+      {/literal}{/if}{literal}
+    }
     });
-  }
+}
 
 /**
  * This function is use to setdefault elements via ajax
@@ -318,98 +349,106 @@
  * @param fname string field name
  * @return void
  */
-function setFieldValue( fname, fieldValue, blockNo ) {
-    var elementId = cj('[name="field['+ blockNo +']['+ fname +']"]');
+function setFieldValue(fname, fieldValue, blockNo) {
+  var elementId = cj('[name="field[' + blockNo + '][' + fname + ']"]');
 
-    if ( elementId.length == 0 ) {
-      elementId =  cj('input[type=checkbox][name^="field['+ blockNo +']['+ fname +']"][type!=hidden]');
-    }
+  if (elementId.length == 0) {
+    elementId = cj('input[type=checkbox][name^="field[' + blockNo + '][' + fname + ']"][type!=hidden]');
+  }
 
-    // if element not found than return
-    if ( elementId.length == 0 ) {
-      return;
-    }
+  // if element not found than return
+  if (elementId.length == 0) {
+    return;
+  }
 
-    //check if it is date element
-    var isDateElement = elementId.attr('format');
+  //check if it is date element
+  var isDateElement = elementId.attr('format');
 
-    // check if it is wysiwyg element
-    var editor = elementId.attr('editor');
+  // check if it is wysiwyg element
+  var editor = elementId.attr('editor');
 
-    //get the element type
-    var elementType = elementId.attr('type');
+  //get the element type
+  var elementType = elementId.attr('type');
 
-    // set the value for all the elements, elements needs to be handled are
-    // select, checkbox, radio, date fields, text, textarea, multi-select
-    // wysiwyg editor, advanced multi-select ( to do )
-    if ( elementType == 'radio' ) {
-      if ( fieldValue ) {
-        elementId.filter("[value=" + fieldValue + "]").prop("checked",true);
-      } else {
-        elementId.removeProp('checked');
-      }
-    } else if ( elementType == 'checkbox' ) {
+  // set the value for all the elements, elements needs to be handled are
+  // select, checkbox, radio, date fields, text, textarea, multi-select
+  // wysiwyg editor, advanced multi-select ( to do )
+  if (elementType == 'radio') {
+    if (fieldValue) {
+      elementId.filter("[value=" + fieldValue + "]").prop("checked", true);
+    }
+    else {
+      elementId.removeProp('checked');
+    }
+  }
+  else {
+    if (elementType == 'checkbox') {
       // handle checkbox
       elementId.removeProp('checked');
-      if ( fieldValue ) {
-        cj.each( fieldValue, function( key, value ) {
-          cj('input[name="field['+ blockNo +']['+ fname +']['+ value +']"]').prop('checked', true);
+      if (fieldValue) {
+        cj.each(fieldValue, function (key, value) {
+          cj('input[name="field[' + blockNo + '][' + fname + '][' + value + ']"]').prop('checked', true);
         });
       }
-    } else if ( editor ) {
-      switch ( editor ) {
-        case 'ckeditor':
-          var elemtId = elementId.attr('id');
-          oEditor = CKEDITOR.instances[elemtId];
-          oEditor.setData( htmlContent );
-          break;
-        case 'tinymce':
-          var elemtId = element.attr('id');
-          tinyMCE.get( elemtId ).setContent( htmlContent );
-          break;
-        case 'joomlaeditor':
+    }
+    else {
+      if (editor) {
+        switch (editor) {
+          case 'ckeditor':
+            var elemtId = elementId.attr('id');
+            oEditor = CKEDITOR.instances[elemtId];
+            oEditor.setData(htmlContent);
+            break;
+          case 'tinymce':
+            var elemtId = element.attr('id');
+            tinyMCE.get(elemtId).setContent(htmlContent);
+            break;
+          case 'joomlaeditor':
           // TO DO
-        case 'drupalwysiwyg':
+          case 'drupalwysiwyg':
           // TO DO
-        default:
-          elementId.val( fieldValue );
+          default:
+            elementId.val(fieldValue);
+        }
+      }
+      else {
+        elementId.val(fieldValue);
       }
-    } else {
-      elementId.val( fieldValue );
     }
+  }
 
-    // since we use different display field for date we also need to set it.
-    // also check for date time field and set the value correctly
-    if ( isDateElement && fieldValue ) {
-      setDateFieldValue( fname, fieldValue, blockNo )
-    }
+  // since we use different display field for date we also need to set it.
+  // also check for date time field and set the value correctly
+  if (isDateElement && fieldValue) {
+    setDateFieldValue(fname, fieldValue, blockNo)
+  }
 }
 
-function setDateFieldValue( fname, fieldValue, blockNo ) {
-   var dateValues = fieldValue.split(' ');
+function setDateFieldValue(fname, fieldValue, blockNo) {
+  var dateValues = fieldValue.split(' ');
 
-   var actualDateElement =  cj('#field_'+ blockNo +'_' + fname );
-   var date_format = actualDateElement.attr('format');
-   var altDateFormat = 'yy-mm-dd';
+  var actualDateElement = cj('#field_' + blockNo + '_' + fname);
+  var date_format = actualDateElement.attr('format');
+  var altDateFormat = 'yy-mm-dd';
 
-   var actualDateValue = cj.datepicker.parseDate( altDateFormat, dateValues[0] );
+  var actualDateValue = cj.datepicker.parseDate(altDateFormat, dateValues[0]);
 
-   // format date according to display field
-   var hiddenDateValue  = cj.datepicker.formatDate( 'mm/dd/yy', actualDateValue );
+  // format date according to display field
+  var hiddenDateValue = cj.datepicker.formatDate('mm/dd/yy', actualDateValue);
 
-   actualDateElement.val( hiddenDateValue );
+  actualDateElement.val(hiddenDateValue);
 
-   var displayDateValue = actualDateElement.val();
-   if ( date_format != 'mm/dd/yy' ) {
-     displayDateValue  = cj.datepicker.formatDate( date_format, actualDateValue );
-   }
+  var displayDateValue = actualDateElement.val();
+  if (date_format != 'mm/dd/yy') {
+    displayDateValue = cj.datepicker.formatDate(date_format, actualDateValue);
+  }
 
-   cj('#field_'+ blockNo +'_' + fname + '_display').val( displayDateValue );
+  cj('#field_' + blockNo + '_' + fname + '_display').val(displayDateValue);
 
-   // need to fix time formatting
-   if ( dateValues[1] ) {
-    cj('#field_'+ blockNo +'_' + fname + '_time').val(dateValues[1].substr(0,5));
-   }
+  // need to fix time formatting
+  if (dateValues[1]) {
+    cj('#field_' + blockNo + '_' + fname + '_time').val(dateValues[1].substr(0, 5));
+  }
 }
 
 </script>
-- 
2.25.1