Skip to content

Commit

Permalink
commit 02/06/2024
Browse files Browse the repository at this point in the history 
alterações na grade
  • Loading branch information
@ribshow
ribshow committed Jun 2, 2024
1 parent 9f5967d commit 09adab9
Show file tree
Hide file tree
Showing 64 changed files with 5,602 additions and 370 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/NewPasswordController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class NewPasswordController extends Controller
*/
public function create(Request $request): View
{
return view('auth.reset-password', ['request' => $request]);
return view('pages.relembrar', ['request' => $request]);
}

/**
Expand Down
298 changes: 298 additions & 0 deletions app/Http/Controllers/HourController.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,298 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use App\Models\Hour;
use App\Models\Course;
use App\Models\Blocks;
use App\Models\Discipline;
use App\Models\User;
use App\Models\Room;
use App\Models\Semester;
use Illuminate\Http\RedirectResponse;

class HourController extends Controller
{
public function show_dsm()
{
//dsm1
$courses = Course::all();
$hour_s = Hour::find(8);
$hour_seg = Hour::find(10);
$hour_t = Hour::find(12);
$hour_qua = Hour::find(14);
$hour_qui = Hour::find(15);
$hour_sex = Hour::find(16);

//dsm2
$hour_segunda = Hour::find(1);
$hour_terca = Hour::find(2);
$hour_quarta = Hour::find(3);
$hour_q= Hour::find(4);
$hour_quinta = Hour::find(5);
$hour_sexta = Hour::find(6);
$hour_sex_2 = Hour::find(7);

//SN 1
// Sistemas Navais 1 SEMESTRE
$courses = Course::all();
$hour_seg_7 = Hour::find(17);
$hour_seg_9 = Hour::find(18);
$hour_seg_11 = Hour::find(19);
$hour_ter_7 = Hour::find(20);
$hour_ter_9 = Hour::find(21);
$hour_qua_7 = Hour::find(22);
$hour_qua_9 = Hour::find(23);
$hour_qua_11 = Hour::find(24);
$hour_qui_7 = Hour::find(25);
$hour_qui_9 = Hour::find(26);
$hour_qui_11 = Hour::find(27);
$hour_sex_9 = Hour::find(28);

// SISTEMAS NAVAIS 2 SEMESTRE
$sn2_seg_7 = Hour::find(29);
$sn2_seg_9 = Hour::find(30);
$sn2_seg_11 = Hour::find(31);
$sn2_ter_7 = Hour::find(32);
$sn2_ter_9 = Hour::find(33);
$sn2_qua_7 = Hour::find(34);
$sn2_qua_9 = Hour::find(35);
$sn2_qua_11 = Hour::find(36);
$sn2_qui_7 = Hour::find(37);
$sn2_qui_9 = Hour::find(38);
$sn2_sex_7 = Hour::find(39);
$sn2_sex_9 = Hour::find(40);

// SISTEMAS NAVAIS 3 SEMESTRE
$sn3_seg_7 = Hour::find(41);
$sn3_seg_9 = Hour::find(42);
$sn3_seg_11 = Hour::find(43);
$sn3_ter_7 = Hour::find(44);
$sn3_ter_9 = Hour::find(45);
$sn3_qua_7 = Hour::find(46);
$sn3_qua_9 = Hour::find(47);
$sn3_qua_11 = Hour::find(48);
$sn3_qui_9 = Hour::find(49);
$sn3_qui_11 = Hour::find(50);
$sn3_sex_7 = Hour::find(51);
$sn3_sex_9 = Hour::find(52);

//SISTEMAS NAVAIS 4 SEMESTRE
$sn4_seg_9 = Hour::find(53);
$sn4_seg_11 = Hour::find(54);
$sn4_ter_9 = Hour::find(55);
$sn4_ter_11 = Hour::find(56);
$sn4_qua_7 = Hour::find(57);
$sn4_qua_9 = Hour::find(58);
$sn4_qua_11 = Hour::find(59);
$sn4_qui_7 = Hour::find(60);
$sn4_qui_9 = Hour::find(61);
$sn4_qui_11 = Hour::find(62);
$sn4_sex_9 = Hour::find(63);
$sn4_sex_11 = Hour::find(64);

// sn 5 semestre
$sn5_seg_7 = Hour::find(65);
$sn5_seg_9 = Hour::find(66);
$sn5_seg_11 = Hour::find(67);
$sn5_ter_7 = Hour::find(68);
$sn5_ter_9 = Hour::find(69);
$sn5_qua_9 = Hour::find(70);
$sn5_qua_11 = Hour::find(71);
$sn5_qui_7 = Hour::find(72);
$sn5_qui_9 = Hour::find(73);
$sn5_qui_11 = Hour::find(74);
$sn5_sex_7 = Hour::find(75);
$sn5_sex_9 = Hour::find(76);

// sn 6 semestre
$sn6_seg_7 = Hour::find(77);
$sn6_seg_9 = Hour::find(78);
$sn6_seg_11 = Hour::find(79);
$sn6_ter_11 = Hour::find(80);
$sn6_qua_7 = Hour::find(81);
$sn6_qua_9 = Hour::find(82);
$sn6_qua_11 = Hour::find(83);
$sn6_qui_7 = Hour::find(84);
$sn6_qui_9 = Hour::find(85);
$sn6_sex_7 = Hour::find(86);
$sn6_sex_9 = Hour::find(87);
$sn6_sex_11 = Hour::find(88);

// cn 1 semestre
$cn1_seg_9 = Hour::find(89);
$cn1_seg_11 = Hour::find(90);
$cn1_ter_7 = Hour::find(91);
$cn1_ter_9 = Hour::find(92);
$cn1_ter_11 = Hour::find(93);
$cn1_qua_7 = Hour::find(94);
$cn1_qua_9 = Hour::find(95);
$cn1_qua_11 = Hour::find(96);
$cn1_qui_7 = Hour::find(97);
$cn1_qui_9 = Hour::find(98);
$cn1_sex_7 = Hour::find(99);
$cn1_sex_9 = Hour::find(100);

// cn 2 semestre
$cn2_seg_7 = Hour::find(101);
$cn2_seg_9 = Hour::find(102);
$cn2_seg_11 = Hour::find(103);
$cn2_ter_7 = Hour::find(104);
$cn2_ter_9 = Hour::find(105);
$cn2_qua_9 = Hour::find(106);
$cn2_qua_11 = Hour::find(107);
$cn2_qui_7 = Hour::find(108);
$cn2_qui_9 = Hour::find(109);
$cn2_qui_11 = Hour::find(110);
$cn2_sex_7 = Hour::find(111);
$cn2_sex_9 = Hour::find(112);

// cn 3 semestre
$cn3_seg_9 = Hour::find(113);
$cn3_seg_11 = Hour::find(114);
$cn3_ter_7 = Hour::find(115);
$cn3_ter_9 = Hour::find(116);
$cn3_qua_7 = Hour::find(117);
$cn3_qua_9 = Hour::find(118);
$cn3_qua_11 = Hour::find(119);
$cn3_qui_7 = Hour::find(120);
$cn3_qui_9 = Hour::find(121);
$cn3_qui_11 = Hour::find(122);
$cn3_sex_7 = Hour::find(123);
$cn3_sex_9 = Hour::find(124);

// cn 4 semestre
$cn4_seg_7 = Hour::find(125);
$cn4_seg_9 = Hour::find(126);
$cn4_ter_7 = Hour::find(127);
$cn4_ter_9 = Hour::find(128);
$cn4_qua_7 = Hour::find(129);
$cn4_qua_9 = Hour::find(130);
$cn4_qua_11 = Hour::find(131);
$cn4_qui_9 = Hour::find(132);
$cn4_qui_11 = Hour::find(133);
$cn4_sex_7 = Hour::find(134);
$cn4_sex_9 = Hour::find(135);
$cn4_sex_11 = Hour::find(136);

// cn 5 semestre
$cn5_seg_9 = Hour::find(137);
$cn5_seg_11 = Hour::find(138);
$cn5_ter_7 = Hour::find(139);
$cn5_ter_9 = Hour::find(140);
$cn5_ter_11 = Hour::find(141);
$cn5_qua_7 = Hour::find(142);
$cn5_qua_9 = Hour::find(143);
$cn5_qui_9 = Hour::find(144);
$cn5_qui_11 = Hour::find(145);
$cn5_sex_7 = Hour::find(146);
$cn5_sex_9 = Hour::find(147);
$cn5_sex_11 = Hour::find(148);

// cn 6 semestre
$cn6_seg_7 = Hour::find(149);
$cn6_seg_9 = Hour::find(150);
$cn6_ter_7 = Hour::find(151);
$cn6_ter_9 = Hour::find(152);
$cn6_ter_11 = Hour::find(153);
$cn6_qua_7 = Hour::find(154);
$cn6_qua_9 = Hour::find(155);
$cn6_qui_7 = Hour::find(156);
$cn6_qui_9 = Hour::find(157);
$cn6_sex_7 = Hour::find(158);
$cn6_sex_9 = Hour::find(159);
$cn6_sex_11 = Hour::find(160);

return view('pages.grade',
compact(
// dsm 1 e 2 semestre
'courses','hour_s','hour_seg','hour_t','hour_qua','hour_qui','hour_sex',
'hour_segunda','hour_terca','hour_quarta','hour_q','hour_quinta','hour_sexta','hour_sex_2',

// sn 1 semestre
'hour_seg_7','hour_seg_9','hour_seg_11',
'hour_ter_7','hour_ter_9','hour_qua_7','hour_qua_9','hour_qua_11',
'hour_qui_7','hour_qui_9','hour_qui_11','hour_sex_9',

// sn 2 semestre
'sn2_seg_7','sn2_seg_9','sn2_seg_11','sn2_ter_7','sn2_ter_9','sn2_qua_7',
'sn2_qua_9','sn2_qua_11','sn2_qui_7','sn2_qui_9','sn2_sex_7','sn2_sex_9',

// sn 3 semestre
'sn3_seg_7','sn3_seg_9','sn3_seg_11','sn3_ter_7','sn3_ter_9','sn3_qua_7',
'sn3_qua_9','sn3_qua_11','sn3_qui_9','sn3_qui_11','sn3_sex_7','sn3_sex_9',

// sn 4 semestre
'sn4_seg_9','sn4_seg_11','sn4_ter_9','sn4_ter_11','sn4_qua_7','sn4_qua_9',
'sn4_qua_11','sn4_qui_7','sn4_qui_9','sn4_qui_11','sn4_sex_9','sn4_sex_11',

// sn 5 semestre
'sn5_seg_7','sn5_seg_9','sn5_seg_11','sn5_ter_7','sn5_ter_9','sn5_qua_9',
'sn5_qua_11','sn5_qui_7','sn5_qui_9','sn5_qui_11','sn5_sex_7','sn5_sex_9',

// sn 6 semestre
'sn6_seg_7','sn6_seg_9','sn6_seg_11','sn6_ter_11','sn6_qua_7','sn6_qua_9',
'sn6_qua_11','sn6_qui_7','sn6_qui_9','sn6_sex_7','sn6_sex_9','sn6_sex_11',

// cn 1 semestre
'cn1_seg_9','cn1_seg_11','cn1_ter_7','cn1_ter_9','cn1_ter_11','cn1_qua_7',
'cn1_qua_9','cn1_qua_11','cn1_qui_7','cn1_qui_9','cn1_sex_7','cn1_sex_9',

// cn 2 semestre
'cn2_seg_7','cn2_seg_9','cn2_seg_11','cn2_ter_7','cn2_ter_9','cn2_qua_9',
'cn2_qua_11','cn2_qui_7','cn2_qui_9','cn2_qui_11','cn2_sex_7','cn2_sex_9',

// cn 3 semestre
'cn3_seg_9','cn3_seg_11','cn3_ter_7','cn3_ter_9','cn3_qua_7','cn3_qua_9',
'cn3_qua_11','cn3_qui_7','cn3_qui_9','cn3_qui_11','cn3_sex_7','cn3_sex_9',

// cn 4 semestre
'cn4_seg_7','cn4_seg_9','cn4_ter_7','cn4_ter_9','cn4_qua_7','cn4_qua_9',
'cn4_qua_11','cn4_qui_9','cn4_qui_11','cn4_sex_7','cn4_sex_9','cn4_sex_11',

// cn 5 semestre
'cn5_seg_9','cn5_seg_11','cn5_ter_7','cn5_ter_9','cn5_ter_11','cn5_qua_7',
'cn5_qua_9','cn5_qui_9','cn5_qui_11','cn5_sex_7','cn5_sex_9','cn5_sex_11',

// cn 6 semestre
'cn6_seg_7','cn6_seg_9','cn6_ter_7','cn6_ter_9','cn6_ter_11','cn6_qua_7',
'cn6_qua_9','cn6_qui_7','cn6_qui_9','cn6_sex_7','cn6_sex_9','cn6_sex_11',

));
}
public function grade()
{
$courses = Course::all();
$disciplines = Discipline::all();
$blocks = Blocks::all();
$users = User::all();
$rooms = Room::all();
$semesters = Semester::all();

return view('pages.making',
compact('courses','disciplines','users','blocks','rooms','semesters'));

}

public function store(Request $request): RedirectResponse
{

//dd($request->all());

//$hour = $request->input('hours');

//dd($hour);

Hour::create(['user_id'=>$request->users,
'course_id'=>$request->courses,
'discipline_id'=>$request->disciplines,
'block_id'=>$request->blocks,
'room_id'=>$request->rooms,
'semester_id'=>$request->semesters,
'dia'=>$request->days,
'hora'=>$request->hours]);

return redirect()->route('fazer')->with('status','hour-created');
}
}
8 changes: 3 additions & 5 deletions app/Http/Controllers/IntegraController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ public function create()
// 'block_id'=>5
//]);

$room = Hour::find(7);

$room->update([
'dia'=>'Sexta-feira',
]);
$hour = Hour::find(7);
$hour->user_id = 5;
$hour->save();
}

/**
Expand Down
22 changes: 15 additions & 7 deletions app/Http/Controllers/PostController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,26 @@
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\File;

use Exception;
use Illuminate\Support\Facades\Log;
class PostController extends Controller
{
public function store(Request $request): RedirectResponse
{
$validated = $request->validate([
'title'=>'required|string|max:255',
'message'=>'required|string|max:1000',
]);
try{
$validated = $request->validate([
'title'=>'required|string|max:80',
'message'=>'required|string|max:250',
]);

$request->user()->posts()->create($validated);
return redirect(route('mural'));
}catch(Exception $e){
Log::error('Erro ao criar post: '.$e->getMessage());

return redirect()->back()->withErrors(['error'=>'Ocorreu um erro ao criar o Post']);
}

$request->user()->posts()->create($validated);
return redirect(route('mural'));
}

public function show(): View
Expand Down
11 changes: 11 additions & 0 deletions app/Models/Hour.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ class Hour extends Model
protected $fillable = [
'dia',
'hora',
'user_id',
'course_id',
'semester_id',
'block_id',
'room_id',
'discipline_id',
];

public function course(): BelongsTo
Expand All @@ -42,4 +48,9 @@ public function semester(): BelongsTo
{
return $this->belongsTo(Semester::class);
}

public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}
Loading

0 comments on commit 09adab9

Please sign in to comment.