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

Passed

Push — master ( 7239dc...63bb69 )

by Esza

created 2017-12-11 13:00 UTC

Status

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

@@ -14,69 +14,69 @@  discard block
 block discarded – undo
 class EpormasCounterController 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 = EpormasCounter::whereNull('deleted_at')
-                          ->with('getCity')
-                          ->with('getCategory')
-                          ->get();
-      } 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 = EpormasCounter::whereNull('deleted_at')
+                            ->with('getCity')
+                            ->with('getCategory')
+                            ->get();
+        } 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()
-  {
-      $city = EpormasCity::all();
-      $category = EpormasCategory::all();
-      try {
-          $error = false;
-          $statusCode = 200;
-          $title = 'Success';
-          $type = 'success';
-          $message = 'Success';
-          $citys = $city;
-          $categorys = $category;
-      } catch (Exception $e) {
-          $error = true;
-          $statusCode = 404;
-          $title = 'Error';
-          $type = 'error';
-          $message = 'Error';
-          $citys = 'Not Found';
-          $categorys = 'Not Found';
-      } finally {
-          return Response::json(array(
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
+    public function create()
+    {
+        $city = EpormasCity::all();
+        $category = EpormasCategory::all();
+        try {
+            $error = false;
+            $statusCode = 200;
+            $title = 'Success';
+            $type = 'success';
+            $message = 'Success';
+            $citys = $city;
+            $categorys = $category;
+        } catch (Exception $e) {
+            $error = true;
+            $statusCode = 404;
+            $title = 'Error';
+            $type = 'error';
+            $message = 'Error';
+            $citys = 'Not Found';
+            $categorys = 'Not Found';
+        } finally {
+            return Response::json(array(
             'error' => $error,
             'status' => $statusCode,
             'title' => $title,
@@ -84,31 +84,31 @@  discard block
 block discarded – undo
             'message' => $message,
             'city' => $citys,
             'category' => $categorys
-          ));
-      }
-  }
+            ));
+        }
+    }
 
-  /**
-   * 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',
@@ -117,44 +117,44 @@  discard block
 block discarded – undo
 
         $validator = Validator::make($request->all(), $rules);
         if ($validator->fails()) {
-          return Response::json(array(
-              'title' => 'Error',
-              'type'  => 'error',
-              'message' => $validator->errors()->all()
-          ));
+            return Response::json(array(
+                '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(array(
-              'title' => 'Error',
-              'type'  => 'error',
-              'message' => 'Data has already been taken.'
-          ));
+            return Response::json(array(
+                '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(array(
-              'title' => 'Error',
-              'type'  => 'error',
-              'message' => 'Data has already been taken.'
-          ));
+            return Response::json(array(
+                'title' => 'Error',
+                'type'  => 'error',
+                'message' => 'Data has already been taken.'
+            ));
         }
 
         $error = false;
@@ -173,23 +173,23 @@  discard block
 block discarded – undo
             'via' => $via
         ]);
         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;
@@ -209,24 +209,24 @@  discard block
 block discarded – undo
             $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)
+    {
         $city = EpormasCity::all();
         $category = EpormasCategory::all();
         try {
@@ -254,27 +254,27 @@  discard block
 block discarded – undo
             $format = 'Not Found';
         } finally {
             return Response::json(array(
-              'error' => $error,
-              'status' => $statusCode,
-              'title' => $title,
-              'type' => $type,
-              'message' => $message,
-              'city' => $citys,
-              'category' => $categorys,
-              'result' => $result,
-              'tanggal' => $format
+                'error' => $error,
+                'status' => $statusCode,
+                'title' => $title,
+                'type' => $type,
+                'message' => $message,
+                'city' => $citys,
+                'category' => $categorys,
+                'result' => $result,
+                'tanggal' => $format
             ));
         }
-  }
+    }
 
-  /**
-   * 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')
@@ -289,28 +289,28 @@  discard block
 block discarded – undo
 
         $validator = Validator::make($request->all(), $rules);
         if ($validator->fails()) {
-          return Response::json(array(
-              'title' => 'Error',
-              'type'  => 'error',
-              'message' => $validator->errors()->all()
-          ));
+            return Response::json(array(
+                '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(array(
-                  'title' => 'Error',
-                  'type'  => 'error',
-                  'message' => 'Data has already been taken.'
-              ));
+                return Response::json(array(
+                    'title' => 'Error',
+                    'type'  => 'error',
+                    'message' => 'Data has already been taken.'
+                ));
             }
         }
 
@@ -318,34 +318,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(array(
-                  'title' => 'Error',
-                  'type'  => 'error',
-                  'message' => 'Data has already been taken.'
-              ));
+                return Response::json(array(
+                    '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(array(
-                  'title' => 'Error',
-                  'type'  => 'error',
-                  'message' => 'Data has already been taken.'
-              ));
+                return Response::json(array(
+                    'title' => 'Error',
+                    'type'  => 'error',
+                    'message' => 'Data has already been taken.'
+                ));
             }
         }
 
@@ -355,13 +355,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;
         }
 
         $error = false;
@@ -380,37 +380,37 @@  discard block
 block discarded – undo
             'via' => $via
         ]);
         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)
-  {
-      EpormasCounter::find($id)->delete();
-      $error = false;
-      $statusCode = 200;
-      $title = 'Success';
-      $type = 'success';
-      $message = 'Data deleted successfully';
-      return Response::json(array(
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
+        EpormasCounter::find($id)->delete();
+        $error = false;
+        $statusCode = 200;
+        $title = 'Success';
+        $type = 'success';
+        $message = 'Data deleted successfully';
+        return Response::json(array(
         'error' => $error,
         'status' => $statusCode,
         'title' => $title,
         'type' => $type,
         'message' => $message
-      ));
-  }
+        ));
+    }
 
 }
 

Please login to merge, or discard this patch.

		@@ -14,69 +14,69 @@ 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		- {
24		- try {
25		- $error = false;
26		- $statusCode = 200;
27		- $title = 'Success';
28		- $type = 'success';
29		- $message = 'Success';
30		- $result = EpormasCounter::whereNull('deleted_at')
31		- ->with('getCity')
32		- ->with('getCategory')
33		- ->get();
34		- } catch (Exception $e) {
35		- $error = true;
36		- $statusCode = 404;
37		- $title = 'Error';
38		- $type = 'error';
39		- $message = 'Error';
40		- $result = 'Not Found';
41		- } finally {
42		- return Response::json(array(
	17	+ /**
	18	+ * Display a listing of the resource.
	19	+ *
	20	+ * @return Response
	21	+ */
	22	+ public function index()
	23	+ {
	24	+ try {
	25	+ $error = false;
	26	+ $statusCode = 200;
	27	+ $title = 'Success';
	28	+ $type = 'success';
	29	+ $message = 'Success';
	30	+ $result = EpormasCounter::whereNull('deleted_at')
	31	+ ->with('getCity')
	32	+ ->with('getCategory')
	33	+ ->get();
	34	+ } catch (Exception $e) {
	35	+ $error = true;
	36	+ $statusCode = 404;
	37	+ $title = 'Error';
	38	+ $type = 'error';
	39	+ $message = 'Error';
	40	+ $result = 'Not Found';
	41	+ } finally {
	42	+ return Response::json(array(
43	43	'error' => $error,
44	44	'status' => $statusCode,
45	45	'title' => $title,
46	46	'type' => $type,
47	47	'message' => $message,
48	48	'result' => $result
49		- ));
50		- }
51		- }
	49	+ ));
	50	+ }
	51	+ }
