From 38d7911bed53c7d2c38fb8c129bba3d40d9092ec Mon Sep 17 00:00:00 2001
From: Afiq <afiq@arrahns.local>
Date: Wed, 13 Jan 2021 11:36:27 +0800
Subject: [PATCH] dashboard

---
 app/Http/Controllers/GadaiController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 67346ea..21231d2 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1011,8 +1011,9 @@ class GadaiController extends Controller
             }elseif($request->method == 'monthly'){
                 $penggadai_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(DISTINCT nokp) AS total_customer')->addSelect('t_gadai')->groupBy('t_gadai')->orderBy('t_gadai','desc')->get();
             }elseif($request->method == 'yearly'){
-                $penggadai_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(DISTINCT nokp) AS total_customer')->addSelect('t_gadai')->groupBy('t_gadai')->orderBy('t_gadai','desc')->get();
+                $penggadai_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(DISTINCT nokp) AS total_customer')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->orderBy('t_gadai','desc')->get();
             }
+            // dd($penggadai_cawangan);
             $penggadai_data = [];
             if($request->method == 'weekly'){
                 for($i=0;$i<7;$i++){
@@ -1042,7 +1043,7 @@ class GadaiController extends Controller
             }elseif($request->method == 'monthly'){
                 $gadaian_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(norujukan) AS total_norujukan')->addSelect('t_gadai')->groupBy('t_gadai')->orderBy('t_gadai','desc')->get();
             }elseif($request->method == 'yearly'){
-                $gadaian_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(norujukan) AS total_norujukan')->addSelect('t_gadai')->groupBy('t_gadai')->orderBy('t_gadai','desc')->get();
+                $gadaian_cawangan = Gadai::on($cawangan['mysql'])->selectRaw('COUNT(norujukan) AS total_norujukan')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->orderBy('t_gadai','desc')->get();
             }
             $gadaian_data = [];
             if($request->method == 'weekly'){