Merge branch 'master' into file-v3

# Conflicts:
#	config/version.yml
This commit is contained in:
Mathieu Lagacé
2020-10-13 14:48:50 -04:00
30 changed files with 908 additions and 922 deletions

View File

@@ -1,6 +1,11 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-sm-12 col-lg-12 text-right">
<a class="btn btn-primary btn-round" href="/admin/schedule/table">
<i class="material-icons">table_view</i> Vue Tableau
</a>
</div>
<div class="col-sm-12 col-lg-12">
<div class="card">
<div class="card-body pb-0">

View File

@@ -31,41 +31,34 @@
<p>
Choisissez quels permissions doivent être associé avec ce grade.
</p>
<div id="accordion" role="tablist">
<table id="permission-table" class="table table-bordered" style="width:100%">
<thead class="d-none">
<th class="d-none">Cat</th>
<th>Nom</th>
<th></th>
</thead>
<tbody>
@foreach(\App\Permission::allToArray() as $key => $cat)
<div class="card card-collapse">
<div class="card-header" role="tab" id="headingOne">
<h5 class="mb-0">
<a class="text-capitalize" data-toggle="collapse" href="#coll-{{$key}}" @if ($loop->first) aria-expanded="true" @endif aria-controls="collapseOne">
{{$key}}
<i class="material-icons">keyboard_arrow_down</i>
</a>
</h5>
</div>
<div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
<div class="card-body">
<div class="row">
@foreach($cat as $r)
<div class="col-3 text-center">
<input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}">
<h5>{{$r['communName']}}</h5>
<div class="btn-group">
<button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fas fa-times"></i></button>
<!--<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>-->
<button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
</div>
<p>
<small>{{$r['desc']}}</small>
</p>
</div>
@endforeach
@foreach($cat as $r)
<tr>
<td class="d-none">{{$key}}</td>
<td>
<input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}">
{{$r['communName']}}<br>
<small>{{$r['desc']}}</small>
</td>
<td class="text-center">
<div class="btn-group">
<button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fas fa-times"></i></button>
<!--<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>-->
<button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
</div>
</div>
</div>
</div>
</td>
</tr>
@endforeach
@endforeach
</div>
</tbody>
</table>
</div>
<div class="col-md-12 mt-5">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
@@ -83,5 +76,17 @@
$('#desc').trumbowyg({
lang: 'fr'
});
$(document).ready(function() {
$('#permission-table').DataTable({
rowGroup: {
dataSrc: 0
},
pageLength: 100,
lengthChange: false,
columnDefs: [
{ "visible": false, "targets": [0] }
]
});
} );
</script>
@endsection

View File

@@ -31,7 +31,41 @@
<p>
Choisissez quels permissions doivent être associé avec ce grade.
</p>
<div id="accordion" role="tablist">
<table id="permission-table" class="table table-bordered" style="width:100%">
<thead class="d-none">
<th class="d-none">Cat</th>
<th>Nom</th>
<th></th>
</thead>
<tbody>
@foreach(\App\Permission::allToArray() as $key => $cat)
@foreach($cat as $r)
<tr>
<td class="d-none">{{$key}}</td>
<td>
<input class="d-none" type="text" id="{{$r['ckey']}}"
name="{{$r['ckey']}}" value="{{$rank->p($r['ckey'])}}">
{{$r['communName']}}<br>
<small>{{$r['desc']}}</small>
</td>
<td class="text-center">
<div class="btn-group">
<button type="button" id="{{$r['ckey']}}-close"
class="btn btn-just-icon @if($rank->p($r['ckey']) != -1) btn-outline-danger @else btn-danger @endif"
onclick="switchPermissionSwitch('{{$r['ckey']}}','close')">
<i class="fas fa-times"></i></button>
<button type="button" id="{{$r['ckey']}}-plus"
class="btn btn-just-icon @if($rank->p($r['ckey']) != 1) btn-outline-success @else btn-success @endif"
onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')">
<i class="fa fa-plus"></i></button>
</div>
</td>
</tr>
@endforeach
@endforeach
</tbody>
</table>
{{--<div id="accordion" role="tablist">
@foreach(\App\Permission::allToArray() as $key => $cat)
<div class="mb-4">
<h3 class="text-capitalize">{{$key}}</h3>
@@ -56,12 +90,11 @@
<i class="fa fa-plus"></i></button>
</div>
</div>
<hr>
@endforeach
</div>
</div>
@endforeach
</div>
</div>--}}
</div>
<div class="col-md-12 mt-5">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
@@ -79,5 +112,17 @@
$('#desc').trumbowyg({
lang: 'fr'
});
$(document).ready(function() {
$('#permission-table').DataTable({
rowGroup: {
dataSrc: 0
},
pageLength: 100,
lengthChange: false,
columnDefs: [
{ "visible": false, "targets": [0] }
]
});
} );
</script>
@endsection