52	52
53		- /**
54		- * Show the form for creating a new resource.
55		- *
56		- * @return Response
57		- */
58		- public function create()
59		- {
60		- $city = EpormasCity::all();
61		- $category = EpormasCategory::all();
62		- try {
63		- $error = false;
64		- $statusCode = 200;
65		- $title = 'Success';
66		- $type = 'success';
67		- $message = 'Success';
68		- $citys = $city;
69		- $categorys = $category;
70		- } catch (Exception $e) {
71		- $error = true;
72		- $statusCode = 404;
73		- $title = 'Error';
74		- $type = 'error';
75		- $message = 'Error';
76		- $citys = 'Not Found';
77		- $categorys = 'Not Found';
78		- } finally {
79		- return Response::json(array(
	53	+ /**
	54	+ * Show the form for creating a new resource.
	55	+ *
	56	+ * @return Response
	57	+ */
	58	+ public function create()
	59	+ {
	60	+ $city = EpormasCity::all();
	61	+ $category = EpormasCategory::all();
	62	+ try {
	63	+ $error = false;
	64	+ $statusCode = 200;
	65	+ $title = 'Success';
	66	+ $type = 'success';
	67	+ $message = 'Success';
	68	+ $citys = $city;
	69	+ $categorys = $category;
	70	+ } catch (Exception $e) {
	71	+ $error = true;
	72	+ $statusCode = 404;
	73	+ $title = 'Error';
	74	+ $type = 'error';
	75	+ $message = 'Error';
	76	+ $citys = 'Not Found';
	77	+ $categorys = 'Not Found';
	78	+ } finally {
	79	+ return Response::json(array(
80	80	'error' => $error,
81	81	'status' => $statusCode,
82	82	'title' => $title,
		@@ -84,31 +84,31 @@ discard block
		block discarded – undo
84	84	'message' => $message,
85	85	'city' => $citys,
86	86	'category' => $categorys
87		- ));
88		- }
89		- }
	87	+ ));
	88	+ }
	89	+ }
90	90
91		- /**
92		- * Store a newly created resource in storage.
93		- *
94		- * @return Response
95		- */
96		- public function store(Request $request, $version='')
97		- {
	91	+ /**
	92	+ * Store a newly created resource in storage.
	93	+ *
	94	+ * @return Response
	95	+ */
	96	+ public function store(Request $request, $version='')
	97	+ {
98	98	$path = \Request::path();
99	99	$explode = explode('/', $path);
100	100
101	101	$from = 'form';
102	102	if(in_array('api',$explode)){
103		- $from = 'api';
	103	+ $from = 'api';
104	104	}
105	105
106	106	$via = $from;
107	107	if($version != '' && $version != 'store'){
108		- $via .= '-'.$version;
	108	+ $via .= '-'.$version;
109	109	}
110	110
111		- $rules = [
	111	+ $rules = [
112	112	'count' => 'required\|numeric',
113	113	'city_id' => 'required\|numeric',
114	114	'category_id' => 'required\|numeric',
		@@ -117,44 +117,44 @@ discard block
		block discarded – undo
117	117
118	118	$validator = Validator::make($request->all(), $rules);
119	119	if ($validator->fails()) {
120		- return Response::json(array(
121		- 'title' => 'Error',
122		- 'type' => 'error',
123		- 'message' => $validator->errors()->all()
124		- ));
	120	+ return Response::json(array(
	121	+ 'title' => 'Error',
	122	+ 'type' => 'error',
	123	+ 'message' => $validator->errors()->all()
	124	+ ));
125	125	}
126	126
127	127	$format = date('Y-m-d', strtotime(str_replace(' ','-',$request->tanggal)));
128	128	$resultcek = EpormasCounter::whereNull('deleted_at')
129		- ->where('tanggal','like','%'.$format.'%')
130		- ->where('category_id',$request->category_id)
131		- ->where('city_id',$request->city_id)
132		- ->groupBy('tahun','bulan','category_id','city_id')
133		- ->orderBy('bulan')
134		- ->count();
	129	+ ->where('tanggal','like','%'.$format.'%')
	130	+ ->where('category_id',$request->category_id)
	131	+ ->where('city_id',$request->city_id)
	132	+ ->groupBy('tahun','bulan','category_id','city_id')
	133	+ ->orderBy('bulan')
	134	+ ->count();
135	135	if($resultcek > 0){
136		- return Response::json(array(
137		- 'title' => 'Error',
138		- 'type' => 'error',
139		- 'message' => 'Data has already been taken.'
140		- ));
	136	+ return Response::json(array(
	137	+ 'title' => 'Error',
	138	+ 'type' => 'error',
	139	+ 'message' => 'Data has already been taken.'
	140	+ ));
141	141	}
142	142
143	143	$date = explode("-",$format);
144	144	$data = EpormasCounter::whereNull('deleted_at')
145		- ->where('tahun', $date[0])
146		- ->where('bulan', $date[1])
147		- ->where('category_id',$request->category_id)
148		- ->where('city_id',$request->city_id)
149		- ->groupBy('tahun','bulan','category_id','city_id')
150		- ->orderBy('bulan')
151		- ->count();
	145	+ ->where('tahun', $date[0])
	146	+ ->where('bulan', $date[1])
	147	+ ->where('category_id',$request->category_id)
	148	+ ->where('city_id',$request->city_id)
	149	+ ->groupBy('tahun','bulan','category_id','city_id')
	150	+ ->orderBy('bulan')
	151	+ ->count();
152	152	if($data > 0){
153		- return Response::json(array(
154		- 'title' => 'Error',
155		- 'type' => 'error',
156		- 'message' => 'Data has already been taken.'
157		- ));
	153	+ return Response::json(array(
	154	+ 'title' => 'Error',
	155	+ 'type' => 'error',
	156	+ 'message' => 'Data has already been taken.'
	157	+ ));
158	158	}
159	159
160	160	$error = false;
		@@ -173,23 +173,23 @@ discard block
		block discarded – undo
173	173	'via' => $via
174	174	]);
175	175	return Response::json(array(
176		- 'error' => $error,
177		- 'status' => $statusCode,
178		- 'title' => $title,
179		- 'type' => $type,
180		- 'message' => $message,
181		- 'result' => $result
	176	+ 'error' => $error,
	177	+ 'status' => $statusCode,
	178	+ 'title' => $title,
	179	+ 'type' => $type,
	180	+ 'message' => $message,
	181	+ 'result' => $result
182	182	));
183		- }
	183	+ }
