updated

@@ -100,12 +100,13 @@ class OutputReportController extends Controller
 	//if($dashboarduser->usertype == "User"){
 	//if($dashboarduser->usertype == "User"){
             // output reports
             // output reports
             $products = DB::table('output_products')
             $products = DB::table('output_products')
-            ->select('output_products.id as productId','output_products.name','output_products.status', 'output_report.product_id',  'output_report.id as reportId', 'output_report.lead_generated', 'output_report.lead_generated_amount', 'output_report.lead_closed' , 'output_report.lead_closed_amount' )
-            ->leftJoin('output_report', 'output_products.id', '=', 'output_report.product_id')
+	    ->select('id as productId','name','status')
             ->where('status', '1')
             ->where('status', '1')
             ->orderBy('output_products.id')
             ->orderBy('output_products.id')
             ->get();
             ->get();
-
+	    $report = DB::table('output_report')
+		->where('user_id',Auth::user()->id)
+		->get();
             // total income
             // total income
             $totalIncome = DB::select("select sum(income) as income from output_report where user_id=".Auth::user()->id);
             $totalIncome = DB::select("select sum(income) as income from output_report where user_id=".Auth::user()->id);
 	
 	
@@ -135,7 +136,7 @@ class OutputReportController extends Controller
                         }
                         }
                 //print_r($usersarray);
                 //print_r($usersarray);
         $output = DB::table('output_report')->whereIn('user_id',$usersarray)->where('date','=',date("Y-m-d"))->orderBy('user_id')->get();	
         $output = DB::table('output_report')->whereIn('user_id',$usersarray)->where('date','=',date("Y-m-d"))->orderBy('user_id')->get();	
-            return view("layout.module.outputreport.outputreport")->with('data', ['products' => $products, 'totalIncome' => $totalIncome[0]->income, 'noOfAttempts' => $noOfAttempts , 'noOfContacts' => $noOfContacts  , 'uniqueContacts' => $uniqueContacts , 'output' => $output]);
+            return view("layout.module.outputreport.outputreport")->with('data', ['products' => $products, 'totalIncome' => $totalIncome[0]->income, 'noOfAttempts' => $noOfAttempts , 'noOfContacts' => $noOfContacts  , 'uniqueContacts' => $uniqueContacts , 'output' => $output, 'report' => $report]);
 //	}
 //	}
         }
         }
 
 

 
 
 <?php
 <?php
 use App\Models\User; 
 use App\Models\User; 
- if(Auth::user()->id=="1" || Auth::user()->id=="90" || Auth::user()->id == "127"){ ?>
+ if(Auth::user()->id=="1"){ ?>
 <div class="container">
 <div class="container">
 	 <div style="text-align:center">
 	 <div style="text-align:center">
     	<h2>Output Report</h2>
     	<h2>Output Report</h2>
@@ -55,15 +55,16 @@ use App\Models\User;
 	foreach ($data['products'] as $key => $value) {
 	foreach ($data['products'] as $key => $value) {
 		//print_r($value);
 		//print_r($value);
 		//print_r($ProductType);
 		//print_r($ProductType);
-		
+//	foreach ($data['report'] as $key1 => $value1) {
+		//print_r($value1);
 	 ?>
 	 ?>
 	 				<tr>
 	 				<tr>
 	 					<td> <input type="hidden" name="products[<?= $i ?>][productId]" value="<?php echo $value->productId; ?>">
 	 					<td> <input type="hidden" name="products[<?= $i ?>][productId]" value="<?php echo $value->productId; ?>">
 	 					 <input type="hidden" name="products[<?= $i ?>][product]" value="<?php echo $value->name; ?>" ><?php echo $value->name; ?></td>
 	 					 <input type="hidden" name="products[<?= $i ?>][product]" value="<?php echo $value->name; ?>" ><?php echo $value->name; ?></td>
-	 					<td><input type="number" name="products[<?= $i ?>][lg]" value="<?php echo $value->lead_generated; ?>"></td>
-	 					<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lgAmt]"  value="<?php echo $value->lead_generated_amount; ?>"></td>
-	 					<td><input type="number" name="products[<?= $i ?>][lc]" value="<?php echo $value->lead_closed; ?>"></td>
-	 					<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lcAmt]" value="<?php echo $value->lead_closed_amount; ?>"></td>
+	 					<td><input type="number" name="products[<?= $i ?>][lg]" value="<?php //echo isset($value1)?$value1->lead_generated:"0"; ?>"></td>
+	 					<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lgAmt]"  value="<?php // echo isset($value1)?$value1->lead_generated_amount:"0"; ?>"></td>
+	 					<td><input type="number" name="products[<?= $i ?>][lc]" value="<?php // echo isset($value1)?$value1->lead_closed:"0"; ?>"></td>
+	 					<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lcAmt]" value="<?php //echo isset($value1)?$value1->lead_closed_amount:"0"; ?>"></td>
 	 				</tr>
 	 				</tr>
 	 			<?php 
 	 			<?php 
 
 
@@ -80,6 +81,16 @@ use App\Models\User;
  if(Auth::user()->usertype == "Supervisor"){ ?>
  if(Auth::user()->usertype == "Supervisor"){ ?>
 <form class="form-horizontal"  id="output-report-supervisor" name="output-report-supervisor">
 <form class="form-horizontal"  id="output-report-supervisor" name="output-report-supervisor">
 <div class="table-responsive" style="background: #fff;">
 <div class="table-responsive" style="background: #fff;">
+<?php $supervisor = User::where('supervisor','=',Auth::user()->username)->get();
+//	foreach($supervisor as $super){ 
+?>
+<br>
+RM Code:<select id="abc" style="border:3px solid #efefef;">
+                <option>All</option>
+	<?php foreach($supervisor as $super){ ?>
+<option value="<?php echo $super->username; ?>"><?php echo $super->username; ?></option>
+<?php } ?>
+</select>
 	<table class="table">
 	<table class="table">
 	<thead>
 	<thead>
 		<th></th>
 		<th></th>