Skip to content
Snippets Groups Projects
Verified Commit 942e1406 authored by Florian Azizian's avatar Florian Azizian
Browse files

FIX #14670 TIME 0:35 fix merge template for notifications

parent bb70a51a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
migration/20.03/migrateTemplates.php
+ 2
− 2
View file @ 942e1406
......@@ -164,7 +164,7 @@ $DATA_TO_REPLACE = [
'notes.identifier' => '[res_letterbox.res_id]',
'notes.subject' => '[res_letterbox.subject]',
'notes.note_text' => '[notes]',
'notes.note_text' => '[notes.content;block=tr]',
'notes.user_id' => '',
'notes.# ;frm=0000' => '[res_letterbox.# ;frm=0000]',
'notes.doc_date;block=tr;frm=dd/mm/yyyy' => '[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]',
......@@ -173,7 +173,7 @@ $DATA_TO_REPLACE = [
'notes.doc_date' => '[res_letterbox.doc_date]',
'notes.contact_society' => '[contact.company]',
'notes.contact_firstname' => '[contact.firstname]',
'notes.contact_lastname' => '[contact.lastname]',
'notes.contact_lastname' => '[contact.lastname;block=tr]',
'notes.linktodetail' => '[res_letterbox.linktodetail]',
'notes.linktodoc' => '[res_letterbox.linktodoc]',
];
......
sql/data_fr.sql
+ 13
− 15
View file @ 942e1406
......@@ -1293,9 +1293,9 @@ INSERT INTO templates (template_id, template_label, template_comment, template_c
</tr>
<tr>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.res_id]</font></td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.typist]</font></td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.typist_label]</font></td>
<td>
<p><font face="arial,helvetica,sans-serif" size="2">[sender.company] [sender.firstname] [sender.lastname][sender.function][sender.address_number][sender.address_street][sender.address_postcode][sender.address_town]</font></p>
<p><font face="arial,helvetica,sans-serif" size="2">[sender.company;block=tr] [sender.firstname] [sender.lastname] [sender.function] [sender.address_number] [sender.address_street] [sender.address_postcode] [sender.address_town]</font></p>
</td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]</font></td>
<td><font face="arial,helvetica,sans-serif" color="#FF0000"><strong><font size="2">[res_letterbox.subject]</font></strong></font></td>
......@@ -1323,9 +1323,9 @@ INSERT INTO templates (template_id, template_label, template_comment, template_c
</tr>
<tr>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.res_id]</font></td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.typist]</font></td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.typist_label]</font></td>
<td>
<p><font face="arial,helvetica,sans-serif" size="2">[sender.company] [sender.firstname] [sender.lastname][sender.function][sender.address_number][sender.address_street][sender.address_postcode][sender.address_town]</font></p>
<p><font face="arial,helvetica,sans-serif" size="2">[sender.company;block=tr] [sender.firstname] [sender.lastname] [sender.function] [sender.address_number] [sender.address_street] [sender.address_postcode] [sender.address_town]</font></p>
</td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]</font></td>
<td><font face="arial,helvetica,sans-serif" color="#FF0000"><strong><font size="2">[res_letterbox.subject]</font></strong></font></td>
......@@ -1350,8 +1350,8 @@ INSERT INTO templates (template_id, template_label, template_comment, template_c
</tr>
<tr>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.res_id]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.typist]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[sender.company] [sender.firstname] [sender.lastname][sender.function][sender.address_number][sender.address_street][sender.address_postcode][sender.address_town]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.typist_label]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[sender.company;block=tr] [sender.firstname] [sender.lastname][sender.function][sender.address_number][sender.address_street][sender.address_postcode][sender.address_town]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.subject]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.type_label]</td>
......@@ -1372,19 +1372,17 @@ INSERT INTO templates (template_id, template_label, template_comment, template_c
<th style="border: 1px solid #ddd; padding: 8px; padding-top: 12px; padding-bottom: 12px; text-align: left; background-color: #135f7f; color: white;">Date</th>
<th style="border: 1px solid #ddd; padding: 8px; padding-top: 12px; padding-bottom: 12px; text-align: left; background-color: #135f7f; color: white;">Objet</th>
<th style="border: 1px solid #ddd; padding: 8px; padding-top: 12px; padding-bottom: 12px; text-align: left; background-color: #135f7f; color: white;">Note</th>
<th style="border: 1px solid #ddd; padding: 8px; padding-top: 12px; padding-bottom: 12px; text-align: left; background-color: #135f7f; color: white;">Ajout&eacute; par</th>
<th style="border: 1px solid #ddd; padding: 8px; padding-top: 12px; padding-bottom: 12px; text-align: left; background-color: #135f7f; color: white;">Contact</th>
<th style="border: 1px solid #ddd; padding: 8px; padding-top: 12px; padding-bottom: 12px; text-align: left; background-color: #135f7f; color: white;">&nbsp;</th>
</tr>
<tr>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.identifier]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.# ;frm=0000]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.doc_date;block=tr;frm=dd/mm/yyyy]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.subject]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.note_text]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.user_id]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.contact_society] [notes.contact_firstname] [notes.contact_lastname]</td>
<td style="border: 1px solid #ddd; padding: 8px; text-align: right;"><a style="text-decoration: none; background: #135f7f; padding: 5px; color: white; -webkit-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); -moz-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75);" href="[notes.linktodetail]" name="detail">D&eacute;tail</a> <a style="text-decoration: none; background: #135f7f; padding: 5px; color: white; -webkit-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); -moz-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75);" href="[notes.linktodoc]" name="doc">Afficher</a></td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.res_id]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.# ;frm=0000]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[res_letterbox.subject]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[notes.content;block=tr]</td>
<td style="border: 1px solid #ddd; padding: 8px;">[sender.company;block=tr] [sender.firstname] [sender.lastname]</td>
<td style="border: 1px solid #ddd; padding: 8px; text-align: right;"><a style="text-decoration: none; background: #135f7f; padding: 5px; color: white; -webkit-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); -moz-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75);" href="[res_letterbox.linktodetail]" name="detail">D&eacute;tail</a> <a style="text-decoration: none; background: #135f7f; padding: 5px; color: white; -webkit-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); -moz-box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75); box-shadow: 6px 4px 5px 0px rgba(0,0,0,0.75);" href="[res_letterbox.linktodoc]" name="doc">Afficher</a></td>
</tr>
</tbody>
</table>
......
src/app/template/controllers/DatasourceController.php
+ 10
− 4
View file @ 942e1406
......@@ -104,6 +104,11 @@ class DatasourceController
$res['initiator_'.$key] = $value;
}
}
if (!empty($res['typist'])) {
$userInfo = UserModel::getById(['select' => ['firstname', 'lastname'], 'id' => $res['typist']]);
$res['typist_label'] = $userInfo['firstname'] . ' ' . $userInfo['lastname'];
}
$datasources['res_letterbox'][] = $res;
......@@ -114,15 +119,15 @@ class DatasourceController
]);
$resourceContacts = $resourceContacts[0];
$contact = [];
if (!empty($resourceContacts)) {
$contact = ContactModel::getById(['id' => $resourceContacts['item_id'], 'select' => ['*']]);
$postalAddress = ContactController::getContactAfnor($contact);
unset($postalAddress[0]);
$contact['postal_address'] = implode("\n", $postalAddress);
$datasources['sender'][] = $contact;
}
$datasources['sender'][] = $contact;
}
return $datasources;
......@@ -183,12 +188,13 @@ class DatasourceController
$note = "{$labelledUser} {$creationDate} : {$note['note_text']}\n";
}
$contact = [];
if (!empty($resourceContacts)) {
$contact = ContactModel::getById(['id' => $resourceContacts['item_id'], 'select' => ['*']]);
$datasources['sender'][] = $contact;
}
$datasources['sender'][] = $contact;
$datasources['notes'] = $note;
$datasources['notes'][] = ['content' => $note];
}
return $datasources;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment