From 43c783e33ec9484995401c483d1f12eee95defab Mon Sep 17 00:00:00 2001
From: alissonalbuquerque <alissonalbuquerque.dev@gmail.com>
Date: Sun, 23 Apr 2023 15:25:32 -0300
Subject: [PATCH] add melhorias em importacao de usuarios

---
 app/Http/Controllers/CampusController.php     |  4 ++--
 app/Http/Controllers/CursoController.php      |  2 +-
 app/Http/Controllers/ImportUserController.php |  6 +++++-
 resources/views/imports/update_user.blade.php | 13 +++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/CampusController.php b/app/Http/Controllers/CampusController.php
index a9d76da..4c02335 100644
--- a/app/Http/Controllers/CampusController.php
+++ b/app/Http/Controllers/CampusController.php
@@ -20,7 +20,7 @@ class CampusController extends Controller
      */
     public function index()
     {
-        $campus = Campus::all();
+        $campus = Campus::orderBy('unidade_id', 'asc')->get();
         
         return view('campus.index', [
             'menu' => Menu::CAMPUS,
@@ -131,7 +131,7 @@ class CampusController extends Controller
             $campus = $campus->where('name', 'like', '%'.$q.'%');
         }
 
-        $campus = $campus->get();
+        $campus = $campus->orderBy('unidade_id', 'asc')->get();
 
         $array = 
             $campus->map(function($campus, $key)
diff --git a/app/Http/Controllers/CursoController.php b/app/Http/Controllers/CursoController.php
index 77ef351..7e142b9 100644
--- a/app/Http/Controllers/CursoController.php
+++ b/app/Http/Controllers/CursoController.php
@@ -136,7 +136,7 @@ class CursoController extends Controller
             $cursos = $cursos->whereCampusId($campus_id);
         }
 
-        $cursos = $cursos->get();
+        $cursos = $cursos->orderBy('campus_id', 'asc')->get();
 
         $array = 
             $cursos->map(function($curso, $key)
diff --git a/app/Http/Controllers/ImportUserController.php b/app/Http/Controllers/ImportUserController.php
index b78cd9d..b07697e 100644
--- a/app/Http/Controllers/ImportUserController.php
+++ b/app/Http/Controllers/ImportUserController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Campus;
+use App\Models\Curso;
 use App\Models\User;
 use Illuminate\Http\Request;
 
@@ -15,6 +16,8 @@ class ImportUserController extends Controller
     public function actionStore(Request $request)
     {   
         $file = $request->file('uploadFile');
+        $campus = Campus::whereId($request->campus_id)->first();
+        $curso = Curso::whereCampusId($campus->id)->whereName('GERAL (TEMP)')->first();
 
         $handle = fopen($file, 'r');
         $lines = [];
@@ -46,7 +49,8 @@ class ImportUserController extends Controller
                 array_push($list, $data);
                 $count++;
             } else {
-                $user->campus_id = 3;
+                $user->campus_id = $campus->id;
+                $user->curso_id = $curso->id;
                 $user->save();
             }
         }
diff --git a/resources/views/imports/update_user.blade.php b/resources/views/imports/update_user.blade.php
index 78b3ac5..1162e34 100644
--- a/resources/views/imports/update_user.blade.php
+++ b/resources/views/imports/update_user.blade.php
@@ -1,8 +1,21 @@
+@php
+    use App\Models\Campus;
+
+    $campis = Campus::all();
+@endphp
 
 <h1> Update Campus (Users) </h1>
 
 <form action="{{route('import_store')}}" method="post" enctype="multipart/form-data">
     @csrf
     <input type="file" name="uploadFile" id="uploadFile">
+
+    <select name="campus_id" id="campus_id">
+        <option value="0"> Selecione </option>
+        @foreach ($campis as $campus)
+            <option value="{{$campus->id}}"> {{$campus->name}}</option>
+        @endforeach
+    </select>
+
     <button type="submit">Enviar</button>
 </form>
\ No newline at end of file
-- 
GitLab