diff --git a/app/Http/Controllers/API/ContractController.php b/app/Http/Controllers/API/ContractController.php index 164b38ab..81923243 100644 --- a/app/Http/Controllers/API/ContractController.php +++ b/app/Http/Controllers/API/ContractController.php @@ -17,6 +17,8 @@ public function contract(ContractRequest $request){ public function import(Request $request){ + return $request->all();//test + $request->validate([ 'contracts' => 'array: id, hasaba_alysh, hasaba_alysh_status, baha_seljerish, baha_seljerish_status, tdh,tdh_status, hukuk,hukuk_status' ]); diff --git a/app/Http/Controllers/Admin/ContractCrudController.php b/app/Http/Controllers/Admin/ContractCrudController.php index 0a8ab72c..dbe1d93b 100644 --- a/app/Http/Controllers/Admin/ContractCrudController.php +++ b/app/Http/Controllers/Admin/ContractCrudController.php @@ -40,7 +40,7 @@ public function setup() protected function setupListOperation() { - CRUD::column('entrance_number'); + CRUD::column('inputNumber'); /** * Columns can be defined using the fluent syntax or array syntax: * - CRUD::column('price')->type('number'); @@ -58,15 +58,13 @@ protected function setupCreateOperation() { CRUD::setValidation(ContractRequest::class); -// CRUD::field('entrance_number'); - CRUD::field('hasaba_alysh'); - CRUD::field('hasaba_alysh_status'); - CRUD::field('baha_seljerish'); - CRUD::field('baha_seljerish_status'); - CRUD::field('tdh'); - CRUD::field('tdh_status'); - CRUD::field('hukuk'); - CRUD::field('hukuk_status'); + CRUD::field('inputNumber'); + CRUD::field('inputDate'); + CRUD::field('regdDate'); + CRUD::field('markerSpec'); + CRUD::field('workflow_id'); + CRUD::field('note'); + CRUD::field('remark'); /** * Fields can be defined using the fluent syntax or array syntax: diff --git a/app/Models/Contract.php b/app/Models/Contract.php index b19ec2be..479fcdbc 100644 --- a/app/Models/Contract.php +++ b/app/Models/Contract.php @@ -20,15 +20,13 @@ class Contract extends Model // public $timestamps = false; protected $guarded = ['id']; protected $fillable = [ - 'entrance_number', - 'hasaba_alysh', - 'hasaba_alysh_status', - 'baha_seljerish', - 'baha_seljerish_status', - 'tdh', - 'tdh_status', - 'hukuk', - 'hukuk_status' + 'inputNumber', + 'inputDate', + 'regdDate', + 'markerSpec', + 'workflow_id', + 'note', + 'remark', ]; // protected $hidden = []; // protected $dates = []; diff --git a/database/migrations/2022_10_15_114720_add_extrainfo_to_contracts_table.php b/database/migrations/2022_10_15_114720_add_extrainfo_to_contracts_table.php new file mode 100644 index 00000000..60f03cbd --- /dev/null +++ b/database/migrations/2022_10_15_114720_add_extrainfo_to_contracts_table.php @@ -0,0 +1,46 @@ +dropColumn('hasaba_alysh'); + $table->dropColumn('hasaba_alysh_status'); + $table->dropColumn('baha_seljerish'); + $table->dropColumn('baha_seljerish_status'); + $table->dropColumn('tdh'); + $table->dropColumn('tdh_status'); + $table->dropColumn('hukuk'); + $table->dropColumn('hukuk_status'); + $table->string('inputNumber')->nullabale(); + $table->datetime('inputDate')->nullable(); + $table->datetime('regdDate')->nullable(); + $table->bigInnteger('markerSpec')->nullable(); + $table->bigInteger('workflow_id')->nullable(); + $table->text('note')->nullable(); + $table->text('remark')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('contracts', function (Blueprint $table) { + + }); + } +};