diff --git a/.gitignore b/.gitignore index d7563d3..f2889cc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,7 @@ /*.db-wal /node_modules -/*.lockb \ No newline at end of file +/*.lockb +/.idea/inventory-app.iml +/.idea/vcs.xml + diff --git a/.idea/inventory-app.iml b/.idea/inventory-app.iml deleted file mode 100644 index 8d34de7..0000000 --- a/.idea/inventory-app.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/app/item/adjustment/negative.rs b/src/app/item/adjustment/negative.rs index 84b95c2..fa84064 100644 --- a/src/app/item/adjustment/negative.rs +++ b/src/app/item/adjustment/negative.rs @@ -70,8 +70,10 @@ pub async fn negative_adjustment_form_post( .into_response()); } - let trigger_events = - HxResponseTrigger::normal(std::iter::once(HxEvent::from("new-adjustment"))); + let trigger_events = vec![ + HxEvent::from("new-adjustment"), + HxEvent::from("form-submit-success"), + ]; let timestamp = chrono::Utc::now(); @@ -93,7 +95,7 @@ pub async fn negative_adjustment_form_post( .await?; Ok(( - trigger_events, + HxResponseTrigger::normal(trigger_events), NegativeAdjustmentFormTemplate { item_id: id, amount_error: "", diff --git a/src/app/item/adjustment/positive.rs b/src/app/item/adjustment/positive.rs index 8b1d672..e838314 100644 --- a/src/app/item/adjustment/positive.rs +++ b/src/app/item/adjustment/positive.rs @@ -4,14 +4,16 @@ use crate::db::inventory_item::does_inventory_item_allow_fractional_units; use crate::error::AppError; use crate::session::SessionUser; use crate::util::currency::dollars_string_to_int_cents; +use crate::util::extract::htmx_form_data::{HtmxFormData, HtmxFormDataError}; use askama::Template; use askama_axum::{IntoResponse, Response}; use axum::extract::{Path, State}; -use axum::{debug_handler, Form}; +use axum::{async_trait, debug_handler, Form}; use axum_htmx::{HxEvent, HxResponseTrigger}; use serde::Deserialize; use sqlx::SqlitePool; use tracing::info; +use crate::app::routes::AppState; #[derive(Template)] #[template(path = "item/adjustment/positive-adjustment-form.html")] @@ -63,8 +65,10 @@ pub async fn positive_adjustment_form_post( let price = price?; let unit_price = (price as f64 / form_data.amount) as i64; - let trigger_events = - HxResponseTrigger::normal(std::iter::once(HxEvent::from("new-adjustment"))); + let trigger_events = vec![ + HxEvent::from("form-submit-success"), + HxEvent::from("new-adjustment"), + ]; let timestamp = chrono::Utc::now(); @@ -88,7 +92,7 @@ pub async fn positive_adjustment_form_post( .await?; Ok(( - trigger_events, + HxResponseTrigger::normal(trigger_events), PositiveAdjustmentFormTemplate { item_id: id, amount_error: "", diff --git a/templates/item/adjustment/negative-adjustment-form.html b/templates/item/adjustment/negative-adjustment-form.html index 4e47da6..4e82574 100644 --- a/templates/item/adjustment/negative-adjustment-form.html +++ b/templates/item/adjustment/negative-adjustment-form.html @@ -16,15 +16,10 @@ placeholder="Amount" aria-label="amount" required - {% - if - !amount_error.is_empty() - -%} + {% if !amount_error.is_empty() -%} aria-invalid="true" aria-describedby="invalid-amount" - {% - endif - -%} + {% endif -%} /> {% if !amount_error.is_empty() -%} diff --git a/templates/item/adjustment/positive-adjustment-form.html b/templates/item/adjustment/positive-adjustment-form.html index 9cad743..10ea247 100644 --- a/templates/item/adjustment/positive-adjustment-form.html +++ b/templates/item/adjustment/positive-adjustment-form.html @@ -20,7 +20,9 @@ {% endif -%} /> {% if !amount_error.is_empty() -%} - + {{ amount_error }} {% endif -%} @@ -35,20 +37,17 @@ placeholder="Price" aria-label="price" required - {% - if - !price_error.is_empty() - -%} + {% if !price_error.is_empty() -%} aria-invalid="true" aria-describedby="invalid-price" - {% - endif - -%} + {% endif -%} /> {% if !price_error.is_empty() -%} - {{ price_error }} + + {{ price_error }} + {% endif -%}
diff --git a/templates/item/item.html b/templates/item/item.html index 070928a..1073399 100644 --- a/templates/item/item.html +++ b/templates/item/item.html @@ -1,69 +1,92 @@ -{% extends "main.html" %} {% block title %} Items {% endblock %} {% block -content %} +{% extends "main.html" %} -
+{% block title %} Items {% endblock %} -

- {{item.name}} {% if !item.active %} - - Inactive - - {% endif %} -

+{% block content %} -
+
+
+
+
+
+
+
+

Negative Adjustment

+

Positive Adjustment

+
+ +
+
+
+
+
+
+
+
+
- {% if item.active %} -
-
- - -
+ Inactive + + {% endif %} + -
-
-
+
-
+ {% if item.active %} +
+
+ + +
+
+ {% endif %} + +
-
-
- {% endif %} - -
-
-
+ +
{% endblock %} diff --git a/templates/main.html b/templates/main.html index f25f467..3883f4e 100644 --- a/templates/main.html +++ b/templates/main.html @@ -18,7 +18,7 @@ -
+