bantenprov / dashboard-epormas

src/Console/Commands/EpormasCommand.php

Indentation +16 added lines, -16 removed lines

@@ -35,28 +35,28 @@
      * @var string
      */
     protected $stubsController = [
-       'controllers' => [
-           'DashboardEpormasController.stub',
-           'EpormasCategoryController.stub',
-           'EpormasCityController.stub',
-           'EpormasCounterController.stub'
-       ]
+        'controllers' => [
+            'DashboardEpormasController.stub',
+            'EpormasCategoryController.stub',
+            'EpormasCityController.stub',
+            'EpormasCounterController.stub'
+        ]
     ];
 
     protected $stubsModel = [
-       'models' => [
-           'EpormasCategory.stub',
-           'EpormasCity.stub',
-           'EpormasCounter.stub'
-       ]
+        'models' => [
+            'EpormasCategory.stub',
+            'EpormasCity.stub',
+            'EpormasCounter.stub'
+        ]
     ];
 
     protected $stubsSeeds = [
-       'seeds' => [
-           'EpormasCategoryTableSeeder.stub',
-           'EpormasCityTableSeeder.stub',
-           'EpormasCounterTableSeeder.stub'
-       ]
+        'seeds' => [
+            'EpormasCategoryTableSeeder.stub',
+            'EpormasCityTableSeeder.stub',
+            'EpormasCounterTableSeeder.stub'
+        ]
     ];
 
     /**

src/database/migrations/2017_12_01_110734_create_epormas_counter_table.php

Indentation +20 added lines, -20 removed lines

@@ -6,25 +6,25 @@
 
 class CreateEpormasCounterTable extends Migration {
 
-	public function up()
-	{
-		Schema::create('epormas_counter', function(Blueprint $table) {
-			$table->increments('id');
-			$table->timestamps();
-			$table->softDeletes();
-			$table->integer('tahun')->unsigned()->index();
-			$table->string('bulan', 2)->index();
-			$table->datetime('tanggal')->index();
-			$table->integer('count')->unsigned()->index();
-			$table->string('via')->index();
-			$table->integer('user_id')->unsigned()->index();
-			$table->integer('category_id')->unsigned()->index();
-			$table->integer('city_id')->unsigned()->index();
-		});
-	}
+    public function up()
+    {
+        Schema::create('epormas_counter', function(Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+            $table->softDeletes();
+            $table->integer('tahun')->unsigned()->index();
+            $table->string('bulan', 2)->index();
+            $table->datetime('tanggal')->index();
+            $table->integer('count')->unsigned()->index();
+            $table->string('via')->index();
+            $table->integer('user_id')->unsigned()->index();
+            $table->integer('category_id')->unsigned()->index();
+            $table->integer('city_id')->unsigned()->index();
+        });
+    }
 
-	public function down()
-	{
-		Schema::dropIfExists('epormas_counter');
-	}
+    public function down()
+    {
+        Schema::dropIfExists('epormas_counter');
+    }
 }

src/database/migrations/2017_12_01_110734_create_epormas_city_table.php

Indentation +13 added lines, -13 removed lines

@@ -6,18 +6,18 @@
 
 class CreateEpormasCityTable extends Migration {
 
-	public function up()
-	{
-		Schema::create('epormas_city', function(Blueprint $table) {
-			$table->increments('id');
-			$table->timestamps();
-			$table->softDeletes();
-			$table->string('name', 191)->index();
-		});
-	}
+    public function up()
+    {
+        Schema::create('epormas_city', function(Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+            $table->softDeletes();
+            $table->string('name', 191)->index();
+        });
+    }
 
-	public function down()
-	{
-		Schema::dropIfExists('epormas_city');
-	}
+    public function down()
+    {
+        Schema::dropIfExists('epormas_city');
+    }
 }

src/database/migrations/2017_12_01_110734_create_epormas_category_table.php

Indentation +13 added lines, -13 removed lines

@@ -6,18 +6,18 @@
 
 class CreateEpormasCategoryTable extends Migration {
 
-	public function up()
-	{
-		Schema::create('epormas_category', function(Blueprint $table) {
-			$table->increments('id');
-			$table->timestamps();
-			$table->softDeletes();
-			$table->string('name', 191)->index();
-		});
-	}
+    public function up()
+    {
+        Schema::create('epormas_category', function(Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+            $table->softDeletes();
+            $table->string('name', 191)->index();
+        });
+    }
 
-	public function down()
-	{
-		Schema::dropIfExists('epormas_category');
-	}
+    public function down()
+    {
+        Schema::dropIfExists('epormas_category');
+    }
 }

src/database/seeds/EpormasCityTableSeeder.php

Indentation +29 added lines, -29 removed lines

@@ -5,34 +5,34 @@
 
 class EpormasCityTableSeeder extends Seeder {
 
-	public function run()
-	{
-		//DB::table('epormas_city')->delete();
+    public function run()
+    {
+        //DB::table('epormas_city')->delete();
 
-		// create_epormas_city_20171201000000
-		EpormasCity::create(array(
-				'name' => 'Kabupaten Pandeglang'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kabupaten Lebak'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kabupaten Tangerang'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kabupaten Serang'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kota Tangerang'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kota Cilegon'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kota Serang'
-			));
-		EpormasCity::create(array(
-				'name' => 'Kota Tangerang Selatan'
-			));
-	}
+        // create_epormas_city_20171201000000
+        EpormasCity::create(array(
+                'name' => 'Kabupaten Pandeglang'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kabupaten Lebak'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kabupaten Tangerang'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kabupaten Serang'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kota Tangerang'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kota Cilegon'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kota Serang'
+            ));
+        EpormasCity::create(array(
+                'name' => 'Kota Tangerang Selatan'
+            ));
+    }
 }

src/database/seeds/EpormasCategoryTableSeeder.php

Indentation +8 added lines, -8 removed lines

@@ -5,13 +5,13 @@
 
 class EpormasCategoryTableSeeder extends Seeder {
 
-	public function run()
-	{
-		//DB::table('epormas_category')->delete();
+    public function run()
+    {
+        //DB::table('epormas_category')->delete();
 
-		// create_epormas_category_20171201000000
-		EpormasCategory::create(array(
-				'name' => 'Pendidikan'
-			));
-	}
+        // create_epormas_category_20171201000000
+        EpormasCategory::create(array(
+                'name' => 'Pendidikan'
+            ));
+    }
 }

src/database/seeds/EpormasCounterTableSeeder.php

Indentation +15 added lines, -15 removed lines

@@ -5,20 +5,20 @@
 
 class EpormasCounterTableSeeder extends Seeder {
 
-	public function run()
-	{
-		//DB::table('epormas_counter')->delete();
+    public function run()
+    {
+        //DB::table('epormas_counter')->delete();
 
-		// create_epormas_counter_20171201000000
-		EpormasCounter::create(array(
-				'tanggal' => '2017-12-01 00:00:12',
-				'count' => 1,
-				'via' => 'form',
-				'user_id' => 1,
-				'tahun' => 2017,
-				'bulan' => 12,
-				'category_id' => 1,
-				'city_id' => 1
-			));
-	}
+        // create_epormas_counter_20171201000000
+        EpormasCounter::create(array(
+                'tanggal' => '2017-12-01 00:00:12',
+                'count' => 1,
+                'via' => 'form',
+                'user_id' => 1,
+                'tahun' => 2017,
+                'bulan' => 12,
+                'category_id' => 1,
+                'city_id' => 1
+            ));
+    }
 }

src/Http/Controllers/EpormasCityController.php

Indentation +144 added lines, -144 removed lines

@@ -12,91 +12,91 @@ 
 class EpormasCityController extends Controller

 {

 

-  /**

-   * Display a listing of the resource.

-   *

-   * @return Response

-   */

