forked from eatvio/eatvio-infra
analysators added
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\Diary;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class DiaryController extends Controller
|
||||
@@ -17,6 +17,7 @@ class DiaryController extends Controller
|
||||
{
|
||||
/* return view('diary.index'); */
|
||||
$curDiary = $this->getCurrentDiary();
|
||||
|
||||
/* dd($curDiary); */
|
||||
return redirect()->route('diary.edit', $curDiary);
|
||||
}
|
||||
@@ -26,24 +27,25 @@ class DiaryController extends Controller
|
||||
$curUserId = Auth::id();
|
||||
$curDiary = Diary::userToDayItem($curUserId)->first();
|
||||
|
||||
if (!is_null($curDiary)) {
|
||||
if (! is_null($curDiary)) {
|
||||
return $curDiary;
|
||||
}
|
||||
|
||||
return $this->newDiary($curUserId);
|
||||
}
|
||||
|
||||
private function newDiary($curUserId)
|
||||
{
|
||||
$curDiary = new Diary();
|
||||
$curDiary->date = now()->setTimezone('3')->format('Y-m-d');
|
||||
$curDiary->wakeup = '06:30';
|
||||
$curDiary->retire = '22:30';
|
||||
$curDiary->user_id = $curUserId;
|
||||
$curDiary->closed = false;
|
||||
$curDiary->comment = "";
|
||||
$curDiary->save();
|
||||
$curDiary = new Diary();
|
||||
$curDiary->date = now()->setTimezone('3')->format('Y-m-d');
|
||||
$curDiary->wakeup = '06:30';
|
||||
$curDiary->retire = '22:30';
|
||||
$curDiary->user_id = $curUserId;
|
||||
$curDiary->closed = false;
|
||||
$curDiary->comment = '';
|
||||
$curDiary->save();
|
||||
|
||||
return $curDiary;
|
||||
return $curDiary;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -59,7 +61,6 @@ class DiaryController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -78,6 +79,7 @@ class DiaryController extends Controller
|
||||
{
|
||||
/* $curDiary = Diary::find($id); */
|
||||
$daysCount = Diary::where('user_id', auth()->id())->count();
|
||||
|
||||
return view('diary.show', ['curDiary' => $diary, 'daysCount' => $daysCount]);
|
||||
}
|
||||
|
||||
@@ -91,12 +93,13 @@ class DiaryController extends Controller
|
||||
{
|
||||
$curDiary = Diary::find($id);
|
||||
$daysCount = Diary::where('user_id', auth()->id())->count();
|
||||
|
||||
return view(
|
||||
'diary.index',
|
||||
[
|
||||
'diaryId' => $id,
|
||||
'curDiary' => $curDiary,
|
||||
'daysCount' => $daysCount
|
||||
'daysCount' => $daysCount,
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -104,7 +107,6 @@ class DiaryController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
@@ -118,6 +120,7 @@ class DiaryController extends Controller
|
||||
$curDiary->comment = $request->input('comment') ?? '';
|
||||
$curDiary->closed = true;
|
||||
$curDiary->save();
|
||||
|
||||
return redirect()->route('diary.show', $id);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user