RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add basic goal support to journal entry index

This commit is contained in:
Christopher C. Wells 2021-02-15 09:27:44 -08:00
parent 3a36f648db
commit c642111c20
2 changed files with 77 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/Http/Controllers/JournalEntryController.php
View File

@ -29,12 +29,39 @@ class JournalEntryController extends Controller
public function index(Request $request): View public function index(Request $request): View
{ {
$date = $request->date ?? Carbon::now()->toDateString(); $date = $request->date ?? Carbon::now()->toDateString();
$date = Carbon::rawCreateFromFormat('Y-m-d', $date);
// Get entries and nutrient sums for the day.
$entries = JournalEntry::where([
'user_id' => Auth::user()->id,
'date' => $date->toDateString(),
])->get();
$sums = [];
foreach (Nutrients::$all as $nutrient) {
$sums[$nutrient['value']] = round($entries->sum($nutrient['value']));
}
// Get daily goals data for user.
$goals = Auth::user()->getGoalsByTime($date);
$dailyGoals = [];
foreach (Nutrients::$all as $nutrient) {
$goal = $goals['present']
->where('frequency', 'daily')
->where('name', $nutrient['value'])
->first();
if ($goal) {
$dailyGoals[$goal->name] = round($sums[$goal->name] / $goal->goal * 100);
if ($dailyGoals[$goal->name] > 0) {
$dailyGoals[$goal->name] .= '%';
}
}
}
return view('journal-entries.index') return view('journal-entries.index')
->with('entries', JournalEntry::where([ ->with('entries', $entries)
'user_id' => Auth::user()->id, ->with('sums', $sums)
'date' => $date, ->with('dailyGoals', $dailyGoals)
])->get()) ->with('date', $date);
->with('date', Carbon::createFromFormat('Y-m-d', $date));
} }
/** /**

59
resources/views/journal-entries/index.blade.php
View File

@ -37,22 +37,53 @@
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg"> <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
<div class="p-6 bg-white border-b border-gray-200"> <div class="p-6 bg-white border-b border-gray-200">
<div class="flex align-top flex-col space-y-4 sm:flex-row sm:space-x-4 sm:space-y-0"> <div class="flex align-top flex-col space-y-4 sm:flex-row sm:space-x-4 sm:space-y-0">
<div class="w-full sm:w-2/5 md:w-1/3 lg:w-1/4"> <div class="w-full sm:w-5/12 md:w-5/12">
<h3 class="font-semibold text-xl text-gray-800">{{ $date->format('D, j M Y') }}</h3> <h3 class="font-semibold text-xl text-gray-800">{{ $date->format('D, j M Y') }}</h3>
<div class="text-gray-700">{{ $entries->count() }} {{ \Illuminate\Support\Pluralizer::plural('entry', $entries->count()) }}</div> <div class="text-gray-700">{{ $entries->count() }} {{ \Illuminate\Support\Pluralizer::plural('entry', $entries->count()) }}</div>
<div class="grid grid-cols-2 text-sm border-t-8 border-black pt-2"> <div class="text-right border-t-8 border-black pt-2">% Daily goal</div>
<div class="font-extrabold text-lg border-b-4 border-black">Calories</div> <div class="grid grid-cols-2 text-sm">
<div class="font-extrabold text-right text-lg border-b-4 border-black">{{ round($entries->sum('calories'), 2) }}</div> <div class="border-b-4 border-black">
<div class="font-bold border-b border-gray-300">Fat</div> <span class="font-extrabold text-2xl">Calories</span>
<div class="text-right border-b border-gray-300">{{ round($entries->sum('fat'), 2) }}g</div> <span class="text-lg">{{ number_format($sums['calories']) }}</span>
<div class="font-bold border-b border-gray-300">Cholesterol</div> </div>
<div class="text-right border-b border-gray-300">{{ round($entries->sum('cholesterol'), 2) }}mg</div> <div class="font-extrabold text-right text-lg border-b-4 border-black">
<div class="font-bold border-b border-gray-300">Sodium</div> {{ $dailyGoals['calories'] ?? 'N/A' }}
<div class="text-right border-b border-gray-300">{{ round($entries->sum('sodium'), 2) }}mg</div> </div>
<div class="font-bold border-b border-gray-300">Carbohydrates</div> <div class="border-b border-gray-300">
<div class="text-right border-b border-gray-300">{{ round($entries->sum('carbohydrates'), 2) }}g</div> <span class="font-bold">Fat</span>
<div class="font-bold">Protein</div> {{ number_format($sums['fat']) }}g
<div class="text-right">{{ round($entries->sum('protein'), 2) }}g</div> </div>
<div class="text-right border-b border-gray-300">
{{ $dailyGoals['fat'] ?? 'N/A' }}
</div>
<div class="border-b border-gray-300">
<span class="font-bold">Cholesterol</span>
{{ number_format($sums['cholesterol']) }}mg
</div>
<div class="text-right border-b border-gray-300">
{{ $dailyGoals['cholesterol'] ?? 'N/A' }}
</div>
<div class="border-b border-gray-300">
<span class="font-bold">Sodium</span>
{{ number_format($sums['sodium']) }}mg
</div>
<div class="text-right border-b border-gray-300">
{{ $dailyGoals['sodium'] ?? 'N/A' }}
</div>
<div class="border-b border-gray-300">
<span class="font-bold">Carbohydrates</span>
{{ number_format($sums['carbohydrates']) }}g
</div>
<div class="text-right border-b border-gray-300">
{{ $dailyGoals['carbohydrates'] ?? 'N/A' }}
</div>
<div>
<span class="font-bold">Protein</span>
{{ number_format($sums['protein']) }}g
</div>
<div class="text-right">
{{ $dailyGoals['protein'] ?? 'N/A' }}
</div>
</div> </div>
</div> </div>
<div class="w-full sm:w-3/5 md:w-2/3 lg:w-3/4 flex flex-col space-y-4"> <div class="w-full sm:w-3/5 md:w-2/3 lg:w-3/4 flex flex-col space-y-4">