Inspection of "Build Status" - bantenprov/dashboard-epormas - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — master (#6)

unknown

created 2017-12-10 08:30 UTC

Status

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -35,28 +35,28 @@
 block discarded – undo
      * @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'
+        ]
     ];
 
     /**

Please login to merge, or discard this patch.

src/Http/Controllers/DashboardEpormasController.php 1 patch

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

@@ -15,32 +15,32 @@  discard block
 block discarded – undo
 {
     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 @@  discard block
 block discarded – undo
 
         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([
             //Jumlah Penduduk

Please login to merge, or discard this patch.

src/Http/Controllers/EpormasCounterController.php 1 patch

Indentation +133 added lines, -133 removed lines patch added patch discarded remove patch

@@ -14,13 +14,13 @@  discard block
 block discarded – undo
 class EpormasCounterController extends Controller
 {
 
-  /**
-   * Display a listing of the resource.
-   *
-   * @return Response
-   */
-  public function index()
-  {
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function index()
+    {
         $result = EpormasCounter::whereNull('deleted_at')
                         ->with('getCity')
                         ->with('getCategory')
@@ -28,44 +28,44 @@  discard block
 block discarded – undo
         return response()->json([
             '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()
+    {
         $city = EpormasCity::all();
         $category = EpormasCategory::all();
         return response()->json([
             'city' => $city,
             'category' => $category,
         ]);
-  }
+    }
 
-  /**
-   * 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 = [
             'count' => 'required|numeric',
             'city_id' => 'required|numeric',
             'category_id' => 'required|numeric',
@@ -74,44 +74,44 @@  discard block
 block discarded – undo
 
         $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()
+            ]);
         }
 
         $format = date('Y-m-d', strtotime(str_replace(' ','-',$request->tanggal)));
         $resultcek = EpormasCounter::whereNull('deleted_at')
-                             ->where('tanggal','like','%'.$format.'%')
-                             ->where('category_id',$request->category_id)
-                             ->where('city_id',$request->city_id)
-                             ->groupBy('tahun','bulan','category_id','city_id')
-                             ->orderBy('bulan')
-                             ->count();
+                                ->where('tanggal','like','%'.$format.'%')
+                                ->where('category_id',$request->category_id)
+                                ->where('city_id',$request->city_id)
+                                ->groupBy('tahun','bulan','category_id','city_id')
+                                ->orderBy('bulan')
+                                ->count();
         if($resultcek > 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.'
+            ]);
         }
 
         $date = explode("-",$format);
         $data = EpormasCounter::whereNull('deleted_at')
-                       ->where('tahun', $date[0])
-                       ->where('bulan', $date[1])
-                       ->where('category_id',$request->category_id)
-                       ->where('city_id',$request->city_id)
-                       ->groupBy('tahun','bulan','category_id','city_id')
-                       ->orderBy('bulan')
-                       ->count();
+                        ->where('tahun', $date[0])
+                        ->where('bulan', $date[1])
+                        ->where('category_id',$request->category_id)
+                        ->where('city_id',$request->city_id)
+                        ->groupBy('tahun','bulan','category_id','city_id')
+                        ->orderBy('bulan')
+                        ->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.'
+            ]);
         }
 
         $result = EpormasCounter::create([
@@ -130,16 +130,16 @@  discard block
 block discarded – undo
             'type'  => 'success',
             'message' => 'Data created successfully'
         ]);
-  }
+    }
 
-  /**
-   * 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)
+    {
         $result = EpormasCounter::whereNull('deleted_at')
                         ->with('getCity')
                         ->with('getCategory')
@@ -147,16 +147,16 @@  discard block
 block discarded – undo
         return response()->json([
             '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)
+    {
         $city = EpormasCity::all();
         $category = EpormasCategory::all();
         $result = EpormasCounter::whereNull('deleted_at')
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
             'tanggal' => $format,
             'category' => $category,
         ]);
-  }
+    }
 
-  /**
-   * 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 = EpormasCounter::whereNull('deleted_at')
                         ->with('getCity')
                         ->with('getCategory')
@@ -194,28 +194,28 @@  discard block
 block discarded – undo
 
         $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()
+            ]);
         }
 
         $format = date('Y-m-d', strtotime(str_replace(' ','-',$request->tanggal)));
         if($result->city_id != $request->city_id || $result->category_id != $request->category_id){
             $resultcek = EpormasCounter::whereNull('deleted_at')
-                                 ->where('tanggal','like','%'.$format.'%')
-            		                 ->where('category_id',$request->category_id)
-            		                 ->where('city_id',$request->city_id)
-                                 ->groupBy('tahun','bulan','category_id','city_id')
-                                 ->orderBy('bulan')
-                                 ->count();
+                                    ->where('tanggal','like','%'.$format.'%')
+                                        ->where('category_id',$request->category_id)
+                                        ->where('city_id',$request->city_id)
+                                    ->groupBy('tahun','bulan','category_id','city_id')
+                                    ->orderBy('bulan')
+                                    ->count();
             if($resultcek > 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.'
+                ]);
             }
         }
 
@@ -223,34 +223,34 @@  discard block
 block discarded – undo
         $dates = date('Y-m-d', strtotime($result->tanggal));
         if($dates != $format){
             $resultcek = EpormasCounter::whereNull('deleted_at')
-            		                 ->where('category_id',$request->category_id)
-            		                 ->where('city_id',$request->city_id)
-                                 ->where('tanggal','like','%'.$format.'%')
-                                 ->groupBy('tahun','bulan','category_id','city_id')
-                                 ->orderBy('bulan')
-                                 ->count();
+                                        ->where('category_id',$request->category_id)
+                                        ->where('city_id',$request->city_id)
+                                    ->where('tanggal','like','%'.$format.'%')
+                                    ->groupBy('tahun','bulan','category_id','city_id')
+                                    ->orderBy('bulan')
+                                    ->count();
             if($resultcek > 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.'
+                ]);
             }
 
             $data = EpormasCounter::whereNull('deleted_at')
-                           ->where('tahun', $date[0])
-                           ->where('bulan', $date[1])
-            		           ->where('category_id',$request->category_id)
-            		           ->where('city_id',$request->city_id)
-                           ->groupBy('tahun','bulan','category_id','city_id')
-                           ->orderBy('bulan')
-                           ->count();
+                            ->where('tahun', $date[0])
+                            ->where('bulan', $date[1])
+                                ->where('category_id',$request->category_id)
+                                ->where('city_id',$request->city_id)
+                            ->groupBy('tahun','bulan','category_id','city_id')
+                            ->orderBy('bulan')
+                            ->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.'
+                ]);
             }
         }
 
@@ -260,13 +260,13 @@  discard block
 block discarded – undo
         $from = $result->via;
         $user_id = $result->user_id;
         if(in_array('api',$explode)){
-          $from = 'api';
-          $user_id = $request->user_id;
+            $from = 'api';
+            $user_id = $request->user_id;
         }
 
         $via = $from;
         if($version != '' && $version != 'update'){
-          $via .= '-'.$version;
+            $via .= '-'.$version;
         }
 
         $result->update([
@@ -285,21 +285,21 @@  discard block
 block discarded – undo
             'type'  => 'success',
             'message' => 'Data updated successfully'
         ]);
-  }
+    }
 
-  /**
-   * Remove the specified resource from storage.
-   *
-   * @param  int  $id
-   * @return Response
-   */
-  public function destroy($id)
-  {
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
         EpormasCounter::find($id)->delete();
         return response()->json([
             'message' => 'Data deleted successfully'
         ]);
-  }
+    }
 
 }
 

Please login to merge, or discard this patch.

src/Http/Controllers/EpormasCategoryController.php 1 patch

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

@@ -12,71 +12,71 @@  discard block
 block discarded – undo
 class EpormasCategoryController extends Controller
 {
 
-  /**
-   * Display a listing of the resource.
-   *
-   * @return Response
-   */
-  public function index()
-  {
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function index()
+    {
         $result = EpormasCategory::all();
         return response()->json([
             'result' => $result
         ]);
-  }
-
-  /**
-   * 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='')
-  {
+    }
+
+    /**
+     * 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='')
+    {
         $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 = EpormasCategory::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.'
+            ]);
         }
 
         $result = EpormasCategory::create([
@@ -88,44 +88,44 @@  discard block
 block discarded – undo
             'type'  => 'success',
             'message' => 'Data created successfully'
         ]);
-  }
-
-  /**
-   * 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)
+    {
         $result = EpormasCategory::find($id);
         return response()->json([
             '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)
+    {
         $result = EpormasCategory::find($id);
         return response()->json([
             '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 = EpormasCategory::find($id);
 
         $rules = [
@@ -134,24 +134,24 @@  discard block
 block discarded – undo
 
         $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 = EpormasCategory::whereNull('deleted_at')
-                          ->where('name', $request->name)
-                          ->count();
-          if($data > 0){
+            $data = EpormasCategory::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();
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
 
         $from = 'form';
         if(in_array('api',$explode)){
-          $from = 'api';
+            $from = 'api';
         }
 
         $via = $from;
         if($version != '' && $version != 'update'){
-          $via .= '-'.$version;
+            $via .= '-'.$version;
         }
 
         $result->update([
@@ -176,21 +176,21 @@  discard block
 block discarded – undo
             'type'  => 'success',
             'message' => 'Data updated successfully'
         ]);
-  }
-
-  /**
-   * Remove the specified resource from storage.
-   *
-   * @param  int  $id
-   * @return Response
-   */
-  public function destroy($id)
-  {
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
         EpormasCategory::find($id)->delete();
         return response()->json([
             'message' => 'Data deleted successfully'
         ]);
-  }
+    }
 
 }
 

Please login to merge, or discard this patch.

src/Http/Controllers/EpormasCityController.php 1 patch

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

@@ -12,71 +12,71 @@  discard block
 block discarded – undo
 class EpormasCityController extends Controller
 {
 
-  /**
-   * Display a listing of the resource.
-   *
-   * @return Response
-   */
-  public function index()
-  {
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function index()
+    {
         $result = EpormasCity::all();
         return response()->json([
             'result' => $result
         ]);
-  }
-
-  /**
-   * 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='')
-  {
+    }
+
+    /**
+     * 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='')
+    {
         $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.'
+            ]);
         }
 
         $result = EpormasCity::create([
@@ -88,44 +88,44 @@  discard block
 block discarded – undo
             'type'  => 'success',
             'message' => 'Data created successfully'
         ]);
-  }
-
-  /**
-   * 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)
+    {
         $result = EpormasCity::find($id);
         return response()->json([
             '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)
+    {
         $result = EpormasCity::find($id);
         return response()->json([
             '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 = [
@@ -134,24 +134,24 @@  discard block
 block discarded – undo
 
         $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();
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
 
         $from = 'form';
         if(in_array('api',$explode)){
-          $from = 'api';
+            $from = 'api';
         }
 
         $via = $from;
         if($version != '' && $version != 'update'){
-          $via .= '-'.$version;
+            $via .= '-'.$version;
         }
 
         $result->update([
@@ -176,21 +176,21 @@  discard block
 block discarded – undo
             'type'  => 'success',
             'message' => 'Data updated successfully'
         ]);
-  }
-
-  /**
-   * Remove the specified resource from storage.
-   *
-   * @param  int  $id
-   * @return Response
-   */
-  public function destroy($id)
-  {
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
         EpormasCity::find($id)->delete();
         return response()->json([
             'message' => 'Data deleted successfully'
         ]);
-  }
+    }
 
 }
 

Please login to merge, or discard this patch.

src/database/migrations/2017_12_01_110734_create_epormas_counter_table.php 1 patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -6,25 +6,25 @@
 block discarded – undo
 
 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');
+    }
 }

