Przeglądaj źródła

Add ability to update priority and assignee in ticket view

Alan Lam 4 lat temu
rodzic
commit
39b95b5f88
6 zmienionych plików z 110 dodań i 28 usunięć
  1. 32 2
      controllers/ticket.php
  2. 1 7
      controllers/tickets.php
  3. 14 0
      engine/Ticket.php
  4. 17 0
      engine/User.php
  5. 43 8
      views/ticket.php
  6. 3 11
      views/tickets.php

+ 32 - 2
controllers/ticket.php

@@ -2,6 +2,7 @@
 
 namespace App;
 
+use App\Enums\TicketPriorities;
 use RuntimeException;
 
 /**
@@ -22,8 +23,37 @@ $core->addBreadcrumb("/tickets/$id", $ticket->subject);
 
 $request = Request::fromRequest();
 
-$submit = $request->int("submit");
-if($submit) {
+$ticket_submit = $request->int("ticket_submit");
+if($ticket_submit) {
+	$assign_to_user_id = $request->int("assignee");
+	$assign_to_user = null;
+	if($assign_to_user_id) {
+		$assign_to_user = User::requireStaff($assign_to_user_id);
+	}
+
+	$priority = $request->int("priority");
+	if(!TicketPriorities::validate($priority)) {
+		throw new RuntimeException(__("Invalid priority."));
+	}
+
+	if($assign_to_user) {
+		if(!$assign_to_user->is($ticket->assigned_user_id)) {
+			$ticket->assign($assign_to_user);
+		}
+	}
+	else {
+		$ticket->unassign();
+	}
+
+	$ticket->priority = $priority;
+	$ticket->commit();
+
+	Session::addAlert("success", __("Ticket updated successfully."));
+	Http::redirect($ticket->getUrl());
+}
+
+$comment_submit = $request->int("comment_submit");
+if($comment_submit) {
 	$content = $request->string("content");
 	$internal = (int) $request->int("internal");
 	$status = $request->int("status");

+ 1 - 7
controllers/tickets.php

@@ -28,13 +28,7 @@ if($batch_submit) {
 	$assign_to_user = null;
 	$assign_to_user_id = $request->int("assign_to");
 	if($assign_to_user_id) {
-		$assign_to_user = User::get($assign_to_user_id);
-		if(!$assign_to_user) {
-			throw new RuntimeException(__("User not found."));
-		}
-		if(!$assign_to_user->isAdmin()) {
-			throw new RuntimeException(__("%s is not staff.", $assign_to_user->getDisplayName()));
-		}
+		$assign_to_user = User::requireStaff($assign_to_user_id);
 	}
 
 	$status = $request->int("status");

+ 14 - 0
engine/Ticket.php

@@ -96,9 +96,23 @@ class Ticket extends Model {
 		return sprintf("/tickets/%d", $this->id);
 	}
 
+	/**
+	 * @param User $user
+	 * @return bool
+	 * @throws \Exception
+	 */
 	public function assign(User $user): bool {
 		$this->assigned_user_id = $user->id;
 		return $this->commit();
 	}
 
