From 2757bf7f644e205e82772e62b7709c8c76ecacc6 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 4 Jun 2020 10:38:48 -0400
Subject: [PATCH] PMCORE-1542

---
 database/factories/DocumentsFactory.php       |  54 +++++
 gulliver/system/class.g.php                   |   2 +
 tests/resources/images/activate.png           | Bin 0 -> 750 bytes
 tests/resources/images/activity.gif           | Bin 0 -> 6610 bytes
 .../ProcessMaker/BusinessModel/CasesTest.php  |  59 ++++++
 .../src/ProcessMaker/Model/DocumentsTest.php  |  29 +++
 .../Util/Helpers/SaveAppDocumentTest.php      |  47 +++++
 workflow/engine/classes/WsBase.php            |  21 +-
 workflow/engine/classes/class.pmFunctions.php |   6 +-
 .../model/map/AppDocumentMapBuilder.php       |   4 +-
 .../classes/model/map/AppNotesMapBuilder.php  |   4 +-
 .../classes/model/om/BaseAppDocument.php      | 186 ++++++++++++------
 .../classes/model/om/BaseAppDocumentPeer.php  |  23 ++-
 .../engine/classes/model/om/BaseAppNotes.php  | 156 ++++++++++-----
 .../classes/model/om/BaseAppNotesPeer.php     |  23 ++-
 workflow/engine/config/schema.xml             |   9 +-
 workflow/engine/data/mysql/schema.sql         |   3 +
 .../src/ProcessMaker/BusinessModel/Cases.php  | 134 +++++++++++++
 .../src/ProcessMaker/Model/AppNotes.php       |  36 ++++
 .../src/ProcessMaker/Model/Documents.php      |  96 +++++++++
 .../engine/src/ProcessMaker/Util/helpers.php  |  36 ++++
 21 files changed, 781 insertions(+), 147 deletions(-)
 create mode 100644 database/factories/DocumentsFactory.php
 create mode 100644 tests/resources/images/activate.png
 create mode 100644 tests/resources/images/activity.gif
 create mode 100644 tests/unit/workflow/engine/src/ProcessMaker/Model/DocumentsTest.php
 create mode 100644 tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/SaveAppDocumentTest.php
 create mode 100644 workflow/engine/src/ProcessMaker/Model/Documents.php

diff --git a/database/factories/DocumentsFactory.php b/database/factories/DocumentsFactory.php
new file mode 100644
index 000000000..acfafb0ce
--- /dev/null
+++ b/database/factories/DocumentsFactory.php
@@ -0,0 +1,54 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(\ProcessMaker\Model\Documents::class, function (Faker $faker) {
+    $types = ['INPUT', 'OUTPUT', 'ATTACHED'];
+    $type = $faker->randomElement($types);
+    return [
+        'APP_DOC_UID' => G::generateUniqueID(),
+        'APP_DOC_FILENAME' => 'image.png',
+        'APP_DOC_TITLE' => '',
+        'APP_DOC_COMMENT' => '',
+        'DOC_VERSION' => 1,
+        'APP_UID' => G::generateUniqueID(),
+        'DEL_INDEX' => 1,
+        'DOC_UID' => G::generateUniqueID(),
+        'USR_UID' => G::generateUniqueID(),
+        'APP_DOC_TYPE' => $type,
+        'APP_DOC_CREATE_DATE' => $faker->date(),
+        'APP_DOC_INDEX' => 1,
+        'FOLDER_UID' => G::generateUniqueID(),
+        'APP_DOC_PLUGIN' => '',
+        'APP_DOC_TAGS' => '',
+        'APP_DOC_STATUS' => 'ACTIVE',
+        'APP_DOC_STATUS_DATE' => $faker->date(),
+        'APP_DOC_FIELDNAME' => '',
+        'APP_DOC_DRIVE_DOWNLOAD' => '',
+    ];
+});
+
+// Create a dynaform with the foreign keys
+$factory->state(\ProcessMaker\Model\Documents::class, 'case_notes', function (Faker $faker) {
+    return [
+        'APP_DOC_UID' => G::generateUniqueID(),
+        'APP_DOC_FILENAME' => 'image.png',
+        'APP_DOC_TITLE' => '',
+        'APP_DOC_COMMENT' => '',
+        'DOC_VERSION' => 1,
+        'APP_UID' => G::generateUniqueID(),
+        'DEL_INDEX' => 1,
+        'DOC_UID' => G::generateUniqueID(),
+        'USR_UID' => G::generateUniqueID(),
+        'APP_DOC_TYPE' => 'CASE_NOTE',
+        'APP_DOC_CREATE_DATE' => $faker->date(),
+        'APP_DOC_INDEX' => 1,
+        'FOLDER_UID' => G::generateUniqueID(),
+        'APP_DOC_PLUGIN' => '',
+        'APP_DOC_TAGS' => '',
+        'APP_DOC_STATUS' => 'ACTIVE',
+        'APP_DOC_STATUS_DATE' => $faker->date(),
+        'APP_DOC_FIELDNAME' => '',
+        'APP_DOC_DRIVE_DOWNLOAD' => '',
+    ];
+});
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index ee129521e..8e9e9af86 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -2708,6 +2708,8 @@ class G
             $nameToSave = $filter->validateInput($nameToSave, "path");
             @chmod($path . "/" . $nameToSave, $permission);
             umask($oldumask);
+
+            return true;
         } catch (Exception $oException) {
             throw $oException;
         }