Please login to merge, or discard this patch.

src/database/migrations/2017_12_01_110734_create_epormas_city_table.php 1 patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -6,18 +6,18 @@
 block discarded – undo
 
 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');
+    }
 }

Please login to merge, or discard this patch.

src/database/migrations/2017_12_01_110734_create_epormas_category_table.php 1 patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -6,18 +6,18 @@
 block discarded – undo
 
 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');
+    }
 }

Please login to merge, or discard this patch.

src/database/seeds/EpormasCityTableSeeder.php 1 patch

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -5,34 +5,34 @@
 block discarded – undo
 
 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'
+            ));
+    }
 }

Please login to merge, or discard this patch.

		@@ -35,28 +35,28 @@
		block discarded – undo
35	35	* @var string
36	36	*/
37	37	protected $stubsController = [
38		- 'controllers' => [
39		- 'DashboardEpormasController.stub',
40		- 'EpormasCategoryController.stub',
41		- 'EpormasCityController.stub',
42		- 'EpormasCounterController.stub'
43		- ]
	38	+ 'controllers' => [
	39	+ 'DashboardEpormasController.stub',
	40	+ 'EpormasCategoryController.stub',
	41	+ 'EpormasCityController.stub',
	42	+ 'EpormasCounterController.stub'
	43	+ ]
44	44	];
45	45
46	46	protected $stubsModel = [
47		- 'models' => [
48		- 'EpormasCategory.stub',
49		- 'EpormasCity.stub',
50		- 'EpormasCounter.stub'
51		- ]
	47	+ 'models' => [
	48	+ 'EpormasCategory.stub',
	49	+ 'EpormasCity.stub',
	50	+ 'EpormasCounter.stub'
	51	+ ]
52	52	];
53	53
54	54	protected $stubsSeeds = [
55		- 'seeds' => [
56		- 'EpormasCategoryTableSeeder.stub',
57		- 'EpormasCityTableSeeder.stub',
58		- 'EpormasCounterTableSeeder.stub'
59		- ]
	55	+ 'seeds' => [
	56	+ 'EpormasCategoryTableSeeder.stub',
	57	+ 'EpormasCityTableSeeder.stub',
	58	+ 'EpormasCounterTableSeeder.stub'
	59	+ ]
60	60	];
61	61
62	62	/**

		@@ -15,32 +15,32 @@ discard block
		block discarded – undo
15	15	{
16	16	public function epormas()
17	17	{
18		- //Pegawai Epormas
19		- $grafikepormascounter = DB::table('epormas_counter')
	18	+ //Pegawai Epormas
	19	+ $grafikepormascounter = DB::table('epormas_counter')
20	20	->select('tahun','bulan','city_id', DB::raw('SUM(count) as count'))
21	21	->whereNull('deleted_at')->groupBy('tahun','bulan','city_id')->orderBy('bulan')->get();
22		- $grafiktahunepormascounter = DB::table('epormas_counter')
	22	+ $grafiktahunepormascounter = DB::table('epormas_counter')
23	23	->select('tahun', DB::raw('SUM(count) as count'))
24	24	->whereNull('deleted_at')->groupBy('tahun')->orderBy('tahun')->get();
25	25
26		- $namaBulan = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
27		- $namaBulans = array('Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember');
28		- $city = EpormasCity::all();
29		- $category = EpormasCategory::all();
30		- $countcity = count($city);
31		- $countcategory = count($category);
	26	+ $namaBulan = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
	27	+ $namaBulans = array('Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember');
	28	+ $city = EpormasCity::all();
	29	+ $category = EpormasCategory::all();
	30	+ $countcity = count($city);
	31	+ $countcategory = count($category);
32	32
33		- $countgrafikepormascounter = count($grafikepormascounter);
34		- $countgrafiktahunepormascounter = count($grafiktahunepormascounter);
35		- $datagrafikepormascounter = [];
36		- $datagrafiktahunepormascounter = [];
37		- $datagrafikcountepormascounter = [];
38		- $datagrafiktotalepormascounter = [];
39		- $grafikcountepormascounter = [];
40		- $grafikbulanepormascounter = [];
41		- $grafiktotalepormascounter = [];
42		- $grafikpieepormascounter = [];
43		- for($q=0; $q<$countgrafiktahunepormascounter; $q++){
	33	+ $countgrafikepormascounter = count($grafikepormascounter);
	34	+ $countgrafiktahunepormascounter = count($grafiktahunepormascounter);
	35	+ $datagrafikepormascounter = [];
	36	+ $datagrafiktahunepormascounter = [];
	37	+ $datagrafikcountepormascounter = [];
	38	+ $datagrafiktotalepormascounter = [];
	39	+ $grafikcountepormascounter = [];
	40	+ $grafikbulanepormascounter = [];
	41	+ $grafiktotalepormascounter = [];
	42	+ $grafikpieepormascounter = [];
	43	+ for($q=0; $q<$countgrafiktahunepormascounter; $q++){
44	44	$tahungrafikepormascounter = $grafiktahunepormascounter[$q]->tahun;
45	45	$gcountepormascounter = (int)$grafiktahunepormascounter[$q]->count;
46	46	$totaldataepormascounter = $gcountepormascounter;
		@@ -50,47 +50,47 @@ discard block
		block discarded – undo
50	50
51	51	for($kota=1; $kota<=$countcity; $kota++){
52	52	for ($index=0; $index<12; $index++) {
53		- $grafikcountepormascounter[$q][$kota][$index] = 0;
54		- $grafikbulanepormascounter[$q][$kota][$index] = 0;
55		- $grafiktotalepormascounter[$q][$kota][$index] = 0;
56		- $grafikpieepormascounter[$q][$kota][$index] = ['value'=>0,'name'=>$namaBulan[$index]];
57		- $totaldatagrafikepormascounter[$q][$index] = 0;
	53	+ $grafikcountepormascounter[$q][$kota][$index] = 0;
	54	+ $grafikbulanepormascounter[$q][$kota][$index] = 0;
	55	+ $grafiktotalepormascounter[$q][$kota][$index] = 0;
	56	+ $grafikpieepormascounter[$q][$kota][$index] = ['value'=>0,'name'=>$namaBulan[$index]];
	57	+ $totaldatagrafikepormascounter[$q][$index] = 0;
58	58	}
59	59	}
60	60	for($r=0; $r<$countgrafikepormascounter; $r++){
61		- $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
62		- $bulansepormascounter = $grafikepormascounter[$r]->bulan;
63		- $city_id = $grafikepormascounter[$r]->city_id;
64		- if($bulansepormascounter < 10){
	61	+ $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
	62	+ $bulansepormascounter = $grafikepormascounter[$r]->bulan;
	63	+ $city_id = $grafikepormascounter[$r]->city_id;
	64	+ if($bulansepormascounter < 10){
65	65	$bulanepormascounter = substr($bulansepormascounter,1);
66		- }else {
	66	+ }else {
67	67	$bulanepormascounter = $bulansepormascounter;
68		- }
69		- if($tahungrafikepormascounter == $tahunsepormascounter){
70		- $totaldatagrafikepormascounter[$q][$bulanepormascounter-1] += $grafikepormascounter[$r]->count;
71		- }
	68	+ }
	69	+ if($tahungrafikepormascounter == $tahunsepormascounter){
	70	+ $totaldatagrafikepormascounter[$q][$bulanepormascounter-1] += $grafikepormascounter[$r]->count;
	71	+ }
72	72	}
73	73	for($r=0; $r<$countgrafikepormascounter; $r++){
74		- $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
75		- $bulansepormascounter = $grafikepormascounter[$r]->bulan;
76		- $city_id = $grafikepormascounter[$r]->city_id;
77		- if($bulansepormascounter < 10){
	74	+ $tahunsepormascounter = $grafikepormascounter[$r]->tahun;
	75	+ $bulansepormascounter = $grafikepormascounter[$r]->bulan;
	76	+ $city_id = $grafikepormascounter[$r]->city_id;
	77	+ if($bulansepormascounter < 10){
78	78	$bulanepormascounter = substr($bulansepormascounter,1);
79		- }else {
	79	+ }else {
80	80	$bulanepormascounter = $bulansepormascounter;
81		- }
82		- if($tahungrafikepormascounter == $tahunsepormascounter){
83		- $grafikcountepormascounter[$q][$city_id][$bulanepormascounter-1] = (int)$grafikepormascounter[$r]->count;
84		- $grafikbulanepormascounter[$q][$city_id][$bulanepormascounter-1] = $grafikepormascounter[$r]->bulan;
85		- $totaldatagrafikepormascounters = $totaldatagrafikepormascounter[$q][$bulanepormascounter-1];
86		- $grafiktotalepormascounter[$q][$city_id][$bulanepormascounter-1] = $totaldatagrafikepormascounters;
87		- $grafikpieepormascounter[$q][$city_id][$bulanepormascounter-1] = ['value'=>$totaldatagrafikepormascounters,'name'=>$namaBulan[$bulanepormascounter-1]];
88		- }
	81	+ }
	82	+ if($tahungrafikepormascounter == $tahunsepormascounter){
	83	+ $grafikcountepormascounter[$q][$city_id][$bulanepormascounter-1] = (int)$grafikepormascounter[$r]->count;
	84	+ $grafikbulanepormascounter[$q][$city_id][$bulanepormascounter-1] = $grafikepormascounter[$r]->bulan;
	85	+ $totaldatagrafikepormascounters = $totaldatagrafikepormascounter[$q][$bulanepormascounter-1];
	86	+ $grafiktotalepormascounter[$q][$city_id][$bulanepormascounter-1] = $totaldatagrafikepormascounters;
	87	+ $grafikpieepormascounter[$q][$city_id][$bulanepormascounter-1] = ['value'=>$totaldatagrafikepormascounters,'name'=>$namaBulan[$bulanepormascounter-1]];
	88	+ }
	89	+ }
89	90	}
90		- }
91		- $chartgrafikcountepormascounter = ['chartdata'=>$grafikcountepormascounter];
92		- $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]];
93		- //end Pegawai Epormas
	91	+ $chartgrafikcountepormascounter = ['chartdata'=>$grafikcountepormascounter];
	92	+ $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]];
	93	+ //end Pegawai Epormas
94	94
95	95	return response()->json([
96	96	//Jumlah Penduduk

		@@ -14,13 +14,13 @@ discard block
		block discarded – undo
14	14	class EpormasCounterController extends Controller
15	15	{
16	16
17		- /**
18		- * Display a listing of the resource.
19		- *
20		- * @return Response
21		- */
22		- public function index()
23		- {
	17	+ /**
	18	+ * Display a listing of the resource.
	19	+ *
	20	+ * @return Response
	21	+ */
	22	+ public function index()
	23	+ {
24	24	$result = EpormasCounter::whereNull('deleted_at')
25	25	->with('getCity')
26	26	->with('getCategory')
		@@ -28,44 +28,44 @@ discard block
		block discarded – undo
28	28	return response()->json([
29	29	'result' => $result
30	30	]);
31		- }
	31	+ }
32	32
33		- /**
34		- * Show the form for creating a new resource.
35		- *
36		- * @return Response
37		- */
38		- public function create()
39		- {
	33	+ /**
	34	+ * Show the form for creating a new resource.
	35	+ *
	36	+ * @return Response
	37	+ */
	38	+ public function create()
	39	+ {
40	40	$city = EpormasCity::all();
41	41	$category = EpormasCategory::all();
42	42	return response()->json([
43	43	'city' => $city,
44	44	'category' => $category,
45	45	]);
46		- }
	46	+ }
47	47
48		- /**
49		- * Store a newly created resource in storage.
50		- *
51		- * @return Response
52		- */
53		- public function store(Request $request, $version='')
54		- {
	48	+ /**
	49	+ * Store a newly created resource in storage.
	50	+ *
	51	+ * @return Response
	52	+ */
	53	+ public function store(Request $request, $version='')
	54	+ {
55	55	$path = \Request::path();
56	56	$explode = explode('/', $path);
57	57
58	58	$from = 'form';
59	59	if(in_array('api',$explode)){
60		- $from = 'api';
	60	+ $from = 'api';
61	61	}
62	62
63	63	$via = $from;
64	64	if($version != '' && $version != 'store'){
65		- $via .= '-'.$version;
	65	+ $via .= '-'.$version;
66	66	}
67	67
68		- $rules = [
	68	+ $rules = [
69	69	'count' => 'required\|numeric',
70	70	'city_id' => 'required\|numeric',
71	71	'category_id' => 'required\|numeric',
		@@ -74,44 +74,44 @@ discard block
		block discarded – undo
74	74
75	75	$validator = Validator::make($request->all(), $rules);
76	76	if ($validator->fails()) {
77		- return response()->json([
78		- 'title' => 'Error',
79		- 'type' => 'error',
80		- 'message' => $validator->errors()->all()
81		- ]);
	77	+ return response()->json([
	78	+ 'title' => 'Error',
	79	+ 'type' => 'error',
	80	+ 'message' => $validator->errors()->all()
	81	+ ]);
82	82	}
83	83
84	84	$format = date('Y-m-d', strtotime(str_replace(' ','-',$request->tanggal)));
85	85	$resultcek = EpormasCounter::whereNull('deleted_at')
86		- ->where('tanggal','like','%'.$format.'%')
87		- ->where('category_id',$request->category_id)
88		- ->where('city_id',$request->city_id)
89		- ->groupBy('tahun','bulan','category_id','city_id')
90		- ->orderBy('bulan')
91		- ->count();
	86	+ ->where('tanggal','like','%'.$format.'%')
	87	+ ->where('category_id',$request->category_id)
	88	+ ->where('city_id',$request->city_id)
	89	+ ->groupBy('tahun','bulan','category_id','city_id')
	90	+ ->orderBy('bulan')
	91	+ ->count();
92	92	if($resultcek > 0){
93		- return response()->json([
94		- 'title' => 'Error',
95		- 'type' => 'error',
96		- 'message' => 'Data has already been taken.'
97		- ]);
	93	+ return response()->json([
	94	+ 'title' => 'Error',
	95	+ 'type' => 'error',
	96	+ 'message' => 'Data has already been taken.'
	97	+ ]);
98	98	}
99	99
100	100	$date = explode("-",$format);
101	101	$data = EpormasCounter::whereNull('deleted_at')
102		- ->where('tahun', $date[0])
103		- ->where('bulan', $date[1])
104		- ->where('category_id',$request->category_id)
105		- ->where('city_id',$request->city_id)
106		- ->groupBy('tahun','bulan','category_id','city_id')
107		- ->orderBy('bulan')
108		- ->count();
	102	+ ->where('tahun', $date[0])
	103	+ ->where('bulan', $date[1])
	104	+ ->where('category_id',$request->category_id)
	105	+ ->where('city_id',$request->city_id)
	106	+ ->groupBy('tahun','bulan','category_id','city_id')
	107	+ ->orderBy('bulan')
	108	+ ->count();
109	109	if($data > 0){
110		- return response()->json([
111		- 'title' => 'Error',
112		- 'type' => 'error',
113		- 'message' => 'Data has already been taken.'
114		- ]);
	110	+ return response()->json([
	111	+ 'title' => 'Error',
	112	+ 'type' => 'error',
	113	+ 'message' => 'Data has already been taken.'
	114	+ ]);
115	115	}
116	116
117	117	$result = EpormasCounter::create([
		@@ -130,16 +130,16 @@ discard block
		block discarded – undo
130	130	'type' => 'success',
131	131	'message' => 'Data created successfully'
132	132	]);
133		- }
	133	+ }
134	134
135		- /**
136		- * Display the specified resource.
137		- *
138		- * @param int $id
139		- * @return Response
140		- */
141		- public function show($version='', $id)
142		- {
	135	+ /**
	136	+ * Display the specified resource.
	137	+ *
	138	+ * @param int $id
	139	+ * @return Response
	140	+ */
	141	+ public function show($version='', $id)
	142	+ {
143	143	$result = EpormasCounter::whereNull('deleted_at')
144	144	->with('getCity')
145	145	->with('getCategory')
		@@ -147,16 +147,16 @@ discard block
		block discarded – undo
147	147	return response()->json([
148	148	'result' => $result
149	149	]);
150		- }
	150	+ }
151	151
152		- /**
153		- * Show the form for editing the specified resource.
154		- *
155		- * @param int $id
156		- * @return Response
157		- */
158		- public function edit($id)
159		- {
	152	+ /**
	153	+ * Show the form for editing the specified resource.
	154	+ *
	155	+ * @param int $id
	156	+ * @return Response
	157	+ */
	158	+ public function edit($id)
	159	+ {
160	160	$city = EpormasCity::all();
161	161	$category = EpormasCategory::all();
162	162	$result = EpormasCounter::whereNull('deleted_at')
		@@ -170,16 +170,16 @@ discard block
		block discarded – undo
170	170	'tanggal' => $format,
171	171	'category' => $category,
172	172	]);
173		- }
	173	+ }
