Skip to content

Commit

Permalink
update bug min-max
Browse files Browse the repository at this point in the history
  • Loading branch information
VfvRizky committed Jan 4, 2023
1 parent 9c36de0 commit 2d88fa3
Show file tree
Hide file tree
Showing 14 changed files with 82 additions and 46 deletions.
12 changes: 6 additions & 6 deletions app/Http/Controllers/DokterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public function create()
{
// return view('dokter-form');

$jadwals = Jadwal::all();
return view('dokter-form', compact('jadwals'));
$jadwalvariabel = Jadwal::all();
return view('dokter-form', compact('jadwalvariabel'));


}
Expand Down Expand Up @@ -58,7 +58,7 @@ public function store(Request $request)
'alamat'=>$request->Alamat,
'spesialis'=>$request->Spesialis,
'telepon'=>$request->Telepon,
'jadwal'=>$request->Jadwal
'jadwalpraktek'=>$request->Jadwal

]);

Expand Down Expand Up @@ -86,9 +86,9 @@ public function show(Dokter $dokter)
*/
public function edit($id)
{
$jadwals = Jadwal::all();
$jadwalvariabel = Jadwal::all();
$dokter = Dokter::findOrfail($id);
return view('dokter-form-edit', compact('dokter','jadwals'));
return view('dokter-form-edit', compact('dokter','jadwalvariabel'));
}

/**
Expand Down Expand Up @@ -122,7 +122,7 @@ public function update(Request $request, $id)
'alamat'=>$request->Alamat,
'spesialis'=>$request->Spesialis,
'telepon'=>$request->Telepon,
'jadwal'=>$request->Jadwal
'jadwalpraktek'=>$request->Jadwal

]);

Expand Down
14 changes: 7 additions & 7 deletions app/Http/Controllers/JadwalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class JadwalController extends Controller
*/
public function index()
{
$jadwalpraktek = Jadwal::get();
return view('jadwal', compact('jadwalpraktek'));
$jadwalvariabel = Jadwal::get();
return view('jadwal', compact('jadwalvariabel'));
}

/**
Expand Down Expand Up @@ -43,7 +43,7 @@ public function store(Request $request)

$Jadwal= Jadwal::create([

'jadwal'=>$request->Jadwal
'jadwalpraktek'=>$request->Jadwal

]);

Expand All @@ -53,12 +53,12 @@ public function store(Request $request)
/**
* Display the specified resource.
*
* @param \App\Models\Jadwal $jadwal
* @param \App\Models\Jadwal $jadwalvariabel
* @return \Illuminate\Http\Response
*/
public function show(Jadwal $jadwal)
public function show(Jadwal $jadwalvariabel)
{
$jadwal = Jadwal::where('id', $jadwal)->get();
$jadwalvariabel = Jadwal::where('id', $jadwalvariabel)->get();
return view('jadwal', compact('jadwal'));
}

Expand Down Expand Up @@ -92,7 +92,7 @@ public function update(Request $request, $id)
$jadwal = Jadwal::find($id);

$jadwal->update([
'jadwal' => $request->Jadwal
'jadwalpraktek' => $request->Jadwal
]);

return redirect()->route('jadwal.index')->with('success', 'Jadwal telah diubah');
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Dokter.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Dokter extends Model
'alamat',
'spesialis',
'telepon',
'jadwal'
'jadwalpraktek'

];
protected $guarded =['id'];
Expand Down
4 changes: 2 additions & 2 deletions app/Models/Jadwal.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class Jadwal extends Model
{
use HasFactory;
protected $fillable = [
'jadwal'
'jadwalpraktek'

];
protected $guarded =['id'];
public function jadwal()
public function dokter()
{

return $this->hasMany(Dokter::class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function up()
$table->string('alamat')->nullable();
$table->string('spesialis');
$table->string('telepon');
$table->string('jadwal');
$table->string('jadwalpraktek');

$table->timestamps();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function up()
{
Schema::create('jadwals', function (Blueprint $table) {
$table->id();
$table->string('jadwal');
$table->string('jadwalpraktek');
$table->timestamps();
});
}
Expand Down
28 changes: 28 additions & 0 deletions database/migrations/2022_09_24_032828_jadwals.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
//
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
};
21 changes: 13 additions & 8 deletions resources/views/dokter-form-edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,24 @@


</--------------------------------------------------------Jadwal-----------------------------------------------------------------------------------*/>


<div class="form group row">
<label class="col-form-label col-sm-2 pt-0">Jadwal Praktek Lama</label>
<div class="col-sm-8">
<input class="form-control" name="Jadwal" placeholder="jadwal..." type="text" value="{{ $dokter->jadwalpraktek }}" readonly>
</div>
</div>


<div class="form group row">
<label class="col-form-label col-sm-2 pt-0">Jadwal Praktek</label>
<div class="col-sm-3">
<select name="Jadwal" class="form-control" value="{{ $dokter->jadwal}}">
<div class="col-sm-8">
<select name="Jadwal" class="form-control" value="{{ $dokter->jadwalvariabel}}">
<option selected value ="">tentukan jadwal praktek...</option>
@foreach ($jadwals as $jadwal)
<option value="{{ $jadwal->id }}">{{ $jadwal->jadwal }}</option>
@foreach ($jadwalvariabel as $jadwal)
<option value="{{ $jadwal->id }}">{{ $jadwal->jadwalpraktek }}</option>
@endforeach
</select>


</select>
</div>
</div>
<br>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/dokter-form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@
<br> --}}
<div class="form group row">
<label class="col-form-label col-sm-2 pt-0">Jadwal Praktek</label>
<div class="col-sm-3">
<div class="col-sm-8">
<select name="Jadwal" class="form-control @error('Jadwal') is-invalid @enderror">
<option selected value="">pilih jadwal...</option>
@foreach ($jadwals as $jadwal)
<option value="{{ $jadwal->id }}">{{ $jadwal->jadwal }}</option>
@foreach ($jadwalvariabel as $jadwal)
<option value="{{ $jadwal->id }}">{{ $jadwal->jadwalpraktek }}</option>
@endforeach
</select>
@error('Jadwal')
Expand Down
2 changes: 1 addition & 1 deletion resources/views/dokter.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<td> {{ $d->alamat }} </td>
<td> {{ $d->spesialis }} </td>
<td> {{ $d->telepon }} </td>
<td> {{ $d->jadwal }} </td>
<td> {{ $d->jadwalpraktek}} </td>

</-------------------------------------------------------- edit
-----------------------------------------------------------------------------------* />
Expand Down
23 changes: 13 additions & 10 deletions resources/views/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@
</div>
</div>
</nav>
<!-- Masthead-->
<header class="masthead bg-primary text-white text-center">
<div class="container d-flex align-items-center flex-column">
<!-- Masthead Avatar Image-->
<img class="masthead-avatar mb-5" src="img/logo.png" alt="..." />
<!-- Masthead Heading-->

<!--------------------------------------------------------Bagian Isi Konten Teratas----------------------------------------------------------------------------------->
<header class="masthead bg-primary text-white text-center">
<div class="container d-flex align-items-center flex-column">
<!-- Masthead Avatar Image-->
<img class="masthead-avatar mb-5" src="img/logo.png" alt="..." />
<!-- Masthead Heading-->
<h1 class="masthead-heading text-uppercase mb-0">Klinik Maju Sejahtera</h1>
<!-- Icon Divider-->
<div class="divider-custom divider-light">
Expand Down Expand Up @@ -203,10 +204,12 @@
<div class="container"><small>Copyright &copy; Klinik Maju Sejahtera 2022</small></div>
</div>
<!-- Portfolio Modals-->
<!-- Portfolio Modal 1-->
<div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" aria-labelledby="portfolioModal1" aria-hidden="true">
<div class="modal-dialog modal-xl">
<div class="modal-content">

<!-- Portfolio Modal 2-->
<div class="portfolio-modal modal fade" id="portfolioModal2" tabindex="-1" aria-labelledby="portfolioModal2"
aria-hidden="true">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header border-0"><button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button></div>
<div class="modal-body text-center pb-5">
<div class="container">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/jadwal-form-edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">Jadwal Lama</label>
<div class="col-sm-5" >
<input type="text" class="form-control" name ="Jadwal" placeholder="Jadwal" value="{{ $jadwal->jadwal }}" readonly>
<input type="text" class="form-control" name ="Jadwal" placeholder="Jadwal" value="{{ $jadwal->jadwalpraktek }}" readonly>
</div>
</div>

</--------------------------------------------------------Jadwal-----------------------------------------------------------------------------------*/>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Jadwal Baru</label>
<div class="col-sm-5" >
<input type="text" class="form-control" name ="Jadwal" placeholder="Jadwal" value="{{ $jadwal->jadwal }}">
<input type="text" class="form-control" name ="Jadwal" placeholder="Jadwal" value="{{ $jadwal->jadwalpraktek }}">
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions resources/views/jadwal-form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
</--------------------------------------------------------Jadwal Praktek-----------------------------------------------------------------------------------* />
<div class="form-group row">
<label class="col-sm-2 col-form-label">Jadwal Praktek</label>
<div class="col-sm-5">
<div class="col-sm-7">
<input type="text" class="form-control @error('Jadwal') is-invalid @enderror" name="Jadwal"
placeholder="Jadwal" value="{{ old('Jadwal') }}">
placeholder="tuliskan jadwal..." value="{{ old('Jadwal') }}">
@error('Jadwal')
<div class="invalid-feedback">
"Jadwal masih kosong
Expand Down
4 changes: 2 additions & 2 deletions resources/views/jadwal.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</tr>
</thead>
<tbody>
@foreach ($jadwalpraktek as $jp)
@foreach ($jadwalvariabel as $jp)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $jp->jadwal }} </td>
<td> {{ $jp->jadwalpraktek }} </td>

</-------------------------------------------------------- edit
-----------------------------------------------------------------------------------* />
Expand Down

0 comments on commit 2d88fa3

Please sign in to comment.