c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ajout de la BD OCOM

Browse Source
This commit is contained in:
George Frederick "Buzz" Beurling
2020-03-14 09:51:26 -04:00
parent 7433051f85
commit 8a0e09cb80
12 changed files with 434 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
app/Http/Controllers/OCOMController.php
View File

@@ -3,7 +3,9 @@
namespace App\Http\Controllers;
use App\OCOM;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use function GuzzleHttp\json_encode;
use function GuzzleHttp\Psr7\str;
@@ -26,7 +28,11 @@ class OCOMController extends Controller
*/
public function create()
{
return view('admin.ocom.add');
}
public function generate()
{
$text = "Niveau 1,,,,,,,,,Niveau 2,,,,,,,,,Niveau 3,,,,,,,,,Niveau 4,,,,,,,
N° de l'OREN,Objectif de rendement,N° de l’OCOM,Objectif de compétence,Nbredepériode,,Nbre dans horaire,Instructeur,,N° de l’OREN,Objectif de rendement,N° de l’OCOM,Objectif de compétence,Nbre de période,,Nbre dans horaire,Instructeur,,\"N° de
l’OREN\",\"Objectif de
@@ -596,11 +602,11 @@ X20,\"Participer à des activités
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,OREN 490 - Total des périodes d’instruction complémentaires,20,,,
,,,,,,,,,,,,,,,,,,,,,,,,,,,S.O.,Participer à une revue annuelle (ACR),,,3,,,";
\App\OCOM::truncate();
OCOM::truncate();
$matches = [];
$orens = [];
preg_match_all('/[X\d]\d\d,[^,]*/',$text,$matches);
preg_match_all('/[X\d]\d\d,[^,]*/',\request('text'),$matches);
foreach ($matches[0] as $match)
{
$match = str_replace('"',"",$match);
@@ -632,6 +638,7 @@ X20,\"Participer à des activités
$obj_competence = str_replace($ocom[0].",","",$match);
$obj_competence = trim(preg_replace('/\s\s+/', ' ', $obj_competence));
$obj_competence = trim($obj_competence,"\\");
$nbPeriode = preg_replace('/[MC]\S\d\d.\d\d[A-Z]?,[^,]*,/','',$match);
$newocom->nbPeriode = $nbPeriode;
@@ -654,21 +661,83 @@ X20,\"Participer à des activités
$newocom->objectif_competence = $obj_competence;
$newocom->objectif_rendement = $orens[$oren[0]];
$newocom->objectif_rendement = trim($newocom->objectif_rendement,"\\");
$newocom->save();
}
}
dd(\App\OCOM::all());
return redirect('/admin/ocom')->with('success','Base de donnée des cours générée avec succès!');
}
public function showgenerate()
{
return view('admin.ocom.generate');
}
public function updateOCOMDB()
{
$ocoms = OCOM::all();
$from = strtotime(\App\Config::getData('instruction_year_begin'));
$to = strtotime(\App\Config::getData('instruction_year_end'));
$allEvent = \App\Event::all();
$events = collect();
foreach ($allEvent as $e)
{
if ($e->use_schedule == 1)
{
if (strtotime($e->date_begin) >= $from)
{
if (strtotime($e->date_begin) <= $to)
{
$events->push($e);
foreach ($e->courses as $c)
{
$r = $ocoms->where('ocom',$c->ocom)->first();
if ($r != null)
{
$r->saveCourse($c);
}
}
}
}
}
}
foreach ($ocoms as $o)
{
$o->save();
}
dd($ocoms);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
$ocom = new OCOM();
$ocom->ocom = $request->ocom;
$ocom->objectif_competence = $request->objectif_competence;
$ocom->nbPeriode = $request->nbPeriode;
$ocom->objectif_rendement = $request->objectif_rendement;
$ocom->oren = $request->oren;
if ($ocom->ocom[0] == 'C' || $ocom->ocom[0] == 'c')
{
$ocom->complementary = true;
}
else
{
$ocom->complementary = false;
}
$ocom->course_id = "";
$ocom->save();
clog('add','success','a ajouter un ocom',\Auth::User()->id);
return redirect('/admin/ocom/'.$ocom->id);
}
/**
@@ -685,40 +754,58 @@ X20,\"Participer à des activités
/**
* Show the form for editing the specified resource.
*
* @param \App\OCOM $oCOM
* @param $id
* @return \Illuminate\Http\Response
*/
public function edit(OCOM $oCOM)
public function edit($id)
{
//
return view('admin.ocom.edit',['ocom' => OCOM::find($id)]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\OCOM $oCOM
* @return \Illuminate\Http\Response
* @param Request $request
* @param $id
* @return RedirectResponse|Redirector
*/
public function update(Request $request, OCOM $oCOM)
public function update(Request $request,$id)
{
//
$ocom = OCOM::find($id);
$ocom->ocom = $request->ocom;
$ocom->objectif_competence = $request->objectif_competence;
$ocom->nbPeriode = $request->nbPeriode;
$ocom->objectif_rendement = $request->objectif_rendement;
$ocom->oren = $request->oren;
if ($ocom->ocom[0] == 'C' || $ocom->ocom[0] == 'c')
{
$ocom->complementary = true;
}
else
{
$ocom->complementary = false;
}
$ocom->save();
clog('edit','success','a modifié un ocom',\Auth::User()->id);
return redirect('/admin/ocom/'.$id);
}
/**
* Remove the specified resource from storage.
*
* @param \App\OCOM $oCOM
* @param OCOM $oCOM
* @return \Illuminate\Http\Response
*/
public function destroy(OCOM $oCOM)
public function destroy($id)
{
//
OCOM::find($id)->delete();
}
public function jsonList()
{
$ocoms = \App\OCOM::all();
$ocoms = OCOM::all();
$name = [];
@@ -731,7 +818,7 @@ X20,\"Participer à des activités
public function getName(string $ocom)
{
$foo = \App\OCOM::all()->where('ocom','=',$ocom)->first();
$foo = OCOM::all()->where('ocom','=',$ocom)->first();
if($foo != null)
{
return $foo->objectif_competence;

48
app/OCOM.php
View File

@@ -19,14 +19,60 @@ class OCOM extends Model
public function saveCourses($courses)
{
$courses_id = [];
$courses_id = explode(',',$this->course_id);
foreach ($courses as $cours)
{
if ($cours != null){
array_push($courses_id,$cours->id);
}
}
$courses_id = array_unique($courses_id);
$courses_id = array_filter($courses_id);
$this->course_id = implode(',',$courses_id);
$this->save();
}
public function saveCourse($course)
{
$courses_id = explode(',',$this->course_id);
array_push($courses_id,$course->id);
$courses_id = array_unique($courses_id);
$courses_id = array_filter($courses_id);
$this->course_id = implode(',',$courses_id);
$this->save();
}
public function wasGiven()
{
$courses = $this->courses();
$result = collect();
$from = strtotime(\App\Config::getData('instruction_year_begin'));
$to = strtotime(\App\Config::getData('instruction_year_end'));
foreach ($courses as $course)
{
$event = null;
try {
$event = $course->event;
}
catch (\Exception $e)
{
// Nettoyer ?
break;
}
if (strtotime($event->date_begin) >= $from)
{
if (strtotime($event->date_begin) <= $to)
{
$result->push($event);
}
}
}
if ($result->isEmpty())
{
return false;
}
return $result;
}
}

10
database/seeds/ConfigsTableSeeder.php
View File

@@ -256,6 +256,16 @@ class ConfigsTableSeeder extends Seeder
'name' => 'is_Google_Drive_enabled',
'state' => 0,
'data' => '["false"]'
],
[
'name' => 'instruction_year_begin',
'state' => 0,
'data' => '["2019-08-1"]'
],
[
'name' => 'instruction_year_end',
'state' => 0,
'data' => '["2020-05-31"]'
]
];

39
public/js/ocom.js vendored Normal file
View File

@@ -0,0 +1,39 @@
function deleteOCOM(id)
{
Swal.fire({
title: 'Êtes vous certain ?',
text: "Vous ne pourrez annuler cette action",
type: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Oui',
cancelButtonText: 'Non'
}).then((result) => {
if (result.value) {
let request = $.ajax({
url: "/api/ocom/"+id,
method: "DELETE",
data: { api_token : api_token },
dataType: "html"
});
request.done(function (msg) {
Swal.fire(
'Supprimé!',
'Le fichier a été supprimé',
'success'
).then(() => {
window.location.href = '/admin/ocom';
});
});
request.fail(function (jqXHR, textStatus) {
Swal.fire({
type: 'error',
title: 'Oops...',
text: 'Le cours n\'a pas pus être supprimé',
footer: '<small>'+textStatus+'</small>'
})
})
}
});
}

1
public/mix-manifest.json
View File

@@ -1,5 +1,4 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/css/material-dashboard.css": "/css/material-dashboard.css",
"/css/custom.css": "/css/custom.css"

62
resources/views/admin/ocom/add.blade.php Normal file
View File

@@ -0,0 +1,62 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">Ajouter un cours</h4>
</div>
<div class="card-body">
<div class="content">
<form method="post">
@method('PUT')
@csrf
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label for="oren">OREN</label>
<input type="text" class="form-control" id="oren" name="oren" placeholder="103" required>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label for="ocom">OCOM</label>
<input type="text" class="form-control" id="ocom" name="ocom" placeholder="M103.06" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="objectif_competence">Objectif de compétence</label>
<input type="text" class="form-control" id="objectif_competence" name="objectif_competence" placeholder="Établir un objectif personnel pour l'année d'instruction" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="nbPeriode">Nombre de période</label>
<input type="number" class="form-control" id="nbPeriode" name="nbPeriode" placeholder="1" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="objectif_rendement">Objectif de rendement</label>
<input type="text" class="form-control" id="objectif_rendement" name="objectif_rendement" placeholder="Participer à titre de membre d'une équipe" required>
</div>
</div>
<div class="col-md-8 text-right">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
<a class="btn btn-warning" href="{{ url()->previous() }}">Annuler</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
@endsection
@section('breadcrumb')
<a class="navbar-brand" href="/admin/ocom">Base de données des cours</a>/ Ajouter
@endsection
@section('custom_scripts')
@endsection

62
resources/views/admin/ocom/edit.blade.php Normal file
View File

@@ -0,0 +1,62 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">{{$ocom->ocom.' / '.$ocom->objectif_competence}}</h4>
</div>
<div class="card-body">
<div class="content">
<form method="post">
@method('PATCH')
@csrf
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label for="oren">OREN</label>
<input type="text" class="form-control" id="oren" name="oren" placeholder="103" value="{{$ocom->oren}}" required>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label for="ocom">OCOM</label>
<input type="text" class="form-control" id="ocom" name="ocom" placeholder="M103.06" value="{{$ocom->ocom}}" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="objectif_competence">Objectif de compétence</label>
<input type="text" class="form-control" id="objectif_competence" name="objectif_competence" placeholder="Établir un objectif personnel pour l'année d'instruction" value="{{$ocom->objectif_competence}}" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="nbPeriode">Nombre de période</label>
<input type="number" class="form-control" id="nbPeriode" name="nbPeriode" placeholder="1" value="{{$ocom->nbPeriode}}" required>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="objectif_rendement">Objectif de rendement</label>
<input type="text" class="form-control" id="objectif_rendement" name="objectif_rendement" placeholder="Participer à titre de membre d'une équipe" value="{{$ocom->objectif_rendement}}" required>
</div>
</div>
<div class="col-md-8 text-right">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
<a class="btn btn-warning" href="{{ url()->previous() }}">Annuler</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
@endsection
@section('breadcrumb')
<a class="navbar-brand" href="/admin/ocom">Base de données des cours</a> / Modifier /{{$ocom->ocom}}
@endsection
@section('custom_scripts')
@endsection

44
resources/views/admin/ocom/generate.blade.php Normal file
View File

@@ -0,0 +1,44 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">Génération de masse</h4>
</div>
<div class="card-body">
<div class="content">
<form method="post">
<div class="row">
@method('PUT')
@csrf
<div class="col-12">
<p>Coller l'index de chacun des guides pédagogiques de niveau dans la zone de texte. Générer </p>
</div>
<div class="col-12">
<div class="form-group">
<label for="exampleFormControlTextarea1">Index des cours</label>
<textarea class="form-control" id="index" name="text" rows="3"></textarea>
</div>
</div>
<div class="col-12">
<button type="submit" class="btn btn-primary">Générer</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
@endsection
@section('breadcrumb')
<a class="navbar-brand">Base de données des cours</a> / Génération de masse
@endsection
@section('custom_scripts')
<script src="/js/ocom.js"></script>
<script>
$('.tooltip').tooltip('enable')
</script>
@endsection

49
resources/views/admin/ocom/index.blade.php
View File

@@ -8,7 +8,24 @@
</div>
<div class="card-body">
<div class="content">
<p>Liste des cours dans la base de données</p>
<div class="row">
<div class="col-md-8">
<p>Liste des cours dans la base de données</p>
</div>
<div class="col-md-4 justify-content-end pr-4 d-flex">
<a href="ocom/add" data-placement="left" title="Ajouter un cour">
<i class="fas fa-plus-circle fa-3x"></i>
</a>
<div class="dropdown my-auto mx-3">
<a class="dropdown-toggle" href="javascript:;" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-ellipsis-v"></i>
</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
<a class="dropdown-item" href="/admin/ocom/generate">Génération de masse</a>
</div>
</div>
</div>
</div>
<table class="table table-striped table-no-bordered table-hover dataTable dtr-inline" id="table" style="width:100%">
<thead>
<tr>
@@ -23,28 +40,30 @@
</thead>
<tbody>
@foreach($ocoms as $ocom)
<tr class="cursor" onclick="navigate({{$ocom->id}})">
<td class="text-center">
@if($ocom->course_id != "")
<div data-toggle="tooltip" data-placement="right" title="Le cours a été donné">
<tr class="cursor">
<td class="text-center" onclick="navigate({{$ocom->id}})">
@if($ocom->wasGiven() != false)
<div data-toggle="tooltip" data-placement="right" title="Le cours a été donné cette année">
<p class="d-none">1</p>
<i class="fas fa-check-circle fa-2x text-success"></i>
</div>
@else
<div data-toggle="tooltip" data-placement="right" title="Le cours n'a jamais été donné">
<div data-toggle="tooltip" data-placement="right" title="Le cours n'a pas été donné cette année">
<p class="d-none">0</p>
<i class="fas fa-times-circle fa-2x text-warning"></i>
</div>
@endif
</td>
<td>{{$ocom->oren}}</td>
<td>{{$ocom->ocom}}</td>
<td>{{$ocom->nbPeriode}}</td>
<td>{{$ocom->objectif_rendement}}</td>
<td>{{$ocom->objectif_competence}}</td>
<td onclick="navigate({{$ocom->id}})">{{$ocom->oren}}</td>
<td onclick="navigate({{$ocom->id}})">{{$ocom->ocom}}</td>
<td onclick="navigate({{$ocom->id}})">{{$ocom->nbPeriode}}</td>
<td onclick="navigate({{$ocom->id}})">{{$ocom->objectif_rendement}}</td>
<td onclick="navigate({{$ocom->id}})">{{$ocom->objectif_competence}}</td>
<td>
<button class="btn btn-primary btn-fab btn-fab-mini btn-round">
<a href="/admin/ocom/edit/{{$ocom->id}}" class="btn btn-primary btn-fab btn-fab-mini btn-round">
<i class="material-icons">edit</i>
</button>
<button class="btn btn-danger btn-fab btn-fab-mini btn-round">
</a>
<button class="btn btn-danger btn-fab btn-fab-mini btn-round" onclick="deleteOCOM({{$ocom->id}})">
<i class="material-icons">delete</i>
</button>
</td>
@@ -63,12 +82,14 @@
@endsection
@section('custom_scripts')
<script src="/js/ocom.js"></script>
<script>
$('.tooltip').tooltip('enable')
$(document).ready(function() {
$('#table').DataTable({
"lengthMenu": [[25, 50, -1], [25, 50, "All"]],
"ordering" : true,
"order": [[1, "asc"]]
});
} );
</script>

25
resources/views/admin/ocom/show.blade.php
View File

@@ -9,6 +9,19 @@
<div class="card-body">
<div class="content">
<div class="row">
<div class="col-md-1 text-center align-middle p-3">
@if($ocom->wasGiven() != false)
<div data-toggle="tooltip" data-placement="right" title="Le cours a été donné cette année">
<p class="d-none">1</p>
<i class="fas fa-check-circle fa-2x text-success"></i>
</div>
@else
<div data-toggle="tooltip" data-placement="right" title="Le cours n'a pas été donné cette année">
<p class="d-none">0</p>
<i class="fas fa-times-circle fa-2x text-warning"></i>
</div>
@endif
</div>
<div class="col-md-2">
<label>OREN</label>
<p>{{$ocom->oren}}</p>
@@ -21,7 +34,7 @@
<label>Objectif de compétence</label>
<p>{{$ocom->objectif_competence}}</p>
</div>
<div class="col-md-4">
<div class="col-md-3">
<label>Nombre de période</label>
<p>{{$ocom->nbPeriode}}</p>
</div>
@@ -30,15 +43,15 @@
<p>{{$ocom->objectif_rendement}}</p>
</div>
<div class="col-md-8 text-right">
<button type="button" class="btn btn-warning">Modifier</button>
<button type="button" class="btn btn-danger">Supprimer</button>
<a href="/admin/ocom/edit/{{$ocom->id}}" class="btn btn-warning">Modifier</a>
<button type="button" class="btn btn-danger" onclick="deleteOCOM('{{$ocom->id}}')">Supprimer</button>
</div>
<div class="col-12">
<label>Index des périodes</label>
@if($ocom->course_id == "")
<p class="text-center text-muted">Le cours n'est jamais donnée</p>
<p class="text-center text-muted">Le cours n'a jamais été donnée</p>
@else
<table class="table table-striped">
<table id="table" class="table table-striped">
<thead>
<tr>
<th>ID</th>
@@ -72,12 +85,14 @@
@endsection
@section('custom_scripts')
<script src="/js/ocom.js"></script>
<script>
$('.tooltip').tooltip('enable')
$(document).ready(function() {
$('#table').DataTable({
"lengthMenu": [[25, 50, -1], [25, 50, "All"]],
"ordering" : true,
"order": [[1, "asc"]]
});
} );
</script>

3
routes/api.php
View File

@@ -75,6 +75,9 @@ Route::middleware('auth:api')->group(function () {
$user = \App\User::find($id);
return $user->getPerm("schedule_edit");
})->middleware('perm:user_see');
Route::delete('/ocom/{id}','OCOMController@destroy');
});
Route::get('/admin/ping', function(){
$users = \App\User::all();

8
routes/web.php
View File

@@ -15,7 +15,7 @@ use Illuminate\Support\Facades\Storage;
/* Basic Auth Route */
Auth::routes();
Route::get('logout', 'Auth\LoginController@logout')->name('logout');
Route::get('/ocom/create','OCOMController@create');
Route::get('/ocom/create','OCOMController@updateOCOMDB');
@@ -169,6 +169,12 @@ Route::middleware(['auth'])->group(function () {
/** OCOM */
Route::get('/admin/ocom','OCOMController@index');
Route::get('/admin/ocom/generate','OCOMController@showgenerate');
Route::put('/admin/ocom/generate','OCOMController@generate');
Route::get('/admin/ocom/add','OCOMController@create');
Route::put('/admin/ocom/add','OCOMController@store');
Route::get('/admin/ocom/edit/{id}','OCOMController@edit');
Route::patch('/admin/ocom/edit/{id}','OCOMController@update');
Route::get('/admin/ocom/{id}','OCOMController@show');
});