Moves last to 20 days data and adds admin graphs

Pr0x3 · Mar 10, 2018 · e27c9f5 · e27c9f5
1 parent 970eb6e
commit e27c9f5
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 56 deletions.
diff --git a/central-server/app/Http/Controllers/UserController.php b/central-server/app/Http/Controllers/UserController.php
@@ -114,7 +114,8 @@ function leaderboard()
             ->sortBy(function($log) {
             	return $log->minutes;
 								})->reverse();	
-
+        // dd($orders);
+		// dd(json_encode($this->getUsernames($orders)));
 		return json_encode($this->getUsernames($orders));
 
 	}
@@ -151,7 +152,7 @@ function getUsernames($orders)
 	 				break;
 	 			}
 	 			else
-	 				$order->username = "Not Registered";
+	 				$order->name = "Not Registered";
 
 	 		}
 	 	}
@@ -164,6 +165,7 @@ function parseGraph($id)
 		$user = User::where('id',$id)->first();
 		$data = $user->hoursActiveInAWeek(Carbon::today('Asia/Kolkata'));
 		$date = $user->daysOfAWeek();
+		// dd($date);
 
 		$total = 0;
 		foreach( $data as $time){
@@ -209,7 +211,24 @@ function adminLine()
 		$this->check_admin();
 		$leaderboard = json_decode($this->leaderboard());
 
-		return view('admin_line', ['message'=>'', 'error'=>'']);
+		$data = [];
+
+
+
+		foreach ($leaderboard as $leader) {
+			$user = User::where('mac_address',$leader->mac_address)->first();
+			$alldata = json_decode($this->parseGraph($user->id));
+			// dd($alldata[0]);
+			$data[$user->name]['data'] = $alldata[0];
+			// $data[$user->name] = [];
+			// array_push($data[$user->name], $alldata[0]);
+			// array_push($data[$user->name], $alldata[2]);
+			$data[$user->name]['total'] = $alldata[2];
+			// $data[$user->name]['total'] = $alldata[2];
+			$data[$user->name]['dates'] = $alldata[1];
+		}
+		// dd($data);
+		return view('admin_line', ['message'=>'', 'error'=>'', 'data' => $data]);
 
 	}
 
@@ -232,4 +251,21 @@ function sathi()
 		return view('admin_sathi',['message'=>'','error'=>'']);
 	}
 
+	// function populate() 
+	// {
+	// 	$this->check_admin();
+
+	// 	$logs = DB::connection('mysql2')->select('select * from log where data="a0:d3:7a:29:64:a9"');
+
+	// 	$i=1270;
+
+	// 	foreach ($logs as $log)
+	// 	{
+	// 		DB::connection('mysql2')->insert('insert into test_logs(id,mac_address,ip_address,timestamp) values ('.$i.',"a0:d3:7a:29:64:a9","192.168.2.102","'.Carbon::createFromTimestamp($log->time)->addMonth()->addDays(2).'")');
+	// 		$i = $i+1;
+	// 	}
+	// 	die('done');
+
+	// }
+
 }
diff --git a/central-server/app/User.php b/central-server/app/User.php
@@ -72,7 +72,7 @@ function hoursActiveInAWeek($day)
 
 		$time_week = array();
 
