diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php index a687e854ebcab3bc8642dd04902ccbdaf2c851b2..aae6f533936661767fb8c2cdf7b70e26062a4ff0 100755 --- a/modules/visa/class/class_modules_tools_Abstract.php +++ b/modules/visa/class/class_modules_tools_Abstract.php @@ -521,9 +521,9 @@ abstract class visa_Abstract extends Database $circuit = $this->getWorkflow($res_id, $coll_id, $typeList); $sAllAttachmentSigned = $this->isAllAttachementSigned($res_id); if ($sAllAttachmentSigned == 'noAttachment') { - $str = '<input type="hidden" id="isAllAttachementSigned" value="true"/>'; - $isAllAttachementSigned = " disabled='disabled'"; - $isAllAttachementSignedInfo = _IS_ALL_ATTACHMENT_SIGNED_INFO; + $str = '<input type="hidden" id="isAllAttachementSigned" value="false"/>'; + $isAllAttachementSigned = ""; + $isAllAttachementSignedInfo = ""; } else if ($sAllAttachmentSigned == 'yes') { $str = '<input type="hidden" id="isAllAttachementSigned" value="allsigned"/>'; @@ -583,7 +583,7 @@ abstract class visa_Abstract extends Database $str .= '<br/><br/>'; } if (!empty($isAllAttachementSignedInfo)) { - $str .= '<b style="color:red;" id="cannotaddsignatory">'.$isAllAttachementSignedInfo.'</b>'; + $str .= '<b style="color:red;">'.$isAllAttachementSignedInfo.'</b>'; } $str .= '<div id="visa_content">'; //VISA USER IN DOCUMENT @@ -1288,7 +1288,7 @@ abstract class PdfNotes_Abstract extends FPDI } $data[] = array(utf8_decode($user),$date,utf8_decode($notes)); } - //var_dump(utf8_decode($notes)); + return $data; } diff --git a/modules/visa/js/functions.js b/modules/visa/js/functions.js index e26ccdff62ff94de941351daf4aa0ec3c3a28d95..0bf9fe47e4d28121bbeb3197c14dc423dfb56967 100755 --- a/modules/visa/js/functions.js +++ b/modules/visa/js/functions.js @@ -108,7 +108,6 @@ function delVisaUser(target) { } function resetPosVisa () { - //$j(".visaUserSign").css("visibility","hidden"); i = 1; $j(".droptarget").each(function() { this.id = 'visa_' + i; @@ -118,33 +117,30 @@ function resetPosVisa () { i++; }); - if($j("#cannotaddsignatory").length == 0){ - i = 1; - var hasSignatory = false; - $j(".droptarget").each(function() { - if ($j("#signRequest_"+(i)+" option:selected[value=true]").length) { - userRequestSign=true; - } else { - userRequestSign=false; - } - if ($j("#signedUser_"+(i)).css('visibility') == 'visible') { - userSignatory=true; - } else { - userSignatory=false; - } - - if(userRequestSign || userSignatory){ - hasSignatory = true; - } - if ($j("#signRequest_"+(i+1)).length == 0 && !hasSignatory) { - $j('#signRequest_'+(i)).val("true"); - } - i++; + i = 1; + var hasSignatory = false; + $j(".droptarget").each(function() { + if ($j("#signRequest_"+(i)+" option:selected[value=true]").length) { + userRequestSign=true; + } else { + userRequestSign=false; + } + if ($j("#signedUser_"+(i)).css('visibility') == 'visible') { + userSignatory=true; + } else { + userSignatory=false; + } - }); - i--; - } + if(userRequestSign || userSignatory){ + hasSignatory = true; + } + if ($j("#signRequest_"+(i+1)).length == 0 && !hasSignatory) { + $j('#signRequest_'+(i)).val("true"); + } + i++; + }); + i--; } function updateVisaWorkflow(resId) { @@ -175,7 +171,7 @@ function updateVisaWorkflow(resId) { if(userRequestSign || userSignatory){ hasSignatory = true; } - if ($j("#signRequest_"+(i+2)).length == 0 && !hasSignatory && $j("#cannotaddsignatory").length == 0) { + if ($j("#signRequest_"+(i+2)).length == 0 && !hasSignatory) { userRequestSign=true; $j('#signRequest_'+(i+1)).val("true"); }