muadzmi02
/
sipadu_mbip
forked from SwissLink/sipadu_mbip
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

notis

master
Siti Rahayu 4 years ago
parent
5b3334d971
commit
f867ec2876
7 changed files with 801 additions and 66 deletions
Split View Show Diff Stats
  1. 186
    30
      app/Http/Controllers/Api/CompoundResourceController.php
  2. 1
    1
      app/Http/Controllers/Main/CompoundController.php
  3. 267
    0
      public/js/dataNotis.js
  4. 2
    0
      resources/views/main-dashboard/compound/_part/filter_form.blade.php
  5. 142
    0
      resources/views/main-dashboard/compound/_part/filter_form_notice.blade.php
  6. 202
    35
      resources/views/main-dashboard/compound/prenotice_index.blade.php
  7. 1
    0
      routes/api.php

+ 186
- 30
app/Http/Controllers/Api/CompoundResourceController.php View File

@@ -1,7 +1,7 @@
<?php

namespace App\Http\Controllers\Api;
use Illuminate\Support\Facades\Log;
use Illuminate\Http\Request;
use App\Http\Controllers\Api\BaseController;
use Carbon\Carbon;
@@ -46,7 +46,8 @@ class CompoundResourceController extends BaseController
*
* @return \Illuminate\Http\Response
*/
private function searchCompoundAll($jenis,$modul,$status,$start_date,$end_date){
private function searchCompoundAll($jenis,$modul,$status,$start_date,$end_date,$day3, $day7){
$dateS = Carbon::createFromFormat('Y-m-d', $start_date);
$start = $dateS->copy()->startOfDay();
@@ -58,7 +59,18 @@ class CompoundResourceController extends BaseController
$end = $dateS->copy()->endOfDay();
}

$compound = Compound::where('jenis', $jenis)->whereBetween('created_at', array($start, $end));
if(!empty($day3))
{
$compound = Compound::where('jenis', $jenis)->whereBetween('created_at', array($start->subDays(3), $end->subDays(3)));
}
else if(!empty($day7))
{
$compound = Compound::where('jenis', $jenis)->whereBetween('created_at', array($start->subDays(7), $end->subDays(7)));
}
else
{
$compound = Compound::where('jenis', $jenis)->whereBetween('created_at', array($start, $end));
}
if($modul == 'All'){
$compound = $compound;
@@ -81,9 +93,20 @@ class CompoundResourceController extends BaseController
return $compound;
}

private function searchCompoundAllWithoutDate($jenis,$modul,$status){
private function searchCompoundAllWithoutDate($jenis,$modul,$status,$day3, $day7){

$compound = Compound::where('jenis', $jenis);
if(!empty($day3))
{
$compound = Compound::where('jenis', $jenis)->where('created_at', Carbon::now()->subDays(3));
}
else if(!empty($day7))
{
$compound = Compound::where('jenis', $jenis)->where('created_at', Carbon::now()->subDays(7));
}
else
{
$compound = Compound::where('jenis', $jenis);
}

if($modul == 'All'){
$compound = $compound;
@@ -95,6 +118,7 @@ class CompoundResourceController extends BaseController
});
}else {
$compound = $compound->where('modul', $modul);

}

if($status == 'All'){
@@ -106,15 +130,16 @@ class CompoundResourceController extends BaseController
return $compound;
}

private function filterCompoundByEnforcer($enforcer,$jenis,$modul,$status,$start_date,$end_date){
private function filterCompoundByEnforcer($enforcer,$jenis,$modul,$status,$start_date,$end_date,$day3, $day7){
if(!empty($start_date)){
$compound = $this->searchCompoundAll($jenis,$modul,$status,$start_date,$end_date);
$compound = $this->searchCompoundAll($jenis,$modul,$status,$start_date,$end_date,$day3, $day7);
}else{
$compound = $this->searchCompoundAllWithoutDate($jenis,$modul,$status);
$compound = $this->searchCompoundAllWithoutDate($jenis,$modul,$status,$day3, $day7);
}


if($enforcer == 'All'){
return $compound;
}else {
@@ -123,8 +148,9 @@ class CompoundResourceController extends BaseController
}
}

private function filterCompoundByFaulty($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department){
$compound = $this->filterCompoundByEnforcer($enforcer,$jenis,$modul,$status,$start_date,$end_date);
private function filterCompoundByFaulty($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$day3, $day7){
$compound = $this->filterCompoundByEnforcer($enforcer,$jenis,$modul,$status,$start_date,$end_date,$day3, $day7);
if($faulty == 'All'){
return $compound->whereIn('jbkod',$department);
}else {
@@ -133,8 +159,8 @@ class CompoundResourceController extends BaseController
}
}

private function searchPlateNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no){
$compound = $this->filterCompoundByFaulty($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department);
private function searchPlateNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$day3, $day7){
$compound = $this->filterCompoundByFaulty($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$day3, $day7);
if(!empty($plate_no)){
$compound = $compound->where('no_plate',$plate_no);
return $compound;
@@ -143,8 +169,8 @@ class CompoundResourceController extends BaseController
}
}

private function searchKpd($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd){
$compound = $this->searchPlateNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no);
private function searchKpd($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$day3, $day7){
$compound = $this->searchPlateNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$day3, $day7);
if(!empty($kpd)){
$compound = $compound->where('kpd',$kpd);
return $compound;
@@ -154,8 +180,8 @@ class CompoundResourceController extends BaseController
}
}

private function searchCompanyNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no){
$compound = $this->searchKpd($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd);
private function searchCompanyNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$day3, $day7){
$compound = $this->searchKpd($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$day3, $day7);
if(!empty($company_no)){
$compound = $compound->where('no_daftar_syarikat','LIKE',$company_no);
return $compound;
@@ -164,8 +190,8 @@ class CompoundResourceController extends BaseController
}
}

