diff --git a/app/Http/Controllers/CampusController.php b/app/Http/Controllers/CampusController.php index a9d76da0997e1b0deddedfb33a0f5b7f5b8fd6b7..4c023356ae03ca550157350ba69d9c5b4b92888d 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 77ef3516c4c53a75dc9669baf93235d13ef3864e..7e142b96f51c8f302df87c0b675f49cf1e81016c 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 b78cd9df683583e5c15ee321b5cac299f6dbd99e..b07697e1ba1feff88f96578b2eddea4cb2311826 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 78b3ac5468bba4f6b58f60abdbf4a9f71f2d7f8e..1162e34be2e0cf09f12826d064df897c44d04285 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