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

3.2.4

Browse Source
This commit is contained in:
Mathieu Lagace
2019-09-30 17:06:31 -04:00
parent d1ce6ba6da
commit 0166c48daa
38 changed files with 618 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/EventController.php
View File

@@ -50,7 +50,8 @@ class EventController extends Controller
$event->is_mandatory = 0;
}
$event->desc = request('desc');
$event->msg = request('msg');
$event->date_msg = request('date_msg');
$event->save();
if ($event->type == 1) {
@@ -60,7 +61,7 @@ class EventController extends Controller
$course = new \App\Course();
$users = \App\User::all();
$instructor = 1;
$instructor = request('instruc_n'.$l.'_p'.$p);
foreach ($users as $user) {
if($user->fullname() == request('instruc_n'.$l.'_p'.$p))
@@ -130,6 +131,7 @@ class EventController extends Controller
$event->is_mandatory = 0;
}
$event->desc = request('desc');
$event->msg = \request('msg');
$event->save();
@@ -151,7 +153,7 @@ class EventController extends Controller
}
$users = \App\User::all();
$instructor = 1;
$instructor = request('instruc_n'.$l.'_p'.$p);
foreach ($users as $user) {
if($user->fullname() == request('instruc_n'.$l.'_p'.$p))

2
app/Http/Controllers/JobController.php
View File

@@ -20,7 +20,7 @@ class JobController extends Controller
$jobs = $jobs_sorted->values();
return view('admin.job.index', ['jobs' => $jobs]);
return view('admin.configs.jobs.index', ['jobs' => $jobs]);
}
/**

14
app/Http/Controllers/NewsController.php
View File

@@ -14,13 +14,13 @@ class NewsController extends Controller
*/
public function index()
{
return view('public.allnews',['news' => News::where('publish','=','1')->paginate(9)]);
return view('public.allnews',['news' => News::allWithWeeklyMsg()->where('publish','=','1')->sortByDesc('updated_at')->paginate(9)]);
}
public function indexAdmin()
{
clogNav('a consulté les nouvelles');
return view('admin.news.index',['news' => \App\News::paginate(9)]);
return view('admin.news.index',['news' => News::allWithWeeklyMsg()->sortByDesc('updated_at')->paginate(9)]);
}
/**
@@ -69,8 +69,14 @@ class NewsController extends Controller
*/
public function show($id)
{
clog('see','success','a consulté une nouvelle',null,'App\News',$id);
return view('public.news', ['new' => \App\News::find($id)]);
if (\request('type') == 'msg')
{
return view('public.news', ['new' => \App\News::getWeeklyMsg(\App\Event::find($id))]);
}
else
{
return view('public.news', ['new' => \App\News::find($id)]);
}
}
/**

3
app/Http/Controllers/PublicController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\News;
use Illuminate\Http\Request;
class PublicController extends Controller
@@ -14,7 +15,7 @@ class PublicController extends Controller
public function index()
{
return view('public.index',[
'news' => \App\News::all()->where('publish','1')->sortByDesc('created_at')->take(3),
'news' => \App\News::allWithWeeklyMsg()->where('publish','=','1')->sortByDesc('created_at')->take(3),
'activities' => \App\ComplementaryActivity::all()->where('is_promoted','1'),
'pictures' => \App\Picture::all()->sortByDesc('created_at')->take(\App\Config::getData('nb_activity_public'))
]);

6
app/Http/Controllers/ScheduleController.php
View File

@@ -213,10 +213,14 @@ class ScheduleController extends Controller
$activity = \App\ComplementaryActivity::find($type);
$begin_time = $date." ".$activity->begin_time;
$end_time = $date." ".$activity->end_time;
$msg_time = Date('c',strtotime($begin_time.'-4day'));
return view('admin.schedule.modal.add',[
'activity' => \App\ComplementaryActivity::find($type),
'begin_time' => $begin_time,
'end_time' => $end_time
'end_time' => $end_time,
'msg_time' => $msg_time
]);
}