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 modification des event_type

Browse Source
This commit is contained in:
George Frederick "Buzz" Beurling
2020-04-16 18:32:02 -04:00
parent 4b659c5db1
commit f104c1b61b
14 changed files with 797 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/EventType.php
View File

@@ -9,4 +9,33 @@ class EventType extends Model
protected $casts = [
'schedule_model' => 'array',
];
public function getScheduleModelData($level,$periode)
{
if (isset($this->schedule_model['default_value']))
{
dd($this->schedule_model ['default_value']);
return $this->schedule_model['default_value'][$periode-1][$level-1];
}
else
{
return [
'ocom' => 'M103.03',
'name' => 'Super cours',
'location' => 'Bic',
'instructor' => 'Math',
'desc' => ''
];
}
}
public function nbLevel()
{
return count($this->schedule_model['niveaux']);
}
public function nbPeriode()
{
return count($this->schedule_model['periodes']);
}
}

75
app/GoogleDriveFile.php
View File

@@ -337,41 +337,60 @@ class GoogleDriveFile extends Model
$user = \Auth::user();
$sidebarArray = [];
$dirList = \App\GoogleDriveFile::all();
if ($dirList->where('path','=','.Privé/.Cadet')->first()->canAuthUser())
$temp = $dirList->where('path','=','.Privé/.Cadet')->first();
if ($temp != null)
{
$sidebarArray['Cadet'] = [
'route' => 'admin.files.cadet',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
if ($dirList->where('path','=','.Privé/.Cadet')->first()->canAuthUser())
{
$sidebarArray['Cadet'] = [
'route' => 'admin.files.cadet',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
}
}
if ($dirList->where('path','=','.Privé/.Staff')->first()->canAuthUser())
$temp = $dirList->where('path','=','.Privé/.Staff')->first();
if ($temp != null)
{
$sidebarArray['Staff'] = [
'route' => 'admin.files.staff',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
if ($dirList->where('path','=','.Privé/.Staff')->first()->canAuthUser())
{
$sidebarArray['Staff'] = [
'route' => 'admin.files.staff',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
}
}
if ($dirList->where('path','=','.Privé/.ETAMAS')->first()->canAuthUser())
$temp = $dirList->where('path','=','.Privé/.ETAMAS')->first();
if ($temp != null)
{
$sidebarArray['ETAMAS'] = [
'route' => 'admin.files.etamas',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
if ($dirList->where('path','=','.Privé/.ETAMAS')->first()->canAuthUser())
{
$sidebarArray['ETAMAS'] = [
'route' => 'admin.files.etamas',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
}
}
if ($dirList->where('path','=','.Privé/.Officier')->first()->canAuthUser())
$temp = $dirList->where('path','=','.Privé/.Officier')->first();
if ($temp != null)
{
$sidebarArray['Officier'] = [
'route' => 'admin.files.officier',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
if ($dirList->where('path','=','.Privé/.Officier')->first()->canAuthUser())
{
$sidebarArray['Officier'] = [
'route' => 'admin.files.officier',
'icon' => 'fas fa-folder-open',
'perm' => null,
'child' => null
];
}
}
$sidebarArray['Publique'] = [
'route' => 'admin.files.publique',

88
app/Http/Controllers/EventTypeController.php
View File

@@ -68,9 +68,88 @@ class EventTypeController extends Controller
* @param \App\EventType $eventType
* @return \Illuminate\Http\Response
*/
public function update(Request $request, EventType $eventType)
public function update(Request $request, $id)
{
//
$eventType = EventType::findOrFail($id);
$eventType->name = $request->name;
$eventType->location = $request->location;
$eventType->begin_time = $request->begin_time;
$eventType->end_time = $request->end_time;
$eventType->calendar_icon = $request->calendar_icon;
$eventType->calendar_color = $request->calendar_color;
$eventType->admin_desc = $request->admin_desc;
if ($request->use_weekly_msg == 'on')
{
$eventType->use_weekly_msg = 1;
$eventType->weekly_msg_publication_time = $request->weekly_msg_publication_time;
$eventType->weekly_msg = $request->weekly_msg;
}
else
{
$eventType->use_weekly_msg = 0;
$eventType->weekly_msg_publication_time = '';
$eventType->weekly_msg = '';
}
if ($request->use_schedule == 'on')
{
$eventType->use_schedule = 1;
}
else
{
$eventType->use_schedule = 0;
}
if ($request->is_mandatory == 'on')
{
$eventType->is_mandatory = 1;
}
else
{
$eventType->is_mandatory = 0;
}
$nbOfLevel = 1;
while (\request('level_name_'.$nbOfLevel))
{
$nbOfLevel++;
}
$nbOfLevel = $nbOfLevel-1;
$nbOfPeriode = 1;
while (\request('periode_name_'.$nbOfPeriode))
{
$nbOfPeriode++;
}
$nbOfPeriode = $nbOfPeriode -1;
$model = [];
for ($x = 1; $x <= $nbOfPeriode; $x++) {
$model['periodes'][$x-1] = [
'name' => \Request('periode_name_'.$x),
'begin_time' => \Request('periode_begin_time_'.$x),
'end_time' => \Request('periode_end_time_'.$x)
];
}
for ($i = 1; $i <= $nbOfLevel; $i++) {
$model['niveaux'][$i-1] = [
'name' => \Request('level_name_'.$i)
];
for ($x = 1; $x <= $nbOfPeriode; $x++) {
$model['default_value'][$x-1][$i-1] = [
'ocom' => \Request('ocom_n'.$i.'_p'.$x),
'name' => \Request('name_n'.$i.'_p'.$x),
'location' => \Request('location_n'.$i.'_p'.$x),
'instructor' => \Request('instruc_n'.$i.'_p'.$x),
'desc' => \Request('desc_n'.$i.'_p'.$x),
'use_course' => \Request('use_course_n'.$i.'_p'.$x),
];
}
}
$eventType->schedule_model = $model;
$eventType->save();
return redirect()->back()->with('success','Modification sauvegardé avec succès');
}
/**
@@ -83,4 +162,9 @@ class EventTypeController extends Controller
{
//
}
public function toJson($id)
{
return EventType::findOrFail($id)->toArray();
}
}

19
app/Http/Controllers/ScheduleEditorController.php
View File

@@ -11,9 +11,24 @@ class ScheduleEditorController extends Controller
return view('admin.schedule.editor.course');
}
public function getCourseEmpty(int $niveau,int $periode)
public function getCourseEmpty(int $niveau,int $periode,$event_type = 1)
{
return view('admin.schedule.editor.course',['periode' => $periode, 'niveau' => $niveau]);
$eventType = \App\EventType::findOrFail($event_type);
$data = $eventType->getScheduleModelData($niveau,$periode);
$ocom = $data['ocom'];
$name = $data['name'];
$location = $data['location'];
$instructor = $data['instructor'];
$desc = $data['desc'];
return view('admin.schedule.editor.course',[
'periode' => $periode,
'niveau' => $niveau,
'ocom' => $ocom,
'name' => $name,
'location' => $location,
'instructor' => $instructor,
'desc' => $desc]);
}
public function getTemplate(int $id)

9
app/Permission.php
View File

@@ -188,6 +188,15 @@ class Permission extends Model
'valeur' => 0
],
],
'Administration' => [
'cadet_list_see' => [
'ckey' => 'cadet_list_see',
'communName' => 'Voir la liste nominative',
'desc' => 'L\'utilisateur peut-il voir la liste nominative',
'icon' => 'fa-eye',
'valeur' => 0
],
],
'Horaire' => [
'schedule_see' => [
'ckey' => 'schedule_see',