+	/**
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public function unassign(): bool {
+		$this->assigned_user_id = null;
+		return $this->commit();
+	}
+
 }

+ 17 - 0
engine/User.php

@@ -46,6 +46,23 @@ class User extends Model {
 		return ["Mr", "Mrs", "Ms"];
 	}
 
+	public static function getStaffOptions(): array {
+		$staff_users = self::query(["admin" => 1]);
+		$staff_options = [];
+		foreach($staff_users as $staff_user) {
+			$staff_options[$staff_user->id] = $staff_user->getDisplayName();
+		}
+		return $staff_options;
+	}
+
+	public static function requireStaff(?int $user_id): User {
+		$user = self::get($user_id);
+		if(!$user || !$user->isAdmin()) {
+			throw new RuntimeException(__("Invalid staff."));
+		}
+		return $user;
+	}
+
 	// Object methods
 
 	/**

+ 43 - 8
views/ticket.php

@@ -2,6 +2,7 @@
 
 namespace App;
 
+use App\Enums\TicketPriorities;
 use App\Enums\TicketStatuses;
 use App\Helpers\HtmlHelper;
 
@@ -19,11 +20,11 @@ $creator = $ticket->getCreator();
 
 $render_data_row = static function(string $title, string $html): void {
 	?>
-	<div class="row">
-		<div class="col-6">
+	<div class="row my-1">
+		<div class="col-6 col-md-3">
 			<strong><?=htmlspecialchars($title)?></strong>
 		</div>
-		<div class="col-6">
+		<div class="col-6 col-md">
 			<?=$html?>
 		</div>
 	</div>
@@ -87,13 +88,46 @@ $render_data_row = static function(string $title, string $html): void {
 			</div>
 		</div>
 	</div>
+	<div class="card-body border-top">
+		<h5><?=htmlspecialchars(__("Update Ticket"))?></h5>
+
+		<form method="post">
+			<div class="row">
+				<div class="col-sm">
+					<div class="mb-2">
+						<label class="form-label" for="assignee"><?=htmlspecialchars(__("Assignee"))?></label>
+						<select class="form-control" name="assignee" id="assignee">
+							<option value=""><?=htmlspecialchars(__("Unassigned"))?></option>
+							<?php
+							HtmlHelper::renderOptions(User::getStaffOptions(), $ticket->assigned_user_id);
+							?>
+						</select>
+					</div>
+				</div>
+				<div class="col-sm">
+					<div class="mb-2">
+						<label class="form-label" for="priority"><?=htmlspecialchars(__("Priority"))?></label>
+						<select class="form-control" name="priority" id="priority">
+							<?php
+							HtmlHelper::renderOptions(TicketPriorities::options(), $ticket->priority);
+							?>
+						</select>
+					</div>
+				</div>
+			</div>
+			<button type="submit" class="btn btn-primary" name="ticket_submit" value="1">
+				<i class="fa fa-fw fa-save"></i>
+				<?=htmlspecialchars(__("Update Ticket"))?>
+			</button>
+		</form>
+
+	</div>
 </div>
 
 <div class="card mb-3">
-	<div class="card-header">
-		<?=htmlspecialchars(__("Add Comment"))?>
-	</div>
 	<div class="card-body">
+		<h5><?=htmlspecialchars(__("Add Comment"))?></h5>
+
 		<form method="post" enctype="multipart/form-data">
 			<div class="row">
 				<div class="col-lg">
@@ -128,8 +162,9 @@ $render_data_row = static function(string $title, string $html): void {
 				</div>
 			</div>
 
-			<button type="submit" class="btn btn-primary" name="submit" value="1">
-				<?=htmlspecialchars(__("Update Ticket"))?>
+			<button type="submit" class="btn btn-success" name="comment_submit" value="1">
+				<i class="fa fa-fw fa-plus"></i>
+				<?=htmlspecialchars(__("Add Comment"))?>
 			</button>
 
 		</form>

+ 3 - 11
views/tickets.php

@@ -12,12 +12,6 @@ use App\Helpers\HtmlHelper;
 $core = Core::getInstance();
 $user = $core->getUser();
 
-$staff_users = User::query(["admin" => 1]);
-$staff_options = [];
-foreach($staff_users as $staff_user) {
-	$staff_options[$staff_user->id] = $staff_user->getDisplayName();
-}
-
 ?>
 
 <div class="row mb-3">
@@ -96,10 +90,8 @@ else {
 		</table>
 
 		<div class="card">
-			<div class="card-header">
-				<?=htmlspecialchars(__("Batch Actions"))?>
-			</div>
 			<div class="card-body">
+				<h5><?=htmlspecialchars(__("Batch Actions"))?></h5>
 				<div class="row">
 					<div class="col-lg">
 						<div class="mb-2">
@@ -107,7 +99,7 @@ else {
 							<select class="form-control" name="assign_to" id="assign-to">
 								<option value=""><?=htmlspecialchars(__("Select User"))?></option>
 								<?php
-								HtmlHelper::renderOptions($staff_options);
+								HtmlHelper::renderOptions(User::getStaffOptions());
 								?>
 							</select>
 						</div>
@@ -126,7 +118,7 @@ else {
 				</div>
 
 				<button type="submit" class="btn btn-primary" name="batch_submit" value="1">
-					<?=htmlspecialchars(__("Submit"))?>
+					<?=htmlspecialchars(__("Update Tickets"))?>
 				</button>
 			</div>
 		</div>