184	184
185		- /**
186		- * Display the specified resource.
187		- *
188		- * @param int $id
189		- * @return Response
190		- */
191		- public function show($version='', $id)
192		- {
	185	+ /**
	186	+ * Display the specified resource.
	187	+ *
	188	+ * @param int $id
	189	+ * @return Response
	190	+ */
	191	+ public function show($version='', $id)
	192	+ {
193	193	try {
194	194	$error = false;
195	195	$statusCode = 200;
		@@ -209,24 +209,24 @@ discard block
		block discarded – undo
209	209	$result = 'Not Found';
210	210	} finally {
211	211	return Response::json(array(
212		- 'error' => $error,
213		- 'status' => $statusCode,
214		- 'title' => $title,
215		- 'type' => $type,
216		- 'message' => $message,
217		- 'result' => $result
	212	+ 'error' => $error,
	213	+ 'status' => $statusCode,
	214	+ 'title' => $title,
	215	+ 'type' => $type,
	216	+ 'message' => $message,
	217	+ 'result' => $result
218	218	));
219	219	}
220		- }
	220	+ }
221	221
222		- /**
223		- * Show the form for editing the specified resource.
224		- *
225		- * @param int $id
226		- * @return Response
227		- */
228		- public function edit($id)
229		- {
	222	+ /**
	223	+ * Show the form for editing the specified resource.
	224	+ *
	225	+ * @param int $id
	226	+ * @return Response
	227	+ */
	228	+ public function edit($id)
	229	+ {
230	230	$city = EpormasCity::all();
231	231	$category = EpormasCategory::all();
232	232	try {
		@@ -254,27 +254,27 @@ discard block
		block discarded – undo
254	254	$format = 'Not Found';
255	255	} finally {
256	256	return Response::json(array(
257		- 'error' => $error,
258		- 'status' => $statusCode,
259		- 'title' => $title,
260		- 'type' => $type,
261		- 'message' => $message,
262		- 'city' => $citys,
263		- 'category' => $categorys,
264		- 'result' => $result,
265		- 'tanggal' => $format
	257	+ 'error' => $error,
	258	+ 'status' => $statusCode,
	259	+ 'title' => $title,
	260	+ 'type' => $type,
	261	+ 'message' => $message,
	262	+ 'city' => $citys,
	263	+ 'category' => $categorys,
	264	+ 'result' => $result,
	265	+ 'tanggal' => $format
266	266	));
267	267	}
268		- }
	268	+ }