-  public function index()

-  {

-      try {

-          $error = false;

-          $statusCode = 200;

-          $title = 'Success';

-          $type = 'success';

-          $message = 'Success';

-          $result = EpormasCity::all();

-      } catch (Exception $e) {

-          $error = true;

-          $statusCode = 404;

-          $title = 'Error';

-          $type = 'error';

-          $message = 'Error';

-          $result = 'Not Found';

-      } finally {

-          return Response::json(array(

+    /**

+     * Display a listing of the resource.

+     *

+     * @return Response

+     */

+    public function index()

+    {

+        try {

+            $error = false;

+            $statusCode = 200;

+            $title = 'Success';

+            $type = 'success';

+            $message = 'Success';

+            $result = EpormasCity::all();

+        } catch (Exception $e) {

+            $error = true;

+            $statusCode = 404;

+            $title = 'Error';

+            $type = 'error';

+            $message = 'Error';

+            $result = 'Not Found';

+        } finally {

+            return Response::json(array(

             'error' => $error,

             'status' => $statusCode,

             'title' => $title,

             'type' => $type,

             'message' => $message,

             'result' => $result

-          ));

-      }

-  }

+            ));

+        }

+    }

 

-  /**

-   * Show the form for creating a new resource.

-   *

-   * @return Response

-   */

