Skip to content
Snippets Groups Projects
Verified Commit 2e18638f authored by Florian Azizian's avatar Florian Azizian
Browse files

FEAT #7888 (ixbus) esignature/mansignature + process_limit_date

parent 921f8a0f
No related branches found
No related tags found
No related merge requests found
...@@ -119,7 +119,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col ...@@ -119,7 +119,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$nature = get_value_fields($values_form, 'nature'); $nature = get_value_fields($values_form, 'nature');
$messageModel = get_value_fields($values_form, 'messageModel'); $messageModel = get_value_fields($values_form, 'messageModel');
$manSignature = get_value_fields($values_form, 'mansignature'); $manSignature = get_value_fields($values_form, 'mansignature');
$attachmentToFreeze = IxbusController::sendDatas(['config' => $config, 'resIdMaster' => $res_id, 'loginIxbus' => $loginIxbus, 'passwordIxbus' => $passwordIxbus, 'classeurName' => $nature, 'messageModel' => $messageModel, 'manSignature' => var_export($manSignature, true)]); $attachmentToFreeze = IxbusController::sendDatas(['config' => $config, 'resIdMaster' => $res_id, 'loginIxbus' => $loginIxbus, 'passwordIxbus' => $passwordIxbus, 'classeurName' => $nature, 'messageModel' => $messageModel, 'manSignature' => $manSignature]);
} elseif ($config['id'] == 'iParapheur') { } elseif ($config['id'] == 'iParapheur') {
include_once 'modules/visa/class/IParapheurController.php'; include_once 'modules/visa/class/IParapheurController.php';
$attachmentToFreeze = IParapheurController::sendDatas(['config' => $config, 'resIdMaster' => $res_id]); $attachmentToFreeze = IParapheurController::sendDatas(['config' => $config, 'resIdMaster' => $res_id]);
......
...@@ -32,7 +32,7 @@ class IxbusController ...@@ -32,7 +32,7 @@ class IxbusController
$html .= '</select><br /><br />'; $html .= '</select><br /><br />';
$html .= '<label for="messageModel">' . _WORKFLOW_MODEL_IXBUS . '</label><select name="messageModel" id="messageModel">'; $html .= '<label for="messageModel">' . _WORKFLOW_MODEL_IXBUS . '</label><select name="messageModel" id="messageModel">';
foreach ($initializeDatas['messagesModel'] as $key => $value) { foreach ($initializeDatas['messagesModel'] as $value) {
$html .= '<option value="'; $html .= '<option value="';
$html .= $value; $html .= $value;
$html .= '">'; $html .= '">';
...@@ -42,7 +42,7 @@ class IxbusController ...@@ -42,7 +42,7 @@ class IxbusController
$html .= '</select><br /><br />'; $html .= '</select><br /><br />';
$html .= '<label for="loginIxbus">'._ID_IXBUS.'</label><input name="loginIxbus" id="loginIxbus"/><br /><br />'; $html .= '<label for="loginIxbus">'._ID_IXBUS.'</label><input name="loginIxbus" id="loginIxbus"/><br /><br />';
$html .= '<label for="passwordIxbus">'._PASSWORD_IXBUS.'</label><input type="password" name="passwordIxbus" id="passwordIxbus"/><br /><br />'; $html .= '<label for="passwordIxbus">'._PASSWORD_IXBUS.'</label><input type="password" name="passwordIxbus" id="passwordIxbus"/><br /><br />';
$html .= _ESIGN . '<input type="radio" name="mansignature" id="esignature" value="false" checked="checked" />' . _HANDWRITTEN_SIGN .'<input type="radio" name="mansignature" id="signature" value="true" /><br /><br />'; $html .= _ESIGN . '<input type="radio" name="mansignature" id="mansignature" value="false" checked="checked" />' . _HANDWRITTEN_SIGN .'<input type="radio" name="mansignature" id="mansignature" value="true" /><br /><br />';
return $html; return $html;
} }
...@@ -283,7 +283,7 @@ class IxbusController ...@@ -283,7 +283,7 @@ class IxbusController
$mainResource = \Resource\models\ResModel::getExtById(['resId' => $aArgs['resIdMaster'], 'select' => ['process_limit_date']]); $mainResource = \Resource\models\ResModel::getExtById(['resId' => $aArgs['resIdMaster'], 'select' => ['process_limit_date']]);
if (empty($mainResource['process_limit_date'])) { if (empty($mainResource['process_limit_date'])) {
$processLimitDate = $mainResource['process_limit_date'] = date('Y-m-d', strtotime(date("Y-m-d"). ' + 7 days')); $processLimitDate = date('Y-m-d', strtotime(date("Y-m-d"). ' + 14 days'));
} else { } else {
$processLimitDateTmp = explode(" ", $mainResource['process_limit_date']); $processLimitDateTmp = explode(" ", $mainResource['process_limit_date']);
$processLimitDate = $processLimitDateTmp[0]; $processLimitDate = $processLimitDateTmp[0];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment