From f1bd63c7ea88bb950eb53e2e6ff748928470fd69 Mon Sep 17 00:00:00 2001
From: "Alfonso Saavedra \"Son Link" <sonlink.dourden@gmail.com>
Date: Tue, 31 Dec 2024 11:51:25 +0100
Subject: [PATCH] Added new tables with the lists of the most used tracks and
 cars in the category

---
 app/Controllers/Home.php |  7 ++---
 app/Views/main.php       | 58 +++++++++-------------------------------
 public/js/home_tables.js | 46 +++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index be4b729..4a2d726 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -130,7 +130,7 @@ class Home extends BaseController
 		################################
 		*/
 		//list($tplData['mylaps'], $_) = $bestLapsModel->getBests($period, $carCatId, 0, 0);
-		
+		/*
 		$tplData['tracks'] = [];
 		$builder = $this->db->table('races');
 		$builder->select('track_id, COUNT(*) AS count');
@@ -160,8 +160,9 @@ class Home extends BaseController
 
 			$tplData['tracks'] = $tracks;
 			$tplData['tracksNames'] = $tracksNames;
-		}
+		}*/
 
+		/*
 		$tplData['cars'] = [];
 
 		$builder = $this->db->table('races r');
@@ -174,7 +175,7 @@ class Home extends BaseController
 
 		$query = $builder->get();
 		if ($query && $query->getNumRows() > 0) $tplData['cars'] = $query->getResult();
-
+		*/
 		echo get_header('Home', ['minidt.css']);
 		echo view('main', $tplData);
 		echo get_footer(['minidt.js', 'home_tables.js']);
diff --git a/app/Views/main.php b/app/Views/main.php
index ded3ed6..b66fc62 100644
--- a/app/Views/main.php
+++ b/app/Views/main.php
@@ -1,10 +1,8 @@
 <?php
 	$menu = '<nav>';
 	$menuSelect = '<select id="menu-select">';
-	/*################################
-	## generate the car category selection menu
-	################################
-	*/
+	
+	// generate the car category selection menu
 	foreach ($carCategoriesList as $cat)
 	{
 		$class = '';
@@ -16,19 +14,19 @@
 			//if no category has been chosen by the user, used the first valid (non empty) one
 			if ($carCatId == '') $carCatId = $cat->id;
 
-			//set a splecial class for the menu item that represent the currently selected class
+			//set a special class for the menu item that represent the currently selected class
 			if ($carCatId == $cat->id )
 			{
 				$class = 'class="selected"';
 				$selected = 'selected';
 			}
 
-			//echo "\n<a href='?cat=".$id."' $class>".$category->name."</a>";
 			$url = rewriteUrl('cat', $cat->id);
 			$menu .= "<a href=\"$url\" $class>{$cat->name}</a>";
 			$menuSelect .= "<option value=\"$url\" $selected>{$cat->name}</option>";
 		}
 	}
+
 	$menu .= '</nav>';
 	$menuSelect .= '</select>';
 ?>
@@ -73,50 +71,18 @@
 		Most used Tracks<br />
 		<small><?php echo $periodString; ?></small>
 	</h3>
-	<table class="fullPage responsive cat-table">
-		<thead>
-			<tr>
-				<th>Track</th>
-				<th>Races</th>
-			</tr>
-		</thead>
-		<tbody>
-		<?php foreach ($tracks as $race): ?>
-			<tr>
-				<td data-title="Track">
-					<?= clickableName($race->track_id, 'track', $tracksNames[$race->track_id]) ?>
-				</td>
-				<td data-title="Races">
-					<?= $race->count ?>
-				</td>
-			</tr>
-		<?php endforeach ?>
-		</tbody>
-	</table>
+	<div class="table-container">
+		<table id="most_used_tracks" class="fullPage responsive cat-table"></table>
+	</div>
+
 	<h3>
 		Top cars<br />
 		<small><?php echo $periodString; ?></small>
 	</h3>
-	<table class="fullPage responsive cat-table">
-		<thead>
-			<tr>
-				<th>Car</th>
-				<th>Races</th>
-			</tr>
-		</thead>
-		<tbody>
-		<?php foreach ($cars as $car): ?>
-			<tr>
-				<td data-title="Car">
-					<?= clickableName($car->car_id, 'car', $car->name) ?>
-				</td>
-				<td data-title="Races">
-					<?= $car->count ?>
-				</td>
-			</tr>
-		<?php endforeach ?>
-		</tbody>
-	</table>
+	<div class="table-container">
+		<table id="most_used_cars" class="fullPage responsive cat-table"></table>
+	</div>
+
 </div>
 <script>
 	period = '<?= $period ?>';
diff --git a/public/js/home_tables.js b/public/js/home_tables.js
index a0b93e0..e6c64b9 100644
--- a/public/js/home_tables.js
+++ b/public/js/home_tables.js
@@ -80,4 +80,50 @@ const dt_bests_laps = new MiniDT({
 		period: period,
 		car_cat: car_cat
 	}
+})
+
+const dt_most_used_tracks = new MiniDT({
+	target: 'most_used_tracks',
+	url: `${base_url}/api/most_used_tracks`,
+	cols:  [
+		{
+			title: 'Track',
+			col: 'track_id',
+			render: (row) => {
+				return linkTag(row.track_id, 'track', row.track_name)
+			}
+		},
+		{
+			title: 'Races',
+			col: 'count',
+			align: 'right'
+		},
+	],
+	params: {
+		period: period,
+		car_cat: car_cat
+	}
+})
+
+const dt_most_used_cars = new MiniDT({
+	target: 'most_used_cars',
+	url: `${base_url}/api/most_used_cars`,
+	cols:  [
+		{
+			title: 'Car',
+			col: 'car_id',
+			render: (row) => {
+				return linkTag(row.car_id, 'track', row.name)
+			}
+		},
+		{
+			title: 'Races',
+			col: 'count',
+			align: 'right'
+		},
+	],
+	params: {
+		period: period,
+		car_cat: car_cat
+	}
 })
\ No newline at end of file