private function searchNric($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric){
$compound = $this->searchCompanyNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no);
private function searchNric($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$day3, $day7){
$compound = $this->searchCompanyNo($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$day3, $day7);
if(!empty($nric)){
$compound = $compound->where('identity',$nric);
return $compound;
@@ -174,8 +200,8 @@ class CompoundResourceController extends BaseController
}
}

private function searchLesen($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license){
$compound = $this->searchNric($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric);
private function searchLesen($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$day3, $day7){
$compound = $this->searchNric($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$day3, $day7);
if(!empty($license)){
$compound = $compound->where('no_akaun_lesen', 'exists', true)->where('no_akaun_lesen',$license);
return $compound;
@@ -184,8 +210,8 @@ class CompoundResourceController extends BaseController
}
}

private function searchName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP){
$compound = $this->searchLesen($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license);
private function searchName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$day3, $day7){
$compound = $this->searchLesen($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$day3, $day7);
if(!empty($namaP)){
$compound = $compound->where('nama', 'LIKE', "%{$namaP}%");
return $compound;
@@ -194,8 +220,9 @@ class CompoundResourceController extends BaseController
}
}

private function searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name){
$compound = $this->searchName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP);
private function searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name,$day3, $day7){
$compound = $this->searchName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$day3, $day7);

if(!empty($company_name)){
$compound = $compound->where('nama_syarikat', 'exists', true)->where('nama_syarikat', 'LIKE', '%{$company_name%}');
return $compound;
@@ -214,12 +241,20 @@ class CompoundResourceController extends BaseController
// $status = 'All';
// $jenis = 'Pelbagai_JPB';
// if(!empty($request->department)){
// $department = ["5df721c5cde7fd741433c6b2","5d957899f3da686c08192026","5d9d4a699b802d5a31031a8a","5d9d4db1aa95fa07f7245e28","5d9d5955eb4f92300927f188","5d9e965fec0023467756a02a","5d9eba38e4be2267877896a8"];
// $department = array (
// 0 => '5df355f891d6e66b9c5e626d',
// 1 => '5df721c5cde7fd741433c6b2',
// 2 => '5df722a24636f4594f4a3c3d',
// 3 => '5f17a31795dbfd3320761bfe',
// 4 => '5f3b872fea58cb3c1b0e7b8d',
// );
// }else {
// $department = [];
// }
// $start_date = '2020-08-18';
// $end_date = '2020-09-20';
// // $start_date = '';
// // $end_date = '';
// $start_date = '2020-08-29';
// $end_date = '2020-08-29';

// $enforcer = 'All';
// $faulty = 'All';
@@ -230,6 +265,8 @@ class CompoundResourceController extends BaseController
// $license = '';
// $namaP = '';
// $company_name = '';
// $day3 = 3;
// $day7 = '';

/////////////////////////////////////////////////////////////////////////////////

@@ -256,10 +293,27 @@ class CompoundResourceController extends BaseController
$license = $request->license;
$namaP = $request->nameP;
$company_name = $request->company_name;
$day3='';
$day7='';

if ($request->has('day3')) {
$day3 = $request->day3; //has() checks if param exist and filled
}
if ($request->has('day7')) {
$day3 = $request->day7; //has() checks if param exist and filled
}

// if (!empty($start_date)) {
// }

$nested_data = array();

$compound = $this->searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name)->orderBy('created_at','ASC')->get();
$compound = $this->searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name, $day3, $day7)->orderBy('created_at','ASC')->get();
// info($compound);

return \DataTables::of(CompoundResource::collection($compound))->addIndexColumn()
->addColumn('index', function($row) {
@@ -319,6 +373,108 @@ class CompoundResourceController extends BaseController
})->rawColumns(['index','status_kemaskini','kesalahan'])->make(true);
}

public function notice_index(Request $request)
{
$per_page = '';
$kpd = '';

$modul = '02';
$status = 'All';
$jenis = 'Pelbagai_JPB';
$department = array (
0 => '5df355f891d6e66b9c5e626d',
1 => '5df721c5cde7fd741433c6b2',
2 => '5df722a24636f4594f4a3c3d',
3 => '5f17a31795dbfd3320761bfe',
4 => '5f3b872fea58cb3c1b0e7b8d',
);
$start_date = '2020-08-18';
$end_date = '2020-09-20';

$enforcer = 'All';
$faulty = 'All';

$plate_no = strtolower('');
$company_no = strtolower('');
$nric = '';
$license = '';
$namaP = '';
$company_name = '';


###############################################################################################################

// $per_page = $request->per_page;
// $kpd = $request->kpd;

// $modul = $request->modul;
// $status = $request->status;
// $jenis = $request->type;
// if(!empty($request->department)){
// $department = json_decode($request->department);
// }else {
// $department = [];
// }
// $start_date = $request->start_date;
// $end_date = $request->end_date;

// $enforcer = $request->enforcer;
// $faulty = $request->faulty;

// $plate_no = strtolower($request->plate_no);
// $company_no = strtolower($request->company_no);
// $nric = $request->nric;
// $license = $request->license;
// $namaP = $request->nameP;
// $company_name = $request->company_name;

$nested_data = array();

$compound = $this->searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name)->orderBy('created_at','ASC')->get();

// return \DataTables::of(CompoundResource::collection($compound))->addIndexColumn()
// ->addColumn('index', function($row) {
// $curr = Carbon::now();
// $dtC = Carbon::parse($row['created_at'])->setTimezone('Asia/Kuala_Lumpur');

// if($curr->diffInDays($dtC) <= 3){
// $html = 'New';
// }else{ $html = ''; }
// return $html;
// });

if (!empty($compound)) {

foreach ($compound as $key => $c) {

$faulty = Faulty::where('_id', $c->seksyen_kesalahan)->first();
$enforcer = StaffDetail::where('_id', $c->dikeluarkan)->first();
array_push($nested_data, array(
'index' => '',
'modul' => $c->modul,
'kpd' => $c->kpd,
'jenis' => $c->jenis,
'masa' => $c->created_at,
'kesalahan' => $faulty->nama,
'nric' => $c->identity,
'nama' => $c->nama,
'penguatkuasa' => $enforcer->full_name,
// 'tindakan' =>

));
}
}


return \DataTables::of($nested_data)->addIndexcolumn()->make(true);

}

