FEAT #9207 NoteController correction + add lang

src/app/note/controllers/NoteController.php

@@ -41,16 +41,12 @@ class NoteController
     {
         $data = $request->getParams();
 
-        if (!Validator::intVal()->validate($data['identifier']) || !ResController::hasRightByResId(['resId' => $data['identifier'], 'userId' => $GLOBALS['userId']])) {
-            return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
-        }
-       
-        //Insert note in notes table and recover last insert ID
+        //Check data
         $check = Validator::stringType()->notEmpty()->validate($data['note_text']);
         $check = $check && Validator::intVal()->notEmpty()->validate($data['identifier']); //correspond to res_id
         $check = $check && Validator::stringType()->notEmpty()->validate($GLOBALS['userId']);
         
-        if(isset($data['entities_chosen'])) {
+        if (isset($data['entities_chosen'])) {
             $check = $check && Validator::arrayType()->validate($data['entities_chosen']);
         }
         
@@ -58,26 +54,31 @@ class NoteController
             return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
         }
 
-        $data['note_id'] = NoteModel::create($data);
+        if (!ResController::hasRightByResId(['resId' => $data['identifier'], 'userId' => $GLOBALS['userId']])) {
+            return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
+        }
+        
+        //Insert note in notes table and recover last insert ID
+        $noteId = NoteModel::create($data);
     
         //Insert relation note with entities in note_entities_table
-        if (!empty($data['note_id']) && !empty($data['entities_chosen'])) {
+        if (!empty($noteId) && !empty($data['entities_chosen'])) {
             foreach($data['entities_chosen'] as $entity) {  
-                $entity = NoteEntityModel::create( ['item_id' => $entity, 'note_id' => $data['note_id'] ]);
+               NoteEntityModel::create( ['item_id' => $entity, 'note_id' => $noteId ]);
             }
         }
 
         //Insert in history
         HistoryController::add( [
             'tableName' => "notes",
-            'recordId'  => $data['note_id'],
+            'recordId'  => $noteId,
             'eventType' => "ADD",
             'userId'    => $GLOBALS['userId'],
-            'info'      => "Annotation ajoutée (" . $data['note_id'] . ")",
+            'info'      => _NOTE_ADDED . " (" . $noteId . ")",
             'moduleId'  => 'notes',
             'eventId'   => 'noteadd']
         );
 
-        return $response->withJson(['noteId' => $data['note_id']]);
+        return $response->withJson(['noteId' => $noteId]);
     }
 }

src/app/note/models/NoteEntityModelAbstract.php

@@ -32,5 +32,7 @@ abstract class NoteEntityModelAbstract
                 'item_id'   => $aArgs['item_id']
             ]
         ]);
+
+        return true;
     }
 }

src/core/lang/lang-en.php

@@ -132,6 +132,7 @@ define('_BACK_FROM_VACATION', 'back from vacation');
 define('_DOC_DISPLAYING', 'Displaying document');
 define('_DOC_ADDED', 'Document added');
 define('_ATTACH_DISPLAYING', 'Displaying attachment');
+define('_NOTE_ADDED', 'Note added');
 
 // LISTS
 define('_DOCUMENTS_LIST_WITH_ATTACHMENTS', 'List with filters and responses');

src/core/lang/lang-fr.php

@@ -132,6 +132,7 @@ define('_BACK_FROM_VACATION', 'de retour de son absence');
 define('_DOC_DISPLAYING', 'Visualisation du document');
 define('_DOC_ADDED', 'Document ajouté');
 define('_ATTACH_DISPLAYING', 'Visualisation de la pièce jointe');
+define('_NOTE_ADDED', 'Annotation ajoutée');
 
 // LISTS
 define('_DOCUMENTS_LIST_WITH_ATTACHMENTS', 'Liste avec filtres et réponses');

src/core/lang/lang-nl.php

@@ -408,3 +408,4 @@ define('_REDACTOR', 'Opsteller');
 define('_ASSIGNEE', 'Toegekende persoon');
 define('_SENDMAIL_PARAM', '_TO_TRANSLATE');
 define('_SENDMAIL_PARAM_DESC', '_TO_TRANSLATE');
+define('_NOTE_ADDED', 'note added _TO_TRANSLATE');