From d049e2bf9b1c518f49f9967b74377fd31f76726e Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 26 Feb 2019 16:15:33 +0100
Subject: [PATCH] FEAT #9685 Notes Refactoring
---
.../class/class_lists_Abstract.php | 14 +-
apps/maarch_entreprise/loadNoteList.php | 11 +-
.../smartphone/ajax_add_notes.php | 2 +-
apps/maarch_entreprise/smartphone/details.php | 4 +-
.../smartphone/modify_notes.php | 2 +-
.../smartphone/view_notes.php | 7 +-
.../avis/class/avis_controler_Abstract.php | 7 +-
modules/cases/cases_notes_list.php | 6 +-
modules/entities/redirect.php | 12 +-
modules/export_seda/class/ArchiveTransfer.php | 2 +-
modules/folder/show_folder.php | 2 +-
.../class/class_modules_tools_Abstract.php | 16 +-
.../notes/class/notes_controler_Abstract.php | 10 +-
modules/notes/load_toolbar_notes.php | 3 +-
modules/notes/note_details.php | 17 +-
modules/notes/notes.php | 12 +-
modules/notes/notes_ajax_content.php | 25 +--
.../SendMessageExchangeController.php | 4 +-
.../class/class_modules_tools_Abstract.php | 8 +-
.../datasources/letterbox_attachment.php | 8 +-
modules/visa/batch/batch_tools.php | 4 +-
.../class/class_modules_tools_Abstract.php | 18 +-
sql/develop.sql | 3 +
sql/structure.sql | 18 +-
src/app/note/controllers/NoteController.php | 6 +-
src/app/note/models/NoteModel.php | 155 +++++++++++++++-
src/app/note/models/NoteModelAbstract.php | 173 ------------------
.../controllers/SummarySheetController.php | 4 +-
.../app/notes/notes-list.component.html | 2 +-
29 files changed, 248 insertions(+), 307 deletions(-)
delete mode 100755 src/app/note/models/NoteModelAbstract.php
diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php
index 40ce6992533..3ce38e3ca51 100755
--- a/apps/maarch_entreprise/class/class_lists_Abstract.php
+++ b/apps/maarch_entreprise/class/class_lists_Abstract.php
@@ -2149,8 +2149,12 @@ abstract class lists_Abstract extends Database
//Show column
if ($showColumn[$actualColumn] === true) {
//Different background on ordered column
- (strpos($this->orderField, $sortColumn[$actualColumn]) !== false) ?
- $columnStyle = ' style="background-image: url(static.php?filename=black_0.1.png);"' : $columnStyle = '';
+ if ($sortColumn[$actualColumn] === null) {
+ $columnStyle = '';
+ } else {
+ (strpos($this->orderField, $sortColumn[$actualColumn]) !== false) ?
+ $columnStyle = ' style="background-image: url(static.php?filename=black_0.1.png);"' : $columnStyle = '';
+ }
//column
$column .= '<th'.$columnStyle.' width="'.$resultFirstRow[$actualColumn]['size']
@@ -2162,9 +2166,9 @@ abstract class lists_Abstract extends Database
if ($this->params['bool_sortColumn']) {
if ($sortColumn[$actualColumn] !== false) {
//Change color of sort icon
- ($this->order == 'desc' && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)) ?
+ ($this->order == 'desc' && isset($sortColumn[$actualColumn]) && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)) ?
$sortImgDown = 'mCdarkOrange' : $sortImgDown = 'mCdarkBlue';
- ($this->order == 'asc' && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)) ?
+ ($this->order == 'asc' && isset($sortColumn[$actualColumn]) && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)) ?
$sortImgUp = 'mCdarkOrange' : $sortImgUp = 'mCdarkBlue';
$column .= '<br/><br/>';
@@ -3347,7 +3351,7 @@ abstract class lists_Abstract extends Database
}
//Different background on ordered column
- (strpos($this->orderField, $resultTheLine[$column]['order']) !== false) ?
+ isset($resultTheLine[$column]['order']) && (strpos($this->orderField, $resultTheLine[$column]['order']) !== false) ?
$columnStyle = ' style="background-image: url(static.php?filename=black_0.1.png);"' : $columnStyle = '';
//If there is action on line click
diff --git a/apps/maarch_entreprise/loadNoteList.php b/apps/maarch_entreprise/loadNoteList.php
index 7662ae43fb4..a51085a45fb 100755
--- a/apps/maarch_entreprise/loadNoteList.php
+++ b/apps/maarch_entreprise/loadNoteList.php
@@ -34,7 +34,7 @@ if (isset($_REQUEST['identifier'])) {
$query = "SELECT ";
$query .= "DISTINCT(notes.id), ";
$query .= "user_id, ";
- $query .= "date_note, ";
+ $query .= "creation_date, ";
$query .= "note_text ";
$query .= "FROM ";
$query .= "notes ";
@@ -43,11 +43,8 @@ if (isset($_REQUEST['identifier'])) {
$query .= "on ";
$query .= "notes.id = note_entities.note_id ";
$query .= "WHERE ";
- $query .= "coll_id = ? ";
- $arrayPDO = array($_SESSION['collection_id_choice']);
- $query .= "AND ";
$query .= "identifier = ? ";
- $arrayPDO = array_merge($arrayPDO, array($_REQUEST['identifier']));
+ $arrayPDO = [$_REQUEST['identifier']];
$query .= "AND ";
$query .= "( ";
$query .= "( ";
@@ -70,7 +67,7 @@ if (isset($_REQUEST['identifier'])) {
$query .= "OR ";
$query .= "user_id = '" . $_SESSION['user']['UserId'] . "' ";
$query .= ") ";
- $query .= " order by date_note desc";
+ $query .= " order by creation_date desc";
$stmt = $db->query($query, $arrayPDO);
@@ -118,7 +115,7 @@ if (isset($_REQUEST['identifier'])) {
$return .= functions::xssafe($firstname) . ' ' . functions::xssafe($lastname);
$return .= ', ';
- $return .= functions::xssafe($Core_Tools->format_date_db($return_db->date_note));
+ $return .= functions::xssafe($Core_Tools->format_date_db($return_db->creation_date));
$return .= '</div>';
diff --git a/apps/maarch_entreprise/smartphone/ajax_add_notes.php b/apps/maarch_entreprise/smartphone/ajax_add_notes.php
index 9d035224a32..8f241b47b02 100755
--- a/apps/maarch_entreprise/smartphone/ajax_add_notes.php
+++ b/apps/maarch_entreprise/smartphone/ajax_add_notes.php
@@ -21,7 +21,7 @@ $db = new Database();
$sec = new security();
$table = $sec->retrieve_table_from_coll($_REQUEST['coll_id']);
$date = $db->current_datetime();
-$query = "INSERT INTO " . NOTES_TABLE . "(identifier, note_text, date_note, user_id, coll_id, tablename)
+$query = "INSERT INTO " . NOTES_TABLE . "(identifier, note_text, creation_date, user_id, coll_id, tablename)
VALUES(".$_REQUEST['id'] . ", '" . $_REQUEST['fieldNotes']. "', " . $date . ", '"
. functions::xssafe($_SESSION['user']['UserId']) . "', '"
. functions::xssafe($_REQUEST['coll_id']) . "', '"
diff --git a/apps/maarch_entreprise/smartphone/details.php b/apps/maarch_entreprise/smartphone/details.php
index 97009af5a37..ffd801df04f 100755
--- a/apps/maarch_entreprise/smartphone/details.php
+++ b/apps/maarch_entreprise/smartphone/details.php
@@ -180,9 +180,9 @@ $tnlAdr = \Convert\models\AdrModel::getTypedDocumentAdrByResId([
<?php
if ($core->is_module_loaded('notes')) {
require_once 'modules/notes/notes_tables.php';
- $selectNotes = 'SELECT * FROM '.NOTES_TABLE.' WHERE identifier = ? AND coll_id = ? ORDER BY date_note DESC';
+ $selectNotes = 'SELECT * FROM '.NOTES_TABLE.' WHERE identifier = ? ORDER BY creation_date DESC';
$dbNotes = new Database();
- $stmtNote = $dbNotes->query($selectNotes, array($s_id, $_SESSION['collection_id_choice']));
+ $stmtNote = $dbNotes->query($selectNotes, array($s_id));
$nbNotes = $stmtNote->rowCount(); ?>
<!--<ul>
<li>-->
diff --git a/apps/maarch_entreprise/smartphone/modify_notes.php b/apps/maarch_entreprise/smartphone/modify_notes.php
index 670d59bae80..8fa7fa9a485 100755
--- a/apps/maarch_entreprise/smartphone/modify_notes.php
+++ b/apps/maarch_entreprise/smartphone/modify_notes.php
@@ -47,7 +47,7 @@ if (isset($_REQUEST['newtext']) && isset($_REQUEST['notes_id'])) {
$date = $db->current_datetime();
$query = " UPDATE " . NOTES_TABLE . " SET
note_text='" .$_REQUEST['newtext']. "'
- , date_note=" .$date. "
+ , creation_date=" .$date. "
WHERE note_text= ? AND id= ? ";
if($db->query($query,array($_REQUEST['oldnote'],$_REQUEST['notes_id']))){
//echo 'query ' . $query;
diff --git a/apps/maarch_entreprise/smartphone/view_notes.php b/apps/maarch_entreprise/smartphone/view_notes.php
index 12f7c229853..39b0f34ed5d 100755
--- a/apps/maarch_entreprise/smartphone/view_notes.php
+++ b/apps/maarch_entreprise/smartphone/view_notes.php
@@ -19,13 +19,12 @@ $stmt = $db->query(
"SELECT u.lastname as lastname,
u.firstname as firstname,
notes.note_text,
- notes.date_note as date_note,
+ notes.creation_date as creation_date,
notes.id as notes_id
FROM " . NOTES_TABLE . " notes, " . $_SESSION['tablename']['users'] ." u
WHERE notes.user_id = u.user_id
AND notes.identifier = ?
- AND notes.coll_id = ?
- ORDER BY notes.date_note DESC",array($_REQUEST['id'],$_REQUEST['collId']));
+ ORDER BY notes.creation_date DESC",array($_REQUEST['id']));
//$db->show();
$notesList = '<div id="newNote" class="row" style="display: none;"></div>';
if ($stmt->rowCount()< 1) {
@@ -35,7 +34,7 @@ if ($stmt->rowCount()< 1) {
$line->note_text = str_replace("\n", "<br>", $line->note_text);
$notesList .= '<div class="row" id="'.functions::xssafe($line->notes_id).'">
<div>' . functions::xssafe($line->firstname) . ' '
- . functions::xssafe($line->lastname) . ' le ' . functions::xssafe($line->date_note) . '</div>
+ . functions::xssafe($line->lastname) . ' le ' . functions::xssafe($line->creation_date) . '</div>
<table>
<tr>
<td>
diff --git a/modules/avis/class/avis_controler_Abstract.php b/modules/avis/class/avis_controler_Abstract.php
index 36333cfd090..a46a0f31057 100755
--- a/modules/avis/class/avis_controler_Abstract.php
+++ b/modules/avis/class/avis_controler_Abstract.php
@@ -402,12 +402,11 @@ abstract class avis_controler_Abstract
} else {
$query = 'UPDATE '.NOTES_TABLE
.' SET note_text = ?'
- .', date_note = CURRENT_TIMESTAMP'
+ .', creation_date = CURRENT_TIMESTAMP'
.' WHERE identifier = ?'
- ." AND note_text LIKE '[POUR AVIS]%'"
- .' AND coll_id = ?';
+ ." AND note_text LIKE '[POUR AVIS]%'";
- $stmt = $db->query($query, array($noteContent, $resId, $collId));
+ $stmt = $db->query($query, array($noteContent, $resId));
$hist = new history();
$hist->add(
diff --git a/modules/cases/cases_notes_list.php b/modules/cases/cases_notes_list.php
index c47ba9ac284..4635c0e8f21 100755
--- a/modules/cases/cases_notes_list.php
+++ b/modules/cases/cases_notes_list.php
@@ -87,7 +87,7 @@ $view = $sec->retrieve_view_from_coll_id($_SESSION['collection_id_choice'] );
$select[$view] = array();
array_push($select[$view], "res_id", "alt_identifier", "subject", "dest_user", "type_label", "creation_date", "destination", "category_id, exp_user_id", "category_id as category_img");
$select[$_SESSION['tablename']['not_notes']] = array();
-array_push($select[$_SESSION['tablename']['not_notes']],"id", "date_note", "note_text", "user_id");
+array_push($select[$_SESSION['tablename']['not_notes']],"id", "creation_date", "note_text", "user_id");
$where_request .= " and ".$_SESSION['tablename']['not_notes'].".identifier = ".$view.".res_id";
@@ -250,9 +250,9 @@ for ($ind_notes1=0;$ind_notes1<count($tabNotes);$ind_notes1++)
$tabNotes[$ind_notes1][$ind_notes2]["valign"]="bottom";
$tabNotes[$ind_notes1][$ind_notes2]["show"]=true;
}
- if($tabNotes[$ind_notes1][$ind_notes2][$value]=="date_note")
+ if($tabNotes[$ind_notes1][$ind_notes2][$value]=="creation_date")
{
- $tabNotes[$ind_notes1][$ind_notes2]["date_note"]=$tabNotes[$ind_notes1][$ind_notes2]['value'];
+ $tabNotes[$ind_notes1][$ind_notes2]["creation_date"]=$tabNotes[$ind_notes1][$ind_notes2]['value'];
$tabNotes[$ind_notes1][$ind_notes2]["value"] = $core_tools->format_date_db($tabNotes[$ind_notes1][$ind_notes2]['value'], false, '', true);
$tabNotes[$ind_notes1][$ind_notes2]["label"]=_DATE;
$tabNotes[$ind_notes1][$ind_notes2]["size"]=$size_small;
diff --git a/modules/entities/redirect.php b/modules/entities/redirect.php
index e6ea4411205..e4505f6277d 100755
--- a/modules/entities/redirect.php
+++ b/modules/entities/redirect.php
@@ -368,9 +368,9 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$content_note = str_replace("___", "\n", $content_note);
$stmt = $db->query(
- "INSERT INTO notes (identifier, tablename, user_id, "
- . "date_note, note_text, coll_id ) VALUES (?,?,?,CURRENT_TIMESTAMP,?,?)",
- array($res_id,$table,$userIdTypist,$content_note,$coll_id)
+ "INSERT INTO notes (identifier, user_id, "
+ . "creation_date, note_text ) VALUES (?,?,CURRENT_TIMESTAMP,?)",
+ array($res_id,$userIdTypist,$content_note)
);
}
@@ -415,9 +415,9 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$content_note = str_replace("___", "\n", $content_note);
$stmt = $db->query(
- "INSERT INTO notes (identifier, tablename, user_id, "
- . "date_note, note_text, coll_id ) VALUES (?,?,?,CURRENT_TIMESTAMP,?,?)",
- array($res_id, $table, $userIdTypist, $content_note, $coll_id)
+ "INSERT INTO notes (identifier, user_id, "
+ . "creation_date, note_text ) VALUES (?,?,CURRENT_TIMESTAMP,?)",
+ array($res_id, $userIdTypist, $content_note)
);
}
diff --git a/modules/export_seda/class/ArchiveTransfer.php b/modules/export_seda/class/ArchiveTransfer.php
index 9763042ac06..93af7c9919e 100755
--- a/modules/export_seda/class/ArchiveTransfer.php
+++ b/modules/export_seda/class/ArchiveTransfer.php
@@ -575,7 +575,7 @@ class ArchiveTransfer
$content->CreatedDate = $date->format('Y-m-d');
} elseif ($type == "Note") {
$content->DocumentType = "Note";
- $date = new DateTime($object->date_note);
+ $date = new DateTime($object->creation_date);
$content->CreatedDate = $date->format('Y-m-d');
} elseif ($type == "Email") {
$content->DocumentType = "Courriel";
diff --git a/modules/folder/show_folder.php b/modules/folder/show_folder.php
index 3568a2211e0..cdd1a7a0223 100755
--- a/modules/folder/show_folder.php
+++ b/modules/folder/show_folder.php
@@ -192,7 +192,7 @@ if (isset($_POST['delete_folder'])) {
$notes_tools = new notes();
//Count notes
- $nbr_notes = $notes_tools->countUserNotes($_SESSION['current_folder_id'], 'folders');
+ $nbr_notes = $notes_tools->countUserNotes($_SESSION['current_folder_id']);
if ($nbr_notes > 0 ) $nbr_notes = ' ('.$nbr_notes.')'; else $nbr_notes = '';
//Notes iframe
?>
diff --git a/modules/notes/class/class_modules_tools_Abstract.php b/modules/notes/class/class_modules_tools_Abstract.php
index 91e1668b920..3d90983e1c6 100755
--- a/modules/notes/class/class_modules_tools_Abstract.php
+++ b/modules/notes/class/class_modules_tools_Abstract.php
@@ -170,13 +170,13 @@ abstract class notes_Abstract
}
}
- public function countUserNotes($id, $coll_id) {
+ public function countUserNotes($id) {
$not_nbr = 0;
$db = new Database();
- $stmt = $db->query("SELECT id, identifier, user_id, date_note, note_text FROM "
+ $stmt = $db->query("SELECT id, identifier, user_id, creation_date, note_text FROM "
. NOTES_TABLE
- . " WHERE identifier = ? and coll_id = ? order by date_note desc", array($id, $coll_id));
+ . " WHERE identifier = ? order by creation_date desc", array($id));
while ($res = $stmt->fetchObject())
{
@@ -206,10 +206,10 @@ abstract class notes_Abstract
$userNotes = array();
$db = new Database();
- $stmt = $db->query("SELECT id, identifier, user_id, date_note, note_text FROM "
+ $stmt = $db->query("SELECT id, identifier, user_id, creation_date, note_text FROM "
. NOTES_TABLE
- . " WHERE identifier = ? and coll_id = ? order by date_note desc",
- array($id, $coll_id));
+ . " WHERE identifier = ? order by creation_date desc",
+ array($id));
while ($res = $stmt->fetchObject())
{
@@ -222,7 +222,7 @@ abstract class notes_Abstract
array('id' => $res->id, //ID
'label' => functions::show_string($res->note_text), //Label
'author' => $res->user_id, //Author
- 'date' => $res->date_note //Date
+ 'date' => $res->creation_date //Date
)
);
} else {
@@ -237,7 +237,7 @@ abstract class notes_Abstract
array('id' => $res->id, //ID
'label' => functions::show_string($res->note_text), //Label
'author' => $res->user_id, //Author
- 'date' => $res->date_note //Date
+ 'date' => $res->creation_date //Date
)
);
}
diff --git a/modules/notes/class/notes_controler_Abstract.php b/modules/notes/class/notes_controler_Abstract.php
index 0e5fe624ace..137ca3d5262 100755
--- a/modules/notes/class/notes_controler_Abstract.php
+++ b/modules/notes/class/notes_controler_Abstract.php
@@ -75,16 +75,16 @@ abstract class notes_controler_Abstract
} else {
$query =
"INSERT INTO " . NOTES_TABLE . "(identifier, note_text, "
- . "date_note, user_id, coll_id, tablename) values"
- . " (?, ?, CURRENT_TIMESTAMP, ?, ?, ?)";
+ . "creation_date, user_id) values"
+ . " (?, ?, CURRENT_TIMESTAMP, ?)";
- $stmt = $db->query($query, array($resId, $noteContent, $typist, $collId, $table));
+ $stmt = $db->query($query, array($resId, $noteContent, $typist));
$hist = new history();
$stmt = $db->query(
"SELECT id FROM " . NOTES_TABLE . " WHERE "
- . "identifier = ? and user_id = ? and coll_id = ? order by id desc",
- array($resId, $typist, $collId)
+ . "identifier = ? and user_id = ? order by id desc",
+ array($resId, $typist)
);
$res = $stmt->fetchObject();
$id = $res->id;
diff --git a/modules/notes/load_toolbar_notes.php b/modules/notes/load_toolbar_notes.php
index eddddb6b4d5..21f04a963a1 100755
--- a/modules/notes/load_toolbar_notes.php
+++ b/modules/notes/load_toolbar_notes.php
@@ -1,12 +1,11 @@
<?php
$targetTab = $_REQUEST['targetTab'];
$res_id = $_REQUEST['resId'];
-$coll_id = $_REQUEST['collId'];
require_once 'modules/notes/class/class_modules_tools.php';
$notes_tools = new notes();
//Count notes
-$nbr_notes = $notes_tools->countUserNotes($res_id, $coll_id);
+$nbr_notes = $notes_tools->countUserNotes($res_id);
if ($nbr_notes == 0){
$class = 'nbResZero';
$style2 = 'display:none;';
diff --git a/modules/notes/note_details.php b/modules/notes/note_details.php
index 4d958ea1901..25e022f1486 100755
--- a/modules/notes/note_details.php
+++ b/modules/notes/note_details.php
@@ -55,7 +55,7 @@ if (isset($_REQUEST['modify'])) {
} else if (empty($error)) {
$text = $_REQUEST['notes'];
$db->query(
- "UPDATE ".NOTES_TABLE." SET note_text = ?, date_note = CURRENT_TIMESTAMP WHERE id = ?",
+ "UPDATE ".NOTES_TABLE." SET note_text = ?, creation_date = CURRENT_TIMESTAMP WHERE id = ?",
array($text, $id)
);
@@ -188,26 +188,17 @@ if (empty($table) && empty($collId)) {
$error = _PB_TABLE_COLL;
} else {
- $arrayPDO = array();
- if (! empty($collId)) {
- $where = " and coll_id = :collId";
- $arrayPDO = array_merge($arrayPDO, array(":collId" => $collId));
- } else {
- $where = " and tablename = :table";
- $arrayPDO = array_merge($arrayPDO, array(":table" => $table));
- }
- $arrayPDO = array_merge($arrayPDO, array(":sId" => $sId));
$stmt = $db->query(
- "SELECT n.identifier, n.date_note, n.user_id, n.note_text, u.lastname, "
+ "SELECT n.identifier, n.creation_date, n.user_id, n.note_text, u.lastname, "
. "u.firstname FROM " . NOTES_TABLE . " n inner join ". USERS_TABLE
- . " u on n.user_id = u.user_id WHERE n.id = :sId " . $where, $arrayPDO
+ . " u on n.user_id = u.user_id WHERE n.id = :sId ", [":sId" => $sId]
);
$line = $stmt->fetchObject();
$user = $func->show_string($line->lastname . " " . $line->firstname);
$text = $func->show_string($line->note_text);
$userId = $line->user_id;
- $date = $line->date_note;
+ $date = $line->creation_date;
$identifier = $line->identifier;
}
diff --git a/modules/notes/notes.php b/modules/notes/notes.php
index 0b11b8feb33..865a4a07b49 100755
--- a/modules/notes/notes.php
+++ b/modules/notes/notes.php
@@ -98,7 +98,7 @@ if (isset($_REQUEST['load'])) {
$select[USERS_TABLE] = array(); //Users
//Fields
- array_push($select[NOTES_TABLE], "id", "identifier", "date_note", "user_id", "note_text", "note_text as note_short", "coll_id"); //Notes
+ array_push($select[NOTES_TABLE], "id", "identifier", "creation_date", "user_id", "note_text", "note_text as note_short"); //Notes
array_push($select[USERS_TABLE], "user_id", "lastname || ' ' || firstname as user", "lastname as visibleBy"); //Users
//Where clause
@@ -119,8 +119,8 @@ if (isset($_REQUEST['load'])) {
$orderstr = "order by ".$order_field." ".$order;
else {
$list->setOrder();
- $list->setOrderField('date_note');
- $orderstr = "order by date_note desc";
+ $list->setOrderField('creation_date');
+ $orderstr = "order by creation_date desc";
}
if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
@@ -164,8 +164,8 @@ if (isset($_REQUEST['load'])) {
$tabNotes[$indNotes1][$indNotes2]["order"] = "user_id";
}
- if ($tabNotes[$indNotes1][$indNotes2][$value] == "date_note") {
- $tabNotes[$indNotes1][$indNotes2]["date_note"] = $tabNotes[$indNotes1][$indNotes2]['value'];
+ if ($tabNotes[$indNotes1][$indNotes2][$value] == "creation_date") {
+ $tabNotes[$indNotes1][$indNotes2]["creation_date"] = $tabNotes[$indNotes1][$indNotes2]['value'];
$tabNotes[$indNotes1][$indNotes2]["value"] = $core_tools->format_date_db($tabNotes[$indNotes1][$indNotes2]['value'], false, '', true);
$tabNotes[$indNotes1][$indNotes2]["label"] = _DATE;
$tabNotes[$indNotes1][$indNotes2]["size"] = 10;
@@ -173,7 +173,7 @@ if (isset($_REQUEST['load'])) {
$tabNotes[$indNotes1][$indNotes2]["align"] = "left";
$tabNotes[$indNotes1][$indNotes2]["valign"] = "bottom";
$tabNotes[$indNotes1][$indNotes2]["show"] = true;
- $tabNotes[$indNotes1][$indNotes2]["order"] = "date_note";
+ $tabNotes[$indNotes1][$indNotes2]["order"] = "creation_date";
}
if ($tabNotes[$indNotes1][$indNotes2][$value] == "user") {
$tabNotes[$indNotes1][$indNotes2]["user"] = $tabNotes[$indNotes1][$indNotes2]['value'];
diff --git a/modules/notes/notes_ajax_content.php b/modules/notes/notes_ajax_content.php
index f6d94fee3d2..7a6d7b3bf00 100755
--- a/modules/notes/notes_ajax_content.php
+++ b/modules/notes/notes_ajax_content.php
@@ -245,9 +245,9 @@ switch ($mode) {
$userId = $_SESSION['user']['UserId'];
$db->query(
- "INSERT INTO " . NOTES_TABLE . "(identifier, note_text, date_note, "
- . "user_id, coll_id, tablename) VALUES (?, ?, CURRENT_TIMESTAMP, ?, ?, ?)",
- array($identifier, $notes, $userId, $collId, $table)
+ "INSERT INTO " . NOTES_TABLE . "(identifier, note_text, creation_date, "
+ . "user_id) VALUES (?, ?, CURRENT_TIMESTAMP, ?)",
+ array($identifier, $notes, $userId)
);
//Last insert ID from sequence
@@ -331,19 +331,10 @@ switch ($mode) {
$id = $_REQUEST['id'];
//Check if ID exists
- $arrayPDO = array();
- if (! empty($collId)) {
- $where = " and coll_id = :collId";
- $arrayPDO = array_merge($arrayPDO, array(":collId" => $collId));
- } else {
- $where = " and tablename = :table";
- $arrayPDO = array_merge($arrayPDO, array(":table" => $table));
- }
- $arrayPDO = array_merge($arrayPDO, array(":Id" => $id));
$stmt = $db->query(
- "SELECT n.identifier, n.date_note, n.user_id, n.note_text, u.lastname, "
+ "SELECT n.identifier, n.creation_date, n.user_id, n.note_text, u.lastname, "
. "u.firstname FROM " . NOTES_TABLE . " n inner join ". USERS_TABLE
- . " u on n.user_id = u.user_id WHERE n.id = :Id " . $where, $arrayPDO
+ . " u on n.user_id = u.user_id WHERE n.id = :Id ", [":Id" => $id]
);
if($stmt->rowCount() > 0) {
@@ -353,7 +344,7 @@ switch ($mode) {
$user = $request->show_string($line->lastname . " " . $line->firstname);
$notes = $line->note_text;
$userId = $line->user_id;
- $date = $line->date_note;
+ $date = $line->creation_date;
$identifier = $line->identifier;
$notesEntities = array();
@@ -458,7 +449,7 @@ switch ($mode) {
$notes = $_REQUEST['notes'];
$db->query(
- "UPDATE ".NOTES_TABLE." SET note_text = ?, date_note = CURRENT_TIMESTAMP WHERE id = ?",
+ "UPDATE ".NOTES_TABLE." SET note_text = ?, creation_date = CURRENT_TIMESTAMP WHERE id = ?",
array($notes, $id)
);
@@ -548,7 +539,7 @@ switch ($mode) {
$msgResult = _NOTES_DELETED;
//Count notes
- $toolbarBagde_script = $_SESSION['config']['businessappurl'] . 'index.php?display=true&module=notes&page=load_toolbar_notes&origin=parent&resId='.$identifier.'&collId='.$collId;
+ $toolbarBagde_script = $_SESSION['config']['businessappurl'] . 'index.php?display=true&module=notes&page=load_toolbar_notes&origin=parent&resId='.$identifier;
$js .='loadToolbarBadge(\'notes_tab\',\''.$toolbarBagde_script.'\');';
}
break;
diff --git a/modules/sendmail/Controllers/SendMessageExchangeController.php b/modules/sendmail/Controllers/SendMessageExchangeController.php
index 7c3137d0607..4eac1e06b59 100755
--- a/modules/sendmail/Controllers/SendMessageExchangeController.php
+++ b/modules/sendmail/Controllers/SendMessageExchangeController.php
@@ -236,7 +236,7 @@ class SendMessageExchangeController
if (!empty($aArgs['notes'])) {
$notes = \Note\models\NoteModel::getByResId([
- 'select' => ['notes.id', 'notes.user_id', 'notes.date_note', 'notes.note_text', 'users.firstname', 'users.lastname', 'users_entities.entity_id'],
+ 'select' => ['notes.id', 'notes.user_id', 'notes.creation_date', 'notes.note_text', 'users.firstname', 'users.lastname', 'users_entities.entity_id'],
'resId' => $aArgs['resId']
]);
@@ -247,7 +247,7 @@ class SendMessageExchangeController
}
$oComment = new stdClass();
- $date = new DateTime($value['date_note']);
+ $date = new DateTime($value['creation_date']);
$entityRoot = \Entity\models\EntityModel::getEntityRootById(['entityId' => $value['entity_id']]);
$userEntity = \Entity\models\entitymodel::getByEntityId(['entityId' => $value['entity_id']]);
$oComment->value = $value['firstname'].' '.$value['lastname'].' - '.$date->format('d-m-Y H:i:s').' ('.$entityRoot['entity_label'].' - '.$userEntity['entity_label'].') : '.$value['note_text'];
diff --git a/modules/sendmail/class/class_modules_tools_Abstract.php b/modules/sendmail/class/class_modules_tools_Abstract.php
index 62eaaac88aa..8e8c10d8713 100755
--- a/modules/sendmail/class/class_modules_tools_Abstract.php
+++ b/modules/sendmail/class/class_modules_tools_Abstract.php
@@ -725,10 +725,10 @@ abstract class SendmailAbstract extends Database
for ($i=0; $i < count($notesArray); $i++) {
$stmt = $db->query(
- "select n.date_note, n.note_text, u.lastname, "
+ "select n.creation_date, n.note_text, u.lastname, "
. "u.firstname from " . NOTES_TABLE . " n inner join ". USERS_TABLE
- . " u on n.user_id = u.user_id where n.id = ? and identifier = ? and coll_id = ? order by date_note desc",
- array($notesArray[$i], $id, $coll_id)
+ . " u on n.user_id = u.user_id where n.id = ? and identifier = ? order by creation_date desc",
+ array($notesArray[$i], $id)
);
if ($stmt->rowCount() > 0) {
@@ -737,7 +737,7 @@ abstract class SendmailAbstract extends Database
$user = functions::show_string($line->firstname . " " . $line->lastname);
$notes = functions::show_string($line->note_text);
- $date = functions::dateformat($line->date_note);
+ $date = functions::dateformat($line->creation_date);
$content .= "<tr height='130px'>";
$content .= "<td width='15%'>";
diff --git a/modules/templates/datasources/letterbox_attachment.php b/modules/templates/datasources/letterbox_attachment.php
index 11cf103b0df..28c6797f534 100755
--- a/modules/templates/datasources/letterbox_attachment.php
+++ b/modules/templates/datasources/letterbox_attachment.php
@@ -134,12 +134,12 @@ if (!empty($res_id)) {
// Notes
$datasources['notes'] = array();
- $stmt = $dbDatasource->query('SELECT notes.*, users.firstname, users.lastname FROM notes left join users on notes.user_id = users.user_id WHERE coll_id = ? AND identifier = ?', array($coll_id, $res_id));
+ $stmt = $dbDatasource->query('SELECT notes.*, users.firstname, users.lastname FROM notes left join users on notes.user_id = users.user_id WHERE identifier = ?', array($res_id));
$countNote = 1;
while ($notes = $stmt->fetchObject()) {
$datasources['notes'][0]['note_text'.$countNote] = $notes->note_text;
- $datasources['notes'][0]['date_note'.$countNote] = $notes->date_note;
+ $datasources['notes'][0]['date_note'.$countNote] = $notes->creation_date;
++$countNote;
}
@@ -210,7 +210,7 @@ if (!empty($res_id)) {
$stmt2 = $dbDatasource->query('SELECT u.*, ue.user_role as role FROM users u, users_entities ue WHERE u.user_id = ? AND ue.user_id = u.user_id AND ue.primary_entity = ?', [$avis->item_id, 'Y']);
$avisContact = $stmt2->fetchObject();
$stmt3 = $dbDatasource->query('SELECT en.entity_id, en.entity_label FROM entities en, users_entities ue WHERE ue.user_id = ? AND primary_entity = ? AND ue.entity_id = en.entity_id', [$avis->item_id, 'Y']);
- $stmt4 = $dbDatasource->query('SELECT note_text, date_note FROM notes WHERE user_id = ? AND identifier = ? AND note_text LIKE ? ORDER BY date_note ASC', [$avis->item_id, $doc['res_id'], '[Avis n°%']);
+ $stmt4 = $dbDatasource->query('SELECT note_text, creation_date FROM notes WHERE user_id = ? AND identifier = ? AND note_text LIKE ? ORDER BY creation_date ASC', [$avis->item_id, $doc['res_id'], '[Avis n°%']);
$avisEntity = $stmt3->fetchObject();
$avisContent = $stmt4->fetchObject();
@@ -222,7 +222,7 @@ if (!empty($res_id)) {
$datasources['avis'][0]['entity'.$i] = str_replace($avisEntity->entity_id.': ', '', $avisEntity->entity_label);
if ($avisContent) {
$datasources['avis'][0]['note'.$i] = $avisContent->note_text;
- $datasources['avis'][0]['date_note'.$i] = $avisContent->note_text;
+ $datasources['avis'][0]['date_note'.$i] = $avisContent->creation_date;
}
}
}
diff --git a/modules/visa/batch/batch_tools.php b/modules/visa/batch/batch_tools.php
index f01c580b2dc..3b6d16335c8 100755
--- a/modules/visa/batch/batch_tools.php
+++ b/modules/visa/batch/batch_tools.php
@@ -158,7 +158,7 @@ function Bt_createAttachment($aArgs = [])
{
if (!empty($aArgs['noteContent'])) {
$GLOBALS['db']->query(
- "INSERT INTO notes (identifier, tablename, user_id, date_note, note_text, coll_id) VALUES (?, 'res_letterbox', 'superadmin', CURRENT_TIMESTAMP, ?, 'letterbox_coll')",
+ "INSERT INTO notes (identifier, user_id, creation_date, note_text) VALUES (?, 'superadmin', CURRENT_TIMESTAMP, ?)",
[$aArgs['res_id_master'], $aArgs['noteContent']]
);
}
@@ -226,7 +226,7 @@ function Bt_refusedSignedMail($aArgs = [])
{
if (!empty($aArgs['noteContent'])) {
$GLOBALS['db']->query(
- "INSERT INTO notes (identifier, tablename, user_id, date_note, note_text, coll_id) VALUES (?, 'res_letterbox', 'superadmin', CURRENT_TIMESTAMP, ?, 'letterbox_coll')",
+ "INSERT INTO notes (identifier, user_id, creation_date, note_text) VALUES (?, 'superadmin', CURRENT_TIMESTAMP, ?)",
[$aArgs['resIdMaster'], $aArgs['noteContent']]
);
}
diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php
index 89dbb7dcf33..8ffa08f4b24 100755
--- a/modules/visa/class/class_modules_tools_Abstract.php
+++ b/modules/visa/class/class_modules_tools_Abstract.php
@@ -1352,27 +1352,19 @@ abstract class PdfNotes_Abstract extends FPDI
$db2 = new Database();
foreach ($tab as $id) {
//Check if ID exists
- $arrayPDO = array();
- if (!empty($collId)) {
- $where = ' and coll_id = :collId';
- $arrayPDO = array_merge($arrayPDO, array(':collId' => $collId));
- }
- $arrayPDO = array_merge($arrayPDO, array(':Id' => $id));
$stmt2 = $db2->query(
- 'SELECT n.identifier, n.date_note, n.user_id, n.note_text, u.lastname, '
+ 'SELECT n.identifier, n.creation_date, n.user_id, n.note_text, u.lastname, '
.'u.firstname FROM '.NOTES_TABLE.' n inner join '.USERS_TABLE
- .' u on n.user_id = u.user_id WHERE n.id = :Id '.$where,
- $arrayPDO
+ .' u on n.user_id = u.user_id WHERE n.id = :Id ',
+ [':Id' => $id]
);
if ($stmt2->rowCount() > 0) {
$line = $stmt2->fetchObject();
$user = $request->show_string($line->lastname.' '.$line->firstname);
$notes = str_replace('â†', '<=', $line->note_text);
- $userId = $line->user_id;
- $date = explode('-', date('d-m-Y', strtotime($line->date_note)));
- $date = $date[0].'/'.$date[1].'/'.$date[2].' '.date('H:i', strtotime($line->date_note));
- $identifier = $line->identifier;
+ $date = explode('-', date('d-m-Y', strtotime($line->creation_date)));
+ $date = $date[0].'/'.$date[1].'/'.$date[2].' '.date('H:i', strtotime($line->creation_date));
}
$data[] = array(utf8_decode($user), $date, utf8_decode($notes));
}
diff --git a/sql/develop.sql b/sql/develop.sql
index 52dccb984a8..efa950959e2 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -148,6 +148,9 @@ UPDATE res_letterbox SET locker_user_id = NULL;
ALTER TABLE res_letterbox ALTER COLUMN locker_user_id DROP DEFAULT;
ALTER TABLE res_letterbox ALTER COLUMN locker_user_id TYPE INTEGER USING locker_user_id::integer;
ALTER TABLE res_letterbox ALTER COLUMN locker_user_id SET DEFAULT NULL;
+ALTER TABLE notes DROP COLUMN IF EXISTS tablename;
+ALTER TABLE notes DROP COLUMN IF EXISTS coll_id;
+ALTER TABLE notes RENAME COLUMN date_note TO creation_date;
/* PARAM LIST DISPLAY */
diff --git a/sql/structure.sql b/sql/structure.sql
index 95ef747dee9..e492d4909c5 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -778,27 +778,13 @@ CREATE TABLE lc_stack
)
WITH (OIDS = FALSE);
-
-
--- modules/notes/sql/structure/notes.postgresql.sql
-
-CREATE SEQUENCE notes_seq
- INCREMENT 1
- MINVALUE 1
- MAXVALUE 9223372036854775807
- START 20
- CACHE 1;
-
-
CREATE TABLE notes
(
- id bigint NOT NULL DEFAULT nextval('notes_seq'::regclass),
+ id serial,
identifier bigint NOT NULL,
- tablename character varying(50),
user_id character varying(128) NOT NULL,
- date_note timestamp without time zone NOT NULL,
+ creation_date timestamp without time zone NOT NULL,
note_text text NOT NULL,
- coll_id character varying(50),
CONSTRAINT notes_pkey PRIMARY KEY (id)
)
WITH (OIDS=FALSE);
diff --git a/src/app/note/controllers/NoteController.php b/src/app/note/controllers/NoteController.php
index 660215a3988..1ae343ccac9 100755
--- a/src/app/note/controllers/NoteController.php
+++ b/src/app/note/controllers/NoteController.php
@@ -36,7 +36,7 @@ class NoteController
return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
}
- $aNotes = NoteModel::getByResId(['select' => ['notes.id', 'firstname', 'lastname', 'entity_label', 'note_text', 'date_note'], 'resId' => $aArgs['resId'], 'orderBy' => ['date_note DESC']]);
+ $aNotes = NoteModel::getByResId(['select' => ['notes.id', 'firstname', 'lastname', 'entity_label', 'note_text', 'creation_date'], 'resId' => $aArgs['resId'], 'orderBy' => ['creation_date DESC']]);
return $response->withJson($aNotes);
}
@@ -105,10 +105,10 @@ class NoteController
$pdf->AddPage();
foreach ($aArgs['ids'] as $noteId) {
- $note = NoteModel::getById(['id' => $noteId, 'select' => ['note_text', 'date_note', 'user_id']]);
+ $note = NoteModel::getById(['id' => $noteId, 'select' => ['note_text', 'creation_date', 'user_id']]);
$user = UserModel::getByLogin(['login' => $note['user_id'], 'select' => ['firstname', 'lastname']]);
- $date = new \DateTime($note['date_note']);
+ $date = new \DateTime($note['creation_date']);
$date = $date->format('d-m-Y H:i');
$pdf->Cell(0, 20, "{$user['firstname']} {$user['lastname']} : {$date}", 1, 2, 'C', false);
diff --git a/src/app/note/models/NoteModel.php b/src/app/note/models/NoteModel.php
index 4a1a8821601..817d7b74e61 100755
--- a/src/app/note/models/NoteModel.php
+++ b/src/app/note/models/NoteModel.php
@@ -14,6 +14,159 @@
namespace Note\models;
-class NoteModel extends NoteModelAbstract
+use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
+
+class NoteModel
{
+ public static function get(array $aArgs = [])
+ {
+ ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
+ ValidatorModel::intType($aArgs, ['limit']);
+
+ $notes = DatabaseModel::select([
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['notes'],
+ 'where' => empty($aArgs['where']) ? [] : $aArgs['where'],
+ 'data' => empty($aArgs['data']) ? [] : $aArgs['data'],
+ 'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
+ 'limit' => empty($aArgs['limit']) ? 0 : $aArgs['limit']
+ ]);
+
+ return $notes;
+ }
+
+ public static function getById(array $aArgs)
+ {
+ ValidatorModel::notEmpty($aArgs, ['id']);
+ ValidatorModel::intVal($aArgs, ['id']);
+ ValidatorModel::arrayType($aArgs, ['select']);
+
+ $note = DatabaseModel::select([
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['notes'],
+ 'where' => ['id = ?'],
+ 'data' => [$aArgs['id']],
+ ]);
+
+ if (empty($note[0])) {
+ return [];
+ }
+
+ return $note[0];
+ }
+
+ public static function countByResId(array $aArgs)
+ {
+ ValidatorModel::notEmpty($aArgs, ['resId', 'login']);
+ ValidatorModel::intVal($aArgs, ['resId']);
+ ValidatorModel::stringType($aArgs, ['login']);
+
+ $nb = 0;
+ $countedNotes = [];
+ $entities = [];
+
+ $aEntities = DatabaseModel::select([
+ 'select' => ['entity_id'],
+ 'table' => ['users_entities'],
+ 'where' => ['user_id = ?'],
+ 'data' => [$aArgs['login']]
+ ]);
+
+ foreach ($aEntities as $value) {
+ $entities[] = $value['entity_id'];
+ }
+
+ $aNotes = DatabaseModel::select([
+ 'select' => ['notes.id', 'user_id', 'item_id'],
+ 'table' => ['notes', 'note_entities'],
+ 'left_join' => ['notes.id = note_entities.note_id'],
+ 'where' => ['identifier = ?'],
+ 'data' => [$aArgs['resId']]
+ ]);
+
+ foreach ($aNotes as $value) {
+ if (empty($value['item_id']) && !in_array($value['id'], $countedNotes)) {
+ ++$nb;
+ $countedNotes[] = $value['id'];
+ } elseif (!empty($value['item_id'])) {
+ if ($value['user_id'] == $aArgs['login'] && !in_array($value['id'], $countedNotes)) {
+ ++$nb;
+ $countedNotes[] = $value['id'];
+ } elseif (in_array($value['item_id'], $entities) && !in_array($value['id'], $countedNotes)) {
+ ++$nb;
+ $countedNotes[] = $value['id'];
+ }
+ }
+ }
+
+ return $nb;
+ }
+
+ public static function create(array $aArgs)
+ {
+ ValidatorModel::notEmpty($aArgs, ['identifier', 'note_text']);
+ ValidatorModel::intVal($aArgs, ['identifier']);
+
+ $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'notes_seq']);
+
+ DatabaseModel::insert([
+ 'table' => 'notes',
+ 'columnsValues' => [
+ 'id' => $nextSequenceId,
+ 'identifier' => $aArgs['identifier'],
+ 'user_id' => $GLOBALS['userId'],
+ 'creation_date' => 'CURRENT_TIMESTAMP',
+ 'note_text' => $aArgs['note_text']
+ ]
+ ]);
+
+ return $nextSequenceId;
+ }
+
+ public static function getByResId(array $aArgs = [])
+ {
+ ValidatorModel::notEmpty($aArgs, ['resId']);
+ ValidatorModel::intVal($aArgs, ['resId']);
+
+ //get notes
+ $aReturn = DatabaseModel::select([
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['notes', 'users', 'users_entities', 'entities'],
+ 'left_join' => ['notes.user_id = users.user_id', 'users.user_id = users_entities.user_id', 'users_entities.entity_id = entities.entity_id'],
+ 'where' => ['notes.identifier = ?', 'users_entities.primary_entity=\'Y\''],
+ 'data' => [$aArgs['resId']],
+ 'order_by' => empty($aArgs['orderBy']) ? ['creation_date'] : $aArgs['orderBy']
+ ]);
+ $tmpNoteId = [];
+ foreach ($aReturn as $value) {
+ $tmpNoteId[] = $value['id'];
+ }
+ //get entities
+
+ if (!empty($tmpNoteId)) {
+ $tmpEntitiesRestriction = [];
+ $entities = DatabaseModel::select([
+ 'select' => ['note_id', 'item_id', 'short_label'],
+ 'table' => ['note_entities', 'entities'],
+ 'left_join' => ['note_entities.item_id = entities.entity_id'],
+ 'where' => ['note_id in (?)'],
+ 'data' => [$tmpNoteId],
+ 'order_by' => ['short_label']
+ ]);
+
+ foreach ($entities as $key => $value) {
+ $tmpEntitiesRestriction[$value['note_id']][] = $value['short_label'];
+ }
+ }
+
+ foreach ($aReturn as $key => $value) {
+ if (!empty($tmpEntitiesRestriction[$value['id']])) {
+ $aReturn[$key]['entities_restriction'] = $tmpEntitiesRestriction[$value['id']];
+ }
+ }
+
+ return $aReturn;
+ }
+
}
\ No newline at end of file
diff --git a/src/app/note/models/NoteModelAbstract.php b/src/app/note/models/NoteModelAbstract.php
deleted file mode 100755
index cd8461ed71b..00000000000
--- a/src/app/note/models/NoteModelAbstract.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/**
- * 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 Note Model
- * @author dev@maarch.org
- */
-
-namespace Note\models;
-
-use SrcCore\models\DatabaseModel;
-use SrcCore\models\ValidatorModel;
-
-abstract class NoteModelAbstract
-{
- public static function get(array $aArgs = [])
- {
- ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
- ValidatorModel::intType($aArgs, ['limit']);
-
- $notes = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['notes'],
- 'where' => empty($aArgs['where']) ? [] : $aArgs['where'],
- 'data' => empty($aArgs['data']) ? [] : $aArgs['data'],
- 'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
- 'limit' => empty($aArgs['limit']) ? 0 : $aArgs['limit']
- ]);
-
- return $notes;
- }
-
- public static function getById(array $aArgs)
- {
- ValidatorModel::notEmpty($aArgs, ['id']);
- ValidatorModel::intVal($aArgs, ['id']);
- ValidatorModel::arrayType($aArgs, ['select']);
-
- $note = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['notes'],
- 'where' => ['id = ?'],
- 'data' => [$aArgs['id']],
- ]);
-
- if (empty($note[0])) {
- return [];
- }
-
- return $note[0];
- }
-
- public static function countByResId(array $aArgs)
- {
- ValidatorModel::notEmpty($aArgs, ['resId', 'login']);
- ValidatorModel::intVal($aArgs, ['resId']);
- ValidatorModel::stringType($aArgs, ['login']);
-
- $nb = 0;
- $countedNotes = [];
- $entities = [];
-
- $aEntities = DatabaseModel::select([
- 'select' => ['entity_id'],
- 'table' => ['users_entities'],
- 'where' => ['user_id = ?'],
- 'data' => [$aArgs['login']]
- ]);
-
- foreach ($aEntities as $value) {
- $entities[] = $value['entity_id'];
- }
-
- $aNotes = DatabaseModel::select([
- 'select' => ['notes.id', 'user_id', 'item_id'],
- 'table' => ['notes', 'note_entities'],
- 'left_join' => ['notes.id = note_entities.note_id'],
- 'where' => ['identifier = ?'],
- 'data' => [$aArgs['resId']]
- ]);
-
- foreach ($aNotes as $value) {
- if (empty($value['item_id']) && !in_array($value['id'], $countedNotes)) {
- ++$nb;
- $countedNotes[] = $value['id'];
- } elseif (!empty($value['item_id'])) {
- if ($value['user_id'] == $aArgs['login'] && !in_array($value['id'], $countedNotes)) {
- ++$nb;
- $countedNotes[] = $value['id'];
- } elseif (in_array($value['item_id'], $entities) && !in_array($value['id'], $countedNotes)) {
- ++$nb;
- $countedNotes[] = $value['id'];
- }
- }
- }
-
- return $nb;
- }
-
- public static function create(array $aArgs)
- {
- ValidatorModel::notEmpty($aArgs, ['identifier', 'note_text']);
- ValidatorModel::intVal($aArgs, ['identifier']);
-
- $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'notes_seq']);
-
- DatabaseModel::insert([
- 'table' => 'notes',
- 'columnsValues' => [
- 'id' => $nextSequenceId,
- 'identifier' => $aArgs['identifier'],
- 'tablename' => 'res_letterbox',
- 'user_id' => $GLOBALS['userId'],
- 'date_note' => 'CURRENT_TIMESTAMP',
- 'note_text' => $aArgs['note_text'],
- 'coll_id' => 'letterbox_coll'
- ]
- ]);
-
- return $nextSequenceId;
- }
-
- public static function getByResId(array $aArgs = [])
- {
- ValidatorModel::notEmpty($aArgs, ['resId']);
- ValidatorModel::intVal($aArgs, ['resId']);
-
- //get notes
- $aReturn = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['notes', 'users', 'users_entities', 'entities'],
- 'left_join' => ['notes.user_id = users.user_id', 'users.user_id = users_entities.user_id', 'users_entities.entity_id = entities.entity_id'],
- 'where' => ['notes.identifier = ?', 'users_entities.primary_entity=\'Y\''],
- 'data' => [$aArgs['resId']],
- 'order_by' => empty($aArgs['orderBy']) ? ['date_note'] : $aArgs['orderBy']
- ]);
- $tmpNoteId = [];
- foreach ($aReturn as $value) {
- $tmpNoteId[] = $value['id'];
- }
- //get entities
-
- if (!empty($tmpNoteId)) {
- $tmpEntitiesRestriction = [];
- $entities = DatabaseModel::select([
- 'select' => ['note_id', 'item_id', 'short_label'],
- 'table' => ['note_entities', 'entities'],
- 'left_join' => ['note_entities.item_id = entities.entity_id'],
- 'where' => ['note_id in (?)'],
- 'data' => [$tmpNoteId],
- 'order_by' => ['short_label']
- ]);
-
- foreach ($entities as $key => $value) {
- $tmpEntitiesRestriction[$value['note_id']][] = $value['short_label'];
- }
- }
-
- foreach ($aReturn as $key => $value) {
- if (!empty($tmpEntitiesRestriction[$value['id']])) {
- $aReturn[$key]['entities_restriction'] = $tmpEntitiesRestriction[$value['id']];
- }
- }
-
- return $aReturn;
- }
-}
diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php
index 43d6d942622..f89a7a3e04b 100644
--- a/src/app/resource/controllers/SummarySheetController.php
+++ b/src/app/resource/controllers/SummarySheetController.php
@@ -115,7 +115,7 @@ class SummarySheetController
foreach ($units as $unit) {
if ($unit['unit'] == 'notes') {
$data['notes'] = NoteModel::get([
- 'select' => ['id', 'note_text', 'user_id', 'date_note', 'identifier'],
+ 'select' => ['id', 'note_text', 'user_id', 'creation_date', 'identifier'],
'where' => ['identifier in (?)'],
'data' => [$tmpIds],
'order_by' => ['identifier']]);
@@ -535,7 +535,7 @@ class SummarySheetController
if ($allowed) {
$notes[] = [
'user' => UserModel::getLabelledUserById(['login' => $rawNote['user_id']]),
- 'date' => TextFormatModel::formatDate($rawNote['date_note']),
+ 'date' => TextFormatModel::formatDate($rawNote['creation_date']),
'note' => $rawNote['note_text']
];
}
diff --git a/src/frontend/app/notes/notes-list.component.html b/src/frontend/app/notes/notes-list.component.html
index 224f53586a1..b048be97a0e 100644
--- a/src/frontend/app/notes/notes-list.component.html
+++ b/src/frontend/app/notes/notes-list.component.html
@@ -18,7 +18,7 @@
style="color: white;flex: 1;font-size: 25px;margin: auto;"></i></div>
<mat-card-title>{{note.firstname}} {{note.lastname}}</mat-card-title>
<mat-card-subtitle>{{note.entity_label}}</mat-card-subtitle>
- <mat-card-subtitle title='{{note.date_note | date : "le dd/MM/y à HH:mm"}}' style="position: absolute;right: 10px;top: 20px;font-size: 10px;">{{note.date_note
+ <mat-card-subtitle title='{{note.creation_date | date : "le dd/MM/y à HH:mm"}}' style="position: absolute;right: 10px;top: 20px;font-size: 10px;">{{note.creation_date
| timeAgo}}</mat-card-subtitle>
</mat-card-header>
<mat-card-content>
--
GitLab