Skip to content

GitLab

P
power
Commit 2f94c36b authored by Pardeep Sahu's avatar Pardeep Sahu
Browse files
Options

mis report column add in all panels

parent 52d9390f
Pipeline #2290 passed with stage
    in 24 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 1395 additions and 3284 deletions
    app/Http/Controllers/AdminController.php
    View file @ 2f94c36b
    This diff is collapsed.
    app/Http/Controllers/AsmController.php
    View file @ 2f94c36b
    This diff is collapsed.
    app/Http/Controllers/RsmController.php
    View file @ 2f94c36b
    This diff is collapsed.
    app/Http/Controllers/SseController.php
    View file @ 2f94c36b
    This diff is collapsed.
    app/Http/Controllers/attendanceController.php
    View file @ 2f94c36b
    ......@@ -464,7 +464,20 @@ class attendanceController extends Controller
    if (!empty($_GET['firm_id'])) {
    $asms = $asms->where('firm_id', $_GET['firm_id']);
    }
    $asms = $asms->get();
    $asms = $asms->orderBy('name', 'ASC')->get();
    $allDealers = User::where(['role' => 2, 'status' => 1]);
    if (!empty($request->firm_id)) {
    $allDealers = $allDealers->where("firm_id", $request->firm_id);
    }
    if (!empty($request->asm_id)) {
    $allDealers = $allDealers->whereRaw("find_in_set($request->asm_id,reporting_authority)");
    }
    $allDealers = $allDealers->select('id', 'name')
    ->orderBy('name', 'asc')->get();
    $result = DB::table('users')->whereIn('role', [3, 4])->where('dealer_id', '!=', null)->where(function ($query) use ($request) {
    if (!empty($_GET['firm_id'])) {
    ......@@ -474,6 +487,10 @@ class attendanceController extends Controller
    $asm_id = $_GET['asm_id'];
    $query->whereRaw("find_in_set($asm_id,reporting_authority)");
    }
    if (!empty($_GET['dealer_id'])) {
    $dealer_id = $_GET['dealer_id'];
    $query->where('dealer_id', $dealer_id);
    }
    })->groupBy('dealer_id')->select('dealer_id')->get()->toArray();
    $result1 = DB::table('users')->whereIn('role', [3, 4, 5])->where('dealer_office', '!=', null)
    // ->groupBy('dealer_office')->select('dealer_office')->get()->toArray();
    ......@@ -485,6 +502,10 @@ class attendanceController extends Controller
    $asm_id = $_GET['asm_id'];
    $query->whereRaw("find_in_set($asm_id,reporting_authority)");
    }
    if (!empty($_GET['dealer_id'])) {
    $dealer_id = $_GET['dealer_id'];
    $query->where('dealer_id', $dealer_id);
    }
    })->groupBy('dealer_office')->select('dealer_office')->get()->toArray();
    $result = array_merge($result, $result1);
    ......@@ -521,7 +542,7 @@ class attendanceController extends Controller
    $dealer_name = array_map('strtolower', array_column($result, 'dealer_name'));
    $result1 = array_multisort($dealer_name, SORT_ASC, $result);
    return view('admin/dailyattendance')->with(['result' => $result, 'firms' => $firms, 'asms' => $asms]);
    return view('admin/dailyattendance')->with(['result' => $result, 'firms' => $firms, 'asms' => $asms, 'allDealers' => $allDealers]);
    }
    }
    }
    app/Http/helpers.php
    View file @ 2f94c36b
    ......@@ -1016,6 +1016,12 @@ function getSizeNameByTreatmentId($treatment_id)
    return sizeName(@$data->size_id);
    }
    function getSizeByTreatmentId($treatment_id)
    {
    $data = DB::table('treatments')->where('id', $treatment_id)->first();
    return @$data->size_id;
    }
    function averageTargetCount($count,$average,$percent)
    {
    ......
    resources/views/admin/dailyattendance.blade.php
    View file @ 2f94c36b
    ......@@ -52,7 +52,7 @@
    </div>
    <div class="col-md-2">
    <select class="form-control" id="asm_id" name="asm_id">
    <select class="form-control" id="asm_id" name="asm_id" onchange="this.form.submit()">
    <option style="width: 350px;" value="">Select ASM</option>
    @foreach($asms as $asm)
    <option value="{{ @$asm->id }}" @if (@$asm->id == @$_GET['asm_id'])
    ......@@ -62,6 +62,14 @@
    @endforeach
    </select>
    </div>
    <div class="form-group col-md-4 col-sm-4 col-xs-12">
    <select class="form-control" id="dealer_id" name="dealer_id" onchange="this.form.submit()">
    <option value="">Select Dealer</option>
    @foreach($allDealers as $value)
    <option {{(@request()->dealer_id==$value->id)?'selected':''}} value="{{$value->id}}">{{$value->name}}</option>
    @endforeach
    </select>
    </div>
    @endif
    <div class="col-md-4">
    <input class="btn btn-primary" type="submit" value="Submit">
    ......
    resources/views/admin/dcf_report.blade.php
    View file @ 2f94c36b
    ......@@ -2,82 +2,82 @@
    @section('content')
    <div class="content-wrapper">
    <!-- Content Header (Page header) -->
    <section class="content-header">
    <h1>
    Reports
    <!-- <small>advanced tables</small> -->
    </h1>
    <ol class="breadcrumb">
    <li><a href="{{url('/admin')}}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
    <li class="active">Reports</li>
    </ol>
    </section>
    <!-- Main content -->
    <section class="content">
    <div class="row">
    <div class="tab-button-outer">
    <ul id="tab-button">
    <li class="">
    <a href="#tab03">DCF</a>
    </li>
    </ul>
    </div>
    <div class="tab-select-outer">
    <select id="tab-select">
    <option value="#tab03">DCF</option>
    </select>
    </div>
    <div class="col-xs-12">
    <div class="box">
    <div class="box-header" style="text-align: center; margin: 0 auto;">
    <h3 class="box-title">Reports List</h3>
    </div><!-- /.box-header -->
    <div class="tab-contents" id="tab03">
    @if(Session::has('error'))
    <div class="alert alert-danger">{{ Session::get('error') }}</div>
    @endif
    @if(Session::has('success'))
    <div class="alert alert-success">{{ Session::get('success') }}</div>
    @endif
    <form action="" class="" method="GET">
    <div class="row">
    <div class="input-group form-group report-field col-md-4 col-sm-4 col-xs-12" style="float: left !important;">
    <label>Select Month</label>
    <input type="text" id="selectMonth" name="selectMonth" placeholder="Select Month" value="" class="datePicker1 form-control" autocomplete="off" />
    </div>
    <!-- Content Header (Page header) -->
    <section class="content-header">
    <h1>
    Reports
    <!-- <small>advanced tables</small> -->
    </h1>
    <ol class="breadcrumb">
    <li><a href="{{url('/admin')}}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
    <li class="active">Reports</li>
    </ol>
    </section>
    <!-- Main content -->
    <section class="content">
    <div class="row">
    <div class="tab-button-outer">
    <ul id="tab-button">
    <li class="">
    <a href="#tab03">DCF</a>
    </li>
    </ul>
    </div>
    <div class="tab-select-outer">
    <select id="tab-select">
    <option value="#tab03">DCF</option>
    </select>
    </div>
    <div class="col-xs-12">
    <div class="box">
    <div class="box-header" style="text-align: center; margin: 0 auto;">
    <h3 class="box-title">Reports List</h3>
    </div><!-- /.box-header -->
    <div class="tab-contents" id="tab03">
    @if(Session::has('error'))
    <div class="alert alert-danger">{{ Session::get('error') }}</div>
    @endif
    @if(Session::has('success'))
    <div class="alert alert-success">{{ Session::get('success') }}</div>
    @endif
    <form action="" class="" method="GET">
    <div class="row">
    <div class="input-group form-group report-field col-md-4 col-sm-4 col-xs-12" style="float: left !important;">
    <label>Select Month</label>
    <input type="text" id="selectMonth" name="selectMonth" placeholder="Select Month" value="" class="datePicker1 form-control" autocomplete="off" />
    </div>
    <div class="form-group report-field col-md-4 col-sm-4 col-xs-12">
    <label>Firms</label>
    <select name="firm" class="form-control" id="firm">
    <option value="">Select Firms</option>
    @foreach($firmsList as $firm)
    <option value="{{$firm->id}}" @if(@$oldFirm == $firm->id) {{'selected'}} @endif>{{$firm->firm_name}}</option>
    @endforeach
    </select>
    </div>
    <div class="form-group report-field col-md-4 col-sm-4 col-xs-12">
    <label>Firms</label>
    <select name="firm" class="form-control" id="firm">
    <option value="">Select Firms</option>
    @foreach($firmsList as $firm)
    <option value="{{$firm->id}}" @if(@$oldFirm == $firm->id) {{'selected'}} @endif>{{$firm->firm_name}}</option>
    @endforeach
    </select>
    </div>
    <div class="form-group report-field col-md-4 col-sm-4 col-xs-12">
    <label>Brands</label>
    <select class="form-control" id="brand" name="brand">
    <option value="">Select Brand</option>
    @foreach($brandList as $value)
    <option {{(@request()->brand==$value->id)?'selected':''}} value="{{$value->id}}">{{$value->brand_name}}</option>
    @endforeach
    </select>
    </div>
    <div class="form-group report-field col-md-6 col-sm-6 col-xs-12" style="margin-top:25px;">
    <input class="btn btn-success" type="submit" value="Download">
    </div>
    </div>
    </form>
    <div class="form-group report-field col-md-4 col-sm-4 col-xs-12">
    <label>Brands</label>
    <select class="form-control" id="brand" name="brand">
    <option value="">Select Brand</option>
    @foreach($brandList as $value)
    <option {{(@request()->brand==$value->id)?'selected':''}} value="{{$value->id}}">{{$value->brand_name}}</option>
    @endforeach
    </select>
    </div>
    <div class="form-group report-field col-md-6 col-sm-6 col-xs-12" style="margin-top:25px;">
    <input class="btn btn-success" type="submit" value="Download">
    </div>
    </div><!-- /.box -->
    </div><!-- /.col -->
    </div><!-- /.row -->
    </section><!-- /.content -->
    </div><!-- /.content-wrapper -->
    </div>
    </form>
    </div>
    </div><!-- /.box -->
    </div><!-- /.col -->
    </div><!-- /.row -->
    </section><!-- /.content -->
    </div><!-- /.content-wrapper -->
    <script type="text/javascript">
    setTimeout(function() {
    $('.alert').fadeOut('slow');
    ......
    resources/views/admin/misReport.blade.php
    View file @ 2f94c36b
    This diff is collapsed.
    resources/views/asm/dailyattendance.blade.php
    View file @ 2f94c36b
    ......@@ -38,7 +38,7 @@
    </div>
    @if(!isset($employees))
    <div class="col-md-2">
    <select class="form-control" id="firm_id" name="firm_id">
    <select class="form-control" id="firm_id" name="firm_id" onchange="this.form.submit()">
    <option value="">Select Firm</option>
    @if (count($firms)>0)
    @foreach($firms as $firm)
    ......@@ -51,8 +51,14 @@
    </select>
    </div>
    <div class="form-group col-md-4 col-sm-4 col-xs-12">
    <select class="form-control" id="dealer_id" name="dealer_id" onchange="this.form.submit()">
    <option value="">Select Dealer</option>
    @foreach($allDealers as $value)
    <option {{(@request()->dealer_id==$value->id)?'selected':''}} value="{{$value->id}}">{{$value->name}}</option>
    @endforeach
    </select>
    </div>
    @endif
    ......
    resources/views/asm/misReport.blade.php
    View file @ 2f94c36b
    This diff is collapsed.
    resources/views/rsm/dailyattendance.blade.php
    View file @ 2f94c36b
    ......@@ -38,7 +38,7 @@
    </div>
    @if(!isset($employees))
    <div class="col-md-2">
    <select class="form-control" id="firm_id" name="firm_id">
    <select class="form-control" id="firm_id" name="firm_id" onchange="this.form.submit()">
    <option value="">Select Firm</option>
    @if (count($firms)>0)
    @foreach($firms as $firm)
    ......@@ -52,7 +52,14 @@
    </select>
    </div>
    <div class="form-group col-md-4 col-sm-4 col-xs-12">
    <select class="form-control" id="dealer_id" name="dealer_id" onchange="this.form.submit()">
    <option value="">Select Dealer</option>
    @foreach($allDealers as $value)
    <option {{(@request()->dealer_id==$value->id)?'selected':''}} value="{{$value->id}}">{{$value->name}}</option>
    @endforeach
    </select>
    </div>
    @endif
    ......@@ -66,8 +73,6 @@
    @endif
    </div>
    </form>
    </div>
    </div>
    ......
    resources/views/rsm/misReport.blade.php
    View file @ 2f94c36b
    This diff is collapsed.
    resources/views/sse/dailyattendance.blade.php
    View file @ 2f94c36b
    ......@@ -38,7 +38,7 @@
    </div>
    @if(!isset($employees))
    <div class="col-md-2">
    <select class="form-control" id="firm_id" name="firm_id">
    <select class="form-control" id="firm_id" name="firm_id" onchange="this.form.submit()">
    <option value="">Select Firm</option>
    @if (count($firms)>0)
    @foreach($firms as $firm)
    ......@@ -51,7 +51,14 @@
    </select>
    </div>
    <div class="form-group col-md-4 col-sm-4 col-xs-12">
    <select class="form-control" id="dealer_id" name="dealer_id" onchange="this.form.submit()">
    <option value="">Select Dealer</option>
    @foreach($allDealers as $value)
    <option {{(@request()->dealer_id==$value->id)?'selected':''}} value="{{$value->id}}">{{$value->name}}</option>
    @endforeach
    </select>
    </div>
    @endif
    ......
    resources/views/sse/misReport.blade.php
    View file @ 2f94c36b
    This diff is collapsed.
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    For any issues contact harsimran@01s.in Powered By 01Synergy