v0.10.14b - We now delete events from the database if the event passes the event data
This commit is contained in:
parent
5c087c9b11
commit
6b3af7e667
|
@ -33,6 +33,7 @@ class EventController extends Controller
|
||||||
*/
|
*/
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
|
DB::table('events')->where('date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->delete();
|
||||||
|
|
||||||
$events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
|
$events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
|
||||||
|
|
||||||
|
@ -248,13 +249,16 @@ class EventController extends Controller
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||||
"</tr>";
|
"</tr>";
|
||||||
|
|
||||||
|
|
||||||
$events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%')
|
$events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%')
|
||||||
->orWhere('date','LIKE', $request->search.'%')
|
->orWhere('date','LIKE', $request->search.'%')
|
||||||
->orWhere('accountable','LIKE', $request->search.'%')
|
->orWhere('accountable','LIKE', $request->search.'%')
|
||||||
->get();//Job is here dude :9
|
->get();//Job is here dude :9
|
||||||
|
|
||||||
if(count($events) !== 0){
|
if(count($events) !== 0){
|
||||||
foreach ($events as $key => $event){
|
foreach ($events as $event){
|
||||||
|
if(date('Y-m-d H:i', strtotime('-1 day')) < date('Y-m-d H:i', strtotime($event->date))) {
|
||||||
$output .= '<tr>' .
|
$output .= '<tr>' .
|
||||||
'<td>' . $event->name . '</td>' .
|
'<td>' . $event->name . '</td>' .
|
||||||
'<td>' . $event->accountable . '</td>' .
|
'<td>' . $event->accountable . '</td>' .
|
||||||
|
@ -270,6 +274,7 @@ class EventController extends Controller
|
||||||
'</td>' .
|
'</td>' .
|
||||||
'</tr>';
|
'</tr>';
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}else {
|
}else {
|
||||||
$output.='<tr>'.
|
$output.='<tr>'.
|
||||||
'<td>Intet match</td>'.
|
'<td>Intet match</td>'.
|
||||||
|
|
Loading…
Reference in New Issue