View File

@@ -69,7 +69,7 @@
@else
@foreach ($futureEvent as $event)
<div class="col-md-12">
<div class="alert" style="background-color: @if($event->calendar_color == null){{ \App\ComplementaryActivity::find($event->type)->calendar_color}} @else {{$event->calendar_color}} @endif">
<div class="alert cursor" style="background-color: @if($event->calendar_color == null){{ \App\ComplementaryActivity::find($event->type)->calendar_color}} @else {{$event->calendar_color}} @endif" onclick="navigate('schedule?e={{$event->id}}')">
<div class="row text-white">
<div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
<h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">@if($event->calendar_icon == null) {!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!} @else <i class="{{$event->calendar_icon}}"></i> @endif</h3>

View File

@@ -11,13 +11,13 @@
<form method="post">
@csrf
<div class="row">
<div class="col-md-5">
<div class="col-md-4">
<div class="form-group">
<label class="label-control">Nom</label>
<input type="text" class="form-control" name="name" required/>
</div>
</div>
<div class="col-md-5">
<div class="col-md-4">
<div class="form-group">
<label class="label-control">Emplacement</label>
<input type="text" class="form-control" name="location" required/>
@@ -32,6 +32,15 @@
</label>
</div>
</div>
<div class="col-md-2">
<div class="togglebutton">
<label>
<input type="checkbox" name="hidden">
<span class="toggle"></span>
Évenement caché
</label>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="label-control">Heure de début</label>

View File

@@ -12,13 +12,13 @@
@method('PATCH')
@csrf
<div class="row">
<div class="col-md-5">
<div class="col-md-4">
<div class="form-group">
<label class="label-control">Nom</label>
<input type="text" class="form-control" value="{{$event_type->name}}" name="name" />
</div>
</div>
<div class="col-md-5">
<div class="col-md-4">
<div class="form-group">
<label class="label-control">Emplacement</label>
<input type="text" class="form-control" value="{{$event_type->location}}" name="location" />
@@ -33,6 +33,15 @@
</label>
</div>
</div>
<div class="col-md-2">
<div class="togglebutton">
<label>
<input type="checkbox" name="hidden" @if($event_type->hidden == 1) checked @endif>
<span class="toggle"></span>
Évenement caché
</label>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="label-control">Heure de début</label>

View File