-		for ($i=0; $i<7; $i++){
+		for ($i=0; $i<20; $i++){
 			$temp = clone $today;
 			$temp2 = clone $temp;
 			$temp_before = $temp2->subDays(1);
@@ -88,7 +88,7 @@ function daysOfAWeek()
 	{
 		$now = Carbon::today();
 		$week = array();
-		for($i=0; $i<7; $i++)
+		for($i=0; $i<20; $i++)
 		{
 			array_push($week, $now->format('d/m'));
 			$now->subDays(1);

diff --git a/central-server/config/database.php b/central-server/config/database.php
@@ -53,7 +53,20 @@
             'strict' => true,
             'engine' => null,
         ],
-
+        'mysql2' => [
+            'driver' => 'mysql',
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => 'presence',
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'strict' => true,
+            'engine' => null,
+        ],
         'pgsql' => [
             'driver' => 'pgsql',
             'host' => env('DB_HOST', '127.0.0.1'),

diff --git a/central-server/resources/views/admin_line.blade.php b/central-server/resources/views/admin_line.blade.php
@@ -17,28 +17,41 @@
 	</div>
 	<script>
 		var ctx = document.getElementById("line-chart");
+        var colors = ['#FFB1C1', '#FFCF9F','#4BC0C0', '#9AD0F5'];
+
+        var dataset = []
+        var date = []
+        var cIndex = 0;
+        @foreach ($data as $user => $userdata)
+            date = [];
+            var temp_data = [];
+            @for ($i = 19; $i >= 0; $i--)
+                temp_data.push("{{$userdata['data'][$i]}}");
+            @endfor
+            var temp = {
+                    label: "{{$user}}",
+                    backgroundColor: colors[(cIndex + 1) % 4],
+                    borderColor: colors[(cIndex + 1) % 4],
+                    data: temp_data,
+                    fill: false,
+                }
+            dataset.push(temp);
+            
+            @for ($i = 19; $i >= 0; $i--)
+                date.push("{{$userdata['dates'][$i]}}");
+            @endfor  
+            cIndex = cIndex +1;
+        @endforeach
+
+        // console.log(dataset)
+
+       
 
 		var config = {
             type: 'line',
             data: {
-                labels: ["January", "February", "March", "April", "May", "June", "July"],
-                datasets: [{
-                    label: "kataria",
-                    backgroundColor: '#FFB1C1',
-                    borderColor: '#FFB1C1',
-                    data: [
-                        4,3,1,2,3,4,1
-                    ],
-                    fill: false,
-                }, {
-                    label: "kataria1",
-                    fill: false,
-                    backgroundColor: '#4BC0C0',
-                    borderColor: '#4BC0C0',
-                    data: [
-                        3,2,5,2,4,1,6
-                    ],
-                }]
+                labels: date,
+                datasets: dataset
             },
             options: {
                 tooltips: {

diff --git a/central-server/resources/views/dashboard_bar.blade.php b/central-server/resources/views/dashboard_bar.blade.php
@@ -17,8 +17,24 @@
 	</div>
 	<script>
 		
-		var data = [ {{$data[6]}},{{$data[5]}},{{$data[4]}},{{$data[3]}},{{$data[2]}},{{$data[1]}},{{$data[0]}}];	
-		var date = [ "{{$date[6]}}","{{$date[5]}}","{{$date[4]}}","{{$date[3]}}","{{$date[2]}}","{{$date[1]}}","{{$date[0]}}"];
+		// var data = [ {{$data[6]}},{{$data[5]}},{{$data[4]}},{{$data[3]}},{{$data[2]}},{{$data[1]}},{{$data[0]}}];	
+		// var date = [ "{{$date[6]}}","{{$date[5]}}","{{$date[4]}}","{{$date[3]}}","{{$date[2]}}","{{$date[1]}}","{{$date[0]}}"];
+		var data = []
+		@for ($i = 19; $i >= 0; $i--)
+			data.push({{$data[$i]}});
+		@endfor
+		var date = []
+		@for ($i = 19; $i >= 0; $i--)
+			date.push("{{$date[$i]}}");
+		@endfor
+		var colors = []
+		var colors_list = ['#FFB1C1', '#FFCF9F', '#4BC0C0', '#9AD0F5'];
+		
+		@for ($i = 19; $i >= 0; $i--)
+			colors.push(colors_list[Math.floor(Math.random()*4)]);
+		@endfor
+		// console.log(colors);
+
 		var ctx = document.getElementById("bar-chart");
 		var myChart = new Chart(ctx, {
 						    type: 'bar',
@@ -27,22 +43,8 @@
 						        datasets: [{
 						            label: 'Hours Active',
 						            data: data,
-						            backgroundColor: [
-						                'rgba(255, 99, 132, 0.2)',
-						                'rgba(54, 162, 235, 0.2)',
-						                'rgba(255, 206, 86, 0.2)',
-						                'rgba(75, 192, 192, 0.2)',
-						                'rgba(153, 102, 255, 0.2)',
-						                'rgba(255, 159, 64, 0.2)'
-						            ],
-						            borderColor: [
-						                'rgba(255,99,132,1)',
-						                'rgba(54, 162, 235, 1)',
-						                'rgba(255, 206, 86, 1)',
-						                'rgba(75, 192, 192, 1)',
-						                'rgba(153, 102, 255, 1)',
-						                'rgba(255, 159, 64, 1)'
-						            ],
+						            backgroundColor: colors ,
+						            borderColor: colors,
 						            borderWidth: 1
 						        }]
 						    },

diff --git a/central-server/resources/views/dashboard_line.blade.php b/central-server/resources/views/dashboard_line.blade.php
@@ -17,10 +17,20 @@
 	</div>
 	<script>
 		
-		var data = [ {{$data[6]}},{{$data[5]}},{{$data[4]}},{{$data[3]}},{{$data[2]}},{{$data[1]}},{{$data[0]}}];	
-		var date = [ "{{$date[6]}}","{{$date[5]}}","{{$date[4]}}","{{$date[3]}}","{{$date[2]}}","{{$date[1]}}","{{$date[0]}}"];
+		// var data = [ {{$data[6]}},{{$data[5]}},{{$data[4]}},{{$data[3]}},{{$data[2]}},{{$data[1]}},{{$data[0]}}];	
+		var data = []
+		@for ($i = 19; $i >= 0; $i--)
+			data.push({{$data[$i]}});
+		@endfor
+		var date = []
+		@for ($i = 19; $i >= 0; $i--)
+			date.push("{{$date[$i]}}");
+		@endfor
+		
+		// console.log(data);
+		// var date = [ "{{$date[6]}}","{{$date[5]}}","{{$date[4]}}","{{$date[3]}}","{{$date[2]}}","{{$date[1]}}","{{$date[0]}}"];
 		var colors = ['#FFB1C1', '#FFCF9F', '#FFCF9F', '#4BC0C0', '#9AD0F5'];
-		for($i=0; i<)
+		// for($i=0; i<)
 		var ctx = document.getElementById("line-chart");
 		var myChart = new Chart(ctx, {
 						    type: 'line',

diff --git a/central-server/resources/views/dashboard_pie.blade.php b/central-server/resources/views/dashboard_pie.blade.php
@@ -17,23 +17,29 @@
 	</div>
 	<script>
 		
-		var data = [ {{$data[6]}},{{$data[5]}},{{$data[4]}},{{$data[3]}},{{$data[2]}},{{$data[1]}},{{$data[0]}}];	
-		var date = [ "{{$date[6]}}","{{$date[5]}}","{{$date[4]}}","{{$date[3]}}","{{$date[2]}}","{{$date[1]}}","{{$date[0]}}"];
+		// var data = [ {{$data[6]}},{{$data[5]}},{{$data[4]}},{{$data[3]}},{{$data[2]}},{{$data[1]}},{{$data[0]}}];	
+		// var date = [ "{{$date[6]}}","{{$date[5]}}","{{$date[4]}}","{{$date[3]}}","{{$date[2]}}","{{$date[1]}}","{{$date[0]}}"];
+		var data = []
+		@for ($i = 19; $i >= 0; $i--)
+			data.push({{$data[$i]}});
+		@endfor
+		var date = []
+		@for ($i = 19; $i >= 0; $i--)
+			date.push("{{$date[$i]}}");
+		@endfor
+		var colors = []
+		var colors_list = ['#FFB1C1', '#FFCF9F', '#4BC0C0', '#9AD0F5'];
+		
+		@for ($i = 19; $i >= 0; $i--)
+			colors.push(colors_list[Math.floor(Math.random()*4)]);
+		@endfor
 		var ctx = document.getElementById("pie-chart");
 		var myChart = new Chart(ctx, {
 						    type: 'pie',
 					        data: {
 					            datasets: [{
 					                data: data,
-					                backgroundColor: [
-					                    '#FF6384',
-					                    '#FF9F40',
-					                    '#FFCD56',
-					                    '#36A2EB',
-					                    '#4BC0C0',
-					                    '#FF6384',
-					                    '#FF9F40'
-					                ],
+					                backgroundColor: colors,
 					                label: 'Hours'
 					            }],
 					            labels: date

diff --git a/central-server/routes/web.php b/central-server/routes/web.php
@@ -30,4 +30,5 @@
 Route::get('/admin','UserController@adminIndex');
 Route::get('/admin/stats','UserController@adminLine');
 Route::get('/admin/sathi','UserController@sathi');
+Route::get('/admin/populate', 'UserController@populate');