From 69f4c2641dfd3a9e3952eb115b96f7de9858ccec Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Sun, 23 Sep 2018 23:21:57 +0200
Subject: [PATCH] FEAT #8338 add icon in pj list
---
.../template/documents_list_attachments.html | 2 +-
.../attachments/frame_list_attachments.php | 605 ++++++++++--------
sql/develop.sql | 12 +-
3 files changed, 335 insertions(+), 284 deletions(-)
diff --git a/apps/maarch_entreprise/template/documents_list_attachments.html b/apps/maarch_entreprise/template/documents_list_attachments.html
index ca594f8c6e1..73d25335436 100755
--- a/apps/maarch_entreprise/template/documents_list_attachments.html
+++ b/apps/maarch_entreprise/template/documents_list_attachments.html
@@ -193,7 +193,7 @@ Mods
<i style="font-size:10px;color:#135F7F;" title="##defineLang|_VERSION##">##loadValue|relation##</i>
<i style="color:#135F7F;">##func_previous_version##</i>
</td>
- <td width="65%" style="text-align:left;" title="##defineLang|_STATUS##">
+ <td width="65%" style="text-align:center;" title="##defineLang|_STATUS##">
<i>##loadValue|status##</i>
</td>
<!--<td width="45%" style="text-align:center;font-size:13px;width:100px" title="##defineLang|_STATUS##"></td>-->
diff --git a/modules/attachments/frame_list_attachments.php b/modules/attachments/frame_list_attachments.php
index 13da4cc477e..322fec1a78a 100755
--- a/modules/attachments/frame_list_attachments.php
+++ b/modules/attachments/frame_list_attachments.php
@@ -1,21 +1,12 @@
<?php
-/*
-* Copyright 2015 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Maarch Framework is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
+/**
+* Copyright Maarch since 2008 under licence GPLv3.
+* See LICENCE.txt file at the root folder for more details.
+* This file is part of Maarch software.
+
+* @brief frame_list_attachments
+* @author dev <dev@maarch.org>
+* @ingroup attachments
*/
$core = new core_tools();
@@ -25,35 +16,35 @@ $core->test_service('manage_attachments', 'attachments');
require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
."class".DIRECTORY_SEPARATOR."class_lists.php";
-$list = new lists();
+$list = new lists();
if (empty($_SESSION['collection_id_choice'])) {
$_SESSION['collection_id_choice'] = $_SESSION['user']['collections'][0];
}
if (isset($_REQUEST['resId']) && $_REQUEST['resId'] <> '') {
- $resId = $_REQUEST['resId'];
- $_SESSION['doc_id'] = $resId;
+ $resId = $_REQUEST['resId'];
+ $_SESSION['doc_id'] = $resId;
} else {
$resId = $_SESSION['doc_id'];
}
//test si le paramètre attach_type existe. Possible de mettre plusieurs types separes par une virgule
-if (isset($_REQUEST['attach_type']) && $_REQUEST['attach_type'] <> ''){
- $table_type = explode(",", $_REQUEST['attach_type']);
- $whereAttach = " and (";
- foreach ($table_type as $value) {
- $whereAttach .= "attachment_type = '".$value."' or ";
- }
- $whereAttach = substr($whereAttach, 0, -4) . ") ";
+if (isset($_REQUEST['attach_type']) && $_REQUEST['attach_type'] <> '') {
+ $table_type = explode(",", $_REQUEST['attach_type']);
+ $whereAttach = " and (";
+ foreach ($table_type as $value) {
+ $whereAttach .= "attachment_type = '".$value."' or ";
+ }
+ $whereAttach = substr($whereAttach, 0, -4) . ") ";
}
-if (isset($_REQUEST['attach_type_exclude']) && $_REQUEST['attach_type_exclude'] <> ''){
- $table_type = explode(",", $_REQUEST['attach_type_exclude']);
- $whereAttach = " and (";
- foreach ($table_type as $value) {
- $whereAttach .= "attachment_type <> '".$value."' and ";
- }
- $whereAttach = substr($whereAttach, 0, -4) . ") ";
+if (isset($_REQUEST['attach_type_exclude']) && $_REQUEST['attach_type_exclude'] <> '') {
+ $table_type = explode(",", $_REQUEST['attach_type_exclude']);
+ $whereAttach = " and (";
+ foreach ($table_type as $value) {
+ $whereAttach .= "attachment_type <> '".$value."' and ";
+ }
+ $whereAttach = substr($whereAttach, 0, -4) . ") ";
}
$viewOnly = false;
@@ -69,14 +60,14 @@ $func = new functions();
$db = new Database();
//Templates
-if(isset($_REQUEST['template_selected'])){
- $template_select = $_REQUEST['template_selected'];
-}else{
- $template_select = 'documents_list_attachments';
+if (isset($_REQUEST['template_selected'])) {
+ $template_select = $_REQUEST['template_selected'];
+} else {
+ $template_select = 'documents_list_attachments';
}
$defaultTemplate = $template_select;
$selectedTemplate = $list->getTemplate();
-if (empty($selectedTemplate)) {
+if (empty($selectedTemplate)) {
if (!empty($defaultTemplate)) {
$list->setTemplate($defaultTemplate);
$selectedTemplate = $list->getTemplate();
@@ -90,57 +81,95 @@ $select['res_view_attachments'] = array();
// Important de laisser cet ordre : 'res_id', 'res_id_version', 'relation', 'status'
array_push(
- $select['res_view_attachments'], 'res_id', 'res_id_version', 'relation', 'status', 'identifier', 'attachment_type', 'title', 'dest_user', 'dest_contact_id', 'creation_date', 'typist', 'doc_date', 'updated_by', 'validation_date', 'format', 'in_signature_book');
+ $select['res_view_attachments'],
+ 'res_id',
+ 'res_id_version',
+ 'relation',
+ 'status',
+ 'identifier',
+ 'attachment_type',
+ 'title',
+ 'dest_user',
+ 'dest_contact_id',
+ 'creation_date',
+ 'typist',
+ 'doc_date',
+ 'updated_by',
+ 'validation_date',
+ 'format',
+ 'in_signature_book'
+);
$where = " (res_id_master = ? and coll_id = ? and status <> 'DEL' and status <> 'OBS' and (status <> 'TMP' or (typist = ? and status = 'TMP')))";
-$arrayPDO = array($resId, $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
+$arrayPDO = array($resId, $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
//Filtre sur le type
-if (isset($whereAttach) && $whereAttach <> '') $where .= $whereAttach;
+if (isset($whereAttach) && $whereAttach <> '') {
+ $where .= $whereAttach;
+}
//Order
- $order = $order_field = '';
- $order = $list->getOrder();
- $order_field = $list->getOrderField();
- if (!empty($order_field) && !empty($order)){
- if($_REQUEST['order_field'] == 'identifier'){
- $orderstr = "order by order_alphanum(identifier)"." ".$order;
- }else{
- $orderstr = "order by ".$order_field." ".$order;
- }
- } else {
- $list->setOrder();
- $list->setOrderField('identifier');
- $orderstr = "order by attachment_type asc, order_alphanum(identifier) DESC";
+$order = $order_field = '';
+$order = $list->getOrder();
+$order_field = $list->getOrderField();
+if (!empty($order_field) && !empty($order)) {
+ if ($_REQUEST['order_field'] == 'identifier') {
+ $orderstr = "order by order_alphanum(identifier)"." ".$order;
+ } else {
+ $orderstr = "order by ".$order_field." ".$order;
}
+} else {
+ $list->setOrder();
+ $list->setOrderField('identifier');
+ $orderstr = "order by attachment_type asc, order_alphanum(identifier) DESC";
+}
$parameters = '';
//Extra parameters
-if (isset($_REQUEST['size']) && !empty($_REQUEST['size'])) $parameters .= '&size='.$_REQUEST['size'];
-if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) $parameters .= '&order='.$_REQUEST['order'];
-if (isset($_REQUEST['order_field']) && !empty($_REQUEST['order_field'])) $parameters .= '&order_field='.$_REQUEST['order_field'];
-if (isset($_REQUEST['what']) && !empty($_REQUEST['what'])) $parameters .= '&what='.$_REQUEST['what'];
-if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) $parameters .= '&start='.$_REQUEST['start'];
-if (isset($_REQUEST['template_selected']) && !empty($_REQUEST['template_selected'])) $parameters .= '&template_selected='.$_REQUEST['template_selected'];
+if (isset($_REQUEST['size']) && !empty($_REQUEST['size'])) {
+ $parameters .= '&size='.$_REQUEST['size'];
+}
+if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) {
+ $parameters .= '&order='.$_REQUEST['order'];
+}
+if (isset($_REQUEST['order_field']) && !empty($_REQUEST['order_field'])) {
+ $parameters .= '&order_field='.$_REQUEST['order_field'];
+}
+if (isset($_REQUEST['what']) && !empty($_REQUEST['what'])) {
+ $parameters .= '&what='.$_REQUEST['what'];
+}
+if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
+ $parameters .= '&start='.$_REQUEST['start'];
+}
+if (isset($_REQUEST['template_selected']) && !empty($_REQUEST['template_selected'])) {
+ $parameters .= '&template_selected='.$_REQUEST['template_selected'];
+}
if (!empty($_REQUEST['noModification'])) {
- $parameters .= '&noModification=true';
+ $parameters .= '&noModification=true';
}
//test si le paramètre attach_type existe
-if (isset($_REQUEST['attach_type']) && $_REQUEST['attach_type'] <> '') $parameters .= "&attach_type=".$_REQUEST['attach_type'];
-if (isset($_REQUEST['attach_type_exclude']) && $_REQUEST['attach_type_exclude'] <> '') $parameters .= "&attach_type_exclude=".$_REQUEST['attach_type_exclude'];
-if (isset($_REQUEST['fromDetail']) && $_REQUEST['fromDetail'] <> '') $parameters .= "&fromDetail=".$_REQUEST['fromDetail'];
+if (isset($_REQUEST['attach_type']) && $_REQUEST['attach_type'] <> '') {
+ $parameters .= "&attach_type=".$_REQUEST['attach_type'];
+}
+if (isset($_REQUEST['attach_type_exclude']) && $_REQUEST['attach_type_exclude'] <> '') {
+ $parameters .= "&attach_type_exclude=".$_REQUEST['attach_type_exclude'];
+}
+if (isset($_REQUEST['fromDetail']) && $_REQUEST['fromDetail'] <> '') {
+ $parameters .= "&fromDetail=".$_REQUEST['fromDetail'];
+}
if (isset($_REQUEST['load'])) {
$core->load_lang();
$core->load_html();
- $core->load_header('', true, false);
- ?><body><?php
+ $core->load_header('', true, false); ?>
+
+<body>
+ <?php
$core->load_js();
- if(isset($_REQUEST['attach_type'])){
+ if (isset($_REQUEST['attach_type'])) {
echo '<script>loadToolbarBadge(\'responses_tab\',\''.$_SESSION['config']['businessappurl'] . 'index.php?display=true&module=attachments&page=load_toolbar_attachments&responses&origin=parent&resId='.$resId.'&collId=letterbox_coll\');</script>';
-
- }else{
+ } else {
echo '<script>loadToolbarBadge(\'attachments_tab\',\''.$_SESSION['config']['businessappurl'] . 'index.php?display=true&module=attachments&page=load_toolbar_attachments&origin=parent&resId='.$resId.'&collId=letterbox_coll\');</script>';
}
//Load list
@@ -148,219 +177,231 @@ if (isset($_REQUEST['load'])) {
.'index.php?module=attachments&page=frame_list_attachments'.$parameters;
$listContent = $list->loadList($target);
- echo $listContent;
+ echo $listContent; ?>
+ <div id="container" style="width:100%;min-height:0px;height:0px;"></div>
+</body>
- ?><div id="container" style="width:100%;min-height:0px;height:0px;"></div></body></html><?php
+</html>
+<?php
} else {
+ $request = new request;
+ $attachArr = $request->PDOselect(
+ $select,
+ $where,
+ $arrayPDO,
+ $orderstr,
+ $_SESSION['config']['databasetype'],
+ '500'
+ );
+ // $request->show();
- $request = new request;
- $attachArr = $request->PDOselect(
- $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], '500'
- );
- // $request->show();
-
- foreach ($attachArr as $key => $value) {
- if ($attachArr[$key][0]["value"] == "0") {
- array_shift($attachArr[$key]);
- $attachArr[$key][0]["column"] = "res_id";
- } else {
- unset($attachArr[$key][1]);
- $attachArr[$key] = array_values($attachArr[$key]);
- }
- }
+ foreach ($attachArr as $key => $value) {
+ if ($attachArr[$key][0]["value"] == "0") {
+ array_shift($attachArr[$key]);
+ $attachArr[$key][0]["column"] = "res_id";
+ } else {
+ unset($attachArr[$key][1]);
+ $attachArr[$key] = array_values($attachArr[$key]);
+ }
+ }
- for ($i = 0; $i < count($attachArr); $i ++) {
- //$modifyValue = false;
- if ($attachArr[$i][2]['value'] == 'TMP'){
- $is_tmp=true;
- }else{
- $is_tmp=false;
- }
- for ($j = 0; $j < count($attachArr[$i]); $j ++) {
- foreach (array_keys($attachArr[$i][$j]) as $value) {
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'res_id') {
- $attachArr[$i][$j]['res_id'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _ID;
- $attachArr[$i][$j]['size'] = '18';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = false;
- $attachArr[$i][$j]['order'] = 'res_id';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'relation') {
- $attachArr[$i][$j]['relation'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _VERSION;
- $attachArr[$i][$j]['size'] = '18';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- $attachArr[$i][$j]['order'] = 'relation';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'identifier') {
- $attachArr[$i][$j]['identifier'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _CHRONO_NUMBER;
- $attachArr[$i][$j]['size'] = '18';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = false;
- $attachArr[$i][$j]['order'] = 'identifier';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'attachment_type') {
- $attachArr[$i][$j]['value'] = $_SESSION['attachment_types'][$attachArr[$i][$j]['value']];
- $attachArr[$i][$j]['attachment_type'] = $_SESSION['attachment_types'][$attachArr[$i][$j]['value']];
- $attachArr[$i][$j]['label'] = _ATTACHMENT_TYPES;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'dest_contact_id') {
- if ($attachArr[$i][$j]['value'] <> 0 && $attachArr[$i][$j]['value'] <> '' ) {
- $stmt = $db->query("SELECT firstname, lastname, society FROM contacts_v2 WHERE contact_id = ? ",array($attachArr[$i][$j]['value']));
- $res = $stmt->fetchObject();
- $attachArr[$i][$j]['value'] = functions::protect_string_db($res->firstname) .' '. functions::protect_string_db($res->lastname) . ' '. functions::protect_string_db($res->society);
- }
- $attachArr[$i][$j]['dest_contact_id'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _DEST;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'dest_user') {
- if ($attachArr[$i][$j]['value'] != '') {
- $stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = ? ", [$attachArr[$i][$j]['value']]);
- $res = $stmt->fetchObject();
- $attachArr[$i][$j]['value'] = functions::protect_string_db($res->firstname) .' '. functions::protect_string_db($res->lastname);
- }
- $attachArr[$i][$j]['dest_user'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _DEST;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'updated_by') {
- $stmt = $db->query("SELECT lastname FROM users WHERE user_id = ?",array($attachArr[$i][$j]['value']));
- $res = $stmt->fetchObject();
- $attachArr[$i][$j]['value'] = functions::protect_string_db($res->lastname);
- $attachArr[$i][$j]['updated_by'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _BBY;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- $attachArr[$i][$j]['order'] = 'updated_by';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'typist') {
- $stmt = $db->query("SELECT lastname FROM users WHERE user_id = ?",array($attachArr[$i][$j]['value']));
- $res = $stmt->fetchObject();
- $attachArr[$i][$j]['typist_id'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['value'] = functions::protect_string_db($res->lastname);
- $attachArr[$i][$j]['typist'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _BBY;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- $attachArr[$i][$j]['order'] = 'typist';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'title') {
- $attachArr[$i][$j]['title'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _OBJECT;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- $attachArr[$i][$j]['order'] = 'title';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'creation_date') {
- $attachArr[$i][$j]['value'] = $request->format_date_db(
- $attachArr[$i][$j]['value'], true
- );
- $attachArr[$i][$j]['creation_date'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _CREATED;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'doc_date') {
- $attachArr[$i][$j]['value'] = $request->format_date_db(
- $attachArr[$i][$j]['value'], true
- );
- $attachArr[$i][$j]['doc_date'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _UPDATED_DATE;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'validation_date') {
- $attachArr[$i][$j]['value'] = $request->format_date_db(
- $attachArr[$i][$j]['value'], true
- );
- $attachArr[$i][$j]['validation_date'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _BACK_DATE;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'status') {
- $stmt = $db->query("SELECT label_status FROM status WHERE id = ?", array($attachArr[$i][$j]['value']));
- $res = $stmt->fetchObject();
- $attachArr[$i][$j]['value_bis'] = $attachArr[$i][$j]['value'];
- if($is_tmp == true){
- $attachArr[$i][$j]['value'] = '<span style="color:green;">'.functions::protect_string_db($res->label_status).'</span>';
- }else{
- $attachArr[$i][$j]['value'] = functions::protect_string_db($res->label_status);
- }
- $attachArr[$i][$j]['status'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _STATUS;
- $attachArr[$i][$j]['size'] = '30';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- $attachArr[$i][$j]['order'] = 'status';
- }
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'format') {
- $attachArr[$i][$j]['value'] = $request->show_string(
- $attachArr[$i][$j]['value']
- );
- $attachArr[$i][$j]['format'] = $attachArr[$i][$j]['value'];
- $attachArr[$i][$j]['label'] = _FORMAT;
- $attachArr[$i][$j]['size'] = '5';
- $attachArr[$i][$j]['label_align'] = 'left';
- $attachArr[$i][$j]['align'] = 'left';
- $attachArr[$i][$j]['valign'] = 'bottom';
- $attachArr[$i][$j]['show'] = true;
- $attachArr[$i][$j]['order'] = true;
- $attachArr[$i][$j]['order'] = 'format';
+ for ($i = 0; $i < count($attachArr); $i ++) {
+ //$modifyValue = false;
+ if ($attachArr[$i][2]['value'] == 'TMP') {
+ $is_tmp=true;
+ } else {
+ $is_tmp=false;
+ }
+ for ($j = 0; $j < count($attachArr[$i]); $j ++) {
+ foreach (array_keys($attachArr[$i][$j]) as $value) {
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'res_id') {
+ $attachArr[$i][$j]['res_id'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _ID;
+ $attachArr[$i][$j]['size'] = '18';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = false;
+ $attachArr[$i][$j]['order'] = 'res_id';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'relation') {
+ $attachArr[$i][$j]['relation'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _VERSION;
+ $attachArr[$i][$j]['size'] = '18';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ $attachArr[$i][$j]['order'] = 'relation';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'identifier') {
+ $attachArr[$i][$j]['identifier'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _CHRONO_NUMBER;
+ $attachArr[$i][$j]['size'] = '18';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = false;
+ $attachArr[$i][$j]['order'] = 'identifier';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'attachment_type') {
+ $attachArr[$i][$j]['value'] = $_SESSION['attachment_types'][$attachArr[$i][$j]['value']];
+ $attachArr[$i][$j]['attachment_type'] = $_SESSION['attachment_types'][$attachArr[$i][$j]['value']];
+ $attachArr[$i][$j]['label'] = _ATTACHMENT_TYPES;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'dest_contact_id') {
+ if ($attachArr[$i][$j]['value'] <> 0 && $attachArr[$i][$j]['value'] <> '') {
+ $stmt = $db->query("SELECT firstname, lastname, society FROM contacts_v2 WHERE contact_id = ? ", array($attachArr[$i][$j]['value']));
+ $res = $stmt->fetchObject();
+ $attachArr[$i][$j]['value'] = functions::protect_string_db($res->firstname) .' '. functions::protect_string_db($res->lastname) . ' '. functions::protect_string_db($res->society);
+ }
+ $attachArr[$i][$j]['dest_contact_id'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _DEST;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'dest_user') {
+ if ($attachArr[$i][$j]['value'] != '') {
+ $stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = ? ", [$attachArr[$i][$j]['value']]);
+ $res = $stmt->fetchObject();
+ $attachArr[$i][$j]['value'] = functions::protect_string_db($res->firstname) .' '. functions::protect_string_db($res->lastname);
+ }
+ $attachArr[$i][$j]['dest_user'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _DEST;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'updated_by') {
+ $stmt = $db->query("SELECT lastname FROM users WHERE user_id = ?", array($attachArr[$i][$j]['value']));
+ $res = $stmt->fetchObject();
+ $attachArr[$i][$j]['value'] = functions::protect_string_db($res->lastname);
+ $attachArr[$i][$j]['updated_by'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _BBY;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ $attachArr[$i][$j]['order'] = 'updated_by';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'typist') {
+ $stmt = $db->query("SELECT lastname FROM users WHERE user_id = ?", array($attachArr[$i][$j]['value']));
+ $res = $stmt->fetchObject();
+ $attachArr[$i][$j]['typist_id'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['value'] = functions::protect_string_db($res->lastname);
+ $attachArr[$i][$j]['typist'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _BBY;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ $attachArr[$i][$j]['order'] = 'typist';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'title') {
+ $attachArr[$i][$j]['title'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _OBJECT;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ $attachArr[$i][$j]['order'] = 'title';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'creation_date') {
+ $attachArr[$i][$j]['value'] = $request->format_date_db(
+ $attachArr[$i][$j]['value'],
+ true
+ );
+ $attachArr[$i][$j]['creation_date'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _CREATED;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'doc_date') {
+ $attachArr[$i][$j]['value'] = $request->format_date_db(
+ $attachArr[$i][$j]['value'],
+ true
+ );
+ $attachArr[$i][$j]['doc_date'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _UPDATED_DATE;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'validation_date') {
+ $attachArr[$i][$j]['value'] = $request->format_date_db(
+ $attachArr[$i][$j]['value'],
+ true
+ );
+ $attachArr[$i][$j]['validation_date'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _BACK_DATE;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'status') {
+ $stmt = $db->query("SELECT id, label_status, img_filename FROM status WHERE id = ?", array($attachArr[$i][$j]['value']));
+ $res = $stmt->fetchObject();
+ $attachArr[$i][$j]['value_bis'] = $attachArr[$i][$j]['value'];
+ if ($is_tmp == true) {
+ $attachArr[$i][$j]['value'] = '<span style="color:#135F7F;">'.functions::protect_string_db($res->label_status).'</span>';
+ } else if ($res->id == 'TRA' || $res->id == 'SIGN') {
+ $attachArr[$i][$j]['value'] = '<span style="color:green;"><i title="'.$res->label_status.'" style="font-size:20px;" class="fa fa-2x '.functions::protect_string_db($res->img_filename).'"></i><br/>'.$res->label_status.'</span>';
+ } else {
+ $attachArr[$i][$j]['value'] = '<i title="'.$res->label_status.'" style="font-size:20px;" class="fa fa-2x '.functions::protect_string_db($res->img_filename).'"></i><br/>'.$res->label_status;
+ }
+ $attachArr[$i][$j]['status'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _STATUS;
+ $attachArr[$i][$j]['size'] = '30';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ $attachArr[$i][$j]['order'] = 'status';
+ }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j][$value] == 'format') {
+ $attachArr[$i][$j]['value'] = $request->show_string(
+ $attachArr[$i][$j]['value']
+ );
+ $attachArr[$i][$j]['format'] = $attachArr[$i][$j]['value'];
+ $attachArr[$i][$j]['label'] = _FORMAT;
+ $attachArr[$i][$j]['size'] = '5';
+ $attachArr[$i][$j]['label_align'] = 'left';
+ $attachArr[$i][$j]['align'] = 'left';
+ $attachArr[$i][$j]['valign'] = 'bottom';
+ $attachArr[$i][$j]['show'] = true;
+ $attachArr[$i][$j]['order'] = true;
+ $attachArr[$i][$j]['order'] = 'format';
- if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j]['value'] == 'maarch') {
- //$modifyValue = true;
- }
- }
- }
- }
- if (isset($_REQUEST['fromDetail']) && $_REQUEST['fromDetail'] <> ''){
- array_push($attachArr[$i], array("fromDetail" => $_REQUEST['fromDetail'], "show" => false));
- }
- }
+ if (isset($attachArr[$i][$j][$value]) && $attachArr[$i][$j]['value'] == 'maarch') {
+ //$modifyValue = true;
+ }
+ }
+ }
+ }
+ if (isset($_REQUEST['fromDetail']) && $_REQUEST['fromDetail'] <> '') {
+ array_push($attachArr[$i], array("fromDetail" => $_REQUEST['fromDetail'], "show" => false));
+ }
+ }
//List
$listKey = 'res_id'; //Clé de la liste
@@ -376,7 +417,7 @@ if (isset($_REQUEST['load'])) {
if (!empty($_REQUEST['noModification'])) {
$paramsTab['noModification'] = true;
}
- if ($useTemplate && count($template_list) >0 ) { //Templates
+ if ($useTemplate && count($template_list) >0) { //Templates
$paramsTab['templates'] = array();
$paramsTab['templates'] = $template_list;
}
@@ -384,8 +425,8 @@ if (isset($_REQUEST['load'])) {
$paramsTab['downloadDocumentLink'] = $_SESSION['config']['businessappurl'].'index.php?display=true&module=attachments&page=view_attachment&res_id_master='.$_SESSION['doc_id'];
$paramsTab['visualizeDocumentLink'] = $_SESSION['config']['businessappurl'].'index.php?display=true&module=attachments&page=view_attachment&res_id_master='.$_SESSION['doc_id'].'&viewpdf=true';
- $content = $list->showList($attachArr, $paramsTab, $listKey);
- $status = 0;
+ $content = $list->showList($attachArr, $paramsTab, $listKey);
+ $status = 0;
- echo "{status : " . $status . ", content : '" . addslashes($debug.$content) . "', error : '" . addslashes($error) . "'}";
+ echo "{status : " . $status . ", content : '" . addslashes($debug.$content) . "', error : '" . addslashes($error) . "'}";
}
diff --git a/sql/develop.sql b/sql/develop.sql
index 19dbbea8187..62a48e0e2ad 100644
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -510,8 +510,18 @@ CREATE VIEW res_view_attachments AS
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;
+DELETE FROM status WHERE id = 'A_TRA';
+INSERT INTO status (id, label_status, is_system, img_filename, maarch_module, can_be_searched, can_be_modified) VALUES ('A_TRA', 'PJ Ã traiter', 'Y', 'fa-question', 'apps', 'Y', 'Y');
+
+DELETE FROM status WHERE id = 'TRA';
+INSERT INTO status (id, label_status, is_system, img_filename, maarch_module, can_be_searched, can_be_modified) VALUES ('TRA', 'PJ traitée', 'Y', 'fa-check', 'apps', 'Y', 'Y');
+
DELETE FROM status WHERE id = 'FRZ';
-INSERT INTO status (id, label_status, is_system, img_filename, maarch_module, can_be_searched, can_be_modified) VALUES ('FRZ', 'PJ gelée', 'Y', 'fm-letter-status-inprogress', 'apps', 'Y', 'Y');
+INSERT INTO status (id, label_status, is_system, img_filename, maarch_module, can_be_searched, can_be_modified) VALUES ('FRZ', 'PJ gelée', 'Y', 'fa-pause', 'apps', 'Y', 'Y');
+
+DELETE FROM status WHERE id = 'SIGN';
+INSERT INTO status (id, label_status, is_system, img_filename, maarch_module, can_be_searched, can_be_modified) VALUES ('SIGN', 'PJ signée', 'Y', 'fa-check', 'apps', 'Y', 'Y');
+
DELETE FROM parameters WHERE id = 'homepage_message';
INSERT INTO parameters (id, description, param_value_string) VALUES ('homepage_message', 'Texte apparaissant dans la banière sur la page d''acceuil, laisser vide pour supprimer la banière.', 'Bienvenue dans votre <b>G</b>estion <b>E</b>lectronique du <b>C</b>ourrier.');
\ No newline at end of file
--
GitLab