Quellcode durchsuchen

Add Year filter to project list page

Alan Lam vor 7 Jahren
Ursprung
Commit
3b3b9b68f5
3 geänderte Dateien mit 36 neuen und 4 gelöschten Zeilen
  1. 8 2
      controllers/projects.php
  2. 11 2
      views/project_list.php
  3. 17 0
      views/projects.php

+ 8 - 2
controllers/projects.php

@@ -14,17 +14,23 @@ $nvp = ["customer_id" => $customer->id];
 
 $id = http::value("id", "int");
 $name = http::value("name", "trim");
+$year = http::value("year", "int");
 
 if($id) $nvp["id"] = $id;
 if($name) $nvp["name"] = (new Constraint("CONTAINS"))->setValues($name);
+if($year) {
+	$min_dts = "{$year}-01-01 00:00:00";
+	$max_dts = "{$year}-12-31 23:59:59";
+	$nvp["dts_start"] = (new Constraint("BETWEEN"))->setValues($min_dts, $max_dts);
+}
 
-$projects = Project::query($nvp, ["sort" => "dts_deadline", "order" => "desc"]);
+$projects = Project::query($nvp, ["sort" => "dts_start", "order" => "desc"]);
 $templates = Template::load(array_column($projects, "template_id"));
 
 $filter_count = count($nvp) - 1;
 
 View::includeOnce("header", compact("page_title"));
-View::include("projects", compact("customer", "filter_count", "projects"));
+View::include("projects", compact("customer", "filter_count", "projects", "year"));
 View::includeOnce("footer");
 
 ?>

+ 11 - 2
views/project_list.php

@@ -4,7 +4,8 @@
 			<th class="text-right pr-3">ID</th>
 			<th>Name</th>
 			<th>Template</th>
-			<th>Deadline</th>
+			<th>Period</th>
+			<th>Year</th>
 			<th>Report Month</th>
 			<th></th>
 		</tr>
@@ -12,7 +13,11 @@
 	<tbody>
 	<?php
 	foreach($projects as $project) {
-		$date_deadline = explode(" ", $project->dts_deadline)[0];
+
+		$year = date("Y", strtotime($project->dts_start));
+
+		$date_start = date("M jS", strtotime(explode(" ", $project->dts_start)[0]));
+		$date_deadline = date("M jS", strtotime(explode(" ", $project->dts_deadline)[0]));
 
 		$report_month = "N/A";
 		if($project->dts_report) {
@@ -38,8 +43,12 @@
 				<a href="<?=htmlspecialchars($template->getURL())?>"><?=htmlspecialchars($template->name)?></a>
 			</td>
 			<td class="align-middle">
+				<?=$date_start?> -
 				<?=$date_deadline?>
 			</td>
+			<td class="align-middle">
+				<?=$year?>
+			</td>
 			<td class="align-middle">
 				<?=$report_month?>
 			</td>

+ 17 - 0
views/projects.php

@@ -24,6 +24,7 @@
 
 	<?php
 	$filters_show = $filter_count > 0 ? "show" : "";
+	$year_options = array_reverse(range(2018, date("Y")));
 	?>
 
 	<div class="collapse <?=$filters_show?>" id="project-filters">
@@ -45,6 +46,22 @@
 								<input class="form-control" type="text" name="name" id="name" placeholder="Enter name" value="<?=htmlspecialchars(http::value("name"))?>" />
 							</div>
 						</div>
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="year">Year</label>
+							<div class="col-sm">
+								<select class="form-control" type="text" name="year" id="year">
+									<option value="">Select Year</option>
+									<?php
+									foreach($year_options as $value) {
+										$selected = ($value == $year) ? "selected" : "";
+										?>
+										<option value="<?=$value?>" <?=$selected?>><?=$value?></option>
+										<?php
+									}
+									?>
+								</select>
+							</div>
+						</div>
 						<div class="row">
 							<div class="col-sm offset-sm-4">
 								<button class="btn btn-primary" type="submit">Submit</button>