269	269
270		- /**
271		- * Update the specified resource in storage.
272		- *
273		- * @param int $id
274		- * @return Response
275		- */
276		- public function update(Request $request, $version='', $id)
277		- {
	270	+ /**
	271	+ * Update the specified resource in storage.
	272	+ *
	273	+ * @param int $id
	274	+ * @return Response
	275	+ */
	276	+ public function update(Request $request, $version='', $id)
	277	+ {
278	278	$result = EpormasCounter::whereNull('deleted_at')
279	279	->with('getCity')
280	280	->with('getCategory')
		@@ -289,28 +289,28 @@ discard block
		block discarded – undo
289	289
290	290	$validator = Validator::make($request->all(), $rules);
291	291	if ($validator->fails()) {
292		- return Response::json(array(
293		- 'title' => 'Error',
294		- 'type' => 'error',
295		- 'message' => $validator->errors()->all()
296		- ));
	292	+ return Response::json(array(
	293	+ 'title' => 'Error',
	294	+ 'type' => 'error',
	295	+ 'message' => $validator->errors()->all()
	296	+ ));
297	297	}
298	298
299	299	$format = date('Y-m-d', strtotime(str_replace(' ','-',$request->tanggal)));
300	300	if($result->city_id != $request->city_id \|\| $result->category_id != $request->category_id){
301	301	$resultcek = EpormasCounter::whereNull('deleted_at')
302		- ->where('tanggal','like','%'.$format.'%')
303		- ->where('category_id',$request->category_id)
304		- ->where('city_id',$request->city_id)
305		- ->groupBy('tahun','bulan','category_id','city_id')
306		- ->orderBy('bulan')
307		- ->count();
	302	+ ->where('tanggal','like','%'.$format.'%')
	303	+ ->where('category_id',$request->category_id)
	304	+ ->where('city_id',$request->city_id)
	305	+ ->groupBy('tahun','bulan','category_id','city_id')
	306	+ ->orderBy('bulan')
	307	+ ->count();
308	308	if($resultcek > 0){
309		- return Response::json(array(
310		- 'title' => 'Error',
311		- 'type' => 'error',
312		- 'message' => 'Data has already been taken.'
313		- ));
	309	+ return Response::json(array(
	310	+ 'title' => 'Error',
	311	+ 'type' => 'error',
	312	+ 'message' => 'Data has already been taken.'
	313	+ ));
314	314	}
315	315	}
316	316
		@@ -318,34 +318,34 @@ discard block
		block discarded – undo
318	318	$dates = date('Y-m-d', strtotime($result->tanggal));
319	319	if($dates != $format){
320	320	$resultcek = EpormasCounter::whereNull('deleted_at')
321		- ->where('category_id',$request->category_id)
322		- ->where('city_id',$request->city_id)
323		- ->where('tanggal','like','%'.$format.'%')
324		- ->groupBy('tahun','bulan','category_id','city_id')
325		- ->orderBy('bulan')
326		- ->count();
	321	+ ->where('category_id',$request->category_id)
	322	+ ->where('city_id',$request->city_id)
	323	+ ->where('tanggal','like','%'.$format.'%')
	324	+ ->groupBy('tahun','bulan','category_id','city_id')
	325	+ ->orderBy('bulan')
	326	+ ->count();
327	327	if($resultcek > 0){
328		- return Response::json(array(
329		- 'title' => 'Error',
330		- 'type' => 'error',
331		- 'message' => 'Data has already been taken.'
332		- ));
	328	+ return Response::json(array(
	329	+ 'title' => 'Error',
	330	+ 'type' => 'error',
	331	+ 'message' => 'Data has already been taken.'
	332	+ ));
333	333	}
334	334
335	335	$data = EpormasCounter::whereNull('deleted_at')
336		- ->where('tahun', $date[0])
337		- ->where('bulan', $date[1])
338		- ->where('category_id',$request->category_id)
339		- ->where('city_id',$request->city_id)
340		- ->groupBy('tahun','bulan','category_id','city_id')
341		- ->orderBy('bulan')
342		- ->count();
	336	+ ->where('tahun', $date[0])
	337	+ ->where('bulan', $date[1])
	338	+ ->where('category_id',$request->category_id)
	339	+ ->where('city_id',$request->city_id)
	340	+ ->groupBy('tahun','bulan','category_id','city_id')
	341	+ ->orderBy('bulan')
	342	+ ->count();
343	343	if($data > 0){
344		- return Response::json(array(
345		- 'title' => 'Error',
346		- 'type' => 'error',
347		- 'message' => 'Data has already been taken.'
348		- ));
	344	+ return Response::json(array(
	345	+ 'title' => 'Error',
	346	+ 'type' => 'error',
	347	+ 'message' => 'Data has already been taken.'
	348	+ ));
349	349	}
350	350	}
351	351
		@@ -355,13 +355,13 @@ discard block
		block discarded – undo
355	355	$from = $result->via;
356	356	$user_id = $result->user_id;
357	357	if(in_array('api',$explode)){
358		- $from = 'api';
359		- $user_id = $request->user_id;
	358	+ $from = 'api';
	359	+ $user_id = $request->user_id;
360	360	}
361	361
362	362	$via = $from;
363	363	if($version != '' && $version != 'update'){
364		- $via .= '-'.$version;
	364	+ $via .= '-'.$version;
365	365	}
366	366
367	367	$error = false;
		@@ -380,37 +380,37 @@ discard block
		block discarded – undo
380	380	'via' => $via
381	381	]);
382	382	return Response::json(array(
383		- 'error' => $error,
384		- 'status' => $statusCode,
385		- 'title' => $title,
386		- 'type' => $type,
387		- 'message' => $message,
388		- 'result' => $result
	383	+ 'error' => $error,
	384	+ 'status' => $statusCode,
	385	+ 'title' => $title,
	386	+ 'type' => $type,
	387	+ 'message' => $message,
	388	+ 'result' => $result
389	389	));
390		- }
	390	+ }
391	391
392		- /**
393		- * Remove the specified resource from storage.
394		- *
395		- * @param int $id
396		- * @return Response
397		- */
398		- public function destroy($id)
399		- {
400		- EpormasCounter::find($id)->delete();
401		- $error = false;
402		- $statusCode = 200;
403		- $title = 'Success';
404		- $type = 'success';
405		- $message = 'Data deleted successfully';
406		- return Response::json(array(
	392	+ /**
	393	+ * Remove the specified resource from storage.
	394	+ *
	395	+ * @param int $id
	396	+ * @return Response
	397	+ */
	398	+ public function destroy($id)
	399	+ {
	400	+ EpormasCounter::find($id)->delete();
	401	+ $error = false;
	402	+ $statusCode = 200;
	403	+ $title = 'Success';
	404	+ $type = 'success';
	405	+ $message = 'Data deleted successfully';
	406	+ return Response::json(array(
407	407	'error' => $error,
408	408	'status' => $statusCode,
409	409	'title' => $title,
410	410	'type' => $type,
411	411	'message' => $message
412		- ));
413		- }
	412	+ ));
	413	+ }
414	414
415	415	}
416	416

bantenprov / dashboard-epormas

Push — master ( 7239dc...63bb69 )

Status

Category

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