Merged in develop (pull request #7127)

Update with develop Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-11-18 16:17:32 +00:00
parent 65f6d9e5b9 9a59c363d8
commit b3bfd850ba
57 changed files with 13015 additions and 258 deletions
--- a/database/factories/DelegationFactory.php
+++ b/database/factories/DelegationFactory.php
@@ -53,7 +53,7 @@ $factory->state(\ProcessMaker\Model\Delegation::class, 'foreign_keys', function
        'DEL_TASK_DUE_DATE' => $faker->dateTime(),
        'DEL_RISK_DATE' => $faker->dateTime(),
        'USR_ID' => $user->USR_ID,
-        'PRO_ID' => $process->id,
+        'PRO_ID' => $process->PRO_ID,
        'TAS_ID' => $task->TAS_ID,
        'DEL_DATA' => ''
    ];
--- a/database/factories/DynaformFactory.php
+++ b/database/factories/DynaformFactory.php
@@ -4,10 +4,26 @@
 * Model factory for a dynaform.
 */
 use Faker\Generator as Faker;
-use ProcessMaker\Model\Dynaform;
 use ProcessMaker\Model\Process;

-$factory->define(Dynaform::class, function(Faker $faker) {
+$factory->define(\ProcessMaker\Model\Dynaform::class, function(Faker $faker) {
+    $date = $faker->dateTime();
+    return [
+        'DYN_UID' => G::generateUniqueID(),
+        'DYN_ID' => $faker->unique()->numberBetween(1, 10000),
+        'DYN_TITLE' => $faker->sentence(2),
+        'DYN_DESCRIPTION' => $faker->sentence(5),
+        'PRO_UID' => G::generateUniqueID(),
+        'DYN_TYPE' => 'xmlform',
+        'DYN_FILENAME' => '',
+        'DYN_CONTENT' => '',
+        'DYN_LABEL' => '',
+        'DYN_VERSION' => 2,
+        'DYN_UPDATE_DATE' => $date->format('Y-m-d H:i:s'),
+    ];
+});
+// Create a dynaform with the foreign keys
+$factory->state(\ProcessMaker\Model\Dynaform::class, 'foreign_keys', function (Faker $faker) {
    $date = $faker->dateTime();
    return [
        'DYN_UID' => G::generateUniqueID(),
@@ -26,3 +42,22 @@ $factory->define(Dynaform::class, function(Faker $faker) {
        'DYN_UPDATE_DATE' => $date->format('Y-m-d H:i:s'),
    ];
 });
+
+
+// Create a dynaform with translations defined: ["es", "es-Es"]
+$factory->state(\ProcessMaker\Model\Dynaform::class, 'translations', function (Faker $faker) {
+    $date = $faker->dateTime();
+    return [
+        'DYN_UID' => G::generateUniqueID(),
+        'DYN_ID' => $faker->unique()->numberBetween(1, 10000),
+        'DYN_TITLE' => $faker->sentence(2),
+        'DYN_DESCRIPTION' => $faker->sentence(5),
+        'PRO_UID' => G::generateUniqueID(),
+        'DYN_TYPE' => 'xmlform',
+        'DYN_FILENAME' => '',
+        'DYN_CONTENT' => '',
+        'DYN_LABEL' => '{"es":{"Project-Id-Version":"PM 4.0.1","POT-Creation-Date":"","PO-Revision-Date":"2019-09-11 12:02-0400","Last-Translator":"Colosa <colosa@colosa.com>","Language-Team":"Colosa Developers Team <developers@colosa.com>","MIME-Version":"1.0","Content-Type":"text\/plain; charset=utf-8","Content-Transfer_Encoding":"8bit","X-Poedit-SourceCharset":"utf-8","Content-Transfer-Encoding":"8bit","File-Name":"Test-v2.es.po","X-Generator":"Poedit 1.8.11","X-Poedit-Language":"en","X-Poedit-Country":".","Labels":[{"msgid":"Test without dependent fields","msgstr":"Ejemplo sin campos dependientes"},{"msgid":"Incident Type:","msgstr":"Tipo de incidente:"},{"msgid":"- Select -","msgstr":"- Seleccionar -"},{"msgid":"Incident Sub Type:","msgstr":"Sub tipo de incidente:"},{"msgid":"Test with dependent fields","msgstr":"Ejemplo con campos dependientes"},{"msgid":"Health\/Safety","msgstr":"Salud\/Seguridad"},{"msgid":"Environment","msgstr":"Ambiente"},{"msgid":"Fatality","msgstr":"Ambiente"},{"msgid":"Lost Time Injury","msgstr":"Ambiente"},{"msgid":"Environment","msgstr":"Ambiente"},{"msgid":"Medical Treatment Injury","msgstr":"Lesiones de tratamiento m\u00e9dico"},{"msgid":"Chemical\/Substance Spill","msgstr":"Derrame qu\u00edmico \/ de sustancias"},{"msgid":"Fire\/Explosion","msgstr":"Fuego\/Explosion"},{"msgid":"Offsite Release","msgstr":"Lanzamiento fuera del sitio"}]},"es-Es":{"Project-Id-Version":"PM 4.0.1","POT-Creation-Date":"","PO-Revision-Date":"2019-09-11 12:02-0400","Last-Translator":"Colosa <colosa@colosa.com>","Language-Team":"Colosa Developers Team <developers@colosa.com>","MIME-Version":"1.0","Content-Type":"text\/plain; charset=utf-8","Content-Transfer_Encoding":"8bit","X-Poedit-SourceCharset":"utf-8","Content-Transfer-Encoding":"8bit","File-Name":"Test-v2.es-Es.po","X-Generator":"Poedit 1.8.11","X-Poedit-Language":"en","X-Poedit-Country":".","Labels":[{"msgid":"Test without dependent fields","msgstr":"Ejemplo sin campos dependientes"},{"msgid":"Incident Type:","msgstr":"Tipo de incidente:"},{"msgid":"- Select -","msgstr":"- Seleccionar -"},{"msgid":"Incident Sub Type:","msgstr":"Sub tipo de incidente:"},{"msgid":"Test with dependent fields","msgstr":"Ejemplo con campos dependientes"},{"msgid":"Health\/Safety","msgstr":"Salud\/Seguridad"},{"msgid":"Environment","msgstr":"Ambiente"},{"msgid":"Fatality","msgstr":"Ambiente"},{"msgid":"Lost Time Injury","msgstr":"Ambiente"},{"msgid":"Environment","msgstr":"Ambiente"},{"msgid":"Medical Treatment Injury","msgstr":"Lesiones de tratamiento m\u00e9dico"},{"msgid":"Chemical\/Substance Spill","msgstr":"Derrame qu\u00edmico \/ de sustancias"},{"msgid":"Fire\/Explosion","msgstr":"Fuego\/Explosion"},{"msgid":"Offsite Release","msgstr":"Lanzamiento fuera del sitio"}]}}',
+        'DYN_VERSION' => 2,
+        'DYN_UPDATE_DATE' => $date->format('Y-m-d H:i:s'),
+    ];
+});
--- a/database/factories/ProcessFactory.php
+++ b/database/factories/ProcessFactory.php
@@ -5,57 +5,66 @@
 use Faker\Generator as Faker;

 $factory->define(\ProcessMaker\Model\Process::class, function(Faker $faker) {
-    /**
-     * @todo Determine if we need more base columns populated
-     */
-    $process =  [
+    // Return with default values
+    return [
        'PRO_UID' => G::generateUniqueID(),
+        'PRO_ID' => $faker->unique()->numberBetween(1, 200000),
        'PRO_TITLE' => $faker->sentence(3),
        'PRO_DESCRIPTION' => $faker->paragraph(3),
        'PRO_CREATE_USER' => '00000000000000000000000000000001',
        'PRO_DYNAFORMS' => '',
        'PRO_ITEE' => 1,
-        'PRO_STATUS' => 'ACTIVE'
+        'PRO_STATUS' => 'ACTIVE',
+        'PRO_STATUS_ID' => 1,
+        'PRO_TYPE_PROCESS' => 'PUBLIC',
+        'PRO_UPDATE_DATE' => $faker->dateTime(),
+        'PRO_CREATE_DATE' => $faker->dateTime(),
+        'PRO_CATEGORY' => '',
    ];
+});

-    $task1 = factory(\ProcessMaker\Model\Task::class)
-        ->create([
-            'PRO_UID' => $process['PRO_UID'],
-            'TAS_START'=>'TRUE'
-        ]);
+// Create a process with the foreign keys
+$factory->state(\ProcessMaker\Model\Process::class, 'foreign_keys', function (Faker $faker) {
+    $user = factory(\ProcessMaker\Model\User::class)->create();
+    return [
+        'PRO_UID' => G::generateUniqueID(),
+        'PRO_ID' => $faker->unique()->numberBetween(1, 200000),
+        'PRO_TITLE' => $faker->sentence(3),
+        'PRO_DESCRIPTION' => $faker->paragraph(3),
+        'PRO_CREATE_USER' => $user->USR_UID,
+        'PRO_DYNAFORMS' => '',
+        'PRO_ITEE' => 1,
+        'PRO_STATUS' => 'ACTIVE',
+        'PRO_STATUS_ID' => 1,
+        'PRO_TYPE_PROCESS' => 'PUBLIC',
+        'PRO_UPDATE_DATE' => $faker->dateTime(),
+        'PRO_CREATE_DATE' => $faker->dateTime(),
+        'PRO_CATEGORY' => '',
+    ];
+});

-    $task2 = factory(\ProcessMaker\Model\Task::class)
-        ->create([
-            'PRO_UID' => $process['PRO_UID'],
-        ]);
-
-    //routes
-    factory(\ProcessMaker\Model\Route::class)
-        ->create([
-            'PRO_UID' => $process['PRO_UID'],
-            'TAS_UID' => $task2['TAS_UID'],
-            'ROU_NEXT_TASK' => '-1',
-        ]);
-
-    factory(\ProcessMaker\Model\Route::class)
-        ->create([
-            'PRO_UID' => $process['PRO_UID'],
-            'TAS_UID' => $task1['TAS_UID'],
-            'ROU_NEXT_TASK' => $task2['TAS_UID']
-        ]);
-
-    //User assignments
-    factory(\ProcessMaker\Model\TaskUser::class)
-        ->create([
-            'TAS_UID' => $task1['TAS_UID'],
-            'USR_UID' => \ProcessMaker\Model\User::all()->random()->USR_UID
-        ]);
-
-    factory(\ProcessMaker\Model\TaskUser::class)
-        ->create([
-            'TAS_UID' => $task2['TAS_UID'],
-            'USR_UID' => \ProcessMaker\Model\User::all()->random()->USR_UID
-        ]);
-
-    return $process;
-});
+// Create a process related to the flow designer
+$factory->state(\ProcessMaker\Model\Process::class, 'flow', function (Faker $faker) {
+    // Create values in the foreign key relations
+    $user = factory(\ProcessMaker\Model\User::class)->create();
+    $process = [
+        'PRO_UID' => G::generateUniqueID(),
+        'PRO_ID' => $faker->unique()->numberBetween(1, 200000),
+        'PRO_TITLE' => $faker->sentence(3),
+        'PRO_DESCRIPTION' => $faker->paragraph(3),
+        'PRO_CREATE_USER' => $user->USR_UID,
+        'PRO_DYNAFORMS' => '',
+        'PRO_ITEE' => 1,
+        'PRO_STATUS' => 'ACTIVE',
+        'PRO_STATUS_ID' => 1,
+        'PRO_TYPE_PROCESS' => 'PUBLIC',
+        'PRO_UPDATE_DATE' => $faker->dateTime(),
+        'PRO_CREATE_DATE' => $faker->dateTime(),
+        'PRO_CATEGORY' => '',
+    ];
+    // Create a task related to this process
+    $task = factory(\ProcessMaker\Model\Task::class)->create([
+        'PRO_UID' => $process->PRO_UID,
+        'PRO_ID' => $process->PRO_ID,
+    ]);
+});
--- a/database/factories/TaskFactory.php
+++ b/database/factories/TaskFactory.php
@@ -8,6 +8,7 @@ use Faker\Generator as Faker;
 $factory->define(\ProcessMaker\Model\Task::class, function(Faker $faker) {
    return [
        'PRO_UID' => G::generateUniqueID(),
+        'PRO_ID' => $faker->unique()->numberBetween(),
        'TAS_UID' => G::generateUniqueID(),
        'TAS_ID' => $faker->unique()->numberBetween(),
        'TAS_TITLE' => $faker->sentence(2),
@@ -33,10 +34,10 @@ $factory->define(\ProcessMaker\Model\Task::class, function(Faker $faker) {

 // Create a delegation with the foreign keys
 $factory->state(\ProcessMaker\Model\Task::class, 'foreign_keys', function (Faker $faker) {
+    $process = factory(\ProcessMaker\Model\Process::class)->create();
    return [
-        'PRO_UID' => function() {
-            return $process = factory(\ProcessMaker\Model\Process::class)->create();
-        },
+        'PRO_UID' => $process->PRO_UID,
+        'PRO_ID' => $process->PRO_ID,
        'TAS_UID' => G::generateUniqueID(),
        'TAS_ID' => $faker->unique()->numberBetween(1, 200000),
        'TAS_TITLE' => $faker->sentence(2),