@@ -25,16 +25,16 @@ |
||
| 25 | 25 | |
| 26 | 26 | public function group_egovernment() |
| 27 | 27 | { |
| 28 | - return $this->belongsTo('Bantenprov\GroupEgovernment\Models\Bantenprov\GroupEgovernment\GroupEgovernment','group_egovernment_id'); |
|
| 28 | + return $this->belongsTo('Bantenprov\GroupEgovernment\Models\Bantenprov\GroupEgovernment\GroupEgovernment', 'group_egovernment_id'); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function sector_egovernment() |
| 32 | 32 | { |
| 33 | - return $this->belongsTo('Bantenprov\SectorEgovernment\Models\Bantenprov\SectorEgovernment\SectorEgovernment','sector_egovernment_id'); |
|
| 33 | + return $this->belongsTo('Bantenprov\SectorEgovernment\Models\Bantenprov\SectorEgovernment\SectorEgovernment', 'sector_egovernment_id'); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function user() |
| 37 | 37 | { |
| 38 | - return $this->belongsTo('App\User','user_id'); |
|
| 38 | + return $this->belongsTo('App\User', 'user_id'); |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -10,27 +10,27 @@ |
||
| 10 | 10 | * |
| 11 | 11 | * @return void |
| 12 | 12 | */ |
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - Schema::create('anggarans', function(Blueprint $table) { |
|
| 16 | - $table->increments('id'); |
|
| 17 | - $table->integer('user_id'); |
|
| 18 | - $table->integer('group_egovernment_id'); |
|
| 19 | - $table->integer('sector_egovernment_id'); |
|
| 20 | - $table->string('label')->nullable(); |
|
| 21 | - $table->string('description')->nullable(); |
|
| 22 | - $table->timestamps(); |
|
| 23 | - $table->softDeletes(); |
|
| 24 | - }); |
|
| 25 | - } |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + Schema::create('anggarans', function(Blueprint $table) { |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->integer('user_id'); |
|
| 18 | + $table->integer('group_egovernment_id'); |
|
| 19 | + $table->integer('sector_egovernment_id'); |
|
| 20 | + $table->string('label')->nullable(); |
|
| 21 | + $table->string('description')->nullable(); |
|
| 22 | + $table->timestamps(); |
|
| 23 | + $table->softDeletes(); |
|
| 24 | + }); |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * Reverse the migrations. |
| 29 | 29 | * |
| 30 | 30 | * @return void |
| 31 | 31 | */ |
| 32 | - public function down() |
|
| 33 | - { |
|
| 34 | - Schema::drop('anggarans'); |
|
| 35 | - } |
|
| 32 | + public function down() |
|
| 33 | + { |
|
| 34 | + Schema::drop('anggarans'); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | protected $anggaran; |
| 35 | 35 | protected $user; |
| 36 | 36 | |
| 37 | - public function __construct(Anggaran $anggaran, GroupEgovernment $group_egovernment,SectorEgovernment $sector_egovernment, User $user) |
|
| 37 | + public function __construct(Anggaran $anggaran, GroupEgovernment $group_egovernment, SectorEgovernment $sector_egovernment, User $user) |
|
| 38 | 38 | { |
| 39 | - $this->anggaran = $anggaran; |
|
| 40 | - $this->group_egovernmentModel = $group_egovernment; |
|
| 41 | - $this->sector_egovernment = $sector_egovernment; |
|
| 42 | - $this->user = $user; |
|
| 39 | + $this->anggaran = $anggaran; |
|
| 40 | + $this->group_egovernmentModel = $group_egovernment; |
|
| 41 | + $this->sector_egovernment = $sector_egovernment; |
|
| 42 | + $this->user = $user; |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -68,15 +68,15 @@ discard block |
||
| 68 | 68 | $perPage = request()->has('per_page') ? (int) request()->per_page : null; |
| 69 | 69 | $response = $query->paginate($perPage); |
| 70 | 70 | |
| 71 | - foreach($response as $group_egovernment){ |
|
| 71 | + foreach ($response as $group_egovernment) { |
|
| 72 | 72 | array_set($response->data, 'group_egovernment', $group_egovernment->group_egovernment->label); |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - foreach($response as $sector_egovernment){ |
|
| 75 | + foreach ($response as $sector_egovernment) { |
|
| 76 | 76 | array_set($response->data, 'sector_egovernment', $sector_egovernment->sector_egovernment->label); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - foreach($response as $user){ |
|
| 79 | + foreach ($response as $user) { |
|
| 80 | 80 | array_set($response->data, 'user', $user->user->name); |
| 81 | 81 | } |
| 82 | 82 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $sector_egovernment = $this->sector_egovernment->all(); |
| 97 | 97 | $users = $this->user->all(); |
| 98 | 98 | |
| 99 | - foreach($users as $user){ |
|
| 99 | + foreach ($users as $user) { |
|
| 100 | 100 | array_set($user, 'label', $user->name); |
| 101 | 101 | } |
| 102 | 102 | |
@@ -126,11 +126,11 @@ discard block |
||
| 126 | 126 | 'description' => 'max:255', |
| 127 | 127 | ]); |
| 128 | 128 | |
| 129 | - if($validator->fails()){ |
|
| 130 | - $check = $anggaran->where('label',$request->label)->whereNull('deleted_at')->count(); |
|
| 129 | + if ($validator->fails()) { |
|
| 130 | + $check = $anggaran->where('label', $request->label)->whereNull('deleted_at')->count(); |
|
| 131 | 131 | |
| 132 | 132 | if ($check > 0) { |
| 133 | - $response['message'] = 'Failed, label ' . $request->label . ' already exists'; |
|
| 133 | + $response['message'] = 'Failed, label '.$request->label.' already exists'; |
|
| 134 | 134 | } else { |
| 135 | 135 | $anggaran->group_egovernment_id = $request->input('group_egovernment_id'); |
| 136 | 136 | $anggaran->sector_egovernment_id = $request->input('sector_egovernment_id'); |
@@ -227,10 +227,10 @@ discard block |
||
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | if ($validator->fails()) { |
| 230 | - $check = $anggaran->where('label',$request->label)->whereNull('deleted_at')->count(); |
|
| 230 | + $check = $anggaran->where('label', $request->label)->whereNull('deleted_at')->count(); |
|
| 231 | 231 | |
| 232 | 232 | if ($check > 0) { |
| 233 | - $response['message'] = 'Failed, label ' . $request->label . ' already exists'; |
|
| 233 | + $response['message'] = 'Failed, label '.$request->label.' already exists'; |
|
| 234 | 234 | } else { |
| 235 | 235 | $anggaran->label = $request->input('label'); |
| 236 | 236 | $anggaran->description = $request->input('description'); |