/**
* Show the form for creating a new resource.
*

+ 1
- 1
app/Http/Controllers/Main/CompoundController.php View File

@@ -113,7 +113,7 @@ class CompoundController extends Controller
$staff = StaffDetail::where('roles_access','PenguatKuasa')->whereIn('department_ids',$user->StaffDetail->department_ids)->get();
$deedlaw = Deedlaw::with('Faulty')->whereIn('department_ids',$user->StaffDetail->department_ids)->get();
$now = Carbon::now()->format('Y-m-d');
$modul = '03';
$modul = '02';
return view('main-dashboard.compound.prenotice_index', compact('user','site','staff','deedlaw','now','modul','semua','pre_notice','baru','invest','notice','inven','collap','comp'));
}

+ 267
- 0
public/js/dataNotis.js View File

@@ -0,0 +1,267 @@
$(document).ready( function () {
tableP1 = $('#reportD').DataTable({
// "dom": 'Blfrtip',
// "buttons": [
// 'copy', 'csv', 'excel', 'pdf', 'print'
// ],
"lengthMenu": [[50, 100, -1], [50, 100, "All"]],
"pageLength": 50,
"searching": false,
"serverSide": true,
"processing": true,
"ajax": {
url: SITEURL +'/api/list/compound'+ queryString2,
type: 'GET',
},
"columns": [
{ "data": "index", "name": "index", orderable: false, searchable: false },
{ "data" : "modul", "name": "modul" },
{ "data": "kpd", "name": "kpd" },
{ "data": "jenis", "name": "jenis" },
{ "data": "tarikh_masa", "name": "tarikh_masa" },
{ "data": "kesalahan", "name": "kesalahan" },
{ "data": "nric", "name": "nric" },
{ "data": "nama", "name": "nama" },
{ "data": "enforcer", "name": "enforcer" },
{ "data": "_id", "name": "action", orderable: false, searchable: false },
],
"columnDefs": [
{
"render": function ( data, type, row, meta ) {
if (data != '') {
return '<label class="label label-success">'+data+'</label>&nbsp;'+(meta.row+1);
}else {
return (meta.row+1);
}
},
"targets": 0,
},
{
"render": function ( data, type, row ) {
return '<div style="text-align:center"><a target="_blank" href="'+SITEURL+'/main/compound/'+row.kpd+'/index" class="btn btn-info btn-sm waves-effect waves-light">TERUSKAN</a>'
+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button></div>';
},
"targets": 9,
},
],
"drawCallback": function(settings) {
var api = this.api();
// Output the data for the visible rows to the browser's console
var data = api.rows( {page:'current'} ).data().toArray();
console.log(data);
if (data && data.length > 0) {
for(var i=0;i<data.length;i++){
data[i].status_kemaskini = '-';
data[i].kesalahan = '-';
}
var final_data = JSON.stringify(data);
console.log(final_data);
$.ajax({
type: "POST",
url: SITEURL+'/get/datatable',
data: { _token: token, data : final_data },
success:function(filename){
$('#link1').html('<a target="_blank" href="'+SITEURL+'/download/excel/compound/'+filename+'/Pelbagai" class="btn btn-primary btn-sm waves-effect waves-light">Excel</a>');
$('#link1').show();
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(thrownError);
// swal("Error deleting!", "Rekod tidak berjaya di buang", "error");
}
});
}
},
"language": {
"paginate": {
"previous": "Sebelum",
"next": "Selepas"
},
"sLengthMenu": "Tunjukkan _MENU_ entri",
"zeroRecords": "Tiada Data Ditemui",
"infoEmpty": "Tiada Rekod Yang Wujud",
"infoFiltered": "(Ditapis daripada _MAX_ jumlah rekod)",
"info": "Tunjuk _START_ hingga _END_ daripada _TOTAL_ entri",
"sSearch": "Cari:",
}
});


tableP3 = $('#report3').DataTable({
// "dom": 'Blfrtip',
// "buttons": [
// 'copy', 'csv', 'excel', 'pdf', 'print'
// ],
"lengthMenu": [[50, 100, -1], [50, 100, "All"]],
"pageLength": 50,
"searching": false,
"serverSide": true,
"processing": true,
"ajax": {
url: SITEURL +'/api/list/compound'+ queryString2,
type: 'GET',
data: {
"day3" : 3,
}
},
"columns": [
{ "data": "index", "name": "index", orderable: false, searchable: false },
{ "data" : "modul", "name": "modul" },
{ "data": "kpd", "name": "kpd" },
{ "data": "jenis", "name": "jenis" },
{ "data": "tarikh_masa", "name": "tarikh_masa" },
{ "data": "kesalahan", "name": "kesalahan" },
{ "data": "nric", "name": "nric" },
{ "data": "nama", "name": "nama" },
{ "data": "enforcer", "name": "enforcer" },
{ "data": "_id", "name": "action", orderable: false, searchable: false },
],
"columnDefs": [
{
"render": function ( data, type, row, meta ) {
if (data != '') {
return '<label class="label label-success">'+data+'</label>&nbsp;'+(meta.row+1);
}else {
return (meta.row+1);
}
},
"targets": 0,
},
{
"render": function ( data, type, row ) {
return '<div style="text-align:center"><a target="_blank" href="'+SITEURL+'/main/compound/'+row.kpd+'/index" class="btn btn-info btn-sm waves-effect waves-light">TERUSKAN</a>'
+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button></div>';
},
"targets": 9,
},
],
"drawCallback": function(settings) {
var api = this.api();
// Output the data for the visible rows to the browser's console
var data = api.rows( {page:'current'} ).data().toArray();
console.log(data);
if (data && data.length > 0) {
for(var i=0;i<data.length;i++){
data[i].status_kemaskini = '-';
data[i].kesalahan = '-';
}
var final_data = JSON.stringify(data);
console.log(final_data);
$.ajax({
type: "POST",
url: SITEURL+'/get/datatable',
data: { _token: token, data : final_data },
success:function(filename){
$('#link1').html('<a target="_blank" href="'+SITEURL+'/download/excel/compound/'+filename+'/Pelbagai" class="btn btn-primary btn-sm waves-effect waves-light">Excel</a>');
$('#link1').show();
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(thrownError);
// swal("Error deleting!", "Rekod tidak berjaya di buang", "error");
}
});
}
},
"language": {
"paginate": {
"previous": "Sebelum",
"next": "Selepas"
},
"sLengthMenu": "Tunjukkan _MENU_ entri",
"zeroRecords": "Tiada Data Ditemui",
"infoEmpty": "Tiada Rekod Yang Wujud",
"infoFiltered": "(Ditapis daripada _MAX_ jumlah rekod)",
"info": "Tunjuk _START_ hingga _END_ daripada _TOTAL_ entri",
"sSearch": "Cari:",
}
});

tableP7 = $('#report7').DataTable({
// "dom": 'Blfrtip',
// "buttons": [
// 'copy', 'csv', 'excel', 'pdf', 'print'
// ],
"lengthMenu": [[50, 100, -1], [50, 100, "All"]],
"pageLength": 50,
"searching": false,
"serverSide": true,
"processing": true,
"ajax": {
url: SITEURL +'/api/list/compound'+ queryString2,
type: 'GET',
data: {
"day7" : 7,
},
},
"columns": [
{ "data": "index", "name": "index", orderable: false, searchable: false },
{ "data" : "modul", "name": "modul" },
{ "data": "kpd", "name": "kpd" },
{ "data": "jenis", "name": "jenis" },
{ "data": "tarikh_masa", "name": "tarikh_masa" },
{ "data": "kesalahan", "name": "kesalahan" },
{ "data": "nric", "name": "nric" },
{ "data": "nama", "name": "nama" },
{ "data": "enforcer", "name": "enforcer" },
{ "data": "_id", "name": "action", orderable: false, searchable: false },
],
"columnDefs": [
{
"render": function ( data, type, row, meta ) {
if (data != '') {
return '<label class="label label-success">'+data+'</label>&nbsp;'+(meta.row+1);
}else {
return (meta.row+1);
}
},
"targets": 0,
},
{
"render": function ( data, type, row ) {
return '<div style="text-align:center"><a target="_blank" href="'+SITEURL+'/main/compound/'+row.kpd+'/index" class="btn btn-info btn-sm waves-effect waves-light">TERUSKAN</a>'
+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button></div>';
},
"targets": 9,
},
],
"drawCallback": function(settings) {
var api = this.api();
// Output the data for the visible rows to the browser's console
var data = api.rows( {page:'current'} ).data().toArray();
console.log(data);
if (data && data.length > 0) {
for(var i=0;i<data.length;i++){
data[i].status_kemaskini = '-';
data[i].kesalahan = '-';
}
var final_data = JSON.stringify(data);
// console.log(final_data);
$.ajax({
type: "POST",
url: SITEURL+'/get/datatable',
data: { _token: token, data : final_data },
success:function(filename){
$('#link1').html('<a target="_blank" href="'+SITEURL+'/download/excel/compound/'+filename+'/Pelbagai" class="btn btn-primary btn-sm waves-effect waves-light">Excel</a>');
$('#link1').show();
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(thrownError);
// swal("Error deleting!", "Rekod tidak berjaya di buang", "error");
}
});
}
},
"language": {
"paginate": {
"previous": "Sebelum",
"next": "Selepas"
},
"sLengthMenu": "Tunjukkan _MENU_ entri",
"zeroRecords": "Tiada Data Ditemui",
"infoEmpty": "Tiada Rekod Yang Wujud",
"infoFiltered": "(Ditapis daripada _MAX_ jumlah rekod)",
"info": "Tunjuk _START_ hingga _END_ daripada _TOTAL_ entri",
"sSearch": "Cari:",
}
});

});

+ 2
- 0
resources/views/main-dashboard/compound/_part/filter_form.blade.php View File

@@ -34,10 +34,12 @@
<div class="col-lg-3">
<input type="date" class=" form-control form-control-sm" value="{{ $now }}" name="start_date" id="start_date" required/>
</div>
@if($modul != '02')
<span><b>-</b></span>
<div class="col-lg-3">
<input type="date" class="form-control form-control-sm" value="{{ $now }}" name="end_date" id="end_date" />
</div>
@endif
</div>

<div class="row clearfix" style="margin-bottom: 1.25em">

+ 142
- 0
resources/views/main-dashboard/compound/_part/filter_form_notice.blade.php View File

@@ -0,0 +1,142 @@
<div class="col-xl-10 col-md-12">
<div class="card">
<div class="card-block">
<form id="filter_form" class="main cussPayment" novalidate>
<input type="hidden" name="department" value="{{ json_encode($user->StaffDetail->department_ids) }}">
<input type="hidden" name="modul" value="{{ $modul }}">
<div class="row clearfix">
<div class="col-lg-3">
<label><input type="checkbox" id="check_kpd" checked/>&nbsp;<b>No Notis/Kompaun</b></label>
<div class="input-group input-group-sm">
<!-- <span class="input-group-prepend">
<label class="input-group-text">KPD</label>
</span> -->
<input type="text" class="form-control form-control-sm" placeholder="SCM4744" value="" name="kpd" id="kpd" required />
</div>
</div>

<div class="col-lg-3">
<label><b>Jenis Kompaun <code>*</code></b></label>
<select class="form-control form-control-sm" name="type" id="type_C" required>
<option value="Parkir">Parkir</option>
<option value="Pelbagai_LESEN">Pelbagai LESEN</option>
<option value="Pelbagai_JPB">Pelbagai JPB</option>
<option value="Pelbagai_KT">Pelbagai KT</option>
<option value="Pelbagai_PA">Pelbagai PA</option>
</select>
</div>
</div>

<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<label><input type="checkbox" id="check_date" checked/>&nbsp;<b>Tarikh</b></label>
</div>
<div class="col-lg-3">
<input type="date" class=" form-control form-control-sm" value="{{ $now }}" name="start_date" id="start_date" required/>
</div>
<span><b>-</b></span>
<div class="col-lg-3">
<input type="date" class="form-control form-control-sm" value="{{ $now }}" name="end_date" id="end_date" />
</div>
</div>

<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<label><b>Seksyen Kesalahan</b></label>
</div>
<div class="col-lg-9 .offset-xl-3">
<select class="form-control form-control-sm" name="faulty" required>
<option value="All">All</option>
@foreach($deedlaw as $d)
<optgroup label="{{ $d->nama }}">
@foreach($d->Faulty as $f)
<option value="{{ $f->_id }}">Seksyen {{ $f->sketr }}</option>
@endforeach
</optgroup>
@endforeach
</select>
</div>
</div>

<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<label><b>PenguatKuasa</b></label>
</div>
<div class="col-lg-6 .offset-xl-6">
<select class="form-control form-control-sm" name="enforcer" required>
<option value="All">All</option>
@foreach($staff as $s)
<option value="{{ $s->_id }}"><b>{{ $s->no_badan }}</b>, {{ $s->full_name }}</option>
@endforeach
</select>
</div>
</div>

<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-3">
<label><input type="checkbox" id="checkPlateNo" />&nbsp;<b>No.Plat</b></label>
<input type="text" class="form-control form-control-sm" placeholder="no plat" value="" name="plate_no" id="plate_no"/>
</div>
<div class="col-lg-3">
<label><input type="checkbox" id="checkName" />&nbsp;<b>Nama Pesalah</b></label>
<input type="text" class="form-control form-control-sm" placeholder="nama pesalah" value="" name="nameP" id="nameP"/>
</div>
<div class="col-lg-3">
<label><input type="checkbox" id="checkNric" />&nbsp;<b>NRIC</b></label>
<input type="text" class="form-control form-control-sm" placeholder="nric" value="" name="nric" id="nric"/>
</div>
<div class="col-lg-3">
<label><input type="checkbox" id="checkLicense" />&nbsp;<b>Akaun Lesen</b></label>
<input type="text" class="form-control form-control-sm" placeholder="no lesen" value="" name="license" id="license"/>
</div>
</div>

<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-3">
<label><input type="checkbox" id="checkCompanyNo"/>&nbsp;<b>No.Syarikat</b></label>
<input type="text" class="form-control form-control-sm" placeholder="no syarikat" value="" name="company_no" id="company_no"/>
</div>
<div class="col-lg-3">
<label><input type="checkbox" id="checkCompanyName"/>&nbsp;<b> Nama Syarikat</b></label>
<input type="text" class="form-control form-control-sm" placeholder="nama syarikat" value="" name="company_name" id="company_name"/>
</div>
</div>

@if(Request::is('main/compound'))
<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<label><b>Status</b></label>
</div>
<div class="col-lg-3 .offset-xl-9">
<select class="form-control form-control-sm" name="status" required>
<option value="All">All</option>
<option value="Batal">Batal</option>
<option value="Belum Bayar">Belum Bayar</option>
<option value="Berbayar">Berbayar</option>
</select>
</div>
</div>
@elseif(Request::is('main/compound/completed'))
<input type="hidden" name="status" value="Berbayar">
@elseif(Request::is('main/compound/new'))
<div class="row clearfix" style="margin-bottom: 1.25em">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<label><b>Status</b></label>
</div>
<div class="col-lg-3 .offset-xl-9">
<select class="form-control form-control-sm" name="status" required>
<option value="Belum Bayar">Belum Bayar</option>
<option value="Batal">Batal</option>
</select>
</div>
</div>
@else
<input type="hidden" name="status" value="Belum Bayar">
@endif
<div class="form-group">
<button id="tapis" class="btn btn-info btn-sm waves-effect waves-light">Carian</button>
</div>
</form>
</div>
</div>
</div>

+ 202
- 35
resources/views/main-dashboard/compound/prenotice_index.blade.php View File

@@ -44,8 +44,8 @@
.panel-body .table, .panel-body div {margin-bottom: 0px; }

.r-padd { padding-right: 5%; }
.active { color: #d84315; }
.active:hover { color: #d84315; }
.active { color: #333333; }
.active:hover { color: #333333; }

th { font-weight: 600; }
table.dataTable.nowrap th, table.dataTable.nowrap td {
@@ -64,7 +64,6 @@
</div>
<div class="row">
<div class="col-md-12">

<div class="card">
<div class="card-header">
<div class="row">
@@ -82,11 +81,133 @@
@include('main-dashboard.compound._part.compound_parkir')
</div>
<div id="viewPelbagai">
@include('main-dashboard.compound._part.compound_pelbagai')
<!-- @include('main-dashboard.compound._part.compound_pelbagai') -->
<div class="col-lg-12 col-xl-12">
<!-- Nav tabs -->
<ul class="nav nav-tabs md-tabs" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#default" role="tab">Tarikh Mula</a>
<div class="slide"></div>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#hari3" role="tab">3 Hari Sebelum</a>
<div class="slide"></div>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#hari7" role="tab">7 Hari Sebelum</a>
<div class="slide"></div>
</li>
</ul>
<!-- Tab panes -->
<div class="tab-content card-block">
<div class="tab-pane active" id="default" role="tabpanel">
<div class="dt-responsive table-responsive">
<table id="reportD" class="table table-sm table-striped table-bordered nowrap" style="width:100%">
<thead>
<tr>
<th>#</th>
<th>Modul</th>
<th>No Kpn</th>
<th>Jenis</th>
<th>Tarikh Masa</th>
<th>Kesalahan</th>
<th>Nric</th>
<th>Nama</th>
<th>PenguatKuasa</th>
<th>Tindakan</th>
</tr>
</thead>
<tfoot>
<tr>
<th>#</th>
<th>Modul</th>
<th>No Kpn</th>
<th>Jenis</th>
<th>Tarikh Masa</th>
<th>Kesalahan</th>
<th>Nric</th>
<th>Nama</th>
<th>PenguatKuasa</th>
<th>Tindakan</th>
</tr>
</tfoot>
</table>
</div>
</div>
<div class="tab-pane" id="hari3" role="tabpanel">
<div class="dt-responsive table-responsive">
<table id="report3" class="table table-sm table-striped table-bordered nowrap" style="width:100%">
<thead>
<tr>
<th>#</th>
<th>Modul</th>
<th>No Kpn</th>
<th>Jenis</th>
<th>Tarikh Masa</th>
<th>Kesalahan</th>
<th>Nric</th>
<th>Nama</th>
<th>PenguatKuasa</th>
<th>Tindakan</th>
</tr>
</thead>
<tfoot>
<tr>
<th>#</th>
<th>Modul</th>
<th>No Kpn</th>
<th>Jenis</th>
<th>Tarikh Masa</th>
<th>Kesalahan</th>
<th>Nric</th>
<th>Nama</th>
<th>PenguatKuasa</th>
<th>Tindakan</th>
</tr>
</tfoot>
</table>
</div>
</div>
<div class="tab-pane" id="hari7" role="tabpanel">
<div class="dt-responsive table-responsive">
<table id="report7" class="table table-sm table-striped table-bordered nowrap" style="width:100%">
<thead>
<tr>
<th>#</th>
<th>Modul</th>
<th>No Kpn</th>
<th>Jenis</th>
<th>Tarikh Masa</th>
<th>Kesalahan</th>
<th>Nric</th>
<th>Nama</th>
<th>PenguatKuasa</th>
<th>Tindakan</th>
</tr>
</thead>
<tfoot>
<tr>
<th>#</th>
<th>Modul</th>
<th>No Kpn</th>
<th>Jenis</th>
<th>Tarikh Masa</th>
<th>Kesalahan</th>
<th>Nric</th>
<th>Nama</th>
<th>PenguatKuasa</th>
<th>Tindakan</th>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

@@ -150,19 +271,24 @@
@section('external_js')
<script type="text/javascript">
var SITEURL = '{{URL::to('')}}';
var tableP, tablePl;
var tableP1, tableP3, tableP7;
var queryString1 = '', queryString2 = '', token = "{{ csrf_token() }}";
$('#viewParkir').hide(); $('#link').hide();
$('#viewPelbagai').hide(); $('#link1').hide();
</script>
<script type="text/javascript" src="{{ asset('js/dataParkir.js') }}"></script>
<script type="text/javascript" src="{{ asset('js/dataPelbagai.js') }}"></script>
<script type="text/javascript" src="{{ asset('js/dataNotis.js') }}"></script>
<script type="text/javascript" src="{{ asset('js/function_checkbox.js') }}"></script>
<script type="text/javascript">
$('#tapis').on('click', function (e) {

e.preventDefault();

$('#link').hide(); $('#link1').hide();
var form = $("#filter_form")[0];

if(form.checkValidity() === false) {
e.stopPropagation();
var isValid = form.reportValidity();
@@ -171,6 +297,8 @@
$('#viewPelbagai').hide();
$('#viewParkir').hide();

console.log("kpd checked = " + $('#check_kpd').prop("checked"));

if($('#check_kpd').prop("checked") == false){
$('#kpd').val('');
}
@@ -206,6 +334,7 @@

// Sumbit Search
var form_data = $('#filter_form').serialize();

if($('#type_C').val() == 'Parkir'){

queryString1 = '?'+form_data;
@@ -213,37 +342,66 @@
$('#viewParkir').show();
tableP.ajax.url(SITEURL +'/api/list/compound'+ queryString1).load();

}else if($('#type_C').val() == "Pelbagai"){
}else if($('#type_C').val() == "Pelbagai_JPB"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();
tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}else if($('#type_C').val() == "Pelbagai_JPB"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();
tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}else if($('#type_C').val() == "Pelbagai_KT"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();
tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}else if($('#type_C').val() == "Pelbagai_PA"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();
tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}else if($('#type_C').val() == "Pelbagai_LESEN"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();
tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}
console.log('day 0' + queryString2);
tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 3' + queryString2);
tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 7' + queryString2);
tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}
else if($('#type_C').val() == "Pelbagai_KT"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();

console.log('day 0' + queryString2);
tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 3' + queryString2);
tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 7' + queryString2);
tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}
else if($('#type_C').val() == "Pelbagai_PA"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();

console.log('day 0' + queryString2);
tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 3' + queryString2);
tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 7' + queryString2);
tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}
else if($('#type_C').val() == "Pelbagai_LESEN"){

queryString2 = '?'+form_data;
$('#viewPelbagai').show();
$('#viewParkir').hide();

console.log('day 0' + queryString2);
tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 3' + queryString2);
tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

console.log('day 7' + queryString2);
tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
}

console.log(SITEURL +'/api/list/compound'+ queryString1);
console.log(SITEURL +'/api/list/compound'+ queryString2);
@@ -262,7 +420,7 @@
var input = prompt("Adakah anda pasti kemaskini status kompaun ini? \nTaip 'yes' untuk teruskan", "");
if (input == "yes") {
var form_data = $('#updateSt').serialize();
alert(form_data);
// alert(form_data);

$.ajax({
type: "POST",
@@ -302,7 +460,16 @@
});

function getDetail(id) {
$('#datePay').hide();
$('#id').val(id);
if($('#type_C').val() == 'Parkir'){
$('#datePay').hide();
$('#tarikh_bayar').prop('required', false);
}else {
$('#datePay').show();
$('#tarikh_bayar').prop('required', true);
}

$('#kemaskiniC').modal({
show: true
})

+ 1
- 0
routes/api.php View File

@@ -70,6 +70,7 @@ Route::group(['middleware' => 'mobileapps'], function() {
| Compound
|-------------------------------------------------------------------------*/
Route::get('/list/compound', 'Api\CompoundResourceController@index');
Route::get('/list/notice', 'Api\CompoundResourceController@notice_index');
Route::post('/update/compound/via-dashboard', 'Api\CompoundResourceController@updateStatusPaymentViaDashboard');
Route::get('/compound/list/{modul}', 'Api\CompoundController@compoundList');
Route::get('/compound/{jbkod}/{akta}/{sec}/list/{modul}', 'Api\CompoundController@compoundFilterList');

Write Preview
Loading…
Cancel
Save