diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php
index 9623b526e03a302ea0d1eb4b7506060aaaec84d6..832c7b2a8fb51a8719a2fea120df5bac7980344a 100755
--- a/apps/maarch_entreprise/actions/process.php
+++ b/apps/maarch_entreprise/actions/process.php
@@ -887,15 +887,10 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$res_table = $sec->retrieve_table_from_coll($coll_id);
$ind = $sec->get_ind_collection($coll_id);
$table = $_SESSION['collections'][$ind]['extensions'][0];
- $other_txt = '';
- $process_notes = '';
$folder = '';
$thesaurusList = '';
for ($j = 0; $j < count($values_form); ++$j) {
- if ($values_form[$j]['ID'] == 'process_notes') {
- $process_notes = $values_form[$j]['VALUE'];
- }
if ($values_form[$j]['ID'] == 'folder') {
$folder = $values_form[$j]['VALUE'];
}
@@ -974,8 +969,6 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$_SESSION['redirect']['diff_list'] = array();
unset($_SESSION['redirection']);
unset($_SESSION['redirect']);
- $db->query('UPDATE '.$table.' SET answer_type_bitmask = ?, process_notes = ?, other_answer_desc = ? WHERE res_id= ?',
- array($bitmask, $process_notes, $other_txt, $arr_id[0]));
return array('result' => $arr_id[0].'#', 'history_msg' => '');
}
diff --git a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
index 83c6f369ddf32ad7ed9937997178b5ecbde8f93e..8c3ae4e540fdf7897e8ed899fc98a348e6c7f287 100755
--- a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
+++ b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
@@ -687,62 +687,4 @@ abstract class indexing_searching_app_Abstract extends Database
return $str;
}
-
- public function get_process_data($coll_id, $res_id)
- {
- require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php';
- $sec = new security();
- $view = $sec->retrieve_view_from_coll_id($coll_id);
- if (empty($view)) {
- $view = $sec->retrieve_table_from_coll($coll_id);
- }
- $db = new Database();
- $stmt = $db->query('SELECT answer_type_bitmask, process_notes, other_answer_desc FROM '.$view.' WHERE res_id = ?', array($res_id));
- $res = $stmt->fetchObject();
- $bitmask = $res->answer_type_bitmask;
- $process_notes = functions::show_string($res->process_notes);
- $other_answer_desc = functions::show_string($res->other_answer_desc);
- $contact = false;
- $mail = false;
- $AR = false;
- $fax = false;
- $email = false;
- $other = false;
- $no_answer = false;
- if ($bitmask == '000000' || $bitmask == '') {
- $no_answer = true;
- } else {
- /*
- * Answer type bitmask
- * 0 0 0 0 0 0
- * | | | | | |_ Simple Mail
- * | | | | |___ Registered mail
- * | | | |_____ Direct Contact
- * | | |_______ Email
- * | |_________ Fax
- * |___________ Other Answer
- **/
-
- if ($bitmask[0] == '1') {
- $other = true;
- }
- if ($bitmask[1] == '1') {
- $fax = true;
- }
- if ($bitmask[2] == '1') {
- $email = true;
- }
- if ($bitmask[3] == '1') {
- $contact = true;
- }
- if ($bitmask[4] == '1') {
- $AR = true;
- }
- if ($bitmask[5] == '1') {
- $mail = true;
- }
- }
-
- return array('process_notes' => $process_notes, 'direct_contact' => $contact, 'simple_mail' => $mail, 'registered_mail' => $AR, 'fax' => $fax, 'email' => $email, 'no_answer' => $no_answer, 'other' => $other, 'other_answer_desc' => $other_answer_desc);
- }
}
diff --git a/apps/maarch_entreprise/indexing_searching/little_details_invoices.php b/apps/maarch_entreprise/indexing_searching/little_details_invoices.php
index a63f8e9ac4163ffad4b54ff67b2661a3102904ae..8cd937755b65e521caa9ed05579d52eef7af2abe 100755
--- a/apps/maarch_entreprise/indexing_searching/little_details_invoices.php
+++ b/apps/maarch_entreprise/indexing_searching/little_details_invoices.php
@@ -207,7 +207,6 @@ if (!empty($_SESSION['error'])) {
}
}
- // $processData = $is->get_process_data($collId, $resId);
$status = $res->status;
if (!empty($status)) {
require_once'core/class/class_manage_status.php';
diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php
index 982fe477c165a17348f6e8a2d690e880795de934..b13a1b4250a8dd905f41b22064291f77b34186ba 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv.php
@@ -307,10 +307,6 @@ if ($core_tools->is_module_loaded('folder')) {
$param['project'] = $arr_tmp2;
}
-//process notes
-$arr_tmp2 = array('label' => _PROCESS_NOTES, 'type' => 'textarea', 'param' => array('field_label' => _PROCESS_NOTES, 'other' => $size, 'id' => 'process_notes'));
-$param['process_notes'] = $arr_tmp2;
-
// Reference courrier externe
$arr_tmp2 = array('label' => _REFERENCE_MAIL, 'type' => 'input_text', 'param' => array('field_label' => _REFERENCE_MAIL, 'other' => $size));
$param['external_id'] = $arr_tmp2;
diff --git a/apps/maarch_entreprise/indexing_searching/search_adv_result.php b/apps/maarch_entreprise/indexing_searching/search_adv_result.php
index f9cc06c34022512db69ea5bab0e70baf179a56d1..049edc00d1e97a80a1239ddfc48e9a0356bc7e23 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv_result.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv_result.php
@@ -234,15 +234,6 @@ if (count($_REQUEST['meta']) > 0) {
$arrayPDO = array_merge($arrayPDO, array(":attachmentTypes" => $_REQUEST['attachment_types']));
$where_request .=" and ";
}
-
- // PROCESS NOTES
- elseif ($tab_id_fields[$j] == 'process_notes' && !empty($_REQUEST['process_notes']))
- {
- $json_txt .= " 'process_notes' : ['".addslashes(trim($_REQUEST['process_notes']))."'],";
- $s_process_notes = $func->wash($_REQUEST['process_notes'], "no", _PROCESS_NOTES,"no");
- $where_request .= " (lower(process_notes) LIKE lower(:processNotes) ) and ";
- $arrayPDO = array_merge($arrayPDO, array(":processNotes" => "%".$s_process_notes."%"));
- }
// REFERENCE COURRIER EXTERNE
elseif ($tab_id_fields[$j] == 'external_id' && !empty($_REQUEST['external_id'])) {
$json_txt .= "'external_id' : ['".addslashes(trim($_REQUEST['external_id']))."'],";
@@ -731,52 +722,6 @@ if (count($_REQUEST['meta']) > 0) {
$where_request .=") and ";
$json_txt .= '],';
}
- // ANSWER TYPE BITMASK
- /**
- * Answer type bitmask
- * 0 0 0 0 0 0
- * | | | | | |_ Simple Mail
- * | | | | |___ Registered mail
- * | | | |_____ Direct Contact
- * | | |_______ Email
- * | |_________ Fax
- * |___________ Other Answer
- **/
- elseif ($tab_id_fields[$j] == 'AR' && !empty($_REQUEST['AR']))
- {
- $where_request .= " answer_type_bitmask like '____1_' AND ";
- $json_txt .= " 'AR' : ['".addslashes(trim($_REQUEST['AR']))."'],";
- }
- elseif ($tab_id_fields[$j] == 'fax' && !empty($_REQUEST['fax']))
- {
- $where_request .= " answer_type_bitmask like '_1____' AND ";
- $json_txt .= " 'fax' : ['".addslashes(trim($_REQUEST['fax']))."'],";
- }
- elseif ($tab_id_fields[$j] == 'courriel' && !empty($_REQUEST['courriel']))
- {
- $where_request .= " answer_type_bitmask like '__1___' AND ";
- $json_txt .= " 'courriel' : ['".addslashes(trim($_REQUEST['courriel']))."'],";
- }
- elseif ($tab_id_fields[$j] == 'autre' && !empty($_REQUEST['autre']))
- {
- $where_request .= " answer_type_bitmask like '1_____' AND ";
- $json_txt .= " 'autre' : ['".addslashes(trim($_REQUEST['autre']))."'],";
- }
- elseif ($tab_id_fields[$j] == 'direct' && !empty($_REQUEST['direct']))
- {
- $where_request .= " answer_type_bitmask like '___1__' AND ";
- $json_txt .= " 'direct' : ['".addslashes(trim($_REQUEST['direct']))."'],";
- }
- elseif ($tab_id_fields[$j] == 'simple_mail' && !empty($_REQUEST['simple_mail']))
- {
- $where_request .= " answer_type_bitmask like '_____1' AND ";
- $json_txt .= " 'simple_mail' : ['".addslashes(trim($_REQUEST['simple_mail']))."'],";
- }
- elseif ($tab_id_fields[$j] == 'norep' && !empty($_REQUEST['norep']))
- {
- $where_request .= " answer_type_bitmask = '000000' AND ";
- $json_txt .= " 'norep' : ['".addslashes(trim($_REQUEST['norep']))."'],";
- }
// MAIL CATEGORY
elseif ($tab_id_fields[$j] == 'category' && !empty($_REQUEST['category']))
{
diff --git a/apps/maarch_entreprise/show_technicalInfo_tab.php b/apps/maarch_entreprise/show_technicalInfo_tab.php
index cc1f6cd3ad13ce45df748e89dbcb96218d957733..ccb3d862ddbbfd710d45374ca0bee4a9579571ff 100755
--- a/apps/maarch_entreprise/show_technicalInfo_tab.php
+++ b/apps/maarch_entreprise/show_technicalInfo_tab.php
@@ -81,7 +81,6 @@ $db = new Database();
$fileName = $res->filename;
$creationDate = functions::format_date_db($res->creation_date, false);
$fingerprint = $res->fingerprint;
- $offsetDoc = $res->offset_doc;
$isMultiDs = $res->is_multi_docservers;
if ($isMultiDs == 'Y') {
$adr = array();
@@ -184,11 +183,6 @@ $db = new Database();
<td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($adr[0][$cptAdr]['fingerprint']); ?>" /></td>
</tr>
<tr>
- <th align="left" class="picto">
-
- </th>
- <td align="left" width="200px"><?php echo _OFFSET; ?> :</td>
- <td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($adr[0][$cptAdr]['offset_doc']); ?>"/></td>
<th align="left" class="picto">
</th>
@@ -228,11 +222,6 @@ $db = new Database();
<td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($fingerprint); ?>" /></td>
</tr>
<tr>
- <th align="left" class="picto">
-
- </th>
- <td align="left" width="200px"><?php echo _OFFSET; ?> :</td>
- <td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($offsetDoc); ?>"/></td>
<th align="left" class="picto">
</th>
diff --git a/apps/maarch_entreprise/view_technical_infos.php b/apps/maarch_entreprise/view_technical_infos.php
index 7b1961ab3625d57a96b666d282599f2baf371db0..89d405c3b0b3a073c8c1793223d3bd90a9ae5fbf 100755
--- a/apps/maarch_entreprise/view_technical_infos.php
+++ b/apps/maarch_entreprise/view_technical_infos.php
@@ -72,7 +72,6 @@ if ($coreTools->test_service('view_technical_infos', 'apps', false)) {
$fileName = $res->filename;
$creationDate = functions::format_date_db($res->creation_date, false);
$fingerprint = $res->fingerprint;
- $offsetDoc = $res->offset_doc;
$isMultiDs = $res->is_multi_docservers;
if ($isMultiDs == 'Y') {
$adr = array();
@@ -175,11 +174,6 @@ if ($coreTools->test_service('view_technical_infos', 'apps', false)) {
<td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($adr[0][$cptAdr]['fingerprint']); ?>" /></td>
</tr>
<tr>
- <th align="left" class="picto">
-
- </th>
- <td align="left" width="200px"><?php echo _OFFSET; ?> :</td>
- <td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($adr[0][$cptAdr]['offset_doc']); ?>"/></td>
<th align="left" class="picto">
</th>
@@ -219,11 +213,6 @@ if ($coreTools->test_service('view_technical_infos', 'apps', false)) {
<td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($fingerprint); ?>" /></td>
</tr>
<tr>
- <th align="left" class="picto">
-
- </th>
- <td align="left" width="200px"><?php echo _OFFSET; ?> :</td>
- <td><input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($offsetDoc); ?>"/></td>
<th align="left" class="picto">
</th>
diff --git a/apps/maarch_entreprise/xml/IVS/validation_rules.xml b/apps/maarch_entreprise/xml/IVS/validation_rules.xml
index 2ae6098a68b8c97e8e0703f64bb0f86f4fa7d4c1..ed0f582d77f966f424973d4d40d824092de134e9 100755
--- a/apps/maarch_entreprise/xml/IVS/validation_rules.xml
+++ b/apps/maarch_entreprise/xml/IVS/validation_rules.xml
@@ -399,7 +399,6 @@
<parameter name="mail_nature" type="identifier" />
<parameter name="signatory_name" type="string" />
<parameter name="doc_notes" type="string" />
- <parameter name="process_notes" type="string" />
<parameter name="thesaurus_chosen" type="string" />
<parameter name="chrono" type="string" />
<parameter name="reference_number" type="identifier" />
diff --git a/core/class/class_resource.php b/core/class/class_resource.php
index a51b1513c185de1d07846805b718482ba62b18f5..4a68c911d86257d1f13c0a82cbd29d2b24cd0322 100755
--- a/core/class/class_resource.php
+++ b/core/class/class_resource.php
@@ -214,7 +214,6 @@
$find_docserver_id = false;
$find_path = false;
$find_filename = false;
- $find_offset = false;
$find_fingerprint = false;
$find_filesize = false;
$find_status = false;
@@ -246,8 +245,6 @@
if (!preg_match("/^[\w-.]+.([a-zA-Z-0-9][a-zA-Z-0-9][a-zA-Z-0-9][a-zA-Z-0-9]?|maarch)$/", $data[$i]['value'])) {
$error .= _FILENAME_ERROR . ' ' . $data[$i]['value'] . '<br/>';
}
- } elseif ($data[$i]['column'] == "offset_doc") {
- $find_offset = true;
} elseif ($data[$i]['column'] == 'fingerprint') {
$find_fingerprint = true;
if (!preg_match("/^[0-9A-Fa-f]+$/", $data[$i]['value'])) {
@@ -285,9 +282,6 @@
if ($find_filename == false) {
$error .= _MISSING_FILENAME.'<br/>';
}
- if ($find_offset == false) {
- $error .= _MISSING_OFFSET.'<br/>';
- }
if ($find_fingerprint == false) {
$error .= _MISSING_FINGERPRINT.'<br/>';
}
@@ -323,7 +317,7 @@
}
$docserverAdr = array();
$db = new Database();
- $query = "select res_id, docserver_id, path, filename, format, fingerprint, offset_doc, is_multi_docservers from " . $view
+ $query = "select res_id, docserver_id, path, filename, format, fingerprint, is_multi_docservers from " . $view
. " where res_id = ? ". $whereClause;
$stmt = $db->query($query, array($resId));
if ($stmt->rowCount() > 0) {
@@ -339,12 +333,12 @@
if ($adrTable == 'adr_x') {
$adrTable = 'adr_letterbox';
}
- $query = "select res_id, docserver_id, path, filename, offset_doc, fingerprint, adr_priority from "
+ $query = "select res_id, docserver_id, path, filename, fingerprint, adr_priority from "
. $adrTable . " where res_id = ? order by adr_priority";
$stmt = $db->query($query, array($resId));
if ($stmt->rowCount() > 0) {
while ($line = $stmt->fetchObject()) {
- array_push($docserverAdr, array("docserver_id" => $line->docserver_id, "path" => $line->path, "filename" => $line->filename, "format" => $format, "fingerprint" => $line->fingerprint, "offset_doc" => $line->offset_doc, "adr_priority" => $line->adr_priority));
+ array_push($docserverAdr, array("docserver_id" => $line->docserver_id, "path" => $line->path, "filename" => $line->filename, "format" => $format, "fingerprint" => $line->fingerprint, "adr_priority" => $line->adr_priority));
}
} else {
$control = array("status" => "ko", "error" => _RESOURCE_NOT_FOUND);
@@ -355,7 +349,7 @@
return $control;
}
} else {
- array_push($docserverAdr, array("docserver_id" => $line->docserver_id, "path" => $line->path, "filename" => $line->filename, "format" => $format, "fingerprint" => $line->fingerprint, "offset_doc" => $line->offset_doc, "adr_priority" => ""));
+ array_push($docserverAdr, array("docserver_id" => $line->docserver_id, "path" => $line->path, "filename" => $line->filename, "format" => $format, "fingerprint" => $line->fingerprint, "adr_priority" => ""));
}
$control = array("status" => "ok", $docserverAdr, "error" => "");
return $control;
diff --git a/core/class/resources_controler.php b/core/class/resources_controler.php
index 6c22af0ff9dcb60bd806d296678717fda6569618..86c70b9d802255ab6032514ed23f9bd715507789 100755
--- a/core/class/resources_controler.php
+++ b/core/class/resources_controler.php
@@ -332,14 +332,6 @@ class resources_controler
'type' => 'string',
)
);
- array_push(
- $data,
- array(
- 'column' => 'offset_doc',
- 'value' => '',
- 'type' => 'string',
- )
- );
array_push(
$data,
array(
@@ -366,23 +358,12 @@ class resources_controler
$parameters = array();
$db = new Database();
$findProcessLimitDate = false;
- $findProcessNotes = false;
$delayProcessNotes = 0;
for ($i=0;$i<count($data);$i++) {
if ($data[$i]['column'] == 'process_limit_date') {
$findProcessLimitDate = true;
}
- // if ($data[$i]['column'] == 'process_notes') {
- // $findProcessNotes = true;
- // $delayProcessNotes = $data[$i]['value'];
- // }
- if ($data[$i]['column'] == 'process_notes') {
- $findProcessNotes = true;
- $donnees = explode(',',$data[$i]['value']);
- $delayProcessNotes = $donnees['0'];
- $calendarType = $donnees['1'];
- }
}
if ($table == 'mlb_coll_ext') {
diff --git a/modules/cases/search_adv_for_cases.php b/modules/cases/search_adv_for_cases.php
index 2ce9f03f164968ac9be87eeb1536df99954ee0b0..13ae3e03f7a5cf912e108a9815c438351b829e69 100755
--- a/modules/cases/search_adv_for_cases.php
+++ b/modules/cases/search_adv_for_cases.php
@@ -306,18 +306,6 @@ if ($core->is_module_loaded('entities')) {
$param['destination_mu'] = $arrTmp2;
}
-//process notes
-$arrTmp2 = array(
- 'label' => _PROCESS_NOTES,
- 'type' => 'textarea',
- 'param' => array(
- 'field_label' => _PROCESS_NOTES,
- 'other' => $size,
- 'id' => 'process_notes'
- )
-);
-$param['process_notes'] = $arrTmp2;
-
// chrono
$arrTmp2 = array(
'label' => _CHRONO_NUMBER,
diff --git a/modules/content_management/save_attachment_from_cm.php b/modules/content_management/save_attachment_from_cm.php
index d224f1c2cb82e839a102d7db0c0f87ddba47667d..b3c4c48214389b4c917afafa51c5bc22ae95885b 100755
--- a/modules/content_management/save_attachment_from_cm.php
+++ b/modules/content_management/save_attachment_from_cm.php
@@ -140,7 +140,6 @@ if ($arrayIsAllowed['status'] == false) {
array_push($_SESSION['data'], array( 'column' => "format", 'value' => $fileInfos['format'], 'type' => "string" ) );
array_push($_SESSION['data'], array( 'column' => "docserver_id", 'value' => $storeResult['docserver_id'], 'type' => "string" ) );
array_push($_SESSION['data'], array( 'column' => "status", 'value' => 'TMP', 'type' => "string" ) );
- array_push($_SESSION['data'], array( 'column' => "offset_doc", 'value' => ' ', 'type' => "string" ) );
array_push($_SESSION['data'], array( 'column' => "title", 'value' => $_SESSION['attachmentInfo'][$i]['title'], 'type' => "string" ) );
array_push($_SESSION['data'], array( 'column' => "coll_id", 'value' => $_SESSION['collection_id_choice'], 'type' => "string" ) );
array_push($_SESSION['data'], array( 'column' => "res_id_master", 'value' => $_SESSION['doc_id'], 'type' => "integer") );
diff --git a/modules/life_cycle/batch/custom.php b/modules/life_cycle/batch/custom.php
index 6eb9226527f7235144d22ab308248031e7b2aeaf..4ddf13fd661674b90800370e8698263f6459becf 100755
--- a/modules/life_cycle/batch/custom.php
+++ b/modules/life_cycle/batch/custom.php
@@ -207,15 +207,6 @@ function createPDI($resInContainer)
}
$identifier->setAttributeNode(new DOMAttr('SOURCE', 'RES'));
$reference->appendChild($identifier);
- if (isset($resRecordset->coverage)) {
- $coverage = $docXML->createElement(
- 'COVERAGE', $resRecordset->coverage
- );
- } else {
- $coverage = $docXML->createElement('COVERAGE', '');
- }
- $coverage->setAttributeNode(new DOMAttr('SOURCE', 'RES'));
- $reference->appendChild($coverage);
if (isset($resRecordset->doc_date)) {
$docDate = $docXML->createElement(
'DOC_DATE', $resRecordset->doc_date
@@ -400,15 +391,6 @@ function createPDI($resInContainer)
}
$relation->setAttributeNode(new DOMAttr('SOURCE', 'RES'));
$context->appendChild($relation);
- if (isset($resRecordset->coverage)) {
- $coverage = $docXML->createElement(
- 'COVERAGE', $resRecordset->coverage
- );
- } else {
- $coverage = $docXML->createElement('COVERAGE', '');
- }
- $coverage->setAttributeNode(new DOMAttr('SOURCE', 'RES'));
- $context->appendChild($coverage);
if (isset($resRecordset->rights)) {
$rights = $docXML->createElement(
'RIGHTS', $resRecordset->rights
diff --git a/modules/life_cycle/batch/extract_data.php b/modules/life_cycle/batch/extract_data.php
index 985d3c36002b6dac2c5b6822164144be9f49a61a..2f0d8aad5f283d81048ebb40c2fa64319b24e0a3 100755
--- a/modules/life_cycle/batch/extract_data.php
+++ b/modules/life_cycle/batch/extract_data.php
@@ -320,33 +320,6 @@ try {
);
$signataire = $stmt2->fetchObject();
- #### Nature réponse ####
- switch ($selectedFile->answer_type_bitmask) {
- case "000000":
- $answer = '';
- break;
- case "000001":
- $answer = _SIMPLE_MAIL;
- break;
- case "000010":
- $answer = _REGISTERED_MAIL;
- break;
- case "000100":
- $answer = _DIRECT_CONTACT;
- break;
- case "001000":
- $answer = _EMAIL;
- break;
- case "010000":
- $answer = _FAX;
- break;
- case "100000":
- $answer = _ANSWER;
- break;
- default:
- $answer = '';
- }
-
array_push($arrayAttachments, array( "identifier" => $signed_response->identifier, "typist" => strtoupper($signataire->lastname) . " " . ucfirst($signataire->firstname), "creation_date" => format_date_db($signed_response->creation_date, "", $GLOBALS['databasetype'])));
#### Nombre de Projet de réponse ####
diff --git a/modules/life_cycle/batch/extract_data_2.php b/modules/life_cycle/batch/extract_data_2.php
index a9a8b5a21e67182dea6aaf26c59a652ab17639a3..d765b33dcc4dad28c750d845748bc43328879e42 100755
--- a/modules/life_cycle/batch/extract_data_2.php
+++ b/modules/life_cycle/batch/extract_data_2.php
@@ -439,33 +439,6 @@ try {
);
$signataire = $stmt2->fetchObject();
- #### Nature réponse ####
- switch ($selectedFile->answer_type_bitmask) {
- case "000000":
- $answer = '';
- break;
- case "000001":
- $answer = _SIMPLE_MAIL;
- break;
- case "000010":
- $answer = _REGISTERED_MAIL;
- break;
- case "000100":
- $answer = _DIRECT_CONTACT;
- break;
- case "001000":
- $answer = _EMAIL;
- break;
- case "010000":
- $answer = _FAX;
- break;
- case "100000":
- $answer = _ANSWER;
- break;
- default:
- $answer = '';
- }
-
array_push($arrayAttachments, array( "identifier" => $signed_response->identifier, "typist" => strtoupper($signataire->lastname) . " " . ucfirst($signataire->firstname), "creation_date" => format_date_db($signed_response->creation_date, "", $GLOBALS['databasetype'])));
#### Nombre de Projet de réponse ####
diff --git a/modules/life_cycle/batch/resources.php b/modules/life_cycle/batch/resources.php
index 7db2c8063ffdc2e689686bc7c40c8745bcf3d378..f1640b36508655df160c4de3c6838957eb3d6bf2 100755
--- a/modules/life_cycle/batch/resources.php
+++ b/modules/life_cycle/batch/resources.php
@@ -272,9 +272,6 @@ function esign($resId)
$opstatus = $signatureExResponse->signatureExResult->opStatus;
//D2SStatus
$D2SStatus = $signatureExResponse->signatureExResult->D2SStatus;
- //theSignature
- $theSignature = $signatureExResponse->signatureExResult->D2SSignature->value->_;
- $resultDataSignatureEx['esign_content'] = $theSignature;
//D2SArchiveId
$D2SArchiveId = $signatureExResponse->signatureExResult->D2SArchiveId;
$resultDataSignatureEx['esign_proof_id'] = $D2SArchiveId;
diff --git a/sql/develop.sql b/sql/develop.sql
index 24ea3ab8e7ff4f437513d2e3fbe8f633daa1e180..6e4cb1a220b790b872fe40edb7b9b2e86867ff33 100644
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -157,6 +157,9 @@ ALTER TABLE security DROP COLUMN IF EXISTS mr_stop_date;
ALTER TABLE security DROP COLUMN IF EXISTS where_target;
ALTER TABLE users DROP COLUMN IF EXISTS ra_code;
ALTER TABLE users DROP COLUMN IF EXISTS ra_expiration_date;
+ALTER TABLE mlb_coll_ext DROP COLUMN IF EXISTS answer_type_bitmask;
+ALTER TABLE mlb_coll_ext DROP COLUMN IF EXISTS other_answer_desc;
+ALTER TABLE mlb_coll_ext DROP COLUMN IF EXISTS process_notes;
ALTER TABLE res_letterbox DROP COLUMN IF EXISTS publisher;
ALTER TABLE res_attachments DROP COLUMN IF EXISTS publisher;
ALTER TABLE res_version_attachments DROP COLUMN IF EXISTS publisher;
@@ -235,6 +238,16 @@ ALTER TABLE res_version_attachments DROP COLUMN IF EXISTS video_user;
ALTER TABLE res_letterbox DROP COLUMN IF EXISTS video_date;
ALTER TABLE res_attachments DROP COLUMN IF EXISTS video_date;
ALTER TABLE res_version_attachments DROP COLUMN IF EXISTS video_date;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS ocr_result;
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS ocr_result;
+ALTER TABLE res_version_attachments DROP COLUMN IF EXISTS ocr_result;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS coverage;
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS coverage;
+ALTER TABLE res_version_attachments DROP COLUMN IF EXISTS coverage;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS esign_proof_id;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS esign_proof_content;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS esign_content;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS esign_date;
CREATE OR REPLACE VIEW res_view_letterbox AS
@@ -369,8 +382,6 @@ CREATE OR REPLACE VIEW res_view_letterbox AS
mlb.nature_id,
mlb.alt_identifier,
mlb.admission_date,
- mlb.answer_type_bitmask,
- mlb.other_answer_desc,
mlb.sve_start_date,
mlb.sve_identifier,
mlb.process_limit_date,
@@ -386,7 +397,6 @@ CREATE OR REPLACE VIEW res_view_letterbox AS
r.identifier,
r.title,
r.priority,
- mlb.process_notes,
r.locker_user_id,
r.locker_time,
ca.case_id,
@@ -416,13 +426,13 @@ CREATE OR REPLACE VIEW res_view_letterbox AS
CREATE VIEW res_view_attachments AS
SELECT '0' as res_id, res_id as res_id_version, title, subject, description, type_id, format, typist,
- creation_date, fulltext_result, ocr_result, author, identifier, source, relation, coverage, doc_date, docserver_id, folders_system_id, path,
+ creation_date, fulltext_result, author, identifier, source, relation, doc_date, docserver_id, folders_system_id, path,
filename, offset_doc, fingerprint, filesize, status, destination, validation_date, effective_date, origin, priority, initiator, dest_user,
coll_id, dest_contact_id, dest_address_id, updated_by, is_multicontacts, is_multi_docservers, res_id_master, attachment_type, attachment_id_master, in_signature_book, signatory_user_serial_id
FROM res_version_attachments
UNION ALL
SELECT res_id, '0' as res_id_version, title, subject, description, type_id, format, typist,
- creation_date, fulltext_result, ocr_result, author, identifier, source, relation, coverage, doc_date, docserver_id, folders_system_id, path,
+ creation_date, fulltext_result, author, identifier, source, relation, doc_date, docserver_id, folders_system_id, path,
filename, offset_doc, fingerprint, filesize, status, destination, validation_date, effective_date, origin, priority, initiator, dest_user,
coll_id, dest_contact_id, dest_address_id, updated_by, is_multicontacts, is_multi_docservers, res_id_master, attachment_type, '0', in_signature_book, signatory_user_serial_id
FROM res_attachments;
diff --git a/sql/structure.sql b/sql/structure.sql
index 9529b6244991e6644a0544dd15400834c4cda557..d14e70e80de3e6204202ceeec7ed9412651fd778 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -264,7 +264,6 @@ CREATE TABLE res_attachments
identifier character varying(255) DEFAULT NULL::character varying,
source character varying(255) DEFAULT NULL::character varying,
relation bigint,
- coverage character varying(255) DEFAULT NULL::character varying,
doc_date timestamp without time zone,
docserver_id character varying(32) NOT NULL,
folders_system_id bigint,
@@ -299,7 +298,6 @@ CREATE TABLE res_attachments
fulltext_attempts integer DEFAULT NULL::integer,
tnl_result character varying(10) DEFAULT NULL::character varying,
tnl_attempts integer DEFAULT NULL::integer,
- ocr_result character varying(10) DEFAULT NULL::character varying,
CONSTRAINT res_attachments_pkey PRIMARY KEY (res_id)
)
WITH (OIDS=FALSE);
@@ -1298,7 +1296,6 @@ CREATE TABLE res_letterbox
identifier character varying(255) DEFAULT NULL::character varying,
source character varying(255) DEFAULT NULL::character varying,
relation bigint,
- coverage character varying(255) DEFAULT NULL::character varying,
doc_date timestamp without time zone,
docserver_id character varying(32) NOT NULL,
folders_system_id bigint,
@@ -1354,10 +1351,6 @@ CREATE TABLE res_letterbox
tablename character varying(32) DEFAULT 'res_letterbox'::character varying,
initiator character varying(50) DEFAULT NULL::character varying,
dest_user character varying(128) DEFAULT NULL::character varying,
- esign_proof_id character varying(255),
- esign_proof_content text,
- esign_content text,
- esign_date timestamp without time zone,
locker_user_id character varying(255) DEFAULT NULL::character varying,
locker_time timestamp without time zone,
confidentiality character(1),
@@ -1369,7 +1362,6 @@ CREATE TABLE res_letterbox
fulltext_attempts integer DEFAULT NULL::integer,
tnl_result character varying(10) DEFAULT NULL::character varying,
tnl_attempts integer DEFAULT NULL::integer,
- ocr_result character varying(10) DEFAULT NULL::character varying,
external_id character varying(255) DEFAULT NULL::character varying,
external_link character varying(255) DEFAULT NULL::character varying,
departure_date timestamp without time zone,
@@ -1424,11 +1416,8 @@ CREATE TABLE mlb_coll_ext (
admission_date timestamp without time zone,
sve_start_date timestamp without time zone default NULL,
sve_identifier character varying(255) default NULL,
- answer_type_bitmask character varying(7) default NULL,
- other_answer_desc character varying(255) DEFAULT NULL::character varying,
process_limit_date timestamp without time zone default NULL,
recommendation_limit_date timestamp without time zone default NULL,
- process_notes text,
closing_date timestamp without time zone default NULL,
alarm1_date timestamp without time zone default NULL,
alarm2_date timestamp without time zone default NULL,
@@ -1760,8 +1749,6 @@ CREATE OR REPLACE VIEW res_view_letterbox AS
mlb.nature_id,
mlb.alt_identifier,
mlb.admission_date,
- mlb.answer_type_bitmask,
- mlb.other_answer_desc,
mlb.sve_start_date,
mlb.sve_identifier,
mlb.process_limit_date,
@@ -1777,7 +1764,6 @@ CREATE OR REPLACE VIEW res_view_letterbox AS
r.identifier,
r.title,
r.priority,
- mlb.process_notes,
r.locker_user_id,
r.locker_time,
ca.case_id,
@@ -1874,7 +1860,6 @@ CREATE TABLE res_version_attachments
identifier character varying(255) DEFAULT NULL::character varying,
source character varying(255) DEFAULT NULL::character varying,
relation bigint,
- coverage character varying(255) DEFAULT NULL::character varying,
doc_date timestamp without time zone,
docserver_id character varying(32) NOT NULL,
folders_system_id bigint,
@@ -1946,7 +1931,6 @@ CREATE TABLE res_version_attachments
fulltext_attempts integer DEFAULT NULL::integer,
tnl_result character varying(10) DEFAULT NULL::character varying,
tnl_attempts integer DEFAULT NULL::integer,
- ocr_result character varying(10) DEFAULT NULL::character varying,
CONSTRAINT res_version_attachments_pkey PRIMARY KEY (res_id)
)
WITH (
@@ -1971,13 +1955,13 @@ WITH (OIDS=FALSE);
DROP VIEW IF EXISTS res_view_attachments;
CREATE VIEW res_view_attachments AS
SELECT '0' as res_id, res_id as res_id_version, title, subject, description, type_id, format, typist,
- creation_date, fulltext_result, ocr_result, author, identifier, source, relation, coverage, doc_date, docserver_id, folders_system_id, path,
+ creation_date, fulltext_result, author, identifier, source, relation, doc_date, docserver_id, folders_system_id, path,
filename, offset_doc, fingerprint, filesize, status, destination, validation_date, effective_date, origin, priority, initiator, dest_user,
coll_id, dest_contact_id, dest_address_id, updated_by, is_multicontacts, is_multi_docservers, res_id_master, attachment_type, attachment_id_master, in_signature_book, signatory_user_serial_id
FROM res_version_attachments
UNION ALL
SELECT res_id, '0' as res_id_version, title, subject, description, type_id, format, typist,
- creation_date, fulltext_result, ocr_result, author, identifier, source, relation, coverage, doc_date, docserver_id, folders_system_id, path,
+ creation_date, fulltext_result, author, identifier, source, relation, doc_date, docserver_id, folders_system_id, path,
filename, offset_doc, fingerprint, filesize, status, destination, validation_date, effective_date, origin, priority, initiator, dest_user,
coll_id, dest_contact_id, dest_address_id, updated_by, is_multicontacts, is_multi_docservers, res_id_master, attachment_type, '0', in_signature_book, signatory_user_serial_id
FROM res_attachments;
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index 3e18cb7699d5e4cfb6dc8226418018410deec24b..c7babd9d4d1f76cc635d57f67f1c0292055c7879 100644
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -231,11 +231,6 @@ class StoreController
}
}
- $aArgs['data'][] = [
- 'column' => 'offset_doc',
- 'value' => '',
- 'type' => 'string'
- ];
$aArgs['data'][] = [
'column' => 'docserver_id',
'value' => $aArgs['docserverId'],