fernando/Sistema-Educativo-Laravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modificacion de prospecto a alumno y asignacion de grupos, coordinacion académica

Browse Source
This commit is contained in:
unknown
2026-03-23 15:48:23 -06:00
parent 58e27fc5fc
commit 1bcebeb8a1
43 changed files with 1551 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Actions/Fortify/CreateNewUser.php
+3 -2
View File
@@ -2,6 +2,7 @@
namespace App\Actions\Fortify;
use App\Models\Alumno;
use App\Models\Prospecto;
use App\Models\User;
use Illuminate\Auth\Notifications\ResetPassword;
@@ -52,7 +53,7 @@ class CreateNewUser implements CreatesNewUsers
$user->roles()->sync([4]);
$user->plantelUsuarios()->sync($input['plantels']);
$prospecto = Prospecto::create([
$prospecto = Alumno::create([
'nivel' => 0,
'plan_id' => 0,
'usuario_registro' => 0,
@@ -61,7 +62,7 @@ class CreateNewUser implements CreatesNewUsers
'medio' => 0,
]);
$prospecto->prospectos()->sync([$user->id]);
$prospecto->alumnos()->sync([$user->id]);
$token = Password::createToken($user);
$user->notify(new ResetPassword($token));
app/Http/Controllers/AlumnoController.php
+54 -26
View File
@@ -2,9 +2,9 @@
namespace App\Http\Controllers;
use App\Models\User;
use App\Models\Alumno;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
@@ -21,37 +21,65 @@ class AlumnoController extends Controller
public function index()
{
$user = Auth::user();
if ($user->hasRole('Promotor')) {
$plantelesUsuario = $user->plantelUsuarios->pluck('id');
$alumnos = User::with(['alumnos' => function ($query) use ($user, $plantelesUsuario) {
$query->where('status', 1)
->where(function ($q) use ($user, $plantelesUsuario) {
$q->where('usuario_registro', $user->id)
->orWhereHas('alumnos.plantelUsuarios', function ($sub) use ($plantelesUsuario) {
$sub->whereIn('plantels.id', $plantelesUsuario);
});
});
}])
->whereHas('alumnos', function ($query) use ($user, $plantelesUsuario) {
$query->where('status', 1)
->where(function ($q) use ($user, $plantelesUsuario) {
$q->where('usuario_registro', $user->id)
->orWhereHas('alumnos.plantelUsuarios', function ($sub) use ($plantelesUsuario) {
$sub->whereIn('plantels.id', $plantelesUsuario);
});
});
})
->get();
}
if ($user->hasRole('Control escolar')) {
$plantelesUsuario = $user->plantelUsuarios->pluck('id');
$alumnos = User::with(['alumnos' => function ($query) use ($user, $plantelesUsuario) {
$alumnos = Alumno::with(['alumnos.plantelUsuarios','statusAlumno'])
->where('status','!=',1)
->whereHas('alumnos.plantelUsuarios', function ($q) use ($plantelesUsuario) {
$q->whereIn('plantels.id', $plantelesUsuario);
})
->get();
}
$query->where(function ($q) use ($user, $plantelesUsuario) {
$q->where('usuario_registro', $user->id)
->orWhereHas('alumnos.plantelUsuarios', function ($sub) use ($plantelesUsuario) {
$sub->whereIn('plantels.id', $plantelesUsuario);
});
});
}])
->whereHas('alumnos', function ($query) use ($user, $plantelesUsuario) {
$query->where(function ($q) use ($user, $plantelesUsuario) {
$q->where('usuario_registro', $user->id)
->orWhereHas('alumnos.plantelUsuarios', function ($sub) use ($plantelesUsuario) {
$sub->whereIn('plantels.id', $plantelesUsuario);
});
});
})
->get();
return view('alumno.index', compact('alumnos'));
}
public function edit(Alumno $alumno)
{
return view('alumno.edit',compact('alumno'));
}
public function update(Request $request, Alumno $alumno)
{
$alumno->update($request->all());
return redirect()->route('alumno.edit',$alumno)->with('info','El alumno se actualizo correctamente');
}
public function destroy(Alumno $alumno)
{
$user = $alumno->alumnos()->first();
app/Http/Controllers/DocenteController.php
+64
View File
@@ -0,0 +1,64 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class DocenteController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*/
public function show(string $id)
{
//
}
/**
* Show the form for editing the specified resource.
*/
public function edit(string $id)
{
//
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
{
//
}
/**
* Remove the specified resource from storage.
*/
public function destroy(string $id)
{
//
}
}
app/Http/Controllers/GrupoController.php
+154
View File
@@ -0,0 +1,154 @@
<?php
namespace App\Http\Controllers;
use App\Models\Alumno;
use App\Models\Grupo;
use App\Models\Plan;
use App\Models\Plane;
use App\Models\Plantel;
use App\Models\Turno;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
class GrupoController extends Controller
{
public function __construct() {
$this->middleware('can:grupo.index')->only('index','show');
$this->middleware('can:grupo.create')->only('create','store');
$this->middleware('can:grupo.edit')->only('edit','update');
$this->middleware('can:grupo.destroy')->only('destroy');
}
public function index()
{
$user = Auth::user();
if ($user->hasRole('Admin')) {
$grupos = Grupo::all();
}
if ($user->hasRole(['Control escolar','Coordinación académica'])) {
$plantelesIds = $user->plantelUsuarios->pluck('id');
$grupos = Grupo::with('plan')
->whereHas('plan.planesPlantel', function ($query) use ($plantelesIds) {
$query->whereIn('plantel_id', $plantelesIds);
})
->get();
}
return view('grupo.index', compact('grupos'));
}
public function create()
{
$turnos= Turno::all();
$user = Auth::user();
$plantels = $user->plantelUsuarios->pluck('id');
$planteles = $user->plantelUsuarios;
$plans = Plan::with(['carreraRel', 'nivelRel'])
->whereHas('planesPlantel', function ($query) use ($plantels) {
$query->whereIn('plantel_id', $plantels);
})
->get()
->groupBy(function ($plan) {
return $plan->nivelRel->name;
});
return view('grupo.create',compact(['turnos','plans','planteles']));
}
public function store(Request $request)
{
$nivel = Plan::where('id',$request->plan_id)->first();
$grupo = Grupo::create([
'plan_id' => $request->plan_id,
'ciclo' => 1,
'nivel' => $nivel->nivel,
'plantel' => $request->plantel,
'turno' => $request->turno,
'status'=>1
]);
return redirect()->route('grupo.edit',$grupo)->with('info','El grupo se creo correctamente');
}
public function show(Plane $plane)
{
return view('grupo.show',compact('plane'));
}
public function edit(Grupo $grupo)
{
$turnos= Turno::all();
$user = Auth::user();
$plantels = $user->plantelUsuarios->pluck('id');
$planteles = $user->plantelUsuarios;
$plans = Plan::with(['carreraRel', 'nivelRel'])
->whereHas('planesPlantel', function ($query) use ($plantels) {
$query->whereIn('plantel_id', $plantels);
})
->get()
->groupBy(function ($plan) {
return $plan->nivelRel->name;
});
$ciclos = Plan::where('id',$grupo->plan_id)->first();
return view('grupo.edit',compact(['grupo','turnos','plans','planteles','ciclos']));
}
public function update(Request $request,Grupo $grupo)
{
$nivel = Plan::where('id',$request->plan_id)->first();
$grupo = Grupo::update([
'plan_id' => $request->plan_id,
'ciclo' => 1,
'nivel' => $nivel->nivel,
'plantel' => $request->plantel,
'turno' => $request->turno,
'status'=>1
]);
return redirect()->route('grupo.edit',$grupo)->with('info','El grupo se actualizo correctamente');
}
public function destroy(Grupo $grupo,Request $request)
{
if($request->alumno){
$alumno= Alumno::find($request->alumno);
$alumno->grupos()->detach();
session()->flash('swal',[
'icon'=>'success',
'title'=>'Eliminado!',
'text'=>'Se ha eliminado el registro correctamente'
]);
return redirect()->route('grupo.edit',$grupo);
}else{
$grupo->alumnos()->detach();
$grupo->delete();
session()->flash('swal',[
'icon'=>'success',
'title'=>'Eliminado!',
'text'=>'Se ha eliminado el registro correctamente'
]);
return redirect()->route('grupo.index');
}
}
}
app/Http/Controllers/MateriaController.php
+64
View File
@@ -0,0 +1,64 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class MateriaController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*/
public function show(string $id)
{
//
}
/**
* Show the form for editing the specified resource.
*/
public function edit(string $id)
{
//
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
{
//
}
/**
* Remove the specified resource from storage.
*/
public function destroy(string $id)
{
//
}
}
app/Http/Controllers/MaterialController.php
-2
View File
@@ -8,8 +8,6 @@ use Illuminate\Http\Request;
class MaterialController extends Controller
{
public function store(Request $request)
{
$material =Material::create($request->except(['carrera']));
app/Http/Controllers/PlaneController.php
-1
View File
@@ -24,7 +24,6 @@ class PlaneController extends Controller
return view('plane.index',compact('planes'));
}
public function create()
{
$plantels=Plantel::where('status','=','1')->get();
app/Livewire/DataProspecto.php
+4 -1
View File
@@ -360,7 +360,10 @@ class DataProspecto extends Component
'roles' => Role::whereHas('areas', fn($q) => $q->where('areas.name', 'Promoción'))->get(),
'plantels'=> Plantel::all(),
'user' => Auth::user(),
'campans' => Campan::all(),
'campans' => Campan::whereDate('periodoInicial', '<=', now())
->whereDate('periodoFinal', '>=', now())
->where('status', 1)
->get(),
'medios' => Medio::all(),
]);
}
app/Livewire/GrupoAlumno.php
+92
View File
@@ -0,0 +1,92 @@
<?php
namespace App\Livewire;
use App\Models\Alumno;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\On;
use Livewire\Component;
class GrupoAlumno extends Component
{
public $grupo = null;
public $selectedAlumnos = [];
public $carrera;
#[On('create-grupo')]
public function creategrupo()
{
$this->dispatch('open-grupo-modal');
}
public function mount($grupo)
{
$this->grupo = $grupo;
}
public function guardar()
{
if (empty($this->selectedAlumnos)) {
session()->flash('error', 'Selecciona al menos un alumno');
return;
}
$this->grupo->alumnos()->syncWithoutDetaching($this->selectedAlumnos);
$this->reset('selectedAlumnos');
$this->dispatch('swal',
icon: 'success',
title: 'Anexado!',
text: 'Se agrego el alumno correctamente',
timer: 2000,
confirm: false,
closeModal: true,
reload: 2000
);
$this->dispatch('close-modal');
}
public function render()
{
$user = Auth::user();
$grupo = $this->grupo;
$plantelesUsuario = $user->plantelUsuarios->pluck('id');
$alumnos = Alumno::query()
->with(['alumnos.plantelUsuarios', 'statusAlumno', 'plan.carreraRel','nivelRel'])
->where('status', 2)
->where('nivel', $grupo->nivel)
->whereDoesntHave('grupos')
->whereHas('alumnos.plantelUsuarios', function ($q) use ($plantelesUsuario) {
$q->whereIn('plantels.id', $plantelesUsuario);
})
->orderByRaw("
CASE
WHEN plan_id = {$grupo->plan_id} THEN 0
ELSE 1
END
")
->orderByRaw("
CASE
WHEN nivel = {$grupo->nivel} THEN 0
ELSE 1
END"
)
->get();
return view('livewire.grupo-alumno', [
'alumnos' => $alumnos,
]);
}
}
app/Livewire/ModalProspecto.php
+4 -1
View File
@@ -180,7 +180,10 @@ class ModalProspecto extends Component
'roles' => Role::whereHas('areas', fn($q) => $q->where('areas.name', 'Promoción'))->get(),
'plantels'=> Plantel::all(),
'user' => Auth::user(),
'campans' => Campan::all(),
'campans' => Campan::whereDate('periodoInicial', '<=', now())
->whereDate('periodoFinal', '>=', now())
->where('status', 1)
->get(),
'medios' => Medio::all(),
]);
}
app/Models/Alumno.php
+26 -5
View File
@@ -3,17 +3,13 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
class Alumno extends Model
{
protected $guarded = [];
public function plantelUsuarios(): BelongsToMany
{
return $this->belongsToMany(Plantel::class);
}
public function existe($plantelId): bool
{
return $this->plantelUsuarios()
@@ -26,4 +22,29 @@ class Alumno extends Model
return $this->belongsToMany(User::class);
}
public function usuario()
{
return $this->belongsToMany(User::class);
}
public function statusAlumno(): BelongsTo
{
return $this->belongsTo(AlumnoStatus::class, 'status');
}
public function grupos(): BelongsToMany
{
return $this->belongsToMany(Grupo::class);
}
public function plan()
{
return $this->belongsTo(Plan::class);
}
public function nivelRel()
{
return $this->belongsTo(Nivel::class, 'nivel');
}
}
app/Models/AlumnoStatus.php
+14
View File
@@ -0,0 +1,14 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class AlumnoStatus extends Model
{
protected $table = 'alumno_status';
public $timestamps = false;
protected $guarded = [];
}
app/Models/Docente.php
+10
View File
@@ -0,0 +1,10 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Docente extends Model
{
//
}
app/Models/Grupo.php
+23
View File
@@ -0,0 +1,23 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
class Grupo extends Model
{
protected $guarded = [];
public $timestamps = false;
public function alumnos(): BelongsToMany
{
return $this->belongsToMany(Alumno::class);
}
public function plan()
{
return $this->belongsTo(Plan::class);
}
}
app/Models/Materia.php
+10
View File
@@ -0,0 +1,10 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Materia extends Model
{
//
}
app/Models/Plan.php
+10
View File
@@ -26,4 +26,14 @@ class Plan extends Model
->exists();
}
public function carreraRel()
{
return $this->belongsTo(Carrera::class, 'carrera');
}
public function nivelRel()
{
return $this->belongsTo(Nivel::class, 'nivel');
}
}