@@ -31,7 +31,35 @@
<p>
Choisissez quels permissions doivent être associé avec ce poste.
</p>
<div id="accordion" role="tablist">
<table id="permission-table" class="table table-bordered" style="width:100%">
<thead class="d-none">
<th class="d-none">Cat</th>
<th>Nom</th>
<th></th>
</thead>
<tbody>
@foreach(\App\Permission::allToArray() as $key => $cat)
@foreach($cat as $r)
<tr>
<td class="d-none">{{$key}}</td>
<td>
<input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}">
{{$r['communName']}}<br>
<small>{{$r['desc']}}</small>
</td>
<td class="text-center">
<div class="btn-group">
<button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fas fa-times"></i></button>
<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>
<button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
</div>
</td>
</tr>
@endforeach
@endforeach
</tbody>
</table>
{{--<div id="accordion" role="tablist">
@foreach(\App\Permission::allToArray() as $key => $cat)
<div class="card card-collapse">
<div class="card-header" role="tab" id="headingOne">
@@ -65,7 +93,7 @@
</div>
</div>
@endforeach
</div>
</div>--}}
</div>
<div class="col-md-12 mt-5">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
@@ -83,5 +111,17 @@
$('#desc').trumbowyg({
lang: 'fr'
});
$(document).ready(function() {
$('#permission-table').DataTable({
rowGroup: {
dataSrc: 0
},
pageLength: 100,
lengthChange: false,
columnDefs: [
{ "visible": false, "targets": [0] }
]
});
} );
</script>
@endsection

View File

@@ -31,7 +31,35 @@
<p>
Choisissez quels permissions doivent être associé avec ce poste.
</p>
<div id="accordion" role="tablist">
<table id="permission-table" class="table table-bordered" style="width:100%">
<thead class="d-none">
<th class="d-none">Cat</th>
<th>Nom</th>
<th></th>
</thead>
<tbody>
@foreach(\App\Permission::allToArray() as $key => $cat)
@foreach($cat as $r)
<tr>
<td class="d-none">{{$key}}</td>
<td>
<input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}" value="{{$job->p($r['ckey'])}}">
{{$r['communName']}}<br>
<small>{{$r['desc']}}</small>
</td>
<td class="text-center">
<div class="btn-group">
<button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon @if($job->p($r['ckey']) != -1) btn-outline-danger @else btn-danger @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fas fa-times"></i></button>
<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon @if($job->p($r['ckey']) == 0) btn-warning @else btn-outline-warning @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fas fa-slash"></i></button>
<button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon @if($job->p($r['ckey']) != 1) btn-outline-success @else btn-success @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fas fa-plus"></i></button>
</div>
</td>
</tr>
@endforeach
@endforeach
</tbody>
</table>
{{-- <div id="accordion" role="tablist">
@foreach(\App\Permission::allToArray() as $key => $cat)
<div class="card card-collapse">
<div class="card-header" role="tab" id="headingOne">
@@ -65,7 +93,7 @@
</div>
</div>
@endforeach
</div>
</div>--}}
</div>
<div class="col-md-12 mt-5">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
@@ -83,5 +111,17 @@
$('#desc').trumbowyg({
lang: 'fr'
});
$(document).ready(function() {
$('#permission-table').DataTable({
rowGroup: {
dataSrc: 0
},
pageLength: 100,
lengthChange: false,
columnDefs: [
{ "visible": false, "targets": [0] }
]
});
} );
</script>
@endsection

View File

@@ -157,6 +157,17 @@
</label>
</div>
</div>
<div class="form-group">
<label class="m-0" for="type">Évenement caché</label>
<small class="text-muted d-block">L'évenement doit t-il être caché?</small>
<div class="togglebutton">
<label>
<input type="checkbox" id="hidden" name="hidden">
<span class="toggle"></span>
Caché
</label>
</div>
</div>
<div id="accordion-apparence" role="tablist">
<div class="card card-collapse">
<div class="card-header" role="tab" id="heading-apparence">

View File

@@ -170,6 +170,17 @@
</label>
</div>
</div>
<div class="form-group">
<label class="m-0" for="type">Évenement caché</label>
<small class="text-muted d-block">L'évenement doit t-il être caché?</small>
<div class="togglebutton">
<label>
<input type="checkbox" id="hidden" name="hidden">
<span class="toggle"></span>
Caché
</label>
</div>
</div>
<div id="accordion-apparence" role="tablist">
<div class="card card-collapse">
<div class="card-header" role="tab" id="heading-apparence">

View File

