diff --git a/handler/treasure_chest.go b/handler/treasure_chest.go
index 1c022af..0e62f6c 100644
--- a/handler/treasure_chest.go
+++ b/handler/treasure_chest.go
@@ -84,7 +84,7 @@ func (h TreasureChestImpl) handleTreasureChestItemComp() http.HandlerFunc {
}
transactionsRecurring, err := h.transactionRecurring.GetAllByTreasureChest(user, treasureChest.Id.String())
- transactionsRec := tr.TransactionRecurringItems(transactionsRecurring)
+ transactionsRec := tr.TransactionRecurringItems(transactionsRecurring, "", "", "")
var comp templ.Component
if r.URL.Query().Get("edit") == "true" {
diff --git a/service/transaction_recurring.go b/service/transaction_recurring.go
index 220f26b..3c47853 100644
--- a/service/transaction_recurring.go
+++ b/service/transaction_recurring.go
@@ -309,7 +309,7 @@ func (s TransactionRecurringImpl) Delete(user *types.User, id string) error {
return err
}
- r, err := tx.Exec("DELETE FROM \"transactionRecurring\" WHERE id = ? AND user_id = ?", uuid, user.Id)
+ r, err := tx.Exec("DELETE FROM transaction_recurring WHERE id = ? AND user_id = ?", uuid, user.Id)
err = db.TransformAndLogDbError("transactionRecurring Delete", r, err)
if err != nil {
return err
diff --git a/template/transaction_recurring/transaction_recurring.templ b/template/transaction_recurring/transaction_recurring.templ
index 4c96e58..b536191 100644
--- a/template/transaction_recurring/transaction_recurring.templ
+++ b/template/transaction_recurring/transaction_recurring.templ
@@ -4,77 +4,72 @@ import "fmt"
import "spend-sparrow/template/svg"
import "spend-sparrow/types"
-templ TransactionRecurringItems(transactionsRecurring []*types.TransactionRecurring) {
-
-
-
- | Party |
- Description |
- Value (€) |
- Actions |
-
-
-
- for _, transaction := range transactionsRecurring {
+templ TransactionRecurringItems(transactionsRecurring []*types.TransactionRecurring, editId, accountId, treasureChestId string) {
+
+
+ Party
+ Description
+ Interval
+ Value
+
+ for _, transaction := range transactionsRecurring {
+ if transaction.Id.String() == editId {
+ @EditTransactionRecurring(transaction, accountId, treasureChestId)
+ } else {
@TransactionRecurringItem(transaction)
}
-
-
+ }
+
}
templ TransactionRecurringItem(transactionRecurring *types.TransactionRecurring) {
-
- |
-
- if transactionRecurring.Party != "" {
- { transactionRecurring.Party }
- } else {
-
- }
-
- |
-
-
- if transactionRecurring.Description != "" {
- { transactionRecurring.Description }
- } else {
-
- }
-
- |
-
- if transactionRecurring.Value < 0 {
- { displayBalance(transactionRecurring.Value)+" €" }
- } else {
- { displayBalance(transactionRecurring.Value)+" €" }
- }
- |
-
-
-
- |
-
+
+ if transactionRecurring.Party != "" {
+ { transactionRecurring.Party }
+ } else {
+
+ }
+
+
+ if transactionRecurring.Description != "" {
+ { transactionRecurring.Description }
+ } else {
+
+ }
+
+
+ Every { transactionRecurring.IntervalMonths } month(s)
+
+ if transactionRecurring.Value < 0 {
+ { displayBalance(transactionRecurring.Value)+" €" }
+ } else {
+ { displayBalance(transactionRecurring.Value)+" €" }
+ }
+
+
+
+
}
templ EditTransactionRecurring(transactionRecurring *types.TransactionRecurring, accountId, treasureChestId string) {
@@ -102,79 +97,75 @@ templ EditTransactionRecurring(transactionRecurring *types.TransactionRecurring,
cancelUrl = "/transaction-recurring/" + id
}
}}
-