fix dashboard

pull/1/head
Aji Kamaludin 3 years ago
parent da21d7c4aa
commit 38f2702d1d
No known key found for this signature in database
GPG Key ID: 670E1F26AD5A8099

@ -40,7 +40,9 @@ class DashboardController extends Controller
->get(); ->get();
$products = PayrollItem::selectRaw('product_id, SUM(quantity) as count') $products = PayrollItem::selectRaw('product_id, SUM(quantity) as count')
->whereBetween(DB::raw('DATE(created_at)'), [$startDate, $endDate]) ->whereHas('payroll', function ($query) use ($startDate, $endDate) {
return $query->whereBetween('date', [$startDate, $endDate]);
})
->groupBy('product_id') ->groupBy('product_id')
->with(['product']) ->with(['product'])
->get(); ->get();

52
public/css/app.css vendored

@ -1856,14 +1856,14 @@ html {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.mx-1 {
margin-left: 0.25rem;
margin-right: 0.25rem;
}
.my-auto { .my-auto {
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
} }
.mx-1 {
margin-left: 0.25rem;
margin-right: 0.25rem;
}
.my-2 { .my-2 {
margin-top: 0.5rem; margin-top: 0.5rem;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
@ -1987,9 +1987,6 @@ html {
.max-h-96 { .max-h-96 {
max-height: 24rem; max-height: 24rem;
} }
.max-h-11 {
max-height: 2.75rem;
}
.min-h-screen { .min-h-screen {
min-height: 100vh; min-height: 100vh;
} }
@ -2367,12 +2364,12 @@ html {
.pb-8 { .pb-8 {
padding-bottom: 2rem; padding-bottom: 2rem;
} }
.pl-2 {
padding-left: 0.5rem;
}
.pb-4 { .pb-4 {
padding-bottom: 1rem; padding-bottom: 1rem;
} }
.pl-2 {
padding-left: 0.5rem;
}
.text-left { .text-left {
text-align: left; text-align: left;
} }
@ -2610,23 +2607,24 @@ html {
} }
} }
.react-datepicker-popper { .react-datepicker-popper {
z-index: 40; inset: 0px 0px auto auto !important;
width: 18rem; z-index: 40;
border-radius: 0.25rem; width: 18rem;
border-width: 2px; border-radius: 0.25rem;
--tw-border-opacity: 1; border-width: 2px;
border-color: rgb(229 231 235 / var(--tw-border-opacity)); --tw-border-opacity: 1;
--tw-bg-opacity: 1; border-color: rgb(229 231 235 / var(--tw-border-opacity));
background-color: rgb(255 255 255 / var(--tw-bg-opacity)); --tw-bg-opacity: 1;
padding-left: 0.75rem; background-color: rgb(255 255 255 / var(--tw-bg-opacity));
padding-right: 0.75rem; padding-left: 0.75rem;
padding-top: 0.5rem; padding-right: 0.75rem;
padding-bottom: 0.5rem; padding-top: 0.5rem;
font-size: 0.875rem; padding-bottom: 0.5rem;
line-height: 1.25rem; font-size: 0.875rem;
--tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); line-height: 1.25rem;
--tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
} }
.react-datepicker-left { .react-datepicker-left {
position: absolute !important; position: absolute !important;

@ -6,6 +6,7 @@
} }
.react-datepicker-popper { .react-datepicker-popper {
inset: 0px 0px auto auto !important;
@apply z-40 w-72 text-sm bg-white shadow px-3 py-2 border-2 border-gray-200 rounded; @apply z-40 w-72 text-sm bg-white shadow px-3 py-2 border-2 border-gray-200 rounded;
} }

Loading…
Cancel
Save