Ver Fonte

Add sorting to leads page

Alan Lam há 3 anos atrás
pai
commit
6223c4aeb4
3 ficheiros alterados com 57 adições e 4 exclusões
  1. 34 3
      controllers/sales.php
  2. 12 0
      views/sales.php
  3. 11 1
      views/sales_table.php

+ 34 - 3
controllers/sales.php

@@ -49,14 +49,45 @@ switch($custom_filter) {
 		break;
 }
 
+$sort_options = [
+	"date-asc" => __("Date (Oldest first)"),
+	"date-desc" => __("Date (Newest first)"),
+	"last-updated" => __("Last Updated (Most recent first)"),
+	"predicted-sold-date" => __("Predicted Sold Date (Ascending)"),
+];
+
+$sort = $request->string("sort") ?? "date-desc";
+switch($sort) {
+	case "date-asc":
+		$sort_column = "dts_created";
+		$sort_order = "asc";
+		break;
+
+	default:
+	case "date-desc":
+		$sort_column = "dts_created";
+		$sort_order = "desc";
+		break;
+
+	case "predicted-sold-date":
+		$sort_column = "date_predicted_sold";
+		$sort_order = "desc";
+		break;
+
+	case "last-updated":
+		$sort_column = "dts_updated";
+		$sort_order = "desc";
+		break;
+}
+
 $sale_count = Sale::count($nvp);
 
 $pagination = new Pagination($sale_count);
 $pagination->setTerms(__("%s lead"), __("%s leads"));
 
 $sales = Sale::query($nvp, [
-	"sort" => "dts_updated",
-	"order" => "desc",
+	"sort" => $sort_column,
+	"order" => $sort_order,
 	"offset" => $pagination->getOffset(),
 	"limit" => $pagination->getPageSize()
 ]);
@@ -64,6 +95,6 @@ $sales = Sale::query($nvp, [
 $core->addScript("/js/new-sale-modal.js");
 
 View::include("header");
-View::include("sales", compact("sales", "pagination", "customer_id", "location_id", "status", "number", "custom_filter"));
+View::include("sales", compact("sales", "pagination", "customer_id", "location_id", "status", "number", "custom_filter", "sort_options", "sort"));
 View::include("modals/new_sale");
 View::include("footer");

+ 12 - 0
views/sales.php

@@ -8,11 +8,13 @@ use App\Helpers\HtmlHelper;
 /**
  * @var Sale[] $sales
  * @var Pagination $pagination
+ * @var array $sort_options
  * @var int $customer_id
  * @var int $location_id
  * @var int $status
  * @var int $number
  * @var string $custom_filter
+ * @var string $sort
  */
 
 $custom_filter_options = [
@@ -77,6 +79,16 @@ $custom_filter_options = [
 						</select>
 					</div>
 				</div>
+				<div class="col-sm-4">
+					<div class="mb-3">
+						<label class="form-label" for="sort"><?=htmlspecialchars(__("Sort"))?></label>
+						<select class="form-select" name="sort" id="sort">
+							<?php
+							HtmlHelper::renderOptions($sort_options, $sort);
+							?>
+						</select>
+					</div>
+				</div>
 			</div>
 			<button class="btn btn-primary" type="submit">
 				<?=htmlspecialchars(__("Submit"))?>

+ 11 - 1
views/sales_table.php

@@ -13,7 +13,8 @@ $user = $core->getUser();
 	<colgroup>
 		<col style="width: 1%"/>
 		<col style="width: 15%"/>
-		<col style="width: 55%"/>
+		<col style="width: 40%"/>
+		<col style="width: 15%"/>
 		<col style="width: 15%"/>
 		<col style="width: 15%"/>
 		<col style="width: 1%"/>
@@ -25,6 +26,7 @@ $user = $core->getUser();
 		<th><?=htmlspecialchars(__("Location"))?></th>
 		<th><?=htmlspecialchars(__("Status"))?></th>
 		<th><?=htmlspecialchars(__("Predicted Sold Date"))?></th>
+		<th><?=htmlspecialchars(__("Last Updated"))?></th>
 		<th><?=htmlspecialchars(__("Actions"))?></th>
 	</tr>
 	</thead>
@@ -51,6 +53,14 @@ $user = $core->getUser();
 			<td>
 				<?=htmlspecialchars($sale->getDisplayPredictedSoldDate())?>
 			</td>
+			<td>
+				<?php
+				$dt_updated = $sale->getDateTimeUpdated();
+				if($dt_updated) {
+					echo $dt_updated->diffForHumans();
+				}
+				?>
+			</td>
 			<td class="p-1">
 				<a class="btn btn-sm btn-primary" href="<?=htmlspecialchars($sale->getUrl())?>">
 					<?=htmlspecialchars(__("View"))?>