-  public function create()

-  {

+    /**

+     * Show the form for creating a new resource.

+     *

+     * @return Response

+     */

+    public function create()

+    {

 

-  }

+    }

 

-  /**

-   * Store a newly created resource in storage.

-   *

-   * @return Response

-   */

-  public function store(Request $request, $version='')

-  {

+    /**

+     * Store a newly created resource in storage.

+     *

+     * @return Response

+     */

+    public function store(Request $request, $version='')

+    {

         $path = \Request::path();

         $explode = explode('/', $path);

 

         $from = 'form';

         if(in_array('api',$explode)){

-          $from = 'api';

+            $from = 'api';

         }

 

         $via = $from;

         if($version != '' && $version != 'store'){

-          $via .= '-'.$version;

+            $via .= '-'.$version;

         }

 

-      	$rules = [

+            $rules = [

             'name' => 'required'

         ];

 

         $validator = Validator::make($request->all(), $rules);

         if ($validator->fails()) {

-          return response()->json([

-              'title' => 'Error',

-              'type'  => 'error',

-              'message' => $validator->errors()->all()

-          ]);

+            return response()->json([

+                'title' => 'Error',

+                'type'  => 'error',

+                'message' => $validator->errors()->all()

+            ]);

         }

 

         $data = EpormasCity::whereNull('deleted_at')

                         ->where('name', $request->name)

                         ->count();

         if($data > 0){

-          return response()->json([

-              'title' => 'Error',

-              'type'  => 'error',

-              'message' => 'Data has already been taken.'

-          ]);

+            return response()->json([

+                'title' => 'Error',

+                'type'  => 'error',

+                'message' => 'Data has already been taken.'

+            ]);

         }

 

         try {

@@ -117,24 +117,24 @@ 
             $result = 'Not Found';

         } finally {

             return Response::json(array(

-              'error' => $error,

-              'status' => $statusCode,

-              'title' => $title,

-              'type' => $type,

-              'message' => $message,

-              'result' => $result

+                'error' => $error,

+                'status' => $statusCode,

+                'title' => $title,

+                'type' => $type,

+                'message' => $message,

+                'result' => $result

             ));

         }

-  }

+    }

 

-  /**

-   * Display the specified resource.

-   *

-   * @param  int  $id

-   * @return Response

-   */

-  public function show($version='', $id)

-  {

+    /**

+     * Display the specified resource.

+     *

+     * @param  int  $id

+     * @return Response

+     */

+    public function show($version='', $id)

+    {

         try {

             $error = false;

             $statusCode = 200;

@@ -151,24 +151,24 @@ 
             $result = 'Not Found';

         } finally {

             return Response::json(array(

-              'error' => $error,

-              'status' => $statusCode,

-              'title' => $title,

-              'type' => $type,

-              'message' => $message,

-              'result' => $result

+                'error' => $error,

+                'status' => $statusCode,

+                'title' => $title,

+                'type' => $type,

+                'message' => $message,

+                'result' => $result

             ));

         }

-  }

+    }

 

-  /**

-   * Show the form for editing the specified resource.

-   *

-   * @param  int  $id

-   * @return Response

-   */

-  public function edit($id)

-  {

+    /**

+     * Show the form for editing the specified resource.

+     *

+     * @param  int  $id

+     * @return Response

+     */

+    public function edit($id)

+    {

         try {

             $error = false;

             $statusCode = 200;

@@ -185,24 +185,24 @@ 
             $result = 'Not Found';

         } finally {

             return Response::json(array(

-              'error' => $error,

-              'status' => $statusCode,

-              'title' => $title,

-              'type' => $type,

-              'message' => $message,

-              'result' => $result

+                'error' => $error,

+                'status' => $statusCode,

+                'title' => $title,

+                'type' => $type,

+                'message' => $message,

+                'result' => $result

             ));

         }

-  }

+    }

 

-  /**

-   * Update the specified resource in storage.

-   *

-   * @param  int  $id

-   * @return Response

-   */

-  public function update(Request $request, $version='', $id)

-  {

+    /**

+     * Update the specified resource in storage.

+     *

+     * @param  int  $id

+     * @return Response

+     */

+    public function update(Request $request, $version='', $id)

+    {

         $result = EpormasCity::find($id);

 

         $rules = [

@@ -211,24 +211,24 @@ 
 

         $validator = Validator::make($request->all(), $rules);

         if ($validator->fails()) {

-          return response()->json([

-              'title' => 'Error',

-              'type'  => 'error',

-              'message' => $validator->errors()->all()

-          ]);

+            return response()->json([

+                'title' => 'Error',

+                'type'  => 'error',

+                'message' => $validator->errors()->all()

+            ]);

         }

 

         if($request->name != $result->name){

-          $data = EpormasCity::whereNull('deleted_at')

-                          ->where('name', $request->name)

-                          ->count();

-          if($data > 0){

+            $data = EpormasCity::whereNull('deleted_at')

+                            ->where('name', $request->name)

+                            ->count();

+            if($data > 0){

             return response()->json([

                 'title' => 'Error',

                 'type'  => 'error',

                 'message' => 'Data has already been taken.'

             ]);

-          }

+            }

         }

 

         $path = \Request::path();

@@ -236,12 +236,12 @@ 
 

         $from = 'form';

         if(in_array('api',$explode)){

-          $from = 'api';

+            $from = 'api';

         }

 

         $via = $from;

         if($version != '' && $version != 'update'){

-          $via .= '-'.$version;

+            $via .= '-'.$version;

         }

 

         try {

@@ -262,47 +262,47 @@ 
             $result = 'Not Found';

         } finally {

             return Response::json(array(

-              'error' => $error,

-              'status' => $statusCode,

-              'title' => $title,

-              'type' => $type,

-              'message' => $message,

-              'result' => $result

+                'error' => $error,

+                'status' => $statusCode,

+                'title' => $title,

+                'type' => $type,

+                'message' => $message,

+                'result' => $result

             ));

         }

-  }

+    }

 

-  /**

-   * Remove the specified resource from storage.

-   *

-   * @param  int  $id

-   * @return Response

-   */

-  public function destroy($id)

-  {

-      try {

-          EpormasCity::find($id)->delete();

-          $error = false;

-          $statusCode = 200;

-          $title = 'Success';

-          $type = 'success';

-          $message = 'Data deleted successfully';

-      } catch (Exception $e) {

-          $error = true;

-          $statusCode = 404;

-          $title = 'Error';

-          $type = 'error';

-          $message = 'Error';

-      } finally {

-          return Response::json(array(

+    /**

+     * Remove the specified resource from storage.

+     *

+     * @param  int  $id

+     * @return Response

+     */

+    public function destroy($id)

+    {

+        try {

+            EpormasCity::find($id)->delete();

+            $error = false;

+            $statusCode = 200;

+            $title = 'Success';

+            $type = 'success';

+            $message = 'Data deleted successfully';

+        } catch (Exception $e) {

+            $error = true;

+            $statusCode = 404;

+            $title = 'Error';

+            $type = 'error';

+            $message = 'Error';

+        } finally {

+            return Response::json(array(

             'error' => $error,

             'status' => $statusCode,

             'title' => $title,

             'type' => $type,

             'message' => $message

-          ));

-      }

-  }

+            ));

+        }

+    }

 

 }

 

src/Http/Controllers/DashboardEpormasController.php

Indentation +51 added lines, -51 removed lines

@@ -15,32 +15,32 @@ 
 {
     public function epormas()
     {
-      //Pegawai Epormas
-      $grafikepormascounter = DB::table('epormas_counter')
+        //Pegawai Epormas
+        $grafikepormascounter = DB::table('epormas_counter')
                     ->select('tahun','bulan','city_id', DB::raw('SUM(count) as count'))
                     ->whereNull('deleted_at')->groupBy('tahun','bulan','city_id')->orderBy('bulan')->get();
-      $grafiktahunepormascounter = DB::table('epormas_counter')
+        $grafiktahunepormascounter = DB::table('epormas_counter')
                     ->select('tahun', DB::raw('SUM(count) as count'))
                     ->whereNull('deleted_at')->groupBy('tahun')->orderBy('tahun')->get();
 
-      $namaBulan = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
-      $namaBulans = array('Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember');
-      $city = EpormasCity::all();
-      $category = EpormasCategory::all();
-      $countcity = count($city);
-      $countcategory = count($category);
+        $namaBulan = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
+        $namaBulans = array('Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember');
+        $city = EpormasCity::all();
+        $category = EpormasCategory::all();
+        $countcity = count($city);
+        $countcategory = count($category);
 
-      $countgrafikepormascounter = count($grafikepormascounter);
-      $countgrafiktahunepormascounter = count($grafiktahunepormascounter);
-      $datagrafikepormascounter = [];
-      $datagrafiktahunepormascounter = [];
-      $datagrafikcountepormascounter = [];
-      $datagrafiktotalepormascounter = [];
-      $grafikcountepormascounter = [];
-      $grafikbulanepormascounter = [];
-      $grafiktotalepormascounter = [];
-      $grafikpieepormascounter = [];
-      for($q=0; $q<$countgrafiktahunepormascounter; $q++){
+        $countgrafikepormascounter = count($grafikepormascounter);
+        $countgrafiktahunepormascounter = count($grafiktahunepormascounter);
+        $datagrafikepormascounter = [];
+        $datagrafiktahunepormascounter = [];
+        $datagrafikcountepormascounter = [];
+        $datagrafiktotalepormascounter = [];
+        $grafikcountepormascounter = [];
+        $grafikbulanepormascounter = [];
+        $grafiktotalepormascounter = [];
+        $grafikpieepormascounter = [];
+        for($q=0; $q<$countgrafiktahunepormascounter; $q++){
         $tahungrafikepormascounter = $grafiktahunepormascounter[$q]->tahun;
         $gcountepormascounter  = (int)$grafiktahunepormascounter[$q]->count;
         $totaldataepormascounter = $gcountepormascounter;
@@ -50,47 +50,47 @@ 
 
         for($kota=1; $kota<=$countcity; $kota++){
             for ($index=0; $index<12; $index++) {
-              $grafikcountepormascounter[$q][$kota][$index] = 0;
-              $grafikbulanepormascounter[$q][$kota][$index] = 0;
-              $grafiktotalepormascounter[$q][$kota][$index] = 0;
-              $grafikpieepormascounter[$q][$kota][$index] = ['value'=>0,'name'=>$namaBulan[$index]];
-              $totaldatagrafikepormascounter[$q][$index] = 0;
+                $grafikcountepormascounter[$q][$kota][$index] = 0;
+                $grafikbulanepormascounter[$q][$kota][$index] = 0;
+                $grafiktotalepormascounter[$q][$kota][$index] = 0;
+                $grafikpieepormascounter[$q][$kota][$index] = ['value'=>0,'name'=>$namaBulan[$index]];
+                $totaldatagrafikepormascounter[$q][$index] = 0;
             }
         }
         for($r=0; $r<$countgrafikepormascounter; $r++){
-          $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
-          $bulansepormascounter = $grafikepormascounter[$r]->bulan;
-          $city_id = $grafikepormascounter[$r]->city_id;
-          if($bulansepormascounter < 10){
+            $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
+            $bulansepormascounter = $grafikepormascounter[$r]->bulan;
+            $city_id = $grafikepormascounter[$r]->city_id;
+            if($bulansepormascounter < 10){
             $bulanepormascounter = substr($bulansepormascounter,1);
-          }else {
+            }else {
             $bulanepormascounter = $bulansepormascounter;
-          }
-          if($tahungrafikepormascounter == $tahunsepormascounter){
-              $totaldatagrafikepormascounter[$q][$bulanepormascounter-1] += $grafikepormascounter[$r]->count;
-          }
+            }
+            if($tahungrafikepormascounter == $tahunsepormascounter){
+                $totaldatagrafikepormascounter[$q][$bulanepormascounter-1] += $grafikepormascounter[$r]->count;
+            }
         }
         for($r=0; $r<$countgrafikepormascounter; $r++){
-          $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
-          $bulansepormascounter = $grafikepormascounter[$r]->bulan;
-          $city_id = $grafikepormascounter[$r]->city_id;
-          if($bulansepormascounter < 10){
+            $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
+            $bulansepormascounter = $grafikepormascounter[$r]->bulan;
+            $city_id = $grafikepormascounter[$r]->city_id;
+            if($bulansepormascounter < 10){
             $bulanepormascounter = substr($bulansepormascounter,1);
-          }else {
+            }else {
             $bulanepormascounter = $bulansepormascounter;
-          }
-          if($tahungrafikepormascounter == $tahunsepormascounter){
-              $grafikcountepormascounter[$q][$city_id][$bulanepormascounter-1] = (int)$grafikepormascounter[$r]->count;
-              $grafikbulanepormascounter[$q][$city_id][$bulanepormascounter-1] = $grafikepormascounter[$r]->bulan;
-              $totaldatagrafikepormascounters = $totaldatagrafikepormascounter[$q][$bulanepormascounter-1];
-              $grafiktotalepormascounter[$q][$city_id][$bulanepormascounter-1] = $totaldatagrafikepormascounters;
-              $grafikpieepormascounter[$q][$city_id][$bulanepormascounter-1] = ['value'=>$totaldatagrafikepormascounters,'name'=>$namaBulan[$bulanepormascounter-1]];
-          }
+            }
+            if($tahungrafikepormascounter == $tahunsepormascounter){
+                $grafikcountepormascounter[$q][$city_id][$bulanepormascounter-1] = (int)$grafikepormascounter[$r]->count;
+                $grafikbulanepormascounter[$q][$city_id][$bulanepormascounter-1] = $grafikepormascounter[$r]->bulan;
+                $totaldatagrafikepormascounters = $totaldatagrafikepormascounter[$q][$bulanepormascounter-1];
+                $grafiktotalepormascounter[$q][$city_id][$bulanepormascounter-1] = $totaldatagrafikepormascounters;
+                $grafikpieepormascounter[$q][$city_id][$bulanepormascounter-1] = ['value'=>$totaldatagrafikepormascounters,'name'=>$namaBulan[$bulanepormascounter-1]];
+            }
+        }
         }
-      }
-      $chartgrafikcountepormascounter = ['chartdata'=>$grafikcountepormascounter];
-      $datagrafikepormascounter = ['count'=>$grafikcountepormascounter, 'bulan'=>$grafikbulanepormascounter, 'namabulan'=>$namaBulan, 'namabulans'=>$namaBulans, 'kategori'=>$category, 'kota'=>$city, 'total'=>$grafiktotalepormascounter, 'datatahun'=>['tahun'=>$datagrafiktahunepormascounter, 'count'=>$datagrafikcountepormascounter, 'totaldata'=>$datagrafiktotalepormascounter], 'datapie'=>$grafikpieepormascounter, 'seriesdata'=>[$chartgrafikcountepormascounter]];
-      //end Pegawai Epormas
+        $chartgrafikcountepormascounter = ['chartdata'=>$grafikcountepormascounter];
+        $datagrafikepormascounter = ['count'=>$grafikcountepormascounter, 'bulan'=>$grafikbulanepormascounter, 'namabulan'=>$namaBulan, 'namabulans'=>$namaBulans, 'kategori'=>$category, 'kota'=>$city, 'total'=>$grafiktotalepormascounter, 'datatahun'=>['tahun'=>$datagrafiktahunepormascounter, 'count'=>$datagrafikcountepormascounter, 'totaldata'=>$datagrafiktotalepormascounter], 'datapie'=>$grafikpieepormascounter, 'seriesdata'=>[$chartgrafikcountepormascounter]];
+        //end Pegawai Epormas
 
         return Response::json(array(
             //Jumlah Penduduk