fix: edit costs

for #200
SuperHyperInstantFutureTime · Feb 17, 2025 · 2802fab · 2802fab
1 parent ba5f7e9
commit 2802fab
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 16 deletions.
diff --git a/class/Cost/Cost.php b/class/Cost/Cost.php
@@ -34,4 +34,9 @@ public function getAddedOn():string {
 	public function getDateFormatted():string {
 		return $this->date->format("jS M Y");
 	}
+
+	#[BindGetter]
+	public function getDateValue():string {
+		return $this->date->format("Y-m-d");
+	}
 }
diff --git a/page/_component/cost-editor.html b/page/_component/cost-editor.html
@@ -1,7 +1,7 @@
 <form method="post" onchange="this.submit()">
 	<label>
 		<span>Artist</span>
-		<select name="artist" required data-bind:value="@name">
+		<select name="artist" required data-bind:value="@name" data-rebind>
 			<option></option>
 			<option data-list data-bind:text="name" data-bind:value="id">Artist</option>
 		</select>
@@ -28,7 +28,7 @@
 	</label>
 	<label>
 		<span>Date</span>
-		<input name="date" required type="date" data-bind:value="@name" autocomplete="off" />
+		<input name="date" required type="date" data-bind:value="dateValue" autocomplete="off" />
 	</label>
 
 	<div class="actions">

diff --git a/page/_component/cost-editor.php b/page/_component/cost-editor.php
@@ -29,8 +29,8 @@ function go(
 		$document->querySelector("select[name=artist]"),
 	);
 
-	$artistId = $input->getString("artist");
 	$id = $dynamicPath->get("cost");
+	$artistId = $input->getString("artist");
 	$cost = null;
 
 	if($id === "_new") {
@@ -42,7 +42,9 @@ function go(
 	else {
 		$cost = $costRepository->getById($id);
 		$binder->bindData($cost);
-		$artistId = $cost->product->artist->id;
+		if(!$artistId) {
+			$artistId = $cost->product->artist->id;
+		}
 	}
 
 	if($artistId) {
@@ -58,7 +60,7 @@ function go(
 		}
 	}
 
-	$binder->bindKeyValue("date", date("Y-m-d"));
+	$binder->bindKeyValue("dateValue", date("Y-m-d"));
 }
 
 function do_set_artist(Input $input, Response $response, Uri $uri):void {

diff --git a/page/_component/cost-table.html b/page/_component/cost-table.html
@@ -39,7 +39,7 @@
 	</tr>
 	</thead>
 	<tbody>
-	<tr data-list data-bind:data-id="id">
+	<tr data-list data-bind:data-cost-id="id">
 		<td data-bind:text="product.artist.name">Artist Name</td>
 		<td data-bind:text="product.title">Product Title</td>
 		<td class="currency" data-bind:text="amount">0.00</td>

diff --git a/page/_component/cost-table.php b/page/_component/cost-table.php
@@ -1,4 +1,5 @@
 <?php
+use Gt\Dom\HTMLDocument;
 use Gt\DomTemplate\Binder;
 use Gt\Http\Response;
 use Gt\Input\Input;
@@ -8,9 +9,17 @@
 function go(
 	CostRepository $costRepository,
 	User $user,
+	Input $input,
+	HTMLDocument $document,
 	Binder $binder,
 ):void {
 	$binder->bindList($costRepository->getAll($user));
+
+	if($updatedId = $input->getString("updated")) {
+		if($updatedElement = $document->querySelector("[data-cost-id='$updatedId']")) {
+			$updatedElement->classList->add("new");
+		}
+	}
 }
 
 function do_delete(

diff --git a/query/Cost/getAllForUser.sql b/query/Cost/getAllForUser.sql
@@ -25,4 +25,4 @@ where
 	Cost.userId = ?
 
 order by
-	Artist.name, Product.title
+	Cost.date, Artist.name, Product.title
diff --git a/script/page/_common.es6 b/script/page/_common.es6
@@ -7,4 +7,9 @@ Page.go(function() {
 	Modal.init();
 	LiveUpdate.init();
 	Currency.init();
+
+	let newElement = document.querySelector(".new");
+	if(newElement) {
+		newElement.scrollIntoView({behavior: "smooth"})
+	}
 });
diff --git a/style/component/upload-table.scss b/style/component/upload-table.scss
@@ -32,14 +32,5 @@ upload-table {
 			}
 
 		}
-
-		&.new {
-			@keyframes highlight-new {
-				from {
-					background-color: #81df6a;
-				}
-			}
-			animation: highlight-new 2s forwards 1;
-		}
 	}
 }
diff --git a/style/decorator/data-table.scss b/style/decorator/data-table.scss
@@ -45,4 +45,13 @@
 			}
 		}
 	}
+
+	.new {
+		@keyframes highlight-new {
+			from {
+				background-color: #81df6a;
+			}
+		}
+		animation: highlight-new 2s forwards 1;
+	}
 }