diff --git a/tests/resources/images/activate.png b/tests/resources/images/activate.png
new file mode 100644
index 0000000000000000000000000000000000000000..1be605c56c14b9b49d46d78d8f269193f1908316
GIT binary patch
literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igi2
z6&wl0^#N%B00M4FL_t(I%cYXvOOsI?#-Gj2HJN7FQZ^jRJ2ituvx1N=Gy6BXjVQd4
zj3N?@b`kyl2fFE|4C$g9wJfx&rCS4o+RVW=b#uP&dwzaT7tR;Wx`-Y)HwT{2d7kh2
zdW<pnANhX27+<<`(eJGv_j`RYp(Q5}$moEhooq!`ZfT<@AND;Fe+1l2-WZC9;?Fvp
zx}rX>50WIv5R5Tk#CkrjExgQB)7Jnbc08V)3S-I93z1;-aqr>Yc!3pA<V6S)P^7?#
zq1k^3tq0mLS9-s^SYEvHYVggJ3m8j|4n=~|=RM6Qq9tBL-pNB74M75e1SAPK+QE@P
z80`%)d??QTOmC(xzdiqM$_oHKkAI@GsVkay^2pg)INE`&Z1-5ohNB&1HoxLaIf?G(
z<Iy@#-Gn;>ZFJ1z@gQq|ha?3>3W5YUF*k)E0j@dHn<+#ZBG5+1TmUD=Y-Kmv%7(0U
z-ffh-08Dc*?LaccT!5`?!-=6PtB^+SGYXOrdOMM13XWn>wlXe2kO)dr*pM3lu;)ct
zt0ScZ34*dD3<$(^5CFUYP?43Ktu2HDVU$G~RawQBv|uS47PlZA4rNJ*vOrVoK`_lB
zHe}8P6s_XOY++{gSg2zg;#6R93*6c^$}I)HF3=clM1M;^W`9htvH}~~vq<M&oW0c6
z-u7Vd=wSR~X%4xS6~LHUY>iMy2&Y@mU?wyDZEa!w>e9XR<Q@P33_R)^4tIy2o@yD0
z)_w<M49I9`qcOickJ6{o^;9Brf8Q$as4sDH*cbBMt*iIOv><MzfiWhaES=>ge%okz
gol0cHUjhHBUvhNKI-;$=ZvX%Q07*qoM6N<$g00L$VgLXD

literal 0
HcmV?d00001

diff --git a/tests/resources/images/activity.gif b/tests/resources/images/activity.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94d46c129f6bba02f2f0b230d9f4d2c7a48e1412
GIT binary patch
literal 6610
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
AkpKVy

literal 0
HcmV?d00001

diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/CasesTest.php b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/CasesTest.php
index 99778d4f2..3c7da31c5 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/CasesTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/CasesTest.php
@@ -5,6 +5,8 @@ namespace ProcessMaker\BusinessModel;
 use Exception;
 use G;
 use ProcessMaker\Model\Application;
+use ProcessMaker\Model\Delegation;
+use ProcessMaker\Model\Documents;
 use RBAC;
 use Tests\TestCase;
 
@@ -77,4 +79,61 @@ class CasesTest extends TestCase
         $case = new Cases();
         $case->deleteCase($application->APP_UID, $_SESSION['USER_LOGGED']);
     }
+
+    /**
+     * Review the upload file related to the case notes, an return an exception when the array is empty 
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::uploadFilesInCaseNotes()
+     * 
+     * @test
+     * @expectedException Exception
+     */
+    public function it_return_exception_in_upload_files_related_case_note()
+    {
+        $application = factory(Application::class)->create();
+        factory(Delegation::class)->states('foreign_keys')->create([
+            'APP_NUMBER' => $application->APP_NUMBER,
+            'APP_UID' => $application->APP_UID
+        ]);
+        // Upload the file
+        $case = new Cases();
+        // Return an exception because the files does not exist
+        $case->uploadFilesInCaseNotes('00000000000000000000000000000001', $application->APP_UID, $filesReferences = []);
+    }
+
+     /**
+     * Review the upload file related to the case notes
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::uploadFilesInCaseNotes()
+     * 
+     * @test
+     */
+    public function it_should_upload_files_related_case_note()
+    {
+        $application = factory(Application::class)->create();
+        factory(Delegation::class)->states('foreign_keys')->create([
+            'APP_NUMBER' => $application->APP_NUMBER,
+            'APP_UID' => $application->APP_UID
+        ]);
+        // File reference to upload
+        $filesReferences = [
+            'activityRename.gif' => PATH_TRUNK . 'tests' . PATH_SEP . 'resources' . PATH_SEP . 'images' . PATH_SEP . 'activity.gif',
+        ];
+        // Path of the case
+        $pathCase = PATH_DB . config('system.workspace') . PATH_SEP . 'files' . PATH_SEP . $application->APP_UID . PATH_SEP;
+        // Upload the file
+        $case = new Cases();
+        $result = $case->uploadFilesInCaseNotes('00000000000000000000000000000001', $application->APP_UID, $filesReferences);
+        $result = head($result);
+        $this->assertNotEmpty($result);
+        $this->assertArrayHasKey('APP_UID', $result);
+        $this->assertEquals($application->APP_UID, $result['APP_UID']);
+        $this->assertArrayHasKey('APP_DOC_TYPE', $result);
+        $this->assertEquals(Documents::DOC_TYPE_CASE_NOTE, $result['APP_DOC_TYPE']);
+        $this->assertArrayHasKey('APP_DOC_FILENAME', $result);
+        $this->assertEquals('activityRename.gif', $result['APP_DOC_FILENAME']);
+
+        // Remove the path created
+        G::rm_dir($pathCase);
+    }
 }
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Model/DocumentsTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Model/DocumentsTest.php
new file mode 100644
index 000000000..bc882b79d
--- /dev/null
+++ b/tests/unit/workflow/engine/src/ProcessMaker/Model/DocumentsTest.php
@@ -0,0 +1,29 @@
+<?php
+namespace Tests\unit\workflow\engine\src\ProcessMaker\Model;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use ProcessMaker\Model\Documents;
+use Tests\TestCase;
+
+/**
+ * Class DocumentsTest
+ *
+ * @coversDefaultClass \ProcessMaker\Model\Documents
+ */
+class DocumentsTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /**
+     * Review get app files related to the case notes
+     * 
+     * @test
+     */
+    public function it_test_get_case_note_files()
+    {
+        $appDoc = factory(Documents::class)->states('case_notes')->create();
+        $doc = new Documents();
+        $res = $doc->getAppFiles($appDoc->APP_UID, Documents::DOC_TYPE_CASE_NOTE);
+        $this->assertNotEmpty($res);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/SaveAppDocumentTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/SaveAppDocumentTest.php
new file mode 100644
index 000000000..4f1079a08
--- /dev/null
+++ b/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/SaveAppDocumentTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\unit\workflow\src\ProcessMaker\Util\Helpers;
+
+use G;
+use Tests\TestCase;
+
+class SaveAppDocumentTest extends TestCase
+{
+    /**
+     * It test if the file reference was uploaded
+     *
+     * @test
+     */
+    public function it_should_copy_file_same_name()
+    {
+        $files = [
+            'name' => PATH_TRUNK . 'tests' . PATH_SEP . 'resources' . PATH_SEP . 'images' . PATH_SEP . 'activate.png',
+            'tmp_name' => PATH_TRUNK . 'tests' . PATH_SEP . 'resources' . PATH_SEP . 'images' . PATH_SEP . 'activate.png',
+        ];
+        $appUid  = G::generateUniqueID();
+        $appDocUid  = G::generateUniqueID();
+        $pathCase = PATH_DB . config('system.workspace') . PATH_SEP . 'files' . PATH_SEP . G::getPathFromUID($appUid) . PATH_SEP;
+        saveAppDocument($files, $appUid, $appDocUid, 1, false);
+        $this->assertFileExists($pathCase . $appDocUid . '_1.png');
+        G::rm_dir($pathCase);
+    }
+
+    /**
+     * It test if the file reference was uploaded
+     *
+     * @test
+     */
+    public function it_should_copy_file_different_name()
+    {
+        $files = [
+            'name' => 'activityRename.gif',
+            'tmp_name' => PATH_TRUNK . 'tests' . PATH_SEP . 'resources' . PATH_SEP . 'images' . PATH_SEP . 'activity.gif',
+        ];
+        $appUid  = G::generateUniqueID();
+        $appDocUid  = G::generateUniqueID();
+        $pathCase = PATH_DB . config('system.workspace') . PATH_SEP . 'files' . PATH_SEP . G::getPathFromUID($appUid) . PATH_SEP;
+        saveAppDocument($files, $appUid, $appDocUid, 1, false);
+        $this->assertFileExists($pathCase . $appDocUid . '_1.gif');
+        G::rm_dir($pathCase);
+    }
+}
\ No newline at end of file
diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php
index 898b2af56..48330d1cd 100644
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -3420,16 +3420,17 @@ class WsBase
     /**
      * Add case note
      *
-     * @param string caseUid : ID of the case.
-     * @param string processUid : ID of the process.
-     * @param string taskUid : ID of the task.
-     * @param string userUid : The unique ID of the user who will add note case.
-     * @param string note : Note of the case.
-     * @param int    sendMail : Optional parameter. If set to 1, will send an email to all participants in the case.
+     * @param string $caseUid, ID of the case.
+     * @param string $processUid, ID of the process.
+     * @param string $taskUid, ID of the task.
+     * @param string $userUid, The unique ID of the user who will add note case.
+     * @param string $note, Note of the case.
+     * @param int $sendMail, Optional parameter. If set to 1, will send an email to all participants in the case.
+     * @param array $files, Optional parameter. This is an array of files.
      *
-     * @return $result will return an object
+     * @return object
      */
-    public function addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1)
+    public function addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1, $files = [])
     {
         try {
             if (empty($caseUid)) {
@@ -3474,8 +3475,8 @@ class WsBase
             }
 
             //Add note case
-            $appNote = new AppNotes();
-            $response = $appNote->addCaseNote($caseUid, $userUid, $note, $sendMail);
+            $appNote = new ProcessMaker\BusinessModel\Cases();
+            $response = $appNote->addNote($caseUid, $userUid, $note, $sendMail, $files);
 
             //Response
             $result = new WsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index e99854804..5193afb66 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -2887,13 +2887,15 @@ function PMFUnpauseCase ($caseUid, $delIndex, $userUid)
  * @param string(32) | $userUid | ID user | The unique ID of the user who will add note case.
  * @param string | $note | Note of the case | Note of the case.
  * @param int | $sendMail = 1 | Send mail | Optional parameter. If set to 1, will send an email to all participants in the case.
+ * @param array | $files | Array of files | An array of files (full paths) to be attached to the case notes.
+ * 
  * @return int | $result | Result of the add a case note | Returns 1 if the note has been added to the case.; otherwise, returns 0 if an error occurred.
  *
  */
-function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1)
+function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1, $files = [])
 {
     $ws = new WsBase();
-    $result = $ws->addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail);
+    $result = $ws->addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail, $files);
 
     if ($result->status_code == 0) {
         return 1;
diff --git a/workflow/engine/classes/model/map/AppDocumentMapBuilder.php b/workflow/engine/classes/model/map/AppDocumentMapBuilder.php
index c0a6495d2..9e8ca2f1a 100644
--- a/workflow/engine/classes/model/map/AppDocumentMapBuilder.php
+++ b/workflow/engine/classes/model/map/AppDocumentMapBuilder.php
@@ -81,6 +81,8 @@ class AppDocumentMapBuilder
 
         $tMap->addColumn('DOC_UID', 'DocUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('DOC_ID', 'DocId', 'int', CreoleTypes::INTEGER, false, null);
+
         $tMap->addColumn('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
         $tMap->addColumn('APP_DOC_TYPE', 'AppDocType', 'string', CreoleTypes::VARCHAR, true, 32);
@@ -127,7 +129,7 @@ class AppDocumentMapBuilder
 
         $tMap->addValidator('USR_UID', 'required', 'propel.validator.RequiredValidator', '', 'User UID is required.');
 
-        $tMap->addValidator('APP_DOC_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'INPUT|OUTPUT|ATTACHED', 'Please select a valid document type.');
+        $tMap->addValidator('APP_DOC_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'INPUT|OUTPUT|ATTACHED|CASE_NOTE', 'Please select a valid document type.');
 
         $tMap->addValidator('APP_DOC_TYPE', 'required', 'propel.validator.RequiredValidator', '', 'Application Document Type is required.');
 
diff --git a/workflow/engine/classes/model/map/AppNotesMapBuilder.php b/workflow/engine/classes/model/map/AppNotesMapBuilder.php
index 469e66cda..90f497a0b 100644
--- a/workflow/engine/classes/model/map/AppNotesMapBuilder.php
+++ b/workflow/engine/classes/model/map/AppNotesMapBuilder.php
@@ -63,7 +63,9 @@ class AppNotesMapBuilder
         $tMap = $this->dbMap->addTable('APP_NOTES');
         $tMap->setPhpName('AppNotes');
 
-        $tMap->setUseIdGenerator(false);
+        $tMap->setUseIdGenerator(true);
+
+        $tMap->addColumn('NOTE_ID', 'NoteId', 'int', CreoleTypes::INTEGER, true, null);
 
         $tMap->addColumn('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
diff --git a/workflow/engine/classes/model/om/BaseAppDocument.php b/workflow/engine/classes/model/om/BaseAppDocument.php
index d4874f670..ce2d5a86c 100644
--- a/workflow/engine/classes/model/om/BaseAppDocument.php
+++ b/workflow/engine/classes/model/om/BaseAppDocument.php
@@ -75,6 +75,12 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
      */
     protected $doc_uid = '';
 
+    /**
+     * The value for the doc_id field.
+     * @var        int
+     */
+    protected $doc_id = 0;
+
     /**
      * The value for the usr_uid field.
      * @var        string
@@ -255,6 +261,17 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
         return $this->doc_uid;
     }
 
+    /**
+     * Get the [doc_id] column value.
+     * 
+     * @return     int
+     */
+    public function getDocId()
+    {
+
+        return $this->doc_id;
+    }
+
     /**
      * Get the [usr_uid] column value.
      * 
@@ -616,6 +633,28 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
 
     } // setDocUid()
 
+    /**
+     * Set the value of [doc_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setDocId($v)
+    {
+
+        // Since the native PHP type for this column is integer,
+        // we will cast the input value to an int (if it is not).
+        if ($v !== null && !is_int($v) && is_numeric($v)) {
+            $v = (int) $v;
+        }
+
+        if ($this->doc_id !== $v || $v === 0) {
+            $this->doc_id = $v;
+            $this->modifiedColumns[] = AppDocumentPeer::DOC_ID;
+        }
+
+    } // setDocId()
+
     /**
      * Set the value of [usr_uid] column.
      * 
@@ -949,38 +988,40 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
 
             $this->doc_uid = $rs->getString($startcol + 7);
 
-            $this->usr_uid = $rs->getString($startcol + 8);
+            $this->doc_id = $rs->getInt($startcol + 8);
 
-            $this->app_doc_type = $rs->getString($startcol + 9);
+            $this->usr_uid = $rs->getString($startcol + 9);
 
-            $this->app_doc_create_date = $rs->getTimestamp($startcol + 10, null);
+            $this->app_doc_type = $rs->getString($startcol + 10);
 
-            $this->app_doc_index = $rs->getInt($startcol + 11);
+            $this->app_doc_create_date = $rs->getTimestamp($startcol + 11, null);
 
-            $this->folder_uid = $rs->getString($startcol + 12);
+            $this->app_doc_index = $rs->getInt($startcol + 12);
 
-            $this->app_doc_plugin = $rs->getString($startcol + 13);
+            $this->folder_uid = $rs->getString($startcol + 13);
 
-            $this->app_doc_tags = $rs->getString($startcol + 14);
+            $this->app_doc_plugin = $rs->getString($startcol + 14);
 
-            $this->app_doc_status = $rs->getString($startcol + 15);
+            $this->app_doc_tags = $rs->getString($startcol + 15);
 
-            $this->app_doc_status_date = $rs->getTimestamp($startcol + 16, null);
+            $this->app_doc_status = $rs->getString($startcol + 16);
 
-            $this->app_doc_fieldname = $rs->getString($startcol + 17);
+            $this->app_doc_status_date = $rs->getTimestamp($startcol + 17, null);
 
-            $this->app_doc_drive_download = $rs->getString($startcol + 18);
+            $this->app_doc_fieldname = $rs->getString($startcol + 18);
 
-            $this->sync_with_drive = $rs->getString($startcol + 19);
+            $this->app_doc_drive_download = $rs->getString($startcol + 19);
 
-            $this->sync_permissions = $rs->getString($startcol + 20);
+            $this->sync_with_drive = $rs->getString($startcol + 20);
+
+            $this->sync_permissions = $rs->getString($startcol + 21);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 21; // 21 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 22; // 22 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AppDocument object", $e);
@@ -1209,42 +1250,45 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
                 return $this->getDocUid();
                 break;
             case 8:
-                return $this->getUsrUid();
+                return $this->getDocId();
                 break;
             case 9:
-                return $this->getAppDocType();
+                return $this->getUsrUid();
                 break;
             case 10:
-                return $this->getAppDocCreateDate();
+                return $this->getAppDocType();
                 break;
             case 11:
-                return $this->getAppDocIndex();
+                return $this->getAppDocCreateDate();
                 break;
             case 12:
-                return $this->getFolderUid();
+                return $this->getAppDocIndex();
                 break;
             case 13:
-                return $this->getAppDocPlugin();
+                return $this->getFolderUid();
                 break;
             case 14:
-                return $this->getAppDocTags();
+                return $this->getAppDocPlugin();
                 break;
             case 15:
-                return $this->getAppDocStatus();
+                return $this->getAppDocTags();
                 break;
             case 16:
-                return $this->getAppDocStatusDate();
+                return $this->getAppDocStatus();
                 break;
             case 17:
-                return $this->getAppDocFieldname();
+                return $this->getAppDocStatusDate();
                 break;
             case 18:
-                return $this->getAppDocDriveDownload();
+                return $this->getAppDocFieldname();
                 break;
             case 19:
-                return $this->getSyncWithDrive();
+                return $this->getAppDocDriveDownload();
                 break;
             case 20:
+                return $this->getSyncWithDrive();
+                break;
+            case 21:
                 return $this->getSyncPermissions();
                 break;
             default:
@@ -1275,19 +1319,20 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             $keys[5] => $this->getAppUid(),
             $keys[6] => $this->getDelIndex(),
             $keys[7] => $this->getDocUid(),
-            $keys[8] => $this->getUsrUid(),
-            $keys[9] => $this->getAppDocType(),
-            $keys[10] => $this->getAppDocCreateDate(),
-            $keys[11] => $this->getAppDocIndex(),
-            $keys[12] => $this->getFolderUid(),
-            $keys[13] => $this->getAppDocPlugin(),
-            $keys[14] => $this->getAppDocTags(),
-            $keys[15] => $this->getAppDocStatus(),
-            $keys[16] => $this->getAppDocStatusDate(),
-            $keys[17] => $this->getAppDocFieldname(),
-            $keys[18] => $this->getAppDocDriveDownload(),
-            $keys[19] => $this->getSyncWithDrive(),
-            $keys[20] => $this->getSyncPermissions(),
+            $keys[8] => $this->getDocId(),
+            $keys[9] => $this->getUsrUid(),
+            $keys[10] => $this->getAppDocType(),
+            $keys[11] => $this->getAppDocCreateDate(),
+            $keys[12] => $this->getAppDocIndex(),
+            $keys[13] => $this->getFolderUid(),
+            $keys[14] => $this->getAppDocPlugin(),
+            $keys[15] => $this->getAppDocTags(),
+            $keys[16] => $this->getAppDocStatus(),
+            $keys[17] => $this->getAppDocStatusDate(),
+            $keys[18] => $this->getAppDocFieldname(),
+            $keys[19] => $this->getAppDocDriveDownload(),
+            $keys[20] => $this->getSyncWithDrive(),
+            $keys[21] => $this->getSyncPermissions(),
         );
         return $result;
     }
@@ -1344,42 +1389,45 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
                 $this->setDocUid($value);
                 break;
             case 8:
-                $this->setUsrUid($value);
+                $this->setDocId($value);
                 break;
             case 9:
-                $this->setAppDocType($value);
+                $this->setUsrUid($value);
                 break;
             case 10:
-                $this->setAppDocCreateDate($value);
+                $this->setAppDocType($value);
                 break;
             case 11:
-                $this->setAppDocIndex($value);
+                $this->setAppDocCreateDate($value);
                 break;
             case 12:
-                $this->setFolderUid($value);
+                $this->setAppDocIndex($value);
                 break;
             case 13:
-                $this->setAppDocPlugin($value);
+                $this->setFolderUid($value);
                 break;
             case 14:
-                $this->setAppDocTags($value);
+                $this->setAppDocPlugin($value);
                 break;
             case 15:
-                $this->setAppDocStatus($value);
+                $this->setAppDocTags($value);
                 break;
             case 16:
-                $this->setAppDocStatusDate($value);
+                $this->setAppDocStatus($value);
                 break;
             case 17:
-                $this->setAppDocFieldname($value);
+                $this->setAppDocStatusDate($value);
                 break;
             case 18:
-                $this->setAppDocDriveDownload($value);
+                $this->setAppDocFieldname($value);
                 break;
             case 19:
-                $this->setSyncWithDrive($value);
+                $this->setAppDocDriveDownload($value);
                 break;
             case 20:
+                $this->setSyncWithDrive($value);
+                break;
+            case 21:
                 $this->setSyncPermissions($value);
                 break;
         } // switch()
@@ -1438,55 +1486,59 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setUsrUid($arr[$keys[8]]);
+            $this->setDocId($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setAppDocType($arr[$keys[9]]);
+            $this->setUsrUid($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setAppDocCreateDate($arr[$keys[10]]);
+            $this->setAppDocType($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setAppDocIndex($arr[$keys[11]]);
+            $this->setAppDocCreateDate($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setFolderUid($arr[$keys[12]]);
+            $this->setAppDocIndex($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setAppDocPlugin($arr[$keys[13]]);
+            $this->setFolderUid($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setAppDocTags($arr[$keys[14]]);
+            $this->setAppDocPlugin($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setAppDocStatus($arr[$keys[15]]);
+            $this->setAppDocTags($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setAppDocStatusDate($arr[$keys[16]]);
+            $this->setAppDocStatus($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setAppDocFieldname($arr[$keys[17]]);
+            $this->setAppDocStatusDate($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setAppDocDriveDownload($arr[$keys[18]]);
+            $this->setAppDocFieldname($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setSyncWithDrive($arr[$keys[19]]);
+            $this->setAppDocDriveDownload($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setSyncPermissions($arr[$keys[20]]);
+            $this->setSyncWithDrive($arr[$keys[20]]);
+        }
+
+        if (array_key_exists($keys[21], $arr)) {
+            $this->setSyncPermissions($arr[$keys[21]]);
         }
 
     }
@@ -1532,6 +1584,10 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             $criteria->add(AppDocumentPeer::DOC_UID, $this->doc_uid);
         }
 
+        if ($this->isColumnModified(AppDocumentPeer::DOC_ID)) {
+            $criteria->add(AppDocumentPeer::DOC_ID, $this->doc_id);
+        }
+
         if ($this->isColumnModified(AppDocumentPeer::USR_UID)) {
             $criteria->add(AppDocumentPeer::USR_UID, $this->usr_uid);
         }
@@ -1662,6 +1718,8 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
 
         $copyObj->setDocUid($this->doc_uid);
 
+        $copyObj->setDocId($this->doc_id);
+
         $copyObj->setUsrUid($this->usr_uid);
 
         $copyObj->setAppDocType($this->app_doc_type);
diff --git a/workflow/engine/classes/model/om/BaseAppDocumentPeer.php b/workflow/engine/classes/model/om/BaseAppDocumentPeer.php
index df748ac54..4aaeb0c1d 100644
--- a/workflow/engine/classes/model/om/BaseAppDocumentPeer.php
+++ b/workflow/engine/classes/model/om/BaseAppDocumentPeer.php
@@ -25,7 +25,7 @@ abstract class BaseAppDocumentPeer
     const CLASS_DEFAULT = 'classes.model.AppDocument';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 21;
+    const NUM_COLUMNS = 22;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -55,6 +55,9 @@ abstract class BaseAppDocumentPeer
     /** the column name for the DOC_UID field */
     const DOC_UID = 'APP_DOCUMENT.DOC_UID';
 
+    /** the column name for the DOC_ID field */
+    const DOC_ID = 'APP_DOCUMENT.DOC_ID';
+
     /** the column name for the USR_UID field */
     const USR_UID = 'APP_DOCUMENT.USR_UID';
 
@@ -105,10 +108,10 @@ abstract class BaseAppDocumentPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'AppDocFilename', 'AppDocTitle', 'AppDocComment', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', 'AppDocDriveDownload', 'SyncWithDrive', 'SyncPermissions', ),
-        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::APP_DOC_FILENAME, AppDocumentPeer::APP_DOC_TITLE, AppDocumentPeer::APP_DOC_COMMENT, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, AppDocumentPeer::SYNC_WITH_DRIVE, AppDocumentPeer::SYNC_PERMISSIONS, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'APP_DOC_FILENAME', 'APP_DOC_TITLE', 'APP_DOC_COMMENT', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', 'APP_DOC_DRIVE_DOWNLOAD', 'SYNC_WITH_DRIVE', 'SYNC_PERMISSIONS', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
+        BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'AppDocFilename', 'AppDocTitle', 'AppDocComment', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'DocId', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', 'AppDocDriveDownload', 'SyncWithDrive', 'SyncPermissions', ),
+        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::APP_DOC_FILENAME, AppDocumentPeer::APP_DOC_TITLE, AppDocumentPeer::APP_DOC_COMMENT, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::DOC_ID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, AppDocumentPeer::SYNC_WITH_DRIVE, AppDocumentPeer::SYNC_PERMISSIONS, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'APP_DOC_FILENAME', 'APP_DOC_TITLE', 'APP_DOC_COMMENT', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'DOC_ID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', 'APP_DOC_DRIVE_DOWNLOAD', 'SYNC_WITH_DRIVE', 'SYNC_PERMISSIONS', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
     );
 
     /**
@@ -118,10 +121,10 @@ abstract class BaseAppDocumentPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'AppDocFilename' => 1, 'AppDocTitle' => 2, 'AppDocComment' => 3, 'DocVersion' => 4, 'AppUid' => 5, 'DelIndex' => 6, 'DocUid' => 7, 'UsrUid' => 8, 'AppDocType' => 9, 'AppDocCreateDate' => 10, 'AppDocIndex' => 11, 'FolderUid' => 12, 'AppDocPlugin' => 13, 'AppDocTags' => 14, 'AppDocStatus' => 15, 'AppDocStatusDate' => 16, 'AppDocFieldname' => 17, 'AppDocDriveDownload' => 18, 'SyncWithDrive' => 19, 'SyncPermissions' => 20, ),
-        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::APP_DOC_FILENAME => 1, AppDocumentPeer::APP_DOC_TITLE => 2, AppDocumentPeer::APP_DOC_COMMENT => 3, AppDocumentPeer::DOC_VERSION => 4, AppDocumentPeer::APP_UID => 5, AppDocumentPeer::DEL_INDEX => 6, AppDocumentPeer::DOC_UID => 7, AppDocumentPeer::USR_UID => 8, AppDocumentPeer::APP_DOC_TYPE => 9, AppDocumentPeer::APP_DOC_CREATE_DATE => 10, AppDocumentPeer::APP_DOC_INDEX => 11, AppDocumentPeer::FOLDER_UID => 12, AppDocumentPeer::APP_DOC_PLUGIN => 13, AppDocumentPeer::APP_DOC_TAGS => 14, AppDocumentPeer::APP_DOC_STATUS => 15, AppDocumentPeer::APP_DOC_STATUS_DATE => 16, AppDocumentPeer::APP_DOC_FIELDNAME => 17, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD => 18, AppDocumentPeer::SYNC_WITH_DRIVE => 19, AppDocumentPeer::SYNC_PERMISSIONS => 20, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'APP_DOC_FILENAME' => 1, 'APP_DOC_TITLE' => 2, 'APP_DOC_COMMENT' => 3, 'DOC_VERSION' => 4, 'APP_UID' => 5, 'DEL_INDEX' => 6, 'DOC_UID' => 7, 'USR_UID' => 8, 'APP_DOC_TYPE' => 9, 'APP_DOC_CREATE_DATE' => 10, 'APP_DOC_INDEX' => 11, 'FOLDER_UID' => 12, 'APP_DOC_PLUGIN' => 13, 'APP_DOC_TAGS' => 14, 'APP_DOC_STATUS' => 15, 'APP_DOC_STATUS_DATE' => 16, 'APP_DOC_FIELDNAME' => 17, 'APP_DOC_DRIVE_DOWNLOAD' => 18, 'SYNC_WITH_DRIVE' => 19, 'SYNC_PERMISSIONS' => 20, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
+        BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'AppDocFilename' => 1, 'AppDocTitle' => 2, 'AppDocComment' => 3, 'DocVersion' => 4, 'AppUid' => 5, 'DelIndex' => 6, 'DocUid' => 7, 'DocId' => 8, 'UsrUid' => 9, 'AppDocType' => 10, 'AppDocCreateDate' => 11, 'AppDocIndex' => 12, 'FolderUid' => 13, 'AppDocPlugin' => 14, 'AppDocTags' => 15, 'AppDocStatus' => 16, 'AppDocStatusDate' => 17, 'AppDocFieldname' => 18, 'AppDocDriveDownload' => 19, 'SyncWithDrive' => 20, 'SyncPermissions' => 21, ),
+        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::APP_DOC_FILENAME => 1, AppDocumentPeer::APP_DOC_TITLE => 2, AppDocumentPeer::APP_DOC_COMMENT => 3, AppDocumentPeer::DOC_VERSION => 4, AppDocumentPeer::APP_UID => 5, AppDocumentPeer::DEL_INDEX => 6, AppDocumentPeer::DOC_UID => 7, AppDocumentPeer::DOC_ID => 8, AppDocumentPeer::USR_UID => 9, AppDocumentPeer::APP_DOC_TYPE => 10, AppDocumentPeer::APP_DOC_CREATE_DATE => 11, AppDocumentPeer::APP_DOC_INDEX => 12, AppDocumentPeer::FOLDER_UID => 13, AppDocumentPeer::APP_DOC_PLUGIN => 14, AppDocumentPeer::APP_DOC_TAGS => 15, AppDocumentPeer::APP_DOC_STATUS => 16, AppDocumentPeer::APP_DOC_STATUS_DATE => 17, AppDocumentPeer::APP_DOC_FIELDNAME => 18, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD => 19, AppDocumentPeer::SYNC_WITH_DRIVE => 20, AppDocumentPeer::SYNC_PERMISSIONS => 21, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'APP_DOC_FILENAME' => 1, 'APP_DOC_TITLE' => 2, 'APP_DOC_COMMENT' => 3, 'DOC_VERSION' => 4, 'APP_UID' => 5, 'DEL_INDEX' => 6, 'DOC_UID' => 7, 'DOC_ID' => 8, 'USR_UID' => 9, 'APP_DOC_TYPE' => 10, 'APP_DOC_CREATE_DATE' => 11, 'APP_DOC_INDEX' => 12, 'FOLDER_UID' => 13, 'APP_DOC_PLUGIN' => 14, 'APP_DOC_TAGS' => 15, 'APP_DOC_STATUS' => 16, 'APP_DOC_STATUS_DATE' => 17, 'APP_DOC_FIELDNAME' => 18, 'APP_DOC_DRIVE_DOWNLOAD' => 19, 'SYNC_WITH_DRIVE' => 20, 'SYNC_PERMISSIONS' => 21, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
     );
 
     /**
@@ -238,6 +241,8 @@ abstract class BaseAppDocumentPeer
 
         $criteria->addSelectColumn(AppDocumentPeer::DOC_UID);
 
+        $criteria->addSelectColumn(AppDocumentPeer::DOC_ID);
+
         $criteria->addSelectColumn(AppDocumentPeer::USR_UID);
 
         $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_TYPE);
diff --git a/workflow/engine/classes/model/om/BaseAppNotes.php b/workflow/engine/classes/model/om/BaseAppNotes.php
index 60225d6d6..4eba38105 100644
--- a/workflow/engine/classes/model/om/BaseAppNotes.php
+++ b/workflow/engine/classes/model/om/BaseAppNotes.php
@@ -27,6 +27,12 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     */
     protected static $peer;
 
+    /**
+     * The value for the note_id field.
+     * @var        int
+     */
+    protected $note_id;
+
     /**
      * The value for the app_uid field.
      * @var        string
@@ -101,6 +107,17 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
      */
     protected $alreadyInValidation = false;
 
+    /**
+     * Get the [note_id] column value.
+     * 
+     * @return     int
+     */
+    public function getNoteId()
+    {
+
+        return $this->note_id;
+    }
+
     /**
      * Get the [app_uid] column value.
      * 
@@ -232,6 +249,28 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
         return $this->note_recipients;
     }
 
+    /**
+     * Set the value of [note_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setNoteId($v)
+    {
+
+        // Since the native PHP type for this column is integer,
+        // we will cast the input value to an int (if it is not).
+        if ($v !== null && !is_int($v) && is_numeric($v)) {
+            $v = (int) $v;
+        }
+
+        if ($this->note_id !== $v) {
+            $this->note_id = $v;
+            $this->modifiedColumns[] = AppNotesPeer::NOTE_ID;
+        }
+
+    } // setNoteId()
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -476,32 +515,34 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     {
         try {
 
-            $this->app_uid = $rs->getString($startcol + 0);
+            $this->note_id = $rs->getInt($startcol + 0);
 
-            $this->usr_uid = $rs->getString($startcol + 1);
+            $this->app_uid = $rs->getString($startcol + 1);
 
-            $this->note_date = $rs->getTimestamp($startcol + 2, null);
+            $this->usr_uid = $rs->getString($startcol + 2);
 
-            $this->note_content = $rs->getString($startcol + 3);
+            $this->note_date = $rs->getTimestamp($startcol + 3, null);
 
-            $this->note_type = $rs->getString($startcol + 4);
+            $this->note_content = $rs->getString($startcol + 4);
 
-            $this->note_availability = $rs->getString($startcol + 5);
+            $this->note_type = $rs->getString($startcol + 5);
 
-            $this->note_origin_obj = $rs->getString($startcol + 6);
+            $this->note_availability = $rs->getString($startcol + 6);
 
-            $this->note_affected_obj1 = $rs->getString($startcol + 7);
+            $this->note_origin_obj = $rs->getString($startcol + 7);
 
-            $this->note_affected_obj2 = $rs->getString($startcol + 8);
+            $this->note_affected_obj1 = $rs->getString($startcol + 8);
 
-            $this->note_recipients = $rs->getString($startcol + 9);
+            $this->note_affected_obj2 = $rs->getString($startcol + 9);
+
+            $this->note_recipients = $rs->getString($startcol + 10);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 10; // 10 = AppNotesPeer::NUM_COLUMNS - AppNotesPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 11; // 11 = AppNotesPeer::NUM_COLUMNS - AppNotesPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AppNotes object", $e);
@@ -706,33 +747,36 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     {
         switch($pos) {
             case 0:
-                return $this->getAppUid();
+                return $this->getNoteId();
                 break;
             case 1:
-                return $this->getUsrUid();
+                return $this->getAppUid();
                 break;
             case 2:
-                return $this->getNoteDate();
+                return $this->getUsrUid();
                 break;
             case 3:
-                return $this->getNoteContent();
+                return $this->getNoteDate();
                 break;
             case 4:
-                return $this->getNoteType();
+                return $this->getNoteContent();
                 break;
             case 5:
-                return $this->getNoteAvailability();
+                return $this->getNoteType();
                 break;
             case 6:
-                return $this->getNoteOriginObj();
+                return $this->getNoteAvailability();
                 break;
             case 7:
-                return $this->getNoteAffectedObj1();
+                return $this->getNoteOriginObj();
                 break;
             case 8:
-                return $this->getNoteAffectedObj2();
+                return $this->getNoteAffectedObj1();
                 break;
             case 9:
+                return $this->getNoteAffectedObj2();
+                break;
+            case 10:
                 return $this->getNoteRecipients();
                 break;
             default:
@@ -755,16 +799,17 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     {
         $keys = AppNotesPeer::getFieldNames($keyType);
         $result = array(
-            $keys[0] => $this->getAppUid(),
-            $keys[1] => $this->getUsrUid(),
-            $keys[2] => $this->getNoteDate(),
-            $keys[3] => $this->getNoteContent(),
-            $keys[4] => $this->getNoteType(),
-            $keys[5] => $this->getNoteAvailability(),
-            $keys[6] => $this->getNoteOriginObj(),
-            $keys[7] => $this->getNoteAffectedObj1(),
-            $keys[8] => $this->getNoteAffectedObj2(),
-            $keys[9] => $this->getNoteRecipients(),
+            $keys[0] => $this->getNoteId(),
+            $keys[1] => $this->getAppUid(),
+            $keys[2] => $this->getUsrUid(),
+            $keys[3] => $this->getNoteDate(),
+            $keys[4] => $this->getNoteContent(),
+            $keys[5] => $this->getNoteType(),
+            $keys[6] => $this->getNoteAvailability(),
+            $keys[7] => $this->getNoteOriginObj(),
+            $keys[8] => $this->getNoteAffectedObj1(),
+            $keys[9] => $this->getNoteAffectedObj2(),
+            $keys[10] => $this->getNoteRecipients(),
         );
         return $result;
     }
@@ -797,33 +842,36 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     {
         switch($pos) {
             case 0:
-                $this->setAppUid($value);
+                $this->setNoteId($value);
                 break;
             case 1:
-                $this->setUsrUid($value);
+                $this->setAppUid($value);
                 break;
             case 2:
-                $this->setNoteDate($value);
+                $this->setUsrUid($value);
                 break;
             case 3:
-                $this->setNoteContent($value);
+                $this->setNoteDate($value);
                 break;
             case 4:
-                $this->setNoteType($value);
+                $this->setNoteContent($value);
                 break;
             case 5:
-                $this->setNoteAvailability($value);
+                $this->setNoteType($value);
                 break;
             case 6:
-                $this->setNoteOriginObj($value);
+                $this->setNoteAvailability($value);
                 break;
             case 7:
-                $this->setNoteAffectedObj1($value);
+                $this->setNoteOriginObj($value);
                 break;
             case 8:
-                $this->setNoteAffectedObj2($value);
+                $this->setNoteAffectedObj1($value);
                 break;
             case 9:
+                $this->setNoteAffectedObj2($value);
+                break;
+            case 10:
                 $this->setNoteRecipients($value);
                 break;
         } // switch()
@@ -850,43 +898,47 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
         $keys = AppNotesPeer::getFieldNames($keyType);
 
         if (array_key_exists($keys[0], $arr)) {
-            $this->setAppUid($arr[$keys[0]]);
+            $this->setNoteId($arr[$keys[0]]);
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setUsrUid($arr[$keys[1]]);
+            $this->setAppUid($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setNoteDate($arr[$keys[2]]);
+            $this->setUsrUid($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setNoteContent($arr[$keys[3]]);
+            $this->setNoteDate($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setNoteType($arr[$keys[4]]);
+            $this->setNoteContent($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setNoteAvailability($arr[$keys[5]]);
+            $this->setNoteType($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setNoteOriginObj($arr[$keys[6]]);
+            $this->setNoteAvailability($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setNoteAffectedObj1($arr[$keys[7]]);
+            $this->setNoteOriginObj($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setNoteAffectedObj2($arr[$keys[8]]);
+            $this->setNoteAffectedObj1($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setNoteRecipients($arr[$keys[9]]);
+            $this->setNoteAffectedObj2($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setNoteRecipients($arr[$keys[10]]);
         }
 
     }
@@ -900,6 +952,10 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     {
         $criteria = new Criteria(AppNotesPeer::DATABASE_NAME);
 
+        if ($this->isColumnModified(AppNotesPeer::NOTE_ID)) {
+            $criteria->add(AppNotesPeer::NOTE_ID, $this->note_id);
+        }
+
         if ($this->isColumnModified(AppNotesPeer::APP_UID)) {
             $criteria->add(AppNotesPeer::APP_UID, $this->app_uid);
         }
@@ -997,6 +1053,8 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setNoteId($this->note_id);
+
         $copyObj->setAppUid($this->app_uid);
 
         $copyObj->setUsrUid($this->usr_uid);
diff --git a/workflow/engine/classes/model/om/BaseAppNotesPeer.php b/workflow/engine/classes/model/om/BaseAppNotesPeer.php
index 2efabc48c..858e32b61 100644
--- a/workflow/engine/classes/model/om/BaseAppNotesPeer.php
+++ b/workflow/engine/classes/model/om/BaseAppNotesPeer.php
@@ -25,12 +25,15 @@ abstract class BaseAppNotesPeer
     const CLASS_DEFAULT = 'classes.model.AppNotes';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 10;
+    const NUM_COLUMNS = 11;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
 
 
+    /** the column name for the NOTE_ID field */
+    const NOTE_ID = 'APP_NOTES.NOTE_ID';
+
     /** the column name for the APP_UID field */
     const APP_UID = 'APP_NOTES.APP_UID';
 
@@ -72,10 +75,10 @@ abstract class BaseAppNotesPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'NoteDate', 'NoteContent', 'NoteType', 'NoteAvailability', 'NoteOriginObj', 'NoteAffectedObj1', 'NoteAffectedObj2', 'NoteRecipients', ),
-        BasePeer::TYPE_COLNAME => array (AppNotesPeer::APP_UID, AppNotesPeer::USR_UID, AppNotesPeer::NOTE_DATE, AppNotesPeer::NOTE_CONTENT, AppNotesPeer::NOTE_TYPE, AppNotesPeer::NOTE_AVAILABILITY, AppNotesPeer::NOTE_ORIGIN_OBJ, AppNotesPeer::NOTE_AFFECTED_OBJ1, AppNotesPeer::NOTE_AFFECTED_OBJ2, AppNotesPeer::NOTE_RECIPIENTS, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'NOTE_DATE', 'NOTE_CONTENT', 'NOTE_TYPE', 'NOTE_AVAILABILITY', 'NOTE_ORIGIN_OBJ', 'NOTE_AFFECTED_OBJ1', 'NOTE_AFFECTED_OBJ2', 'NOTE_RECIPIENTS', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+        BasePeer::TYPE_PHPNAME => array ('NoteId', 'AppUid', 'UsrUid', 'NoteDate', 'NoteContent', 'NoteType', 'NoteAvailability', 'NoteOriginObj', 'NoteAffectedObj1', 'NoteAffectedObj2', 'NoteRecipients', ),
+        BasePeer::TYPE_COLNAME => array (AppNotesPeer::NOTE_ID, AppNotesPeer::APP_UID, AppNotesPeer::USR_UID, AppNotesPeer::NOTE_DATE, AppNotesPeer::NOTE_CONTENT, AppNotesPeer::NOTE_TYPE, AppNotesPeer::NOTE_AVAILABILITY, AppNotesPeer::NOTE_ORIGIN_OBJ, AppNotesPeer::NOTE_AFFECTED_OBJ1, AppNotesPeer::NOTE_AFFECTED_OBJ2, AppNotesPeer::NOTE_RECIPIENTS, ),
+        BasePeer::TYPE_FIELDNAME => array ('NOTE_ID', 'APP_UID', 'USR_UID', 'NOTE_DATE', 'NOTE_CONTENT', 'NOTE_TYPE', 'NOTE_AVAILABILITY', 'NOTE_ORIGIN_OBJ', 'NOTE_AFFECTED_OBJ1', 'NOTE_AFFECTED_OBJ2', 'NOTE_RECIPIENTS', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
     );
 
     /**
@@ -85,10 +88,10 @@ abstract class BaseAppNotesPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'NoteDate' => 2, 'NoteContent' => 3, 'NoteType' => 4, 'NoteAvailability' => 5, 'NoteOriginObj' => 6, 'NoteAffectedObj1' => 7, 'NoteAffectedObj2' => 8, 'NoteRecipients' => 9, ),
-        BasePeer::TYPE_COLNAME => array (AppNotesPeer::APP_UID => 0, AppNotesPeer::USR_UID => 1, AppNotesPeer::NOTE_DATE => 2, AppNotesPeer::NOTE_CONTENT => 3, AppNotesPeer::NOTE_TYPE => 4, AppNotesPeer::NOTE_AVAILABILITY => 5, AppNotesPeer::NOTE_ORIGIN_OBJ => 6, AppNotesPeer::NOTE_AFFECTED_OBJ1 => 7, AppNotesPeer::NOTE_AFFECTED_OBJ2 => 8, AppNotesPeer::NOTE_RECIPIENTS => 9, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'NOTE_DATE' => 2, 'NOTE_CONTENT' => 3, 'NOTE_TYPE' => 4, 'NOTE_AVAILABILITY' => 5, 'NOTE_ORIGIN_OBJ' => 6, 'NOTE_AFFECTED_OBJ1' => 7, 'NOTE_AFFECTED_OBJ2' => 8, 'NOTE_RECIPIENTS' => 9, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+        BasePeer::TYPE_PHPNAME => array ('NoteId' => 0, 'AppUid' => 1, 'UsrUid' => 2, 'NoteDate' => 3, 'NoteContent' => 4, 'NoteType' => 5, 'NoteAvailability' => 6, 'NoteOriginObj' => 7, 'NoteAffectedObj1' => 8, 'NoteAffectedObj2' => 9, 'NoteRecipients' => 10, ),
+        BasePeer::TYPE_COLNAME => array (AppNotesPeer::NOTE_ID => 0, AppNotesPeer::APP_UID => 1, AppNotesPeer::USR_UID => 2, AppNotesPeer::NOTE_DATE => 3, AppNotesPeer::NOTE_CONTENT => 4, AppNotesPeer::NOTE_TYPE => 5, AppNotesPeer::NOTE_AVAILABILITY => 6, AppNotesPeer::NOTE_ORIGIN_OBJ => 7, AppNotesPeer::NOTE_AFFECTED_OBJ1 => 8, AppNotesPeer::NOTE_AFFECTED_OBJ2 => 9, AppNotesPeer::NOTE_RECIPIENTS => 10, ),
+        BasePeer::TYPE_FIELDNAME => array ('NOTE_ID' => 0, 'APP_UID' => 1, 'USR_UID' => 2, 'NOTE_DATE' => 3, 'NOTE_CONTENT' => 4, 'NOTE_TYPE' => 5, 'NOTE_AVAILABILITY' => 6, 'NOTE_ORIGIN_OBJ' => 7, 'NOTE_AFFECTED_OBJ1' => 8, 'NOTE_AFFECTED_OBJ2' => 9, 'NOTE_RECIPIENTS' => 10, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
     );
 
     /**
@@ -189,6 +192,8 @@ abstract class BaseAppNotesPeer
     public static function addSelectColumns(Criteria $criteria)
     {
 
+        $criteria->addSelectColumn(AppNotesPeer::NOTE_ID);
+
         $criteria->addSelectColumn(AppNotesPeer::APP_UID);
 
         $criteria->addSelectColumn(AppNotesPeer::USR_UID);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 24e4d7490..313c2ed73 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -230,6 +230,7 @@
         <column name="APP_UID" type="VARCHAR" size="32" required="true" default=""/>
         <column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
         <column name="DOC_UID" type="VARCHAR" size="32" required="true" default=""/>
+        <column name="DOC_ID" type="INTEGER" required="false" default="0"/>
         <column name="USR_UID" type="VARCHAR" size="32" required="true" default=""/>
         <column name="APP_DOC_TYPE" type="VARCHAR" size="32" required="true" default=""/>
         <column name="APP_DOC_CREATE_DATE" type="TIMESTAMP" required="true"/>
@@ -284,7 +285,7 @@
             <rule name="required" message="User UID is required."/>
         </validator>
         <validator column="APP_DOC_TYPE">
-            <rule name="validValues" value="INPUT|OUTPUT|ATTACHED" message="Please select a valid document type."/>
+            <rule name="validValues" value="INPUT|OUTPUT|ATTACHED|CASE_NOTE" message="Please select a valid document type."/>
             <rule name="required" message="Application Document Type is required."/>
         </validator>
         <validator column="APP_DOC_CREATE_DATE">
@@ -3287,7 +3288,7 @@
             <unique-column name="CATEGORY_ID"/>
         </unique>
     </table>
-    <table name="APP_NOTES">
+    <table name="APP_NOTES" idMethod="native">
         <vendor type="mysql">
             <parameter name="Name" value="APP_NOTES"/>
             <parameter name="Engine" value="InnoDB"/>
@@ -3308,6 +3309,7 @@
             <parameter name="Create_options" value=""/>
             <parameter name="Comment" value="Application Notes"/>
         </vendor>
+        <column name="NOTE_ID" type="INTEGER" required="true" autoIncrement="true" unique="true"/>
         <column name="APP_UID" type="VARCHAR" size="32" required="true" default=""/>
         <column name="USR_UID" type="VARCHAR" size="32" required="true" default=""/>
         <column name="NOTE_DATE" type="TIMESTAMP" required="true"/>
@@ -3318,6 +3320,9 @@
         <column name="NOTE_AFFECTED_OBJ1" type="VARCHAR" size="32" default=""/>
         <column name="NOTE_AFFECTED_OBJ2" type="VARCHAR" size="32" required="true" default=""/>
         <column name="NOTE_RECIPIENTS" type="LONGVARCHAR"/>
+        <unique name="NOTE_ID">
+            <unique-column name="NOTE_ID"/>
+        </unique>
         <index name="indexAppNotesDate">
             <index-column name="APP_UID"/>
             <index-column name="NOTE_DATE"/>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 4946fb777..67608ac2e 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -120,6 +120,7 @@ CREATE TABLE `APP_DOCUMENT`
 	`APP_UID` VARCHAR(32) default '' NOT NULL,
 	`DEL_INDEX` INTEGER default 0 NOT NULL,
 	`DOC_UID` VARCHAR(32) default '' NOT NULL,
+	`DOC_ID` INTEGER default 0,
 	`USR_UID` VARCHAR(32) default '' NOT NULL,
 	`APP_DOC_TYPE` VARCHAR(32) default '' NOT NULL,
 	`APP_DOC_CREATE_DATE` DATETIME  NOT NULL,
@@ -1583,6 +1584,7 @@ DROP TABLE IF EXISTS `APP_NOTES`;
 
 CREATE TABLE `APP_NOTES`
 (
+	`NOTE_ID` INTEGER  NOT NULL AUTO_INCREMENT,
 	`APP_UID` VARCHAR(32) default '' NOT NULL,
 	`USR_UID` VARCHAR(32) default '' NOT NULL,
 	`NOTE_DATE` DATETIME  NOT NULL,
@@ -1593,6 +1595,7 @@ CREATE TABLE `APP_NOTES`
 	`NOTE_AFFECTED_OBJ1` VARCHAR(32) default '',
 	`NOTE_AFFECTED_OBJ2` VARCHAR(32) default '' NOT NULL,
 	`NOTE_RECIPIENTS` MEDIUMTEXT,
+	UNIQUE KEY `NOTE_ID` (`NOTE_ID`),
 	KEY `indexAppNotesDate`(`APP_UID`, `NOTE_DATE`),
 	KEY `indexAppNotesUser`(`APP_UID`, `USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Application Notes';
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index c8e078d8a..15727a9c9 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -41,7 +41,9 @@ use ProcessMaker\BusinessModel\User as BmUser;
 use ProcessMaker\Core\System;
 use ProcessMaker\Exception\UploadException;
 use ProcessMaker\Model\Application as ModelApplication;
