@@ -4,8 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Database\Eloquent\Model; |
| 6 | 6 | |
| 7 | -class City extends Model |
|
| 8 | -{ |
|
| 7 | +class City extends Model { |
|
| 9 | 8 | /** |
| 10 | 9 | * @var string |
| 11 | 10 | */ |
@@ -37,7 +36,8 @@ discard block |
||
| 37 | 36 | return $this->hasMany('App\Hospital'); |
| 38 | 37 | } |
| 39 | 38 | |
| 40 | - public function doctor() { |
|
| 39 | + public function doctor() |
|
| 40 | + { |
|
| 41 | 41 | return $this->hasOne('App\Doctor', 'city_id'); |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -4,8 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Database\Eloquent\Model; |
| 6 | 6 | |
| 7 | -class DoctorSpecialization extends Model |
|
| 8 | -{ |
|
| 7 | +class DoctorSpecialization extends Model { |
|
| 9 | 8 | /** |
| 10 | 9 | * @var string |
| 11 | 10 | */ |
@@ -29,7 +28,8 @@ discard block |
||
| 29 | 28 | 'updated_at' |
| 30 | 29 | ]; |
| 31 | 30 | |
| 32 | - public function doctor() { |
|
| 31 | + public function doctor() |
|
| 32 | + { |
|
| 33 | 33 | return $this->hasOne('App\Doctor', 'specialization_id'); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -7,8 +7,7 @@ discard block |
||
| 7 | 7 | use Illuminate\Support\Facades\Auth; |
| 8 | 8 | use App\Articles; |
| 9 | 9 | |
| 10 | -class ArticleController extends Controller |
|
| 11 | -{ |
|
| 10 | +class ArticleController extends Controller { |
|
| 12 | 11 | /** |
| 13 | 12 | * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View |
| 14 | 13 | */ |
@@ -44,13 +43,13 @@ discard block |
||
| 44 | 43 | 'cover_image' => 'image|nullable|max:3999' |
| 45 | 44 | ]); |
| 46 | 45 | |
| 47 | - if($request->hasFile('cover_image')){ |
|
| 46 | + if($request->hasFile('cover_image')) { |
|
| 48 | 47 | $filenameWithExt = $request->file('cover_image')->getClientOriginalName(); |
| 49 | 48 | $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME); |
| 50 | 49 | $extension = $request->file('cover_image')->getClientOriginalExtension(); |
| 51 | 50 | $fileNameToStore = $filename.'_'.time().'.'.$extension; |
| 52 | 51 | $path = $request->file('cover_image')->storeAs('public/cover_images', $fileNameToStore); |
| 53 | - }else { |
|
| 52 | + } else { |
|
| 54 | 53 | $fileNameToStore = 'noimage.jpg'; |
| 55 | 54 | } |
| 56 | 55 | |
@@ -224,7 +223,7 @@ discard block |
||
| 224 | 223 | |
| 225 | 224 | ]); |
| 226 | 225 | |
| 227 | - if($request->hasFile('cover_image')){ |
|
| 226 | + if($request->hasFile('cover_image')) { |
|
| 228 | 227 | $filenameWithExt = $request->file('cover_image')->getClientOriginalName(); |
| 229 | 228 | $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME); |
| 230 | 229 | $extension = $request->file('cover_image')->getClientOriginalExtension(); |
@@ -236,7 +235,7 @@ discard block |
||
| 236 | 235 | $article->category = $request->input('category'); |
| 237 | 236 | $article->title = $request->input('title'); |
| 238 | 237 | $article->content = $request->input('content'); |
| 239 | - if($request->hasFile('cover_image')){ |
|
| 238 | + if($request->hasFile('cover_image')) { |
|
| 240 | 239 | $article->cover_image = $fileNameToStore; |
| 241 | 240 | } |
| 242 | 241 | |
@@ -255,7 +254,7 @@ discard block |
||
| 255 | 254 | { |
| 256 | 255 | $article = Articles::find($id); |
| 257 | 256 | |
| 258 | - if($article->cover_image != 'noimage.jpg'){ |
|
| 257 | + if($article->cover_image != 'noimage.jpg') { |
|
| 259 | 258 | Storage::delete('public/cover_images/'.$article->cover_image); |
| 260 | 259 | } |
| 261 | 260 | |
@@ -11,8 +11,7 @@ discard block |
||
| 11 | 11 | use Psy\Exception\ErrorException; |
| 12 | 12 | |
| 13 | 13 | |
| 14 | -class DoctorController extends Controller |
|
| 15 | -{ |
|
| 14 | +class DoctorController extends Controller { |
|
| 16 | 15 | /** |
| 17 | 16 | * Returning view with data resource |
| 18 | 17 | * |
@@ -146,11 +145,11 @@ discard block |
||
| 146 | 145 | |
| 147 | 146 | public function searchDoctor(Request $request) |
| 148 | 147 | { |
| 149 | - if($request->nama == null AND $request->location != null){ |
|
| 148 | + if($request->nama == null AND $request->location != null) { |
|
| 150 | 149 | $doctor = Doctor::where('city_id',$request->location)->orderBy('name','asc')->paginate(5); |
| 151 | - }elseif ($request->location == null AND $request->nama != null){ |
|
| 150 | + } elseif ($request->location == null AND $request->nama != null) { |
|
| 152 | 151 | $doctor = Doctor::where('name','LIKE','%'.$request->nama.'%')->orderBy('name','asc')->paginate(5); |
| 153 | - }else{ |
|
| 152 | + } else { |
|
| 154 | 153 | $doctor = Doctor::where('name','LIKE','%'.$request->nama.'%')->where('city_id',$request->location)->orderBy('name','asc')->paginate(5); |
| 155 | 154 | } |
| 156 | 155 | $location = City::orderBy('name','asc')->pluck('name','id'); |