diff --git a/modules/avis/documents_list_with_avis.php b/modules/avis/documents_list_with_avis.php index ba8d7eeaa5359b3e45bf372c98ce7c5a38b43314..3d0e52e719ecdb80c9253ff966656299fd43f467 100755 --- a/modules/avis/documents_list_with_avis.php +++ b/modules/avis/documents_list_with_avis.php @@ -96,7 +96,7 @@ array_push( 'contact_firstname', 'contact_lastname', 'contact_society', 'user_lastname', 'user_firstname', 'priority', 'creation_date', 'modification_date', 'admission_date', 'subject', 'process_limit_date', 'recommendation_limit_date', 'entity_label', 'dest_user', 'category_id', 'type_label', - 'exp_user_id', 'doc_custom_n1 as count_attachment', 'alt_identifier', 'is_multicontacts', 'locker_user_id', 'locker_time', 'address_id' + 'exp_user_id', 'doc_custom_n1 as count_attachment', 'alt_identifier', 'is_multicontacts', 'locker_user_id', 'locker_time', 'address_id', 'filename' ); if ($core_tools->is_module_loaded('cases') == true) { @@ -383,6 +383,8 @@ for ($i = 0; $i < $tabI; ++$i) { $tab[$i][$j]['show'] = false; } if ($tab[$i][$j][$value] == 'exp_user_id') { + $itContactI = $i; + $itContactJ = $j; if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname)) { $query = 'SELECT ca.firstname, ca.lastname FROM contact_addresses ca, res_view_letterbox rvl WHERE rvl.res_id = ? @@ -403,7 +405,11 @@ for ($i = 0; $i < $tabI; ++$i) { $tab[$i][$j]['valign'] = 'bottom'; $tab[$i][$j]['show'] = false; $tab[$i][$j]['value_export'] = $tab[$i][$j]['value']; - $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname); + if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname)) { + $tab[$i][$j]['value'] = '<i style="opacity:0.5;">'._UNDEFINED_DATA.'</i>'; + } else { + $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname); + } $tab[$i][$j]['order'] = false; } if ($tab[$i][$j][$value] == 'dest_user') { @@ -414,10 +420,18 @@ for ($i = 0; $i < $tabI; ++$i) { $tab[$i][$j]['valign'] = 'bottom'; $tab[$i][$j]['show'] = false; $tab[$i][$j]['value_export'] = $tab[$i][$j]['value']; + if (!empty($tab[$i][$j]['value'])) { + $user = \User\models\UserModel::getByUserId(['userId' => $tab[$i][$j]['value'], 'select' => ['firstname', 'lastname']]); + $dest = $tab[$i][$j]['value']; + $dest = $user['firstname'] . ' ' . $user['lastname']; + } else { + $dest = '<i style="opacity:0.5;">'._UNDEFINED_DATA.'</i>'; + } + $tab[$i][$j]["value"]=$dest; if ($tab[$i][15]['value'] == 'outgoing') { - $tab[$i][$j]['value'] = '<b>'._TO_CONTACT_C.'</b>'.$tab[$i][$j]['value']; + $tab[$i][$j]['value'] = '<b>'._WRITTEN_BY.' : </b>'.$tab[$i][$j]['value']; } else { - $tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value']; + $tab[$i][$j]['value'] = '<b>'._PROCESSED_BY.' : </b>'.$tab[$i][$j]['value']; } $tab[$i][$j]['order'] = false; } @@ -430,9 +444,17 @@ for ($i = 0; $i < $tabI; ++$i) { $tab[$i][$j]['valign'] = 'bottom'; $tab[$i][$j]['show'] = false; $tab[$i][$j]['value_export'] = $tab[$i][$j]['value']; - $tab[$i][$j]['value'] = _MULTI_CONTACT; $tab[$i][$j]['order'] = false; + if ($_SESSION['mlb_search_current_category_id'] == 'incoming') { + $prefix = '<b>'._TO_CONTACT_C.'</b>'; + } elseif ($_SESSION['mlb_search_current_category_id'] == 'outgoing' || $_SESSION['mlb_search_current_category_id'] == 'internal') { + $prefix = '<b>'._FOR_CONTACT_C.'</b>'; + } else { + $prefix = ''; + } + $tab[$i][$j]['value'] = $prefix.' '._MULTI_CONTACT; $tab[$i][$j]['is_multi_contacts'] = 'Y'; + $tab[$itContactI][$itContactJ]['value'] = null; } } if ($tab[$i][$j][$value] == 'type_label') { @@ -521,6 +543,41 @@ for ($i = 0; $i < $tabI; ++$i) { $tab[$i][$j]['value_export'] = $tab[$i][$j]['value']; $tab[$i][$j]['order'] = 'case_label'; } + if ($tab[$i][$j][$value] == 'real_dest') { + $query = 'SELECT item_id, type FROM resource_contacts WHERE res_id = ?'; + $arrayPDO = array($tab[$i][$j]['value']); + $stmt2 = $db->query($query, $arrayPDO); + $return_stmt = $stmt2->fetchObject(); + + if ($return_stmt->type == 'contact') { + $query = 'SELECT * FROM view_contacts WHERE ca_id = ?'; + $arrayPDO = array($return_stmt->item_id); + $stmt2 = $db->query($query, $arrayPDO); + $return_stmt = $stmt2->fetch(PDO::FETCH_ASSOC); + $formattedContact = \SrcCore\controllers\AutoCompleteController::getFormattedContact(['contact' => $return_stmt]); + $tab[$i][$j]['value'] = $formattedContact['contact']['contact']; + } else if ($return_stmt->type == 'entity') { + $query = 'SELECT short_label FROM entities WHERE id = ?'; + $arrayPDO = array($return_stmt->item_id); + $stmt2 = $db->query($query, $arrayPDO); + $return_stmt = $stmt2->fetchObject(); + $tab[$i][$j]['value'] = $return_stmt->entity_label; + } else { + $query = 'SELECT firstname, lastname FROM users WHERE id = ?'; + $arrayPDO = array($return_stmt->item_id); + $stmt2 = $db->query($query, $arrayPDO); + $return_stmt = $stmt2->fetchObject(); + $tab[$i][$j]['value'] = $return_stmt->firstname.' '. $return_stmt->lastname; + } + if (empty(trim($tab[$i][$j]['value']))) { + $tab[$i][$j]['value'] = null; + } else if ($_SESSION['mlb_search_current_category_id'] == 'outgoing') { + $tab[$i][$j]['value'] = '<b>'._TO_CONTACT_C.'</b>'.$tab[$i][$j]['value']; + } else { + $tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value']; + } + $tab[$i][$j]['order'] = false; + } } } } diff --git a/modules/avis/template/documents_list_with_avis.html b/modules/avis/template/documents_list_with_avis.html index 96d5a8ebdab9bf4cea1079b17bcc1f84f9b697f7..bd0a64ee8d2f23d6ba8b5febd6166a2b8434dac9 100755 --- a/modules/avis/template/documents_list_with_avis.html +++ b/modules/avis/template/documents_list_with_avis.html @@ -54,129 +54,117 @@ Mods #!#TABLE <!-- ----------------------------------------------------------------------- --> - <table border="0" cellspacing="0" class="listing spec zero_padding" id="extended_list" style ="padding: 0px;"> + <table border="0" cellspacing="0" class="listing spec zero_padding listResultContent" id="extended_list" style="display:block;padding: 0px;width:100%;"> #!#HEAD <!-- ----------------------------------------------------------------------- --> - <thead border ="1"> + <thead border="1" class="listResultContentHead"> <tr> - <!--<th width="100%" colspan="2"> - <div align="center" style="border:1px solid; height:20px;margin-bottom:10px;padding-top:10px;vertical-align:middle;"> - ##checkUncheckAll## - ##defineLang|_SORT_BY## : - ##defineLang|_NUM_GED## ##sortColumn|res_id## - ##defineLang|_TYPE## ##sortColumn|type_label## - ##defineLang|_SUBJECT## ##sortColumn|subject## - ##defineLang|_DEST_USER## ##sortColumn|dest_user## - ##defineLang|_REG_DATE## ##sortColumn|creation_date## - ##defineLang|_PROCESS_LIMIT_DATE## ##sortColumn|process_limit_date## - ##defineLang|_ENTITY## ##sortColumn|entity_label## - ##defineLang|_CATEGORY## ##sortColumn|category_id## - ##ifStatement|#isModuleLoaded|cases#===true| #defineLang|_CASE# #sortColumn|case_label#| ## + <th style="width:150px;text-align:center;"> + <span style="text-align:center;"> + ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==res_id|<i>#defineLang|_NUM_GED#</i>|## ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==chrono_number|<i>#defineLang|_CHRONO_NUMBER_SHORT#</i>|## / ##defineLang|_STATUS##<br/>##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==res_id|#sortColumn|res_id#|## ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==chrono_number|#sortColumn|alt_identifier#|## / ##sortColumn|status## + </span> + </th> + <th> + <div style="display:flex;"> + <span style="text-align:center;flex:1;"> + ##defineLang|_SUBJECT## / ##defineLang|_PRIORITY##<br/>##sortColumn|subject## / ##sortColumn|priority## + </span> + <span style="text-align:center;flex:1;"> + ##defineLang|_CATEGORY##<br/>##sortColumn|category_id## + </span> + <span style="text-align:center;flex:1;"> + ##defineLang|_CREATION_DATE##<br/>##sortColumn|creation_date## + </span> + <span style="text-align:center;flex:1;"> + ##defineLang|_MODIFICATION_DATE##<br/>##sortColumn|modification_date## + </span> + <span style="text-align:center;flex:2;"> + ##defineLang|_ASSIGNEE## - ##defineLang|_REDACTOR## / ##defineLang|_ENTITY##<br/>##sortColumn|dest_user## / ##sortColumn|entity_label## + </span> + <span style="text-align:center;flex:1;"> + ##defineLang|_TYPE## / ##defineLang|_NB_AVIS##<br/>##sortColumn|type_label## + </span> + <span style="text-align:center;flex:1;"> + ##defineLang|_DEST_USER## / ##defineLang|_SHIPPER##<br/> + </span> </div> - </th>--> - <th width="120px;"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" > - <tr> - <th style="text-align:center">##checkUncheckAll##<br/>##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==res_id|<i>#defineLang|_NUM_GED#</i>|## ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==chrono_number|<i>#defineLang|_CHRONO_NUMBER_SHORT#</i>|## / ##defineLang|_STATUS##<br/>##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==res_id|#sortColumn|res_id#|## ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==chrono_number|#sortColumn|alt_identifier#|## / ##sortColumn|status##</th> - </tr> - </table> </th> - <th style="text-align:center" > - <table width="100%" border="0" cellspacing="0" cellpadding="0" > - <tr> - - <th style="font-size:9px;" width ="120px">##defineLang|_SUBJECT## / ##defineLang|_PRIORITY##<br/>##sortColumn|subject## / ##sortColumn|priority##</th> - <th style="font-size:9px;text-align:left;" width ="130px">##defineLang|_CATEGORY##<br/>##sortColumn|category_id##</th> - <th style="font-size:9px;" width ="140px" >##defineLang|_RECOMMENDATION_LIMIT_DATE##<br/>##sortColumn|recommendation_limit_date##</th> - <th style="font-size:9px;" width ="185px" >##defineLang|_MODIFICATION_DATE##<br/>##sortColumn|modification_date##</th> - <th style="font-size:9px;" width ="170px" >##defineLang|_ENTITY##<br/>##sortColumn|entity_label##</th> - <th style="font-size:9px;" width ="282px" >##defineLang|_TYPE## / ##defineLang|_NB_AVIS##<br/>##sortColumn|type_label##</th> - <th style="font-size:9px;" width ="50px" >##defineLang|_DEST_USER##<br/>##sortColumn|dest_user##</th> - - </tr> - </table> - </th> </tr> </thead> - <tbody> + <tbody class="listResultContentBody"> #!#RESULT <!-- ----------------------------------------------------------------------- --> - <tr class="##cssLine|col|white##" title="##showDefaultAction##"> - - <td width="10%" ##clickOnLine##> - <!--<div align="center"><img src="##load_img|contact_maarch.gif##" alt="##loadValue|status##" title="##loadValue|status##"> </div>--> - <div align="center" style ="color:#135F7F;">##loadValue|status####func_isConfidential##</div> + <tr class="##cssLine|col|white##"> + <td style="width:150px;text-align:center;"> + ##loadValue|status####func_isConfidential##<br/><br/> + <b title="n°##loadValue|res_id##">##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==res_id|#loadValue|res_id#|## ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==chrono_number|#loadValue|alt_identifier#|##</b> + ##func_cadenas|'#loadValue|locker_user_id#'|'#loadValue|locker_time#'## ##radioButton## ##checkBox## + </td> + <td style="padding: 10px;"> + <span style="display: flex;width: 100%;padding-bottom: 20px;align-items: center;"> + <span style="flex:4;font-weight:bold;padding-left: 10px;font-size:15px;"> + ##loadValue|subject## + </span> + <span style="flex:1;font-weight:bold;padding-left: 10px;font-size:15px;text-align:right;color:#5C7C89;font-style: italic;"> + ##nbNoteAvis|'#loadValue|res_id#'## ##defineLang|_NB_AVIS_SENT## + </span> + <span style="flex:1;text-align: right;"> + <span title="##defineLang|_DEST_USER## - ##defineLang|_SHIPPER##">##loadValue|exp_user_id####loadValue|is_multicontacts## ##func_bool_see_multi_contacts##</span><br/> + ##ifStatement|'#loadValue|real_dest#'!=null|#loadValue|real_dest#|##<br/><br/> + ##ifStatement|'#loadValue|case_label#'!=null|<b>#defineLang|_CASE# : </b>#loadValue|case_label#|## + </span> + </span> + <span style="display: flex;width: 100%;"> + <span style="flex:1;" title="##defineLang|_PRIORITY##"> + ##loadValue|priority## + </span> + <span style="flex:1;" title="##defineLang|_CATEGORY##"> + ##loadValue|category_img## ##loadValue|category_id## + </span> + <span style="flex:1;" title="##defineLang|_CREATION_DATE##"> + <i class="fa fa-calendar-alt fa-2x"></i> ##loadValue|creation_date## + </span> + <span style="flex:1;" title="##defineLang|_MODIFICATION_DATE##"> + <i class="fa fa-calendar-check fa-2x"></i> ##loadValue|modification_date## + </span> + <span style="flex:2;" > + <span title="##defineLang|_ASSIGNEE## - ##defineLang|_REDACTOR##">##loadValue|dest_user##</span> <span title="##defineLang|_ENTITY##">(##loadValue|entity_label##)</span> + </span> + <span style="flex:1;" title="##defineLang|_TYPE##"> + <i class="fa fa-file fa-2x"></i> ##loadValue|type_label## + </span> + <span style="flex:1;" title="##defineLang|_TYPE##"> + <span class="actionsTool" style="text-align:center;"> + ##func_bool_see_notes## + ##showActionAdvResultFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#', 'FT')|#loadValue|count_attachment# == 0## + ##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')## + ##ifStatement|'#loadValue|filename#'!=null|#showIconDocument#|## + ##showIconDetails## + </span> + </span> + </span> + + </td> + </tr> + <tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%"> + <td colspan="6" style="background-color: #f2f2f2;"> + <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;"> + <i class="fa fa-spinner fa-2x"></i><br /> + ##define_lang|_LOADING_INFORMATIONS## + </div> </td> - <td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##> - <table width="100%" border="0" cellspacing="0" cellpadding="0" > - <tr> - <td style="font-size:14px;font-weight:bold;max-width: 1000px;">##loadValue|subject##</td> - <td width="17.5%" style="font-size:14px;font-weight:bold;color:#5C7C89;font-style: italic;"> - ##nbNoteAvis|'#loadValue|res_id#'## ##defineLang|_NB_AVIS_SENT## - </td> - <td width="17.5%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td style="text-align:right">##loadValue|exp_user_id####loadValue|is_multicontacts##</td> - </tr> - - <tr><td> </td><td></td></tr> - <tr> - <td style="text-align:right">##loadValue|dest_user##</td> - </tr> - ##ifStatement|'#loadValue|case_label#'!=null|<tr><td style="text-align:right"><b>#defineLang|_CASE# : </b>#loadValue|case_label#</td></tr>|## - </table> - </td> - </tr> - </table> + </tr> + <tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%"> + <td colspan="6" style="background-color: #f2f2f2;"> + <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;"> + <i class="fa fa-spinner fa-2x"></i><br /> + ##define_lang|_LOADING_INFORMATIONS## + </div> </td> - </tr> - <tr class="##cssLineReload##" title="##showDefaultAction##"> - <td title="n°##loadValue|res_id##" style="text-align:center" style="font-size:13px;" >##func_cadenas|'#loadValue|locker_user_id#'|'#loadValue|locker_time#'## ##radioButton## ##checkBox##<b>##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==res_id|#loadValue|res_id#|## ##ifStatement|'#defineLang|_ID_TO_DISPLAY#'==chrono_number|#loadValue|alt_identifier#|##</b></td> - <td style="text-align:center" > - <table width="100%" border="0" cellspacing="0" cellpadding="0" > - <tr> - - <td style="font-size:10px;" width ="80px">##loadValue|priority##</td> - <td style="font-size:10px;text-align:right;" width ="30px" alt="##defineLang|_CATEGORY##" title="##defineLang|_CATEGORY##" ##clickOnLine##>##loadValue|category_img##</td> - <td style="font-size:10px;" width ="100px" >##loadValue|category_id##</td> - <td style="font-size:10px;text-align:right;" width ="30px" alt="##defineLang|_RECOMMENDATION_LIMIT_DATE##" title="##defineLang|_RECOMMENDATION_LIMIT_DATE##" ##clickOnLine##><i class="fa fa-calendar-alt fa-2x"></i> </td> - <td style="font-size:10px;" width ="100px" >##loadValue|recommendation_limit_date##</td> - <td style="font-size:10px;text-align:right;" width ="30px" alt="##defineLang|_MODIFICATION_DATE##" title="##defineLang|_MODIFICATION_DATE##" ##clickOnLine##><i class="fa fa-calendar-check fa-2x"></i> </td> - <td style="font-size:10px;" width ="100px" >##loadValue|modification_date##</td> - <td style="font-size:10px;text-align:right;" width ="40px" alt="##defineLang|_ENTITY##" title="##defineLang|_ENTITY##" ##clickOnLine##><i class="fa fa-sitemap fa-2x"></i></td> - <td style="font-size:10px;" width ="110px" > ##loadValue|entity_label##</td> - <td style="font-size:10px;text-align:right" width ="30px" alt="##defineLang|_TYPE##" title="##defineLang|_TYPE##" ##clickOnLine##><i class="fa fa-file fa-2x"></i> - <td style="font-size:10px;text-align:left" width ="80px" >##loadValue|type_label##</td> - <td style="font-size:10px;" width ="50px">##func_bool_see_multi_contacts##</td> - <td style="font-size:10px;" width ="30px">##func_bool_see_notes##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#')|#loadValue|count_attachment# == 0##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td> - <td style="font-size:10px;" width ="30px" >##showIconDocument##</td> - <td style="font-size:10px;" width ="30px" >##showIconDetails##</td> - </tr> - </table> - </td> - </tr> - <tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%"> - <td colspan="6" style="background-color: #f2f2f2;"> - <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;"> - <i class="fa fa-spinner fa-2x"></i><br /> - ##define_lang|_LOADING_INFORMATIONS## - </div> - </td> - </tr> - <tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%"> - <td colspan="6" style="background-color: #f2f2f2;"> - <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;"> - <i class="fa fa-spinner fa-2x"></i><br /> - ##define_lang|_LOADING_INFORMATIONS## - </div> - </td> - </tr> + </tr> <tr id="repList_##loadValue|res_id##" name="repList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: #FFF;" width="100%"> <td colspan="2" style="background-color: #f2f2f2;"> <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;"> @@ -192,7 +180,7 @@ Mods ##defineLang|_LOADING_INFORMATIONS## </div> </td> - </tr> + </tr> #!#FOOTER <!-- ----------------------------------------------------------------------- --> @@ -203,6 +191,5 @@ Mods <script> $j('#container').attr('style', 'width: 90%; min-width: 1000px;'); $j('#content').attr('style', 'width: auto; min-width: 1000px;'); - $j('#inner_content').attr('style', 'width: auto; min-width: 1000px;'); $j('table#extended_list').attr('style', 'width: 100%; min-width: 900px; margin: 0;'); </script> \ No newline at end of file