namespace fix, and remove prefix t_

laravolt · Jan 11, 2020 · be876ce · be876ce
1 parent b92a3de
commit be876ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/Console/Commands/GenerateTableByProcessDefinition.php b/src/Console/Commands/GenerateTableByProcessDefinition.php
@@ -44,7 +44,7 @@ public function handle()
         $tableGenerateds = [];
         foreach ($camundaForms as $camundaForm) {
             //prefix t
-            $prefixName = 't_'.$camundaForm->form_name;
+            $prefixName = $camundaForm->form_name;
             $tableGenerateds[$prefixName][] = [
                 'name' => $camundaForm->field_name,
                 'type' => $camundaForm->field_type,

diff --git a/src/Services/FormAdapter/FormAdapter.php b/src/Services/FormAdapter/FormAdapter.php
@@ -2,10 +2,10 @@
 
 namespace Laravolt\Workflow\Services\FormAdapter;
 
-use App\Services\FormAdapter\Fields\StringAdapter;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Collection;
+use Laravolt\Workflow\Services\FormAdapter\Fields\StringAdapter;
 
 class FormAdapter
 {
@@ -89,8 +89,8 @@ protected function transformFields($fields, $segment)
         $definition = [];
         foreach ($fields as $field) {
             $type = Str::studly($field->field_type);
-
-            $adapter = "\\App\\Services\\FormAdapter\\Fields\\{$type}Adapter";
+            
+            $adapter = "\\Laravolt\\Workflow\\Services\\FormAdapter\\Fields\\{$type}Adapter";
             if (! class_exists($adapter)) {
                 $adapter = StringAdapter::class;
             }

diff --git a/src/Workflow.php b/src/Workflow.php
@@ -94,7 +94,7 @@ public function startProcess(Module $module, array $data): ProcessInstance
             // Flagnya ada di kolom camunda_form.type
             foreach ($payload->toFormFields() as $form => $fields) {
                 $dbFields = $fields['fields'];
-
+               
                 if ($fields['type'] == FormType::MAIN_FORM) {
                     $data = $dbFields + $additionalData;
                     $formId = $this->insertData($form, $data);
@@ -117,7 +117,6 @@ public function startProcess(Module $module, array $data): ProcessInstance
                     'task_name' => $module->startTaskName,
                     'process_definition_key' => $processDefinition->key,
                     'created_at' => now(),
-                    'id_kantor' => auth()->user()->kantor->id,
                     'ref_id' => $payload->data['ref_id'] ?? request('ref_id'),
                     'traceable' => json_encode(collect($payload->data)->only(config('laravolt.workflow.traceable')) ?? []),
                 ]);
@@ -262,7 +261,6 @@ public function submitTask(Module $module, string $taskId, array $data, bool $is
                             'status' => $isDraft ? TaskStatus::DRAFT : TaskStatus::UNASSIGNED,
                             'created_at' => now(),
                             'updated_at' => now(),
-                            'id_kantor' => auth()->user()->kantor->id,
                             'ref_id' => $payload->data['ref_id']['ref_id'] ?? request('ref_id'),
                         ]
                     );
@@ -417,11 +415,10 @@ protected function insertData(string $table, array $data)
         $additionalData = [
             'created_by' => auth()->id(),
             'created_at' => now(),
-            'id_kantor' => auth()->user()->kantor->id,
         ];
 
         [$mainTableData, $hasManyData] = $this->filterAndPartition($data, $table);
-
+        
         $id = DB::table($table)->insertGetId($mainTableData + $additionalData);
 
         $this->saveHasMany($hasManyData, $additionalData, $table, $id);
@@ -434,7 +431,6 @@ protected function updateData($id, string $table, array $data)
         $additionalData = [
             'created_by' => auth()->id(),
             'created_at' => now(),
-            'id_kantor' => auth()->user()->kantor->id,
         ];
 
         [$mainTableData, $hasManyData] = $this->filterAndPartition($data, $table);