diff --git a/apps/maarch_entreprise/add_links.php b/apps/maarch_entreprise/add_links.php
index 2af4516628723789fdf2fc680c7146fa24d29f96..454318ed5e74279f536f6d4db0e924cb913a29af 100644
--- a/apps/maarch_entreprise/add_links.php
+++ b/apps/maarch_entreprise/add_links.php
@@ -40,7 +40,7 @@ if (isset($_REQUEST['res_id']) && isset($_REQUEST['res_id_child'])) {
}
}
}
-
+
if ($i == 0 && !$self && count($_SESSION['stockCheckbox'])==1) {
$queryAddLink = "INSERT INTO res_linked (res_parent, res_child, coll_id) VALUES(?, ?, ?)";
$arrayPDO = array($res_parent, $res_child, $_SESSION['collection_id_choice']);
@@ -56,18 +56,26 @@ if (isset($_REQUEST['res_id']) && isset($_REQUEST['res_id_child'])) {
$_SESSION['config']['databasetype'],
'apps'
);
-
+ $altIdentifier = $Class_LinkController->getAltIdentifier($res_child);
$hist3 = new history();
$hist3->add(
$_REQUEST['tableHist'],
$res_parent,
"ADD",
'linkup',
- _THE_DOCUMENT_LINK . $res_child . ' ' . _NOW_LINK_WITH_THIS_ONE,
+ _THE_DOCUMENT_LINK . $altIdentifier.' (n°'.$res_child . ') ' . _NOW_LINK_WITH_THIS_ONE,
$_SESSION['config']['databasetype'],
'apps'
);
- $info = _THE_DOCUMENT_LINK . $res_child . ' ' . _NOW_LINK_WITH_THIS_ONE;
+ //$info = _THE_DOCUMENT_LINK . $altIdentifier.' (n°'.$res_child . ') ' . _NOW_LINK_WITH_THIS_ONE;
+ $allChronoNumber = $Class_LinkController->getAltIdentifierConcatened($_SESSION['stockCheckbox']);
+ if(count($_SESSION['stockCheckbox']) == 1){
+ $info = _THE_DOCUMENT_LINK .$allChronoNumber.' ' . _NOW_LINK_WITH_THIS_ONE;
+ }elseif(count($_SESSION['stockCheckbox']) > 1 && count($_SESSION['stockCheckbox']) < 3){
+ $info = _THE_DOCUMENTS_LINK .$allChronoNumber.' ' . _ARE_NOW_LINK_WITH_THIS_ONE;
+ }elseif(count($_SESSION['stockCheckbox']) >= 3){
+ $info = _THE_DOCUMENT_LINK .$altIdentifier.' (n°'.$res_child . ') ' . _ARE_NOW_LINK_WITH_MANY_DOCUMENTS;
+ }
}elseif($i == 0 && !$self && count($_SESSION['stockCheckbox'])>1){
for($j=0;$j<count($_SESSION['stockCheckbox']);$j++){
$queryAddLink = "INSERT INTO res_linked (res_parent, res_child, coll_id) VALUES(?, ?, ?)";
@@ -84,37 +92,46 @@ if (isset($_REQUEST['res_id']) && isset($_REQUEST['res_id_child'])) {
$_SESSION['config']['databasetype'],
'apps'
);
-
+ $altIdentifier = $Class_LinkController->getAltIdentifier($res_child);
$hist3 = new history();
$hist3->add(
$_REQUEST['tableHist'],
$res_parent,
"ADD",
'linkup',
- _THE_DOCUMENT_LINK . $res_child . ' ' . _NOW_LINK_WITH_THIS_ONE,
+ _THE_DOCUMENT_LINK .$altIdentifier.' (n°'.$res_child . ') ' . _NOW_LINK_WITH_THIS_ONE,
$_SESSION['config']['databasetype'],
'apps'
);
- $info = _THE_DOCUMENT_LINK . $res_child . ' ' . _NOW_LINK_WITH_THIS_ONE;
-
+ //$info = _THE_DOCUMENT_LINKBBBB .$altIdentifier.' (n°'.$res_child . ') ' . _NOW_LINK_WITH_THIS_ONE;
+ }
+ //seek all chrono number
+ $allChronoNumber = $Class_LinkController->getAltIdentifierConcatened($_SESSION['stockCheckbox']);
+ if(count($_SESSION['stockCheckbox']) == 1){
+ $info = _THE_DOCUMENT_LINK .$allChronoNumber.' ' . _NOW_LINK_WITH_THIS_ONE;
+ }elseif(count($_SESSION['stockCheckbox']) > 1 && count($_SESSION['stockCheckbox']) < 3){
+ $info = _THE_DOCUMENTS_LINK .$allChronoNumber.' ' . _ARE_NOW_LINK_WITH_THIS_ONE;
+ }elseif(count($_SESSION['stockCheckbox']) >= 3){
+ $info = _THE_DOCUMENT_LINK .$altIdentifier.' (n°'.$res_child . ') ' . _ARE_NOW_LINK_WITH_MANY_DOCUMENTS;
}
}
} elseif($_REQUEST['mode'] == 'del') {
+ //seek the alt_identifier of the $res_parent
+ $altIdentifier = $Class_LinkController->getAltIdentifier($res_parent);
$queryDelLink = "DELETE FROM res_linked WHERE res_parent=? AND res_child=? and coll_id=?";
$arrayPDO = array($res_parent, $res_child, $_SESSION['collection_id_choice']);
$db->query($queryDelLink, $arrayPDO);
-
$hist2 = new history();
$hist2->add(
$_REQUEST['tableHist'],
$res_child,
"DEL",
'linkdel',
- _LINK_TO_THE_DOCUMENT. $res_parent. ' ' . _LINK_DELETED,
+ _LINK_TO_THE_DOCUMENT. $altIdentifier.' (n°'.$res_parent . ') ' . _LINK_DELETED,
$_SESSION['config']['databasetype'],
'apps'
);
- $info = _LINK_TO_THE_DOCUMENT. $res_parent. ' ' . _LINK_DELETED;
+ $info = _LINK_TO_THE_DOCUMENT. $altIdentifier.' (n°'.$res_parent . ') ' . _LINK_DELETED;
$hist3 = new history();
$hist3->add(
@@ -122,7 +139,7 @@ if (isset($_REQUEST['res_id']) && isset($_REQUEST['res_id_child'])) {
$res_parent,
"DEL",
'linkdel',
- _THE_DOCUMENT_LINK . $res_child . ' ' . _NO_LINK_WITH_THIS_ONE,
+ _THE_DOCUMENT_LINK . $altIdentifier.' (n°'.$res_child . ') ' . _NO_LINK_WITH_THIS_ONE,
$_SESSION['config']['databasetype'],
'apps'
);
diff --git a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
index 10258933e124eb2cd4701ebb7510ce7a7ebfc086..b9486a033dd6182fd9ed6c6c0fd0c3eca9e0fe62 100644
--- a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
@@ -226,10 +226,10 @@ if($mode == 'normal') {
//Fields
//Documents
- array_push($select[$view], "res_id", "res_id as is_labeled", "status", "subject", "category_id as category_img",
+ array_push($select[$view], "res_id", "res_id as is_labeled", "alt_identifier", "status", "subject", "category_id as category_img",
"contact_firstname", "contact_lastname", "contact_society",
"user_lastname", "user_firstname", "dest_user", "type_label",
- "creation_date", "entity_label", "category_id, exp_user_id", "alt_identifier", "count_attachment", "is_multicontacts", "priority", "address_id");
+ "creation_date", "entity_label", "category_id, exp_user_id", "count_attachment", "is_multicontacts", "priority", "address_id");
//Cases
if($core_tools->is_module_loaded("cases") == true) {
array_push($select[$view], "case_id", "case_label", "case_description");
@@ -374,7 +374,11 @@ if($mode == 'normal') {
$tab[$i][$j]["label_align"]="left";
$tab[$i][$j]["align"]="left";
$tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
+ if($_REQUEST['mode'] == 'popup'){
+ $tab[$i][$j]["show"]=false;
+ }else{
+ $tab[$i][$j]["show"]=true;
+ }
$tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
$tab[$i][$j]["order"]='res_id';
$_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
@@ -427,6 +431,21 @@ if($mode == 'normal') {
$tab[$i][$j]['hasNotes'] = $stmt->fetchObject();
$tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
}
+ if($tab[$i][$j][$value]=="alt_identifier")
+ {
+ $tab[$i][$j]["value"] = $tab[$i][$j]['value'];
+ $tab[$i][$j]["label"]=_CHRONO_NUMBER;
+ $tab[$i][$j]["size"]="10";
+ $tab[$i][$j]["label_align"]="left";
+ $tab[$i][$j]["align"]="left";
+ $tab[$i][$j]["valign"]="bottom";
+ if($_REQUEST['mode'] == 'popup'){
+ $tab[$i][$j]["show"]=true;
+ }else{
+ $tab[$i][$j]["show"]=false;
+ }
+ $tab[$i][$j]["order"]='alt_identifier';
+ }
if($tab[$i][$j][$value]=="type_label")
{
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 7682fb4692fe42bd8979a58d6974f116dee5e4bc..382fd39a81e2793443e59e23c8d05025042ccd2d 100644
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -1522,6 +1522,8 @@ if (!defined("_LINK_TO_DOC")) define("_LINK_TO_DOC", "link to a document");
if (!defined("_LINK_REFERENCE")) define("_LINK_REFERENCE", "To link, you have to choose an existing document");
if (!defined("_LINKED_TO")) define("_LINKED_TO", "Linked to a document ");
if (!defined("_NOW_LINK_WITH_THIS_ONE")) define("_NOW_LINK_WITH_THIS_ONE", " is now linked to this document");
+if (!defined("_ARE_NOW_LINK_WITH_THIS_ONE")) define("_ARE_NOW_LINK_WITH_THIS_ONE", " are now linked to this document");
+if (!defined("_ARE_NOW_LINK_WITH_MANY_DOCUMENTS")) define("_ARE_NOW_LINK_WITH_MANY_DOCUMENTS", " are link to many documents");
if (!defined("_LINK_TAB")) define("_LINK_TAB", "Connections");
if (!defined("_LINK_DESC_FOR")) define("_LINK_DESC_FOR", "Document(s) linked to this documents");
if (!defined("_LINK_ASC_FOR")) define("_LINK_ASC_FOR", "Document(s) which are linked to this document");
@@ -1529,6 +1531,7 @@ if (!defined("_ADD_A_LINK")) define("_ADD_A_LINK", "Add a connection");
if (!defined("_LINK_ACTION")) define("_LINK_ACTION", "Link");
if (!defined("_LINK_ALREADY_EXISTS")) define("_LINK_ALREADY_EXISTS", "This connection already exists");
if (!defined("_THE_DOCUMENT_LINK")) define("_THE_DOCUMENT_LINK", "The document ");
+if (!defined("_THE_DOCUMENTS_LINK")) define("_THE_DOCUMENTS_LINK", "The documents ");
if (!defined("_LINK_TO_THE_DOCUMENT")) define("_LINK_TO_THE_DOCUMENT", "The document link ");
if (!defined("_NO_LINK_WITH_THIS_ONE")) define("_NO_LINK_WITH_THIS_ONE", "is no more linked to this one");
if (!defined("_LINK_DELETED")) define("_LINK_DELETED", "was deleted");
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index c9f73edcfc2856e3f7a5fc775540385ec1d2dcc8..803e5010aa4cb0a55548acd4488f74d34a8929e9 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -1522,6 +1522,8 @@ if (!defined("_LINK_TO_DOC")) define("_LINK_TO_DOC", "Lier à un document");
if (!defined("_LINK_REFERENCE")) define("_LINK_REFERENCE", "Pour lier vous devez choisir un document existant");
if (!defined("_LINKED_TO")) define("_LINKED_TO", "Lié au document ");
if (!defined("_NOW_LINK_WITH_THIS_ONE")) define("_NOW_LINK_WITH_THIS_ONE", " est maintenant lié à ce document");
+if (!defined("_ARE_NOW_LINK_WITH_THIS_ONE")) define("_ARE_NOW_LINK_WITH_THIS_ONE", " sont maintenant liés à ce document");
+if (!defined("_ARE_NOW_LINK_WITH_MANY_DOCUMENTS")) define("_ARE_NOW_LINK_WITH_MANY_DOCUMENTS", " est lié à plusieurs documents");
if (!defined("_LINK_TAB")) define("_LINK_TAB", "Liaisons");
if (!defined("_LINK_DESC_FOR")) define("_LINK_DESC_FOR", "Document(s) liés à ce document");
if (!defined("_LINK_ASC_FOR")) define("_LINK_ASC_FOR", "Document(s) au(x)quel(s) est lié ce document");
@@ -1529,6 +1531,7 @@ if (!defined("_ADD_A_LINK")) define("_ADD_A_LINK", "Ajouter une liaison");
if (!defined("_LINK_ACTION")) define("_LINK_ACTION", "Lier");
if (!defined("_LINK_ALREADY_EXISTS")) define("_LINK_ALREADY_EXISTS", "Cette liaison existe déjà ");
if (!defined("_THE_DOCUMENT_LINK")) define("_THE_DOCUMENT_LINK", "Le document ");
+if (!defined("_THE_DOCUMENTS_LINK")) define("_THE_DOCUMENTS_LINK", "Les documents ");
if (!defined("_LINK_TO_THE_DOCUMENT")) define("_LINK_TO_THE_DOCUMENT", "Le lien au document ");
if (!defined("_NO_LINK_WITH_THIS_ONE")) define("_NO_LINK_WITH_THIS_ONE", "n' est plus lié, à celui ci");
if (!defined("_LINK_DELETED")) define("_LINK_DELETED", "à été supprimé");
diff --git a/core/class/LinkController.php b/core/class/LinkController.php
index 330064e2d447dfaaa3ce7d15fabc3c0b4bf2682c..fc3b52e98902526bfb10034f5eccf1bf0bed3772 100755
--- a/core/class/LinkController.php
+++ b/core/class/LinkController.php
@@ -289,4 +289,29 @@ class LinkController
return $i;
}
+
+ public function getAltIdentifier($resId)
+ {
+
+ $db = new Database;
+ $altIdentifierRequest = "SELECT alt_identifier FROM mlb_coll_ext where res_id = ?";
+ $stmt = $db->query($altIdentifierRequest, array($resId));
+ while($altIdentifierResult = $stmt->fetchObject()) {
+ $altIdentifier = $altIdentifierResult->alt_identifier;
+ }
+ return $altIdentifier;
+
+ }
+
+ public function getAltIdentifierConcatened($array)
+ {
+ $_SESSION['chronoNumber'] = '';
+ for($j=0;$j<count($array);$j++){
+
+ $_SESSION['chronoNumber'] .= $this->getAltIdentifier($array[$j]).', ';
+
+ }
+ return substr($_SESSION['chronoNumber'], 0, -2);
+
+ }
}