Merge pull request #14 from marcreis/master

Fix issue #8
PHPcomRapadura · Sep 12, 2018 · 75d8941 · 75d8941
2 parents 5850619 + d7118d7
commit 75d8941
Showing 1 changed file with 57 additions and 48 deletions.
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
@@ -17,23 +17,32 @@ class EventController extends Controller
     public function index(Request $request)
     {
         $data = $request->all();
-//        dd($data, isset($data['dtinicial']) && isset($data['dtfinal']));
-        if(isset($data['dtinicial']) && isset($data['dtfinal']))
-        {
+        if (isset($data['dtinicial']) && isset($data['dtfinal'])) {
 
+            $dataInicialNotEmpty = !empty($data['dtinicial']);
 
-        $dtinicial = \Carbon\Carbon::createFromFormat('d/m/Y', $data['dtinicial']);
-        $dtfinal= \Carbon\Carbon::createFromFormat('d/m/Y', $data['dtfinal']);
+            $dtinicial = ($dataInicialNotEmpty) ? \Carbon\Carbon::createFromFormat('d/m/Y',
+                $data['dtinicial']) : \Carbon\Carbon::now();
 
-            $events = Event::where('datainicial','>=',$dtinicial)
-                           ->where('datafinal','<=',$dtfinal)
-                         ->orderBy('datainicial','ASC')
-                        ->paginate(10); 
-
-            return view('event.list',compact('events'))
-                 ->with('i', ($request->input('page', 1) - 1) * 10);
 
-        }else{
+            $events = Event::where('datainicial', '>=', $dtinicial->toDateString());
+
+
+            if(!empty($data['dtfinal'])){
+                $dtfinal = \Carbon\Carbon::createFromFormat('d/m/Y', $data['dtfinal']);
+
+                 $events->where('datafinal', '<=', $dtfinal->toDateString());
+
+            }
+
+            $events->orderBy('datainicial', 'ASC');
+
+            $events = $events->paginate(10);
+
+            return view('event.list',  compact('events'))
+                ->with('i', ($request->input('page', 1) - 1) * 10) ;
+
+        } else {
 
             return view('event.list');
 
@@ -54,83 +63,83 @@ public function create()
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function store(EventFormRequest $request)
     {
-     $request['datainicial'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datainicial']);
-     $request['datafinal'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafinal']);
-     $request['datafimdocfp'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafimdocfp']);
+        $request['datainicial'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datainicial']);
+        $request['datafinal'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafinal']);
+        $request['datafimdocfp'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafimdocfp']);
+
+        Event::create($request->only('name', 'datainicial', 'datafinal', 'datafimdocfp', 'detalhes'));
 
-         Event::create($request->only('name','datainicial','datafinal','datafimdocfp','detalhes'));
-
         return redirect()
-                ->route('event.create')
-                 ->with(['success'=> 'Salvo com sucesso!']);
+            ->route('event.create')
+            ->with(['success' => 'Salvo com sucesso!']);
     }
 
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int  $id
+     * @param  int $id
      * @return \Illuminate\Http\Response
      */
     public function edit($id)
     {
         $event = Event::find($id);
 
         return view('event.edit')
-             ->with(compact('event'));
+            ->with(compact('event'));
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
+     * @param  \Illuminate\Http\Request $request
+     * @param  int $id
      * @return \Illuminate\Http\Response
      */
     public function update(EventFormRequest $request, $id)
     {
-     $request['datainicial'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datainicial']);
-     $request['datafinal'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafinal']);
-     $request['datafimdocfp'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafimdocfp']);
+        $request['datainicial'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datainicial']);
+        $request['datafinal'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafinal']);
+        $request['datafimdocfp'] = \Carbon\Carbon::createFromFormat('d/m/Y', $request['datafimdocfp']);
 
         $event = Event::find($id);
-        
+
         $event->fill($request->all())->save();
-    
+
         return redirect()
-               ->route('event.edit', $id)
-               ->with(['success'=> 'Dados alterados com sucesso!']);
-        
+            ->route('event.edit', $id)
+            ->with(['success' => 'Dados alterados com sucesso!']);
+
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param  int $id
      * @return \Illuminate\Http\Response
      */
     public function destroy($id)
     {
-            $event = Event::find($id);
-            $talks = Talk::where('event_id',$id)->get();
-
-            if(count($talks) > 0){
-
-                return redirect()
-                        ->route('event.index')
-                        ->with(['danger'=> 'Evento com palestras já submetidas!']);
-            }
+        $event = Event::find($id);
+        $talks = Talk::where('event_id', $id)->get();
 
-            $event->delete();
+        if (count($talks) > 0) {
 
             return redirect()
-                        ->route('event.index')
-                        ->with(['success'=> 'Registro excluido com sucesso!']);
-
-
+                ->route('event.index')
+                ->with(['danger' => 'Evento com palestras já submetidas!']);
+        }
+
+        $event->delete();
+
+        return redirect()
+            ->route('event.index')
+            ->with(['success' => 'Registro excluido com sucesso!']);
+
+
     }
 }