174	174
175		- /**
176		- * Update the specified resource in storage.
177		- *
178		- * @param int $id
179		- * @return Response
180		- */
181		- public function update(Request $request, $version='', $id)
182		- {
	175	+ /**
	176	+ * Update the specified resource in storage.
	177	+ *
	178	+ * @param int $id
	179	+ * @return Response
	180	+ */
	181	+ public function update(Request $request, $version='', $id)
	182	+ {
183	183	$result = EpormasCounter::whereNull('deleted_at')
184	184	->with('getCity')
185	185	->with('getCategory')
		@@ -194,28 +194,28 @@ discard block
		block discarded – undo
194	194
195	195	$validator = Validator::make($request->all(), $rules);
196	196	if ($validator->fails()) {
197		- return response()->json([
198		- 'title' => 'Error',
199		- 'type' => 'error',
200		- 'message' => $validator->errors()->all()
201		- ]);
	197	+ return response()->json([
	198	+ 'title' => 'Error',
	199	+ 'type' => 'error',
	200	+ 'message' => $validator->errors()->all()
	201	+ ]);
202	202	}
203	203
204	204	$format = date('Y-m-d', strtotime(str_replace(' ','-',$request->tanggal)));
205	205	if($result->city_id != $request->city_id \|\| $result->category_id != $request->category_id){
206	206	$resultcek = EpormasCounter::whereNull('deleted_at')
207		- ->where('tanggal','like','%'.$format.'%')
208		- ->where('category_id',$request->category_id)
209		- ->where('city_id',$request->city_id)
210		- ->groupBy('tahun','bulan','category_id','city_id')
211		- ->orderBy('bulan')
212		- ->count();
	207	+ ->where('tanggal','like','%'.$format.'%')
	208	+ ->where('category_id',$request->category_id)
	209	+ ->where('city_id',$request->city_id)
	210	+ ->groupBy('tahun','bulan','category_id','city_id')
	211	+ ->orderBy('bulan')
	212	+ ->count();
213	213	if($resultcek > 0){
214		- return response()->json([
215		- 'title' => 'Error',
216		- 'type' => 'error',
217		- 'message' => 'Data has already been taken.'
218		- ]);
	214	+ return response()->json([
	215	+ 'title' => 'Error',
	216	+ 'type' => 'error',
	217	+ 'message' => 'Data has already been taken.'
	218	+ ]);
219	219	}
220	220	}
221	221
		@@ -223,34 +223,34 @@ discard block
		block discarded – undo
223	223	$dates = date('Y-m-d', strtotime($result->tanggal));
224	224	if($dates != $format){
225	225	$resultcek = EpormasCounter::whereNull('deleted_at')
226		- ->where('category_id',$request->category_id)
227		- ->where('city_id',$request->city_id)
228		- ->where('tanggal','like','%'.$format.'%')
229		- ->groupBy('tahun','bulan','category_id','city_id')
230		- ->orderBy('bulan')
231		- ->count();
	226	+ ->where('category_id',$request->category_id)
	227	+ ->where('city_id',$request->city_id)
	228	+ ->where('tanggal','like','%'.$format.'%')
	229	+ ->groupBy('tahun','bulan','category_id','city_id')
	230	+ ->orderBy('bulan')
	231	+ ->count();
232	232	if($resultcek > 0){
233		- return response()->json([
234		- 'title' => 'Error',
235		- 'type' => 'error',
236		- 'message' => 'Data has already been taken.'
237		- ]);
	233	+ return response()->json([
	234	+ 'title' => 'Error',
	235	+ 'type' => 'error',
	236	+ 'message' => 'Data has already been taken.'
	237	+ ]);
238	238	}
239	239
240	240	$data = EpormasCounter::whereNull('deleted_at')
241		- ->where('tahun', $date[0])
242		- ->where('bulan', $date[1])
243		- ->where('category_id',$request->category_id)
244		- ->where('city_id',$request->city_id)
245		- ->groupBy('tahun','bulan','category_id','city_id')
246		- ->orderBy('bulan')
247		- ->count();
	241	+ ->where('tahun', $date[0])
	242	+ ->where('bulan', $date[1])
	243	+ ->where('category_id',$request->category_id)
	244	+ ->where('city_id',$request->city_id)
	245	+ ->groupBy('tahun','bulan','category_id','city_id')
	246	+ ->orderBy('bulan')
	247	+ ->count();
248	248	if($data > 0){
249		- return response()->json([
250		- 'title' => 'Error',
251		- 'type' => 'error',
252		- 'message' => 'Data has already been taken.'
253		- ]);
	249	+ return response()->json([
	250	+ 'title' => 'Error',
	251	+ 'type' => 'error',
	252	+ 'message' => 'Data has already been taken.'
	253	+ ]);
254	254	}
255	255	}
256	256
		@@ -260,13 +260,13 @@ discard block
		block discarded – undo
260	260	$from = $result->via;
261	261	$user_id = $result->user_id;
262	262	if(in_array('api',$explode)){
263		- $from = 'api';
264		- $user_id = $request->user_id;
	263	+ $from = 'api';
	264	+ $user_id = $request->user_id;
265	265	}
266	266
267	267	$via = $from;
268	268	if($version != '' && $version != 'update'){
269		- $via .= '-'.$version;
	269	+ $via .= '-'.$version;
270	270	}
271	271
272	272	$result->update([
		@@ -285,21 +285,21 @@ discard block
		block discarded – undo
285	285	'type' => 'success',
286	286	'message' => 'Data updated successfully'
287	287	]);
288		- }
	288	+ }
