Explorar el Código

Add filters to document tables

Alan Lam hace 3 años
padre
commit
2a92b56f2d
Se han modificado 3 ficheros con 169 adiciones y 2 borrados
  1. 52 1
      controllers/documents.php
  2. 12 0
      views/components/supplier_id_field.php
  3. 105 1
      views/documents.php

+ 52 - 1
controllers/documents.php

@@ -6,7 +6,10 @@ namespace App;
  * @var string $type_string
  */
 
+use App\Constraint\NotInConstraint;
+use App\Enums\AruStatuses;
 use App\Enums\DocumentTypes;
+use App\Enums\InvoiceStatuses;
 use RuntimeException;
 
 $core = Core::getInstance();
@@ -20,18 +23,21 @@ switch($type_string) {
 		$type = DocumentTypes::INVOICE;
 		$singular = __("%s invoice");
 		$plural = __("%s invoices");
+		$status_field = "invoice_status";
 		break;
 	case "goods-in":
 		$title = __("Goods-In");
 		$type = DocumentTypes::GOODS_IN;
 		$singular = __("%s goods-in documents");
 		$plural = __("%s goods-in documents");
+		$status_field = null;
 		break;
 	case "arus":
 		$title = __("ARUs");
 		$type = DocumentTypes::ADVANCE_REPLACEMENT_UNIT;
 		$singular = __("%s ARU");
 		$plural = __("%s ARUs");
+		$status_field = "aru_status";
 		break;
 	default:
 		throw new RuntimeException(__("Invalid type string."));
@@ -46,6 +52,51 @@ $nvp = [
 	"dts_deleted" => null
 ];
 
+$request = Request::fromRequest();
+
+$supplier_id = $request->int("supplier_id");
+if($supplier_id) {
+	$nvp["supplier_id"] = $supplier_id;
+}
+
+$customer_id = $request->int("customer_id");
+if($customer_id) {
+	$customer = Customer::get($customer_id);
+	if($customer) {
+		$nvp["location_id"] = array_column($customer->getLocations(), "id");
+	}
+	else {
+		$nvp["location_id"] = 0;
+	}
+}
+
+$location_id = $request->int("location_id");
+if($location_id) {
+	$nvp["location_id"] = $location_id;
+}
+
+$status = $request->int("status");
+if($status !== null && $status_field) {
+	$nvp[$status_field] = $status;
+}
+
+$number = $request->int("number");
+if($number) {
+	$nvp["number"] = $number;
+}
+
+$custom_filter = $request->string("custom_filter");
+switch($custom_filter) {
+	case "open":
+		if($type === DocumentTypes::INVOICE) {
+			$nvp["invoice_status"] = new NotInConstraint(InvoiceStatuses::PAID, InvoiceStatuses::VOID);
+		}
+		if($type === DocumentTypes::ADVANCE_REPLACEMENT_UNIT) {
+			$nvp["aru_status"] = new NotInConstraint(AruStatuses::COMPLETED, AruStatuses::CANCELLED);
+		}
+		break;
+}
+
 $count = Document::count($nvp);
 
 $pagination = new Pagination($count);
@@ -61,6 +112,6 @@ $documents = Document::query($nvp, [
 $core->addScript("/js/new-document-modal.js");
 
 View::include("header");
-View::include("documents", compact("title", "type", "documents", "pagination", "type_name"));
+View::include("documents", compact("title", "type_string", "type", "documents", "pagination", "type_name", "supplier_id", "customer_id", "location_id", "status", "number", "custom_filter"));
 View::include("modals/new_document");
 View::include("footer");

+ 12 - 0
views/components/supplier_id_field.php

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @var int $supplier_id
+ */
+
+?>
+
+<div class="mb-3">
+	<label class="form-label" for="supplier-id"><?=htmlspecialchars(__("Supplier ID"))?></label>
+	<input class="form-control" type="number" name="supplier_id" id="supplier-id" value="<?=htmlspecialchars($supplier_id)?>" placeholder="<?=htmlspecialchars(__("Type ID"))?>" />
+</div>

+ 105 - 1
views/documents.php

@@ -2,19 +2,45 @@
 
 namespace App;
 
+use App\Enums\AruStatuses;
 use App\Enums\DocumentTypes;
+use App\Enums\InvoiceStatuses;
+use App\Helpers\HtmlHelper;
 
 /**
  * @var string $title
+ * @var string $type_string
  * @var int $type
  * @var Document[] $documents
  * @var Pagination $pagination
+ * @var int $supplier_id
+ * @var int $customer_id
+ * @var int $location_id
+ * @var int $status
+ * @var int $number
+ * @var int $custom_filter
  */
 
 $is_invoice = ($type === DocumentTypes::INVOICE);
 $is_goods_in = ($type === DocumentTypes::GOODS_IN);
 $is_aru = ($type === DocumentTypes::ADVANCE_REPLACEMENT_UNIT);
 
+$status_options = [];
+$custom_filter_options = [];
+
+if($is_invoice) {
+	$status_options = InvoiceStatuses::options();
+	$custom_filter_options = [
+		"open" => "Open Invoices",
+	];
+}
+if($is_aru) {
+	$status_options = AruStatuses::options();
+	$custom_filter_options = [
+		"open" => "Open ARUs",
+	];
+}
+
 ?>
 <div class="row mb-3">
 	<div class="col">
@@ -34,13 +60,91 @@ $is_aru = ($type === DocumentTypes::ADVANCE_REPLACEMENT_UNIT);
 	?>
 </div>
 
+<div class="card mb-3">
+	<div class="card-header">
+		<?=htmlspecialchars(__("Filters"))?>
+	</div>
+	<div class="card-body">
+		<form action="/<?=$type_string?>" method="post">
+			<div class="row">
+				<?php
+				if($is_goods_in) {
+					?>
+					<div class="col-sm-4">
+						<?php
+						View::include("components/supplier_id_field", compact("supplier_id"));
+						?>
+					</div>
+					<?php
+				}
+				?>
+				<div class="col-sm-4">
+					<?php
+					View::include("components/customer_id_field", compact("customer_id"));
+					?>
+				</div>
+				<div class="col-sm-4">
+					<?php
+					View::include("components/location_id_field", compact("location_id"));
+					?>
+				</div>
+				<?php
+				if($status_options) {
+					?>
+					<div class="col-sm-4">
+						<div class="mb-3">
+							<label class="form-label" for="status"><?=htmlspecialchars(__("Status"))?></label>
+							<select class="form-control" name="status" id="status">
+								<option value=""><?=htmlspecialchars(__("Any Status"))?></option>
+								<?php
+								HtmlHelper::renderOptions($status_options, $status);
+								?>
+							</select>
+						</div>
+					</div>
+					<?php
+				}
+				?>
+				<div class="col-sm-4">
+					<div class="mb-3">
+						<label class="form-label" for="number"><?=htmlspecialchars(__("Number"))?></label>
+						<input class="form-control" type="number" name="number" id="number" value="<?=htmlspecialchars($number)?>" placeholder="<?=htmlspecialchars(__("Type number"))?>" />
+					</div>
+				</div>
+
+				<?php
+				if($custom_filter_options) {
+					?>
+					<div class="col-sm-4">
+						<div class="mb-3">
+							<label class="form-label" for="custom-filter"><?=htmlspecialchars(__("Custom Filter"))?></label>
+							<select class="form-control" name="custom_filter" id="custom-filter">
+								<option value=""><?=htmlspecialchars(__("All %s", $title))?></option>
+								<?php
+								HtmlHelper::renderOptions($custom_filter_options, $custom_filter);
+								?>
+							</select>
+						</div>
+					</div>
+					<?php
+				}
+				?>
+
+			</div>
+			<button class="btn btn-primary" type="submit">
+				<?=htmlspecialchars(__("Submit"))?>
+			</button>
+		</form>
+	</div>
+</div>
+
 <?php
 
 if(empty($documents)) {
 	?>
 	<div class="alert alert-info">
 		<i class="fa fa-fw fa-info-circle"></i>
-		<?=htmlspecialchars(__("No documents to display."))?>
+		<?=htmlspecialchars(__("No %s to display.", $title))?>
 	</div>
 	<?php
 }