diff --git a/apps/maarch_entreprise/definition_mail_categories.php b/apps/maarch_entreprise/definition_mail_categories.php
index 2fcb1c127d5bd34969cf0636083b14347d051ddc..ec3c978897749439a563f35ac65c5f4a670a6591 100755
--- a/apps/maarch_entreprise/definition_mail_categories.php
+++ b/apps/maarch_entreprise/definition_mail_categories.php
@@ -127,16 +127,16 @@ $_ENV['categories']['incoming']['departure_date'] = array (
'modify' => true,
'form_show' => 'date'
);
-$_ENV['categories']['incoming']['description'] = array (
- 'type_form' => 'string',
- 'type_field' => 'string',
- 'mandatory' => false,
- 'label' => _OTHERS_INFORMATIONS,
- 'table' => 'res',
- 'img' => 'info-circle',
- 'modify' => true,
- 'form_show' => 'textarea'
-);
+// $_ENV['categories']['incoming']['description'] = array (
+// 'type_form' => 'string',
+// 'type_field' => 'string',
+// 'mandatory' => false,
+// 'label' => _OTHERS_INFORMATIONS,
+// 'table' => 'res',
+// 'img' => 'info-circle',
+// 'modify' => true,
+// 'form_show' => 'textarea'
+// );
$_ENV['categories']['incoming']['subject'] = array(
'type_form' => 'string',
'type_field' => 'string',
@@ -279,16 +279,16 @@ $_ENV['categories']['outgoing']['departure_date'] = array (
'modify' => true,
'form_show' => 'date'
);
-$_ENV['categories']['outgoing']['description'] = array (
- 'type_form' => 'string',
- 'type_field' => 'string',
- 'mandatory' => false,
- 'label' => _OTHERS_INFORMATIONS,
- 'table' => 'res',
- 'img' => 'info-circle',
- 'modify' => true,
- 'form_show' => 'textarea'
-);
+// $_ENV['categories']['outgoing']['description'] = array (
+// 'type_form' => 'string',
+// 'type_field' => 'string',
+// 'mandatory' => false,
+// 'label' => _OTHERS_INFORMATIONS,
+// 'table' => 'res',
+// 'img' => 'info-circle',
+// 'modify' => true,
+// 'form_show' => 'textarea'
+// );
$_ENV['categories']['outgoing']['department_number_id'] = array (
'type_form' => 'string',
'type_field' => 'string',
diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php
index ea62b686f75a61a47b36983d3011ccf7720bc6ad..1e8904ceb1362440a440e4f2f0efe33b1159b0e7 100755
--- a/apps/maarch_entreprise/indexing_searching/details.php
+++ b/apps/maarch_entreprise/indexing_searching/details.php
@@ -211,15 +211,15 @@ if ($stmt->rowCount() > 0) {
}
$stmt = $db->query(
'SELECT status, format, typist, creation_date, fingerprint, filesize, '
- .'res_id, destination, source, '
- .'description, closing_date, alt_identifier, initiator, entity_label '.$comp_fields
+ .'res_id, destination, '
+ .'closing_date, alt_identifier, initiator, entity_label '.$comp_fields
.' FROM '.$table.' WHERE res_id = ?',
array($s_id)
);
$res = $stmt->fetchObject();
?>
<div id="details_div">
-<?php
+ <?php
echo '<h1 class="titdetail"><i class="fa fa-info-circle fa-2x"></i> ';
if (_ID_TO_DISPLAY == 'res_id') {
$idToDisplay = $s_id;
@@ -231,8 +231,8 @@ if (_ID_TO_DISPLAY == 'res_id') {
echo "<i style='font-style:normal;' title='{$titleToDisplay}'>"._DETAILS.' : '._MAIL." {$idToDisplay}</i>";
echo '</h1>';
?>
-<div id="inner_content" class="clearfix">
-<?php
+ <div id="inner_content" class="clearfix">
+ <?php
if ($stmt->rowCount() == 0) {
$_SESSION['error'] = _NO_DOCUMENT_CORRESPOND_TO_IDENTIFIER;
echo "<script language=\"javascript\" type=\"text/javascript\">window.top.location.href='index.php';</script>";
@@ -334,34 +334,34 @@ if ($stmt->rowCount() == 0) {
$_SESSION['features']['further_informations'][$indexes[$key]['label']] = $indexes[$key]['value'];
}
$data = get_general_data($coll_id, $s_id, $mode_data, $param_data); ?>
- <div class="block">
- <b>
- <p id="back_list">
- <?php
+ <div class="block">
+ <b>
+ <p id="back_list">
+ <?php
if (!isset($_POST['up_res_id']) || !$_POST['up_res_id']) {
if ($_SESSION['indexation'] == false) {
echo '<a href="javascript:history.go(-1)"><i class="fa fa-arrow-circle-left fa-2x" title="'._BACK.'"></i></a>';
}
} ?>
- </p>
- <p id="viewdoc">
- <?php if ($info_mail->filename) {
+ </p>
+ <p id="viewdoc">
+ <?php if ($info_mail->filename) {
?>
- <a href="../../rest/resources/<?php functions::xecho($s_id); ?>/content" target="_blank">
- <?php echo _VIEW_DOC;?>
- <i class="tooltip visaPjUp tooltipstered fa fa-eye fa-2x" style="height: auto; width: auto;font-size: 14px;margin-right:6px;margin-top: -9px;" title="<?php echo _VIEW_DOC; ?>"></i>
- </a>
- <a href="../../rest/resources/<?php functions::xecho($s_id); ?>/originalContent" target="_blank">
- <i class="tooltip visaPjUp tooltipstered fa fa-download fa-2x" style="height: auto; width: auto;font-size: 14px;margin-right:6px;margin-top: -9px;" title="<?php echo _DOWNLOAD_MAIN_DOCUMENT; ?>"></i>
- </a>
- <?php
+ <a href="../../rest/resources/<?php functions::xecho($s_id); ?>/content" target="_blank">
+ <?php echo _VIEW_DOC; ?>
+ <i class="tooltip visaPjUp tooltipstered fa fa-eye fa-2x" style="height: auto; width: auto;font-size: 14px;margin-right:6px;margin-top: -9px;" title="<?php echo _VIEW_DOC; ?>"></i>
+ </a>
+ <a href="../../rest/resources/<?php functions::xecho($s_id); ?>/originalContent" target="_blank">
+ <i class="tooltip visaPjUp tooltipstered fa fa-download fa-2x" style="height: auto; width: auto;font-size: 14px;margin-right:6px;margin-top: -9px;" title="<?php echo _DOWNLOAD_MAIN_DOCUMENT; ?>"></i>
+ </a>
+ <?php
} ?>
-
- </p>
- </b>
- </div>
- <br/>
- <?php
+
+ </p>
+ </b>
+ </div>
+ <br />
+ <?php
//CONSTRUCT TABS
echo '<div class="whole-panel">';
echo '<div style="display:flex;justify-content: flex-end;">';
@@ -528,14 +528,13 @@ if ($stmt->rowCount() == 0) {
//DETAILS TAB
echo "<div class='fa fa-info-circle detailsTab DetailsTabFunc TabSelected' id='DetailstachometerTab' style='font-size: 2em;padding-left: 15px;padding-right: 15px;padding-top: 5px;' title='"._PROPERTIES."' onclick=\"tabClicked('DetailstachometerTab',false);\"></div>";
- echo '</div>';
- ?>
+ echo '</div>'; ?>
- <div class="detailsDisplayDiv" id = "home-panel">
- <br/>
- <form method="post" name="index_doc" id="index_doc" action="index.php?page=details&dir=indexing_searching&id=<?php functions::xecho($s_id); ?>">
- <div align="center">
- <?php
+ <div class="detailsDisplayDiv" id="home-panel">
+ <br />
+ <form method="post" name="index_doc" id="index_doc" action="index.php?page=details&dir=indexing_searching&id=<?php functions::xecho($s_id); ?>">
+ <div align="center">
+ <?php
//TOOLBAR
$toolBar = '';
@@ -553,14 +552,14 @@ if ($stmt->rowCount() == 0) {
$toolBar .= '<input type="button" class="button" name="back_welcome" id="back_welcome" value="'._BACK_TO_WELCOME.'" onclick="window.top.location.href=\''.$_SESSION['config']['businessappurl'].'index.php\';" />';
echo $toolBar; ?>
- </div>
- <h2>
- <span class="date">
- <b><?php echo _FILE_DATA; ?></b>
- </span>
- </h2>
- <table cellpadding="2" cellspacing="2" border="0" class="block forms details" width="100%">
- <?php
+ </div>
+ <h2>
+ <span class="date">
+ <b><?php echo _FILE_DATA; ?></b>
+ </span>
+ </h2>
+ <table cellpadding="2" cellspacing="2" border="0" class="block forms details" width="100%">
+ <?php
$i = 0;
if (!$modify_doc) {
$data['process_limit_date']['readonly'] = true;
@@ -941,35 +940,35 @@ if ($stmt->rowCount() == 0) {
echo '</tr>';
echo '</table>';
//END GENERAL DATAS?>
-
- <div id="opt_indexes">
- <?php if (count($indexes) > 0 || ($core->is_module_loaded('tags') && ($core->test_service('tag_view', 'tags', false) == 1))) {
+
+ <div id="opt_indexes">
+ <?php if (count($indexes) > 0 || ($core->is_module_loaded('tags') && ($core->test_service('tag_view', 'tags', false) == 1))) {
?>
- <br/>
- <h2>
- <span class="date">
- <b><?php echo _OPT_INDEXES; ?></b>
- </span>
- </h2>
- <br/>
- <div class="block forms details">
- <table cellpadding="2" cellspacing="2" border="0" id="opt_indexes_custom" width="100%">
- <?php
+ <br />
+ <h2>
+ <span class="date">
+ <b><?php echo _OPT_INDEXES; ?></b>
+ </span>
+ </h2>
+ <br />
+ <div class="block forms details">
+ <table cellpadding="2" cellspacing="2" border="0" id="opt_indexes_custom" width="100%">
+ <?php
$i = 0;
foreach (array_keys($indexes) as $key) {
if ($i % 2 != 1 || $i == 0) { // pair
echo '<tr class="col">';
} ?>
- <th align="left" class="picto" >
- <?php
+ <th align="left" class="picto">
+ <?php
if (isset($indexes[$key]['img'])) {
?>
- <i class="fa fa-<?php functions::xecho($indexes[$key]['img']); ?> fa-2x" title="<?php echo $indexes[$key]['label']; ?>"></i>
- <?php
+ <i class="fa fa-<?php functions::xecho($indexes[$key]['img']); ?> fa-2x" title="<?php echo $indexes[$key]['label']; ?>"></i>
+ <?php
} ?>
- </th>
- <td align="left" width="200px">
- <?php
+ </th>
+ <td align="left" width="200px">
+ <?php
echo $indexes[$key]['label']; ?>:
</td>
<td style="position:relative">
@@ -986,26 +985,26 @@ if ($stmt->rowCount() == 0) {
} ?>style="width: 99%; font-size:100%" title="
<?php functions::xecho($indexes[$key]['show_value']); ?>" alt="
<?php functions::xecho($indexes[$key]['show_value']); ?>" />-->
- <textarea name="<?php functions::xecho($key); ?>" id="<?php functions::xecho($key); ?>"
- <?php if (!isset($indexes[$key]['readonly']) || $indexes[$key]['readonly'] == true) {
+ <textarea name="<?php functions::xecho($key); ?>" id="<?php functions::xecho($key); ?>" <?php if (!isset($indexes[$key]['readonly']) || $indexes[$key]['readonly'] == true) {
echo 'readonly="readonly" class="readonly"';
} elseif ($indexes[$key]['type'] == 'date') {
echo 'onclick="showCalender(this);"';
} ?> style="width: 200px; " title="<?php echo $indexes[$key]['show_value']; ?>" alt="<?php echo $indexes[$key]['show_value']; ?>" ><?php echo $indexes[$key]['show_value']; ?></textarea>
- <?php
+ <?php
} else {
?>
- <select name="<?php functions::xecho($key); ?>" id="<?php functions::xecho($key); ?>" >
- <option value=""><?php echo _CHOOSE; ?>...</option>
- <?php
+ <select name="<?php functions::xecho($key); ?>" id="<?php functions::xecho($key); ?>">
+ <option value=""><?php echo _CHOOSE; ?>...</option>
+ <?php
for ($j = 0; $j < count($indexes[$key]['values']); ++$j) {
?>
- <option value="<?php functions::xecho($indexes[$key]['values'][$j]['id']); ?>" <?php
+ <option value="<?php functions::xecho($indexes[$key]['values'][$j]['id']); ?>" <?php
if ($indexes[$key]['values'][$j]['id'] == $indexes[$key]['value']) {
echo 'selected="selected"';
- } ?>><?php echo $indexes[$key]['values'][$j]['label']; ?></option><?php
+ } ?>><?php echo $indexes[$key]['values'][$j]['label']; ?>
+ </option><?php
} ?>
- </select><?php
+ </select><?php
}
echo '</td>';
@@ -1018,30 +1017,29 @@ if ($stmt->rowCount() == 0) {
}
++$i;
} ?>
- </table>
- <table cellpadding="2" cellspacing="2" border="0" width="100%">
- <?php
+ </table>
+ <table cellpadding="2" cellspacing="2" border="0" width="100%">
+ <?php
if ($core->is_module_loaded('tags') && ($core->test_service('tag_view', 'tags', false) == 1)) {
include_once 'modules/tags/templates/details/index.php';
- }
- ?>
- </table>
- </div>
- <?php
+ } ?>
+ </table>
+ </div>
+ <?php
} ?>
- </div>
- </form>
- <br>
- <br>
- <?php
+ </div>
+ </form>
+ <br>
+ <br>
+ <?php
}
?>
-</div>
-<?php
+ </div>
+ <?php
$technicalInfo_frame = '<div class="detailsDisplayDiv" id="uniqueDetailsDiv" style="display:none;">';
$technicalInfo_frame .= '<iframe src="" name="uniqueDetailsIframe" width="100%" align="left" scrolling="yes" frameborder="0" id="uniqueDetailsIframe" style="height:100%;"></iframe>';
$technicalInfo_frame .= '</div>';
- echo $technicalInfo_frame; ?>
+ echo $technicalInfo_frame; ?>
</div>
</div>
</div>
diff --git a/core/class/PrintControler.php b/core/class/PrintControler.php
index 38e01cbd06948b86d41f9a62c95b47f8cbe1a17d..ba37c565a8b45e8ed2de15df566f6b779a2c5137 100644
--- a/core/class/PrintControler.php
+++ b/core/class/PrintControler.php
@@ -228,21 +228,17 @@ class PrintControler extends PrintFunctions
$pdf->useTemplate($tplIdx);
/**********************************************************************/
-
- //THE FONT
- $pdf->SetFont('Arial','B',11);
-
+ //PRINT DATE
+ $pdf->SetFont('Arial','',10);
+ $pdf->Cell(40,5,utf8_decode(_PRINT_DATE . ' : ') . date('d-m-Y'),0,0, 'L', false);
+
//APPLICATION NAME
- $pdf->Cell(140,5, utf8_decode($_SESSION['config']['applicationname']),0,0, 'C', false);
-
- $pdf->SetFont('Arial','',10);
-
- //PRINT DATE
- $pdf->Cell(40,5,utf8_decode(_PRINT_DATE . ' : ') . date('d-m-Y'),0,1, 'L', false);
+ $pdf->SetFont('Arial','B',11);
+ $pdf->Cell(110,5, utf8_decode($_SESSION['config']['applicationname']),0,1, 'C', false);
$pdf->SetFont('Arial','B',10);
- //INITIATOR
+ //INITIATOR
if (!empty($resId)) {
$filename_QR = $_SESSION['config']['tmppath'].DIRECTORY_SEPARATOR.$_SESSION['user']['UserId'] . time() . rand() ."_QRCODE.png";
$parameter = \Parameter\models\ParameterModel::getById(['select' => ['param_value_int'], 'id' => 'QrCodePrefix']);
@@ -250,30 +246,23 @@ class PrintControler extends PrintFunctions
if ($parameter['param_value_int'] == 1) {
$prefix = 'Maarch_';
}
- QRcode::png($prefix . $resId, $filename_QR);
+ QRcode::png($prefix . $resId, $filename_QR, 0, 10);
- $pdf->Image($filename_QR, 7, 3);
+ $pdf->Image($filename_QR, 158, 5, 40, 40);
}
- $pdf->Cell(20, 5, "", 0, 0, 'L', false);
+ $pdf->Cell(50, 5, "", 0, 0, 'L', false);
if ($this->array_print[$cpt]['initiator'] <> '') {
$stmt = $db->query(
"select entity_label from entities where entity_id = ?",
array($this->array_print[$cpt]['initiator'])
);
$resultEntity = $stmt->fetchObject();
- $pdf->MultiCell(100, 5, utf8_decode(_INITIATOR . ' : '
+ $pdf->MultiCell(90, 5, utf8_decode(_INITIATOR . ' : '
. $resultEntity->entity_label . " (" . $this->array_print[$cpt]['initiator'] . ")"), 0, 'C', false);
} elseif($this->array_print[$cpt]['typist'] <> '') {
- require_once "modules/entities/class/class_manage_entities.php";
- $entity = new entity();
- $initiator = $entity->get_primary_entity($this->array_print[$cpt]['typist']);
- $stmt = $db->query(
- "select entity_label from entities where entity_id = ?",
- array($initiator['ID'])
- );
- $resultEntity = $stmt->fetchObject();
- $pdf->MultiCell(36,5,utf8_decode(_INITIATOR . ' : '
- . $resultEntity->entity_label . " (" . $initiator['ID'] . ")"), 0, 1, 'L', false);
+ $primaryEntity = \User\models\UserModel::getPrimaryEntityById(['id' => $this->array_print[$cpt]['typist']]);
+ $pdf->MultiCell(90, 5, utf8_decode(_INITIATOR . ' : '
+ . $primaryEntity['entity_label'] . " (" . $primaryEntity['entity_id'] . ")"), 0, 'C', false);
}
$pdf->SetFont('Arial', 'B', 14);
@@ -288,7 +277,7 @@ class PrintControler extends PrintFunctions
} else {
$fileNumber = $this->array_print[$cpt]['res_id'];
}
- $pdf->Cell(182,5,utf8_decode(_PRINTED_FILE_NUMBER . ' : ') . $fileNumber, 1, 1, 'C', false);
+ $pdf->Cell(150,5,utf8_decode(_PRINTED_FILE_NUMBER . ' : ') . $fileNumber, 1, 1, 'C', false);
//BREAK A LINE
$pdf->SetY($pdf->GetY()+4);
@@ -749,8 +738,6 @@ class PrintFunctions
$query_template .= 'listinstance ';
$query_template .= 'WHERE ';
$query_template .= "res_id = ##res_id## ";
- $query_template .= "AND ";
- $query_template .= "coll_id = '" . $collection . "' ";
$query_template .= "AND ";
$query_template .= "item_mode = 'cc'";
diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php
index 6d87fdfe6342db191adf9aeff996e011c0365000..e3d507bdceff2c4385fbae58d6ae3e6add09aacd 100755
--- a/src/app/resource/controllers/SummarySheetController.php
+++ b/src/app/resource/controllers/SummarySheetController.php
@@ -191,11 +191,14 @@ class SummarySheetController
$widthAssignee = $widthNoMargins / 6;
$appName = CoreConfigModel::getApplicationName();
+ $pdf->SetFont('', '', 8);
+ $pdf->Cell(0, 20, "$appName / " . date('d-m-Y'), 0, 2, 'L', false);
+ $pdf->SetY($pdf->GetY() - 20);
+
$pdf->SetFont('', 'B', 12);
$pdf->Cell(0, 20, _SUMMARY_SHEET, 0, 2, 'C', false);
- $pdf->SetY($pdf->GetY() - 20);
+
$pdf->SetFont('', '', 8);
- $pdf->Cell(0, 20, "$appName / " . date('d-m-Y'), 0, 2, 'R', false);
$pdf->Cell(0, 1, $resource['alt_identifier'], 0, 2, 'C', false);
$pdf->SetY($pdf->GetY() + 15);
@@ -214,7 +217,7 @@ class SummarySheetController
$qrCode = new QrCode($prefix . $resource['res_id']);
$qrCode->setSize(400);
$qrCode->setMargin(25);
- $pdf->Image('@'.$qrCode->writeString(), 21, 10, 90, 90);
+ $pdf->Image('@'.$qrCode->writeString(), 485, 10, 90, 90);
}
}
foreach ($units as $key => $unit) {