@@ -0,0 +1,140 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-sm-12 col-lg-12 text-right">
<a class="btn btn-primary btn-round" href="/admin/schedule">
<i class="material-icons">today</i> Vue Horaire
</a>
</div>
<div class="col-sm-12 col-lg-12">
<div class="card">
<div class="card-header">
<h3 class="card-title">Horaire tableau</h3>
</div>
<div class="card-body" style="overflow: scroll;max-height: 79vh">
<div>
<table class="table table-bordered">
<thead class="table-dark">
<tr>
<th></th>
@for($i = 1;$i <= \App\Event::getMaxLevels($events); $i++)
<th>
Niveau {{$i}}
</th>
@endfor
</tr>
<tr>
<td>
<div class="row" style="width: 29rem">
<div class="col-2 pr-0">
Semaine
</div>
<div class="col-4">
Nom
</div>
<div class="col-3">
Date
</div>
<div class="col-3">
Période
</div>
</div>
</td>
@for($i = 1;$i <= \App\Event::getMaxLevels($events); $i++)
<td>
<div class="row" style="width: 35rem">
<div class="col-5">
OCOM - Description
</div>
<div class="col-3">
Instructeur
</div>
<div class="col-2">
Salle
</div>
<div class="col-2">
Materiel
</div>
</div>
</td>
@endfor
</tr>
</thead>
@foreach($events as $event)
<tr class="schedule-table-week">
<td>
<div class="row" style="width: 29rem">
<div class="col-2 text-center m-auto">
{{ $loop->iteration }}
</div>
<div class="col-4 m-auto">
{{$event->name}}
</div>
<div class="col-3 m-auto">
{{$event->date_begin}} à {{ $event->date_end }}
</div>
<div class="col-3 m-auto pr-0">
@if($event->use_schedule == 1)
@foreach($event->schedule["periodes"] as $periode)
<table class="table-borderless">
<tr>
<td style="height: 6rem;vertical-align: middle">
P{{$loop->iteration}} - {{ $periode['begin_time'] }} à {{ $periode['end_time'] }}
</td>
</tr>
</table>
@endforeach
@endif
</div>
</div>
</td>
@if($event->use_schedule == 1)
@for($n = 1;$n <= $event->nbNiveau();$n++)
<td style="padding: 0px;">
@for($p = 1;$p <= $event->nbPeriode();$p++)
<table class="table-borderless">
<tr @if($p != $event->nbPeriode())class="border-bottom"@endif>
<td style="height: 6rem;">
<div class="row" style="width: 35rem">
@php($course = $event->course($p,$n))
<div class="col-5 m-auto">
@if(!$course->use_course())
<b>{{ $course->ocom }}</b> - {{ $course->name }}
@else
{{ $course->desc }}
@endif
</div>
<div class="col-3">
{{ $course->instructor() }}
</div>
<div class="col-2">
{{ $course->location }}
</div>
<div class="col-2">
NA
</div>
@php($course = null)
</div>
</td>
</tr>
</table>
@endfor
</td>
@endfor
@else
<td colspan="{{\App\Event::getMaxLevels($events)}}">
{!! $event->desc !!}
</td>
@endif
</tr>
@endforeach
</table>
</div>
</div>
</div>
</div>
@endsection
@section('custom_scripts')
@endsection

View File

@@ -95,7 +95,7 @@ $sidebar = [
'Configuration' => [
'route' => null,
'icon' => 'menu_book',
'perm' => 'config_edit',
'perm' => 'config_see',
'child' => [
'Général' => [
'route' => 'admin.config.general',
@@ -136,7 +136,7 @@ $sidebar = [
'Apparence' => [
'route' => 'admin.config.customisation',
'icon' => 'fas fa-palette',
'perm' => 'config_edit_instruction',
'perm' => 'config_edit_customization',
'child' => null
]
]

View File

@@ -1,3 +1,8 @@
@if($event->hidden == 1)
<div class="alert alert-danger text-center" role="alert" style="margin-top:-4rem">
<b>Évenement caché</b>
</div>
@endif
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">{{$event->name}}</h5>
<button type="button" class="close" onclick="closeScheduleModal()" aria-label="Close">