+use ProcessMaker\Model\AppNotes;
 use ProcessMaker\Model\Delegation;
+use ProcessMaker\Model\Documents;
 use ProcessMaker\Plugins\PluginRegistry;
 use ProcessMaker\Services\OAuth2\Server;
 use ProcessMaker\Util\DateTime as UtilDateTime;
@@ -3843,6 +3845,138 @@ class Cases
         return $response;
     }
 
+    /**
+     * Add a case note
+     *
+     * @param string $appUid
+     * @param string $userUid
+     * @param string $note
+     * @param bool $sendMail
+     * @param array $files
+     *
+     * @return array
+     * @throws Exception
+     */
+    public function addNote($appUid, $userUid, $note, $sendMail = false, $files = [])
+    {
+        // Register the note
+        $attributes = [
+            "APP_UID" => $appUid,
+            "USR_UID" => $userUid,
+            "NOTE_DATE" => date("Y-m-d H:i:s"),
+            "NOTE_CONTENT" => $note,
+            "NOTE_TYPE" => "USER",
+            "NOTE_AVAILABILITY" => "PUBLIC",
+            "NOTE_RECIPIENTS" => ""
+        ];
+        $response = AppNotes::create($attributes);
+        // Get the FK
+        $noteId = $response->NOTE_ID;
+
+        // Register the files related to the note
+        $this->uploadFilesInCaseNotes($userUid, $appUid, $files, $noteId);
+
+        // Send the email
+        if ($sendMail) {
+            // @todo refactor this section the files attached need to send in the email
+            $case = new ClassesCases();
+            $p = $case->getUsersParticipatedInCase($appUid, 'ACTIVE');
+            $noteRecipientsList = [];
+
+            foreach ($p["array"] as $key => $userParticipated) {
+                if ($key != '') {
+                    $noteRecipientsList[] = $key;
+                }
+            }
+
+            $noteRecipients = implode(",", $noteRecipientsList);
+            $note = stripslashes($note);
+
+            $note = new \AppNotes();
+            $note->sendNoteNotification($appUid, $userUid, $note, $noteRecipients); 
+        }
+    }
+
+    /**
+     * Upload file related to the case notes
+     *
+     * @param string $userUid
+     * @param string $appUid
+     * @param array $filesReferences
+     * @param string $appDocUid
+     *
+     * @return array
+     * @throws Exception
+     */
+    public function uploadFilesInCaseNotes($userUid, $appUid, $filesReferences = [], $noteId = 0)
+    {
+        if (!empty($_FILES["form"]["name"])) {
+            $upload = true;
+            // Array from post upload
+            foreach ($_FILES["form"]["name"] as $fileIndex => $fileName) {
+                if (!is_array($fileName)) {
+                    $files[] = [
+                        'name' => $_FILES["form"]["name"][$fileIndex],
+                        'tmp_name' => $_FILES["form"]["tmp_name"][$fileIndex],
+                        'error' => $_FILES["form"]["error"][$fileIndex]
+                    ];
+                }
+            }
+        } elseif (!empty($filesReferences)) {
+            $upload = false;
+            // Array with path references
+            foreach ($filesReferences as $fileIndex => $fileName) {
+                $nameFile = !is_numeric($fileIndex) ? basename($fileIndex) : basename($fileName);
+                $files[] = [
+                    'name' => $nameFile,
+                    'tmp_name' => $fileName,
+                    'error' => UPLOAD_ERR_OK
+                ];
+            }
+        }
+
+        // Get the delIndex related to the case
+        $cases = new ClassesCases();
+        $delIndex = $cases->getCurrentDelegation($appUid);
+
+        // We will to register the files in the database
+        $response = [];
+        if (!empty($files)) {
+            $i = 0;
+            foreach ($files as $fileIndex => $fileName) {
+                // There is no error, the file uploaded with success
+                if ($fileName["error"] === UPLOAD_ERR_OK) {
+                    $appDocUid = G::generateUniqueID();
+                    $attributes = [
+                        "DOC_ID" => $noteId,
+                        "APP_DOC_UID" => $appDocUid,
+                        "DOC_VERSION" => 1,
+                        "APP_UID" => $appUid,
+                        "DEL_INDEX" => $delIndex,
+                        "USR_UID" => $userUid,
+                        "DOC_UID" => -1,
+                        "APP_DOC_TYPE" => 'CASE_NOTE',
+                        "APP_DOC_CREATE_DATE" => date("Y-m-d H:i:s"),
+                        "APP_DOC_FILENAME" => $fileName["name"]
+                    ];
+                    Documents::create($attributes);
+
+                    // Upload or move the file
+                    $isUploaded = saveAppDocument($fileName, $appUid, $appDocUid, 1, $upload);
+
+                    // List of files uploaded or copy
+                    $response[$i++] = $attributes;
+                } else {
+                    throw new UploadException($fileName['error']);
+                }
+            }
+        } else {
+            throw new Exception(G::LoadTranslation('ID_ERROR_UPLOAD_FILE_CONTACT_ADMINISTRATOR'));
+        }
+
+        return $response;
+    }
+
     /**
      * Run the validations related to an Input Document
      *
diff --git a/workflow/engine/src/ProcessMaker/Model/AppNotes.php b/workflow/engine/src/ProcessMaker/Model/AppNotes.php
index 2db007ad5..402662991 100644
--- a/workflow/engine/src/ProcessMaker/Model/AppNotes.php
+++ b/workflow/engine/src/ProcessMaker/Model/AppNotes.php
@@ -6,6 +6,42 @@ use Illuminate\Database\Eloquent\Model;
 
 class AppNotes extends Model
 {
+    // Set our table name
     protected $table = 'APP_NOTES';
+    // No timestamps
     public $timestamps = false;
+    // Primary key
+    protected $primaryKey = 'NOTE_ID';
+    // The IDs are auto-incrementing
+    public $incrementing = true;
+
+    /**
+     * The model's default values for attributes.
+     *
+     * @var array
+     */
+    protected $attributes = [
+        'NOTE_TYPE' => 'USER',
+        'NOTE_ORIGIN_OBJ' => '',
+        'NOTE_AFFECTED_OBJ1' => '',
+        'NOTE_AFFECTED_OBJ2' => ''
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'APP_UID',
+        'USR_UID',
+        'NOTE_DATE',
+        'NOTE_CONTENT',
+        'NOTE_TYPE',
+        'NOTE_AVAILABILITY',
+        'NOTE_ORIGIN_OBJ',
+        'NOTE_AFFECTED_OBJ1',
+        'NOTE_AFFECTED_OBJ2',
+        'NOTE_RECIPIENTS'
+    ];
 }
diff --git a/workflow/engine/src/ProcessMaker/Model/Documents.php b/workflow/engine/src/ProcessMaker/Model/Documents.php
new file mode 100644
index 000000000..740e7d689
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Model/Documents.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace ProcessMaker\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Documents extends Model
+{
+    // Set our table name
+    protected $table = 'APP_DOCUMENT';
+    // No timestamps
+    public $timestamps = false;
+    // Primary key
+    protected $primaryKey = 'NOTE_ID';
+    // The IDs are auto-incrementing
+    public $incrementing = false;
+    // Valid AppDocType's
+    const DOC_TYPE_ATTACHED = 'ATTACHED';
+    const DOC_TYPE_CASE_NOTE = 'CASE_NOTE';
+    const DOC_TYPE_INPUT = 'INPUT';
+    const DOC_TYPE_OUTPUT = 'OUTPUT';
+
+    /**
+     * The model's default values for attributes.
+     *
+     * @var array
+     */
+    protected $attributes = [
+        'APP_DOC_TITLE' => '',
+        'APP_DOC_COMMENT' => '',
+        'DOC_UID' => '-1',
+        'FOLDER_UID' => '',
+        'APP_DOC_PLUGIN' => '',
+        'APP_DOC_TAGS' => '',
+        'APP_DOC_FIELDNAME' => '',
+        'APP_DOC_DRIVE_DOWNLOAD' => 'a:0:{}',
+        'SYNC_WITH_DRIVE' => 'UNSYNCHRONIZED',
+        'SYNC_PERMISSIONS' => '',
+        'APP_DOC_STATUS_DATE'  => '',
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'DOC_ID',
+        'APP_DOC_UID',
+        'DOC_VERSION',
+        'APP_DOC_FILENAME',
+        'APP_UID',
+        'DEL_INDEX',
+        'DOC_UID',
+        'USR_UID',
+        'APP_DOC_TYPE',
+        'APP_DOC_CREATE_DATE',
+        'APP_DOC_INDEX',
+        'FOLDER_UID',
+        'APP_DOC_STATUS',
+    ];
+
+    /**
+     * Scope a query to filter an specific case
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @param  string $proUid
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeAppUid($query, string $appUid)
+    {
+        return $query->where('APP_UID', $appUid);
+    }
+
+    /**
+     * Return the documents related to the case
+     *
+     * @param int $proId
+     * @param string $type
+     *
+     * @return array
+     */
+    public static function getAppFiles(string $appUid, $type = 'CASE_NOTES')
+    {
+        $query = Documents::query()->select();
+        $query->appUid($appUid);
+        $query->where('APP_DOC_TYPE', $type);
+        $results = $query->get();
+        $documentList = [];
+        $results->each(function ($item, $key) use (&$documentList) {
+            $documentList[] = $item->toArray();
+        });
+
+        return $documentList;
+    }
+}
diff --git a/workflow/engine/src/ProcessMaker/Util/helpers.php b/workflow/engine/src/ProcessMaker/Util/helpers.php
index 22272a78e..a844b2eaa 100644
--- a/workflow/engine/src/ProcessMaker/Util/helpers.php
+++ b/workflow/engine/src/ProcessMaker/Util/helpers.php
@@ -601,3 +601,39 @@ function getMysqlVersion()
 
     return $mysqlVersion;
 }
+
+/**
+ * Move the uploaded file to the documents folder
+ * 
+ * @param array $file
+ * @param string $appUid
+ * @param string $appDocUid
+ * @param int $version
+ * 
+ * @return string
+ */
+function saveAppDocument($file, $appUid, $appDocUid, $version = 1, $upload = true)
+{
+    try {
+        $info = pathinfo($file["name"]);
+        $extension = ((isset($info["extension"])) ? $info["extension"] : "");
+        //$pathCase = G::getPathFromUID($appUid);
+        $fileName = $appDocUid . "_" . $version . "." . $extension;
+
+        $pathCase = PATH_DATA_SITE . 'files' . PATH_SEP . G::getPathFromUID($appUid) . PATH_SEP;
+
+        $response = false;
+        if ($upload) {
+            $response = G::uploadFile(
+                $file["tmp_name"],
+                $pathCase,
+                $fileName
+            );
+        } else {
+            G::verifyPath($pathCase, true);
+            $response = copy($file["tmp_name"], $pathCase . $fileName);
+        }
+    } catch (Exception $e) {
+        throw $e;
+    }
+}