289	289
290		- /**
291		- * Remove the specified resource from storage.
292		- *
293		- * @param int $id
294		- * @return Response
295		- */
296		- public function destroy($id)
297		- {
	290	+ /**
	291	+ * Remove the specified resource from storage.
	292	+ *
	293	+ * @param int $id
	294	+ * @return Response
	295	+ */
	296	+ public function destroy($id)
	297	+ {
298	298	EpormasCounter::find($id)->delete();
299	299	return response()->json([
300	300	'message' => 'Data deleted successfully'
301	301	]);
302		- }
	302	+ }
303	303
304	304	}
305	305

		@@ -12,71 +12,71 @@ discard block
		block discarded – undo
12	12	class EpormasCategoryController extends Controller
13	13	{
14	14
15		- /**
16		- * Display a listing of the resource.
17		- *
18		- * @return Response
19		- */
20		- public function index()
21		- {
	15	+ /**
	16	+ * Display a listing of the resource.
	17	+ *
	18	+ * @return Response
	19	+ */
	20	+ public function index()
	21	+ {
22	22	$result = EpormasCategory::all();
23	23	return response()->json([
24	24	'result' => $result
25	25	]);
26		- }
27		-
28		- /**
29		- * Show the form for creating a new resource.
30		- *
31		- * @return Response
32		- */
33		- public function create()
34		- {
35		-
36		- }
37		-
38		- /**
39		- * Store a newly created resource in storage.
40		- *
41		- * @return Response
42		- */
43		- public function store(Request $request, $version='')
44		- {
	26	+ }
	27	+
	28	+ /**
	29	+ * Show the form for creating a new resource.
	30	+ *
	31	+ * @return Response
	32	+ */
	33	+ public function create()
	34	+ {
	35	+
	36	+ }
	37	+
	38	+ /**
	39	+ * Store a newly created resource in storage.
	40	+ *
	41	+ * @return Response
	42	+ */
	43	+ public function store(Request $request, $version='')
	44	+ {
45	45	$path = \Request::path();
46	46	$explode = explode('/', $path);
47	47
48	48	$from = 'form';
49	49	if(in_array('api',$explode)){
50		- $from = 'api';
	50	+ $from = 'api';
51	51	}
52	52
53	53	$via = $from;
54	54	if($version != '' && $version != 'store'){
55		- $via .= '-'.$version;
	55	+ $via .= '-'.$version;
56	56	}
57	57
58		- $rules = [
	58	+ $rules = [
59	59	'name' => 'required'
60	60	];
61	61
62	62	$validator = Validator::make($request->all(), $rules);
63	63	if ($validator->fails()) {
64		- return response()->json([
65		- 'title' => 'Error',
66		- 'type' => 'error',
67		- 'message' => $validator->errors()->all()
68		- ]);
	64	+ return response()->json([
	65	+ 'title' => 'Error',
	66	+ 'type' => 'error',
	67	+ 'message' => $validator->errors()->all()
	68	+ ]);
69	69	}
70	70
71	71	$data = EpormasCategory::whereNull('deleted_at')
72	72	->where('name', $request->name)
73	73	->count();
74	74	if($data > 0){
75		- return response()->json([
76		- 'title' => 'Error',
77		- 'type' => 'error',
78		- 'message' => 'Data has already been taken.'
79		- ]);
	75	+ return response()->json([
	76	+ 'title' => 'Error',
	77	+ 'type' => 'error',
	78	+ 'message' => 'Data has already been taken.'
	79	+ ]);
80	80	}
81	81
82	82	$result = EpormasCategory::create([
		@@ -88,44 +88,44 @@ discard block
		block discarded – undo
88	88	'type' => 'success',
89	89	'message' => 'Data created successfully'
90	90	]);
91		- }
92		-
93		- /**
94		- * Display the specified resource.
95		- *
96		- * @param int $id
97		- * @return Response
98		- */
99		- public function show($version='', $id)
100		- {
	91	+ }
	92	+
	93	+ /**
	94	+ * Display the specified resource.
	95	+ *
	96	+ * @param int $id
	97	+ * @return Response
	98	+ */
	99	+ public function show($version='', $id)
	100	+ {
101	101	$result = EpormasCategory::find($id);
102	102	return response()->json([
103	103	'result' => $result
104	104	]);
105		- }
106		-
107		- /**
108		- * Show the form for editing the specified resource.
109		- *
110		- * @param int $id
111		- * @return Response
112		- */
113		- public function edit($id)
114		- {
	105	+ }
	106	+
	107	+ /**
	108	+ * Show the form for editing the specified resource.
	109	+ *
	110	+ * @param int $id
	111	+ * @return Response
	112	+ */
	113	+ public function edit($id)
	114	+ {
115	115	$result = EpormasCategory::find($id);
116	116	return response()->json([
117	117	'result' => $result
118	118	]);
119		- }
120		-
121		- /**
122		- * Update the specified resource in storage.
123		- *
124		- * @param int $id
125		- * @return Response
126		- */
127		- public function update(Request $request, $version='', $id)
128		- {
	119	+ }
	120	+
	121	+ /**
	122	+ * Update the specified resource in storage.
	123	+ *
	124	+ * @param int $id
	125	+ * @return Response
	126	+ */
	127	+ public function update(Request $request, $version='', $id)
	128	+ {
129	129	$result = EpormasCategory::find($id);
130	130
131	131	$rules = [
		@@ -134,24 +134,24 @@ discard block
		block discarded – undo
134	134
135	135	$validator = Validator::make($request->all(), $rules);
136	136	if ($validator->fails()) {
137		- return response()->json([
138		- 'title' => 'Error',
139		- 'type' => 'error',
140		- 'message' => $validator->errors()->all()
141		- ]);
	137	+ return response()->json([
	138	+ 'title' => 'Error',
	139	+ 'type' => 'error',
	140	+ 'message' => $validator->errors()->all()
	141	+ ]);
142	142	}
143	143
144	144	if($request->name != $result->name){
145		- $data = EpormasCategory::whereNull('deleted_at')
146		- ->where('name', $request->name)
147		- ->count();
148		- if($data > 0){
	145	+ $data = EpormasCategory::whereNull('deleted_at')
	146	+ ->where('name', $request->name)
	147	+ ->count();
	148	+ if($data > 0){
149	149	return response()->json([
150	150	'title' => 'Error',
151	151	'type' => 'error',
152	152	'message' => 'Data has already been taken.'
153	153	]);
154		- }
	154	+ }
155	155	}
156	156
157	157	$path = \Request::path();
		@@ -159,12 +159,12 @@ discard block
		block discarded – undo
159	159
160	160	$from = 'form';
161	161	if(in_array('api',$explode)){
162		- $from = 'api';
	162	+ $from = 'api';
163	163	}
164	164
165	165	$via = $from;
166	166	if($version != '' && $version != 'update'){
167		- $via .= '-'.$version;
	167	+ $via .= '-'.$version;
168	168	}
169	169
170	170	$result->update([
		@@ -176,21 +176,21 @@ discard block
		block discarded – undo
176	176	'type' => 'success',
177	177	'message' => 'Data updated successfully'
178	178	]);
179		- }
180		-
181		- /**
182		- * Remove the specified resource from storage.
183		- *
184		- * @param int $id
185		- * @return Response
186		- */
187		- public function destroy($id)
188		- {
	179	+ }
	180	+
	181	+ /**
	182	+ * Remove the specified resource from storage.
	183	+ *
	184	+ * @param int $id
	185	+ * @return Response
	186	+ */
	187	+ public function destroy($id)
	188	+ {
189	189	EpormasCategory::find($id)->delete();
190	190	return response()->json([
191	191	'message' => 'Data deleted successfully'
192	192	]);
193		- }
	193	+ }
194	194
195	195	}
196	196

		@@ -12,71 +12,71 @@ discard block
		block discarded – undo
12	12	class EpormasCityController extends Controller
13	13	{
14	14
15		- /**
16		- * Display a listing of the resource.
17		- *
18		- * @return Response
19		- */
20		- public function index()
21		- {
	15	+ /**
	16	+ * Display a listing of the resource.
	17	+ *
	18	+ * @return Response
	19	+ */
	20	+ public function index()
	21	+ {
22	22	$result = EpormasCity::all();
23	23	return response()->json([
24	24	'result' => $result
25	25	]);
26		- }
27		-
28		- /**
29		- * Show the form for creating a new resource.
30		- *
31		- * @return Response
32		- */
33		- public function create()
34		- {
35		-
36		- }
37		-
38		- /**
39		- * Store a newly created resource in storage.
40		- *
41		- * @return Response
42		- */
43		- public function store(Request $request, $version='')
44		- {
	26	+ }
	27	+
	28	+ /**
	29	+ * Show the form for creating a new resource.
	30	+ *
	31	+ * @return Response
	32	+ */
	33	+ public function create()
	34	+ {
	35	+
	36	+ }
	37	+
	38	+ /**
	39	+ * Store a newly created resource in storage.
	40	+ *
	41	+ * @return Response
	42	+ */
	43	+ public function store(Request $request, $version='')
	44	+ {
45	45	$path = \Request::path();
46	46	$explode = explode('/', $path);
47	47
48	48	$from = 'form';
49	49	if(in_array('api',$explode)){
50		- $from = 'api';
	50	+ $from = 'api';
51	51	}
52	52
53	53	$via = $from;
54	54	if($version != '' && $version != 'store'){
55		- $via .= '-'.$version;
	55	+ $via .= '-'.$version;
56	56	}
57	57
58		- $rules = [
	58	+ $rules = [
59	59	'name' => 'required'
60	60	];
61	61
62	62	$validator = Validator::make($request->all(), $rules);
63	63	if ($validator->fails()) {
64		- return response()->json([
65		- 'title' => 'Error',
66		- 'type' => 'error',
67		- 'message' => $validator->errors()->all()
68		- ]);
	64	+ return response()->json([
	65	+ 'title' => 'Error',
	66	+ 'type' => 'error',
	67	+ 'message' => $validator->errors()->all()
	68	+ ]);
69	69	}
70	70
71	71	$data = EpormasCity::whereNull('deleted_at')
72	72	->where('name', $request->name)
73	73	->count();
74	74	if($data > 0){
75		- return response()->json([
76		- 'title' => 'Error',
77		- 'type' => 'error',
78		- 'message' => 'Data has already been taken.'
79		- ]);
	75	+ return response()->json([
	76	+ 'title' => 'Error',
	77	+ 'type' => 'error',
	78	+ 'message' => 'Data has already been taken.'
	79	+ ]);
80	80	}
81	81
82	82	$result = EpormasCity::create([
		@@ -88,44 +88,44 @@ discard block
		block discarded – undo
88	88	'type' => 'success',
89	89	'message' => 'Data created successfully'
90	90	]);
91		- }
92		-
93		- /**
94		- * Display the specified resource.
95		- *
96		- * @param int $id
97		- * @return Response
98		- */
99		- public function show($version='', $id)
100		- {
	91	+ }
	92	+
	93	+ /**
	94	+ * Display the specified resource.
	95	+ *
	96	+ * @param int $id
	97	+ * @return Response
	98	+ */
	99	+ public function show($version='', $id)
	100	+ {
101	101	$result = EpormasCity::find($id);
102	102	return response()->json([
103	103	'result' => $result
104	104	]);
105		- }
106		-
107		- /**
108		- * Show the form for editing the specified resource.
109		- *
110		- * @param int $id
111		- * @return Response
112		- */
113		- public function edit($id)
114		- {
	105	+ }
	106	+
	107	+ /**
	108	+ * Show the form for editing the specified resource.
	109	+ *
	110	+ * @param int $id
	111	+ * @return Response
	112	+ */
	113	+ public function edit($id)
	114	+ {
115	115	$result = EpormasCity::find($id);
116	116	return response()->json([
117	117	'result' => $result
118	118	]);
119		- }
120		-
121		- /**
122		- * Update the specified resource in storage.
123		- *
124		- * @param int $id
125		- * @return Response
126		- */
127		- public function update(Request $request, $version='', $id)
128		- {
	119	+ }
	120	+
	121	+ /**
	122	+ * Update the specified resource in storage.
	123	+ *
	124	+ * @param int $id
	125	+ * @return Response
	126	+ */
	127	+ public function update(Request $request, $version='', $id)
	128	+ {
129	129	$result = EpormasCity::find($id);
130	130
131	131	$rules = [
		@@ -134,24 +134,24 @@ discard block
		block discarded – undo
134	134
135	135	$validator = Validator::make($request->all(), $rules);
136	136	if ($validator->fails()) {
137		- return response()->json([
138		- 'title' => 'Error',
139		- 'type' => 'error',
140		- 'message' => $validator->errors()->all()
141		- ]);
	137	+ return response()->json([
	138	+ 'title' => 'Error',
	139	+ 'type' => 'error',
	140	+ 'message' => $validator->errors()->all()
	141	+ ]);
142	142	}
143	143
144	144	if($request->name != $result->name){
145		- $data = EpormasCity::whereNull('deleted_at')
146		- ->where('name', $request->name)
147		- ->count();
148		- if($data > 0){
	145	+ $data = EpormasCity::whereNull('deleted_at')
	146	+ ->where('name', $request->name)
	147	+ ->count();
	148	+ if($data > 0){
149	149	return response()->json([
150	150	'title' => 'Error',
151	151	'type' => 'error',
152	152	'message' => 'Data has already been taken.'
153	153	]);
154		- }
	154	+ }
155	155	}
156	156
157	157	$path = \Request::path();
		@@ -159,12 +159,12 @@ discard block
		block discarded – undo
159	159
160	160	$from = 'form';
161	161	if(in_array('api',$explode)){
162		- $from = 'api';
	162	+ $from = 'api';
163	163	}
164	164
165	165	$via = $from;
166	166	if($version != '' && $version != 'update'){
167		- $via .= '-'.$version;
	167	+ $via .= '-'.$version;
168	168	}
169	169
170	170	$result->update([
		@@ -176,21 +176,21 @@ discard block
		block discarded – undo
176	176	'type' => 'success',
177	177	'message' => 'Data updated successfully'
178	178	]);
179		- }
180		-
181		- /**
182		- * Remove the specified resource from storage.
183		- *
184		- * @param int $id
185		- * @return Response
186		- */
187		- public function destroy($id)
188		- {
	179	+ }
	180	+
	181	+ /**
	182	+ * Remove the specified resource from storage.
	183	+ *
	184	+ * @param int $id
	185	+ * @return Response
	186	+ */
	187	+ public function destroy($id)
	188	+ {
189	189	EpormasCity::find($id)->delete();
190	190	return response()->json([
191	191	'message' => 'Data deleted successfully'
192	192	]);
193		- }
	193	+ }
194	194
195	195	}
196	196

		@@ -6,25 +6,25 @@
		block discarded – undo
6	6
7	7	class CreateEpormasCounterTable extends Migration {
8	8
9		- public function up()
10		- {
11		- Schema::create('epormas_counter', function(Blueprint $table) {
12		- $table->increments('id');
13		- $table->timestamps();
14		- $table->softDeletes();
15		- $table->integer('tahun')->unsigned()->index();
16		- $table->string('bulan', 2)->index();
17		- $table->datetime('tanggal')->index();
18		- $table->integer('count')->unsigned()->index();
19		- $table->string('via')->index();
20		- $table->integer('user_id')->unsigned()->index();
21		- $table->integer('category_id')->unsigned()->index();
22		- $table->integer('city_id')->unsigned()->index();
23		- });
24		- }
	9	+ public function up()
	10	+ {
	11	+ Schema::create('epormas_counter', function(Blueprint $table) {
	12	+ $table->increments('id');
	13	+ $table->timestamps();
	14	+ $table->softDeletes();
	15	+ $table->integer('tahun')->unsigned()->index();
	16	+ $table->string('bulan', 2)->index();
	17	+ $table->datetime('tanggal')->index();
	18	+ $table->integer('count')->unsigned()->index();
	19	+ $table->string('via')->index();
	20	+ $table->integer('user_id')->unsigned()->index();
	21	+ $table->integer('category_id')->unsigned()->index();
	22	+ $table->integer('city_id')->unsigned()->index();
	23	+ });
	24	+ }
25	25
26		- public function down()
27		- {
28		- Schema::dropIfExists('epormas_counter');
29		- }
	26	+ public function down()
	27	+ {
	28	+ Schema::dropIfExists('epormas_counter');
	29	+ }
30	30	}

		@@ -6,18 +6,18 @@
		block discarded – undo
6	6
7	7	class CreateEpormasCityTable extends Migration {
8	8
9		- public function up()
10		- {
11		- Schema::create('epormas_city', function(Blueprint $table) {
12		- $table->increments('id');
13		- $table->timestamps();
14		- $table->softDeletes();
15		- $table->string('name', 191)->index();
16		- });
17		- }
	9	+ public function up()
	10	+ {
	11	+ Schema::create('epormas_city', function(Blueprint $table) {
	12	+ $table->increments('id');
	13	+ $table->timestamps();
	14	+ $table->softDeletes();
	15	+ $table->string('name', 191)->index();
	16	+ });
	17	+ }
18	18
19		- public function down()
20		- {
21		- Schema::dropIfExists('epormas_city');
22		- }
	19	+ public function down()
	20	+ {
	21	+ Schema::dropIfExists('epormas_city');
	22	+ }
23	23	}

		@@ -6,18 +6,18 @@
		block discarded – undo
6	6
7	7	class CreateEpormasCategoryTable extends Migration {
8	8
9		- public function up()
10		- {
11		- Schema::create('epormas_category', function(Blueprint $table) {
12		- $table->increments('id');
13		- $table->timestamps();
14		- $table->softDeletes();
15		- $table->string('name', 191)->index();
16		- });
17		- }
	9	+ public function up()
	10	+ {
	11	+ Schema::create('epormas_category', function(Blueprint $table) {
	12	+ $table->increments('id');
	13	+ $table->timestamps();
	14	+ $table->softDeletes();
	15	+ $table->string('name', 191)->index();
	16	+ });
	17	+ }
18	18
19		- public function down()
20		- {
21		- Schema::dropIfExists('epormas_category');
22		- }
	19	+ public function down()
	20	+ {
	21	+ Schema::dropIfExists('epormas_category');
	22	+ }
23	23	}

		@@ -5,34 +5,34 @@
		block discarded – undo
5	5
6	6	class EpormasCityTableSeeder extends Seeder {
7	7
8		- public function run()
9		- {
10		- //DB::table('epormas_city')->delete();
	8	+ public function run()
	9	+ {
	10	+ //DB::table('epormas_city')->delete();
11	11
12		- // create_epormas_city_20171201000000
13		- EpormasCity::create(array(
14		- 'name' => 'Kabupaten Pandeglang'
15		- ));
16		- EpormasCity::create(array(
17		- 'name' => 'Kabupaten Lebak'
18		- ));
19		- EpormasCity::create(array(
20		- 'name' => 'Kabupaten Tangerang'
21		- ));
22		- EpormasCity::create(array(
23		- 'name' => 'Kabupaten Serang'
24		- ));
25		- EpormasCity::create(array(
26		- 'name' => 'Kota Tangerang'
27		- ));
28		- EpormasCity::create(array(
29		- 'name' => 'Kota Cilegon'
30		- ));
31		- EpormasCity::create(array(
32		- 'name' => 'Kota Serang'
33		- ));
34		- EpormasCity::create(array(
35		- 'name' => 'Kota Tangerang Selatan'
36		- ));
37		- }
	12	+ // create_epormas_city_20171201000000
	13	+ EpormasCity::create(array(
	14	+ 'name' => 'Kabupaten Pandeglang'
	15	+ ));
	16	+ EpormasCity::create(array(
	17	+ 'name' => 'Kabupaten Lebak'
	18	+ ));
	19	+ EpormasCity::create(array(
	20	+ 'name' => 'Kabupaten Tangerang'
	21	+ ));
	22	+ EpormasCity::create(array(
	23	+ 'name' => 'Kabupaten Serang'
	24	+ ));
	25	+ EpormasCity::create(array(
	26	+ 'name' => 'Kota Tangerang'
	27	+ ));
	28	+ EpormasCity::create(array(
	29	+ 'name' => 'Kota Cilegon'
	30	+ ));
	31	+ EpormasCity::create(array(
	32	+ 'name' => 'Kota Serang'
	33	+ ));
	34	+ EpormasCity::create(array(
	35	+ 'name' => 'Kota Tangerang Selatan'
	36	+ ));
	37	+ }
38	38	}

bantenprov / dashboard-epormas

Pull Request — master (#6)

Status

Category

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

Indentation +133 added lines, -133 removed lines patch added patch discarded remove patch

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch