Page to edit an expense

This commit is contained in:
2025-07-16 22:25:48 +01:00
parent c1e3a68ac1
commit 2a247fea01
12 changed files with 268 additions and 236 deletions
-23
View File
@@ -19,26 +19,3 @@
</fieldset>
</form>
</div>
<script>
document.body.addEventListener("formState", function(evt) {
var messageDiv = document.getElementById("form-state")
messageDiv.innerHTML = evt.detail.value
setTimeout(() => {
messageDiv.innerHTML = ""
}, 3000);
});
// Add the spinner
var btn = document.getElementById("category-submit-button");
btn.addEventListener('htmx:beforeRequest', function (evt) {
btn.classList.add("loading");
spinner(btn)
});
btn.addEventListener('htmx:afterRequest', function (evt) {
btn.classList.remove("loading");
});
</script>
+82 -14
View File
@@ -1,14 +1,82 @@
<table>
<tr>
<td>ID:</td>
<td>{{ .expense.ExpID }}</td>
</tr>
<tr>
<td>Description:</td>
<td>{{ .expense.Description }}</td>
</tr>
<tr>
<td>Date:</td>
<td>{{ formatDate .expense.ExpDate }}</td>
</tr>
</table>
<div>
<form id="expense-form" action="submit">
<fieldset id="form-box-boundaries">
<legend>EXPENSE FORM</legend>
<div class="form-container form-inline">
<div id="form-state" class="warning"></div><br>
<p>
<label for="expense-desc">ID:</label>
<input
readonly
class="tui-input underline fullwidth" type="text" name="expense-id"
value="{{ .expense.ExpID }}" id="expense-id"><br>
</p>
<p>
<label for="expense-desc">Description:</label>
<input
class="tui-input underline fullwidth" type="text" name="expense-desc"
value="{{ .expense.Description }}" id="expense-desc"><br>
</p>
<p>
<label for="expense-date">Date:</label>
<input
class="tui-input underline fullwidth" type="text" name="expense-date"
value="{{ formatDate .expense.ExpDate }}" id="expense-date"><br>
</p>
<p>
<label for="expense-value">Value:</label>
<input
class="tui-input underline fullwidth" type="text" name="expense-value"
value="{{ .expense.Value }}" id="expense-value"><br>
</p>
<p>
<label for="newexp-type-dropdown">Type:</label>
<select name="newexp-type-dropdown" id="newexp-type-dropdown">
{{ range .types }}
<option
{{ if eq .TypeID $.expense.ExpType.TypeID }}selected{{ end }}
value="{{ .TypeID }}">{{ .TypeName }}</option>
{{ end}}
</select>
</p>
<p>
<label for="newexp-cat-dropdown">Category:</label>
<select name="newexp-cat-dropdown" id="newexp-cat-dropdown">
{{ range .categories }}
<option
{{ if eq .CategoryID $.expense.ExpCategory.CategoryID }}selected{{ end }}
value="{{ .CategoryID }}">{{ .CategoryName }}</option>
{{ end}}
</select>
</p>
<p>
<label for="newexp-store-dropdown">Store:</label>
<select name="newexp-store-dropdown" id="newexp-store-dropdown">
{{ range .stores }}
<option
{{ if eq .StoreID $.expense.ExpStore.StoreID }}selected{{ end }}
value="{{ .StoreID }}">{{ .StoreName }}</option>
{{ end}}
</select>
</p>
<br><br>
<button
class="subbutton"
hx-put="/expenses/{{ .expense.ExpID }}"
hx-swap="none"
type="submit"
id="expense-submit-button">UPDATE</button>
<br>
</div>
</fieldset>
</form>
</div>
outside
-23
View File
@@ -65,26 +65,3 @@
</fieldset>
</form>
</div>
<script>
document.body.addEventListener("formState", function(evt) {
var messageDiv = document.getElementById("form-state")
messageDiv.innerHTML = evt.detail.value
setTimeout(() => {
messageDiv.innerHTML = ""
}, 3000);
});
// Add the spinner
var btn = document.getElementById("expense-submit-button");
btn.addEventListener('htmx:beforeRequest', function (evt) {
btn.classList.add("loading");
spinner(btn)
});
btn.addEventListener('htmx:afterRequest', function (evt) {
btn.classList.remove("loading");
});
</script>
-23
View File
@@ -24,26 +24,3 @@
</fieldset>
</form>
</div>
<script>
document.body.addEventListener("formState", function(evt) {
var messageDiv = document.getElementById("form-state")
messageDiv.innerHTML = evt.detail.value
setTimeout(() => {
messageDiv.innerHTML = ""
}, 3000);
});
// Add the spinner
var btn = document.getElementById("store-submit-button");
btn.addEventListener('htmx:beforeRequest', function (evt) {
btn.classList.add("loading");
spinner(btn)
});
btn.addEventListener('htmx:afterRequest', function (evt) {
btn.classList.remove("loading");
});
</script>
-35
View File
@@ -1,35 +0,0 @@
<!--
<pre>
░░░░░
▒░
▒▒▒▒
▓▒
█▓▓▓▓
_____
| ___|
| |_
| _|
| |___
|_____|
_____ _____ _ ____
/ ___// ___/ /_//_ / _ __ ___ ___ __ ____
/ /_ / /__ __ / / | | / //__ \ /__ \ / /_ / _ \
/ __/ /__ / / / / / | | / /___/ / // /// ___\ |___ /
/ /__ ___/ / / / / /_ | |/ // _ /__ //__/// / ____/ /
/____//____/ /__\ \__/ |___/ \___//_/ \___//_/ /_____/
MM""""""""`M MP""""""`MM oo dP
MM mmmmmmmM M mmmmm..M 88
M` MMMM M. `YM dP 88 dP .dP .d8888b. .d8888b. 88d888b. .d8888b.
MM MMMMMMMM MMMMMMM. M 88 88 88 d8' 88' `88 88' `88 88' `88 88' `88
MM MMMMMMMM M. .MMM' M 88 88 88 .88' 88. .88 dP 88. .88 88 88. .88
MM .M Mb. .dM dP dP 8888P' `88888P8 88 `88888P' dP `8888P88
MMMMMMMMMMMM MMMMMMMMMMM .88
d8888P
___________ _ __
/ ____/ ___/(_) / ______ _ ____ _________ _
/ __/ \__ \/ / / | / / __ `// __ \/ ___/ __ `/
/ /___ ___/ / / /| |/ / /_/ // /_/ / / / /_/ /
/_____//____/_/_/ |___/\__,_(_)____/_/ \__, /
</pre>
-->
+1
View File
@@ -8,6 +8,7 @@
<link content="text/css" href="/assets/css/aesthetic.css" rel="stylesheet">
<script content="text/javascript" defer="" src="/assets/js/htmx.min.js"></script>
<script content="text/javascript" defer="" src="/assets/js/pager.js"></script>
<script content="text/javascript" defer="" src="/assets/js/forms.js"></script>
</head>
<body>
-23
View File
@@ -33,26 +33,3 @@
</fieldset>
</form>
</div>
<script>
document.body.addEventListener("formState", function(evt) {
var messageDiv = document.getElementById("form-state")
messageDiv.innerHTML = evt.detail.value
setTimeout(() => {
messageDiv.innerHTML = ""
}, 3000);
});
// Add the spinner
var btn = document.getElementById("type-submit-button");
btn.addEventListener('htmx:beforeRequest', function (evt) {
btn.classList.add("loading");
spinner(btn)
});
btn.addEventListener('htmx:afterRequest', function (evt) {
btn.classList.remove("loading");
});
</script>
-23
View File
@@ -19,26 +19,3 @@
</fieldset>
</form>
</div>
<script>
document.body.addEventListener("formState", function(evt) {
var messageDiv = document.getElementById("form-state")
messageDiv.innerHTML = evt.detail.value
setTimeout(() => {
messageDiv.innerHTML = ""
}, 3000);
});
// Add the spinner
var btn = document.getElementById("type-submit-button");
btn.addEventListener('htmx:beforeRequest', function (evt) {
btn.classList.add("loading");
spinner(btn)
});
btn.addEventListener('htmx:afterRequest', function (evt) {
btn.classList.remove("loading");
});
</script>
+30
View File
@@ -0,0 +1,30 @@
// forms main function
document.addEventListener("DOMContentLoaded", function() {
document.body.addEventListener("formState", function(evt) {
var messageDiv = document.getElementById("form-state")
messageDiv.innerHTML = evt.detail.value
setTimeout(() => {
messageDiv.innerHTML = ""
}, 3000);
});
// Add the spinner
document.addEventListener("htmx:beforeRequest", function(e) {
const target = e.target.closest(".subbutton");
if (!target) {
return;
}
target.classList.add("loading");
spinner(target)
});
document.addEventListener("htmx:afterRequest", function(e) {
const target = e.target.closest(".subbutton");
if (!target) {
return;
}
target.classList.remove("loading");
});
})
+46 -8
View File
@@ -4,7 +4,6 @@ import (
"database/sql"
"fmt"
"log"
"strconv"
_ "github.com/mattn/go-sqlite3"
)
@@ -86,28 +85,31 @@ func GetExpense(expID int) (Expense, error) {
"Stores.StoreID,Stores.StoreName," +
"Categories.CategoryID,Categories.CategoryName," +
"Users.UserID,Users.UserName," +
"expenseTypes.TypeID,expenseTypes.TypeName, " +
"ExpDate,CreationDate " +
"FROM expenses " +
"JOIN Stores, Categories " +
"JOIN Stores ON stores.StoreID = expenses.StoreID " +
"JOIN Categories ON categories.CategoryID = expenses.CategoryID " +
"JOIN Users ON UserID = OwnerUserId " +
"WHERE ExpID = " + strconv.Itoa(expID)
log.Println(query)
"JOIN expenseTypes ON expenseTypes.TypeID = expenses.TypeID " +
"WHERE ExpID = ?"
exp := Expense{ExpID: -1}
err = db.QueryRow(query).Scan(
err = db.QueryRow(query, expID).Scan(
&exp.ExpID, &exp.Description, &exp.Value,
&exp.ExpStore.StoreID, &exp.ExpStore.StoreName,
&exp.ExpCategory.CategoryID, &exp.ExpCategory.CategoryName,
&exp.OwnerUser.UserID, &exp.OwnerUser.UserName,
&exp.ExpType.TypeID, &exp.ExpType.TypeName,
&exp.ExpDate, &exp.CreationDate,
)
if err == sql.ErrNoRows {
return Expense{ExpID: -1}, nil
return Expense{ExpID: -1}, err
}
if err != nil {
return Expense{}, nil
log.Println(err)
return Expense{}, err
}
return exp, nil
@@ -141,3 +143,39 @@ func (exp *Expense) Insert() error {
return nil
}
func (exp *Expense) Update() error {
db, err := sql.Open("sqlite3", "./data/data.db")
if err != nil {
return err
}
defer db.Close()
query := "UPDATE expenses " +
"SET " +
"Description = ?," +
"Value = ?," +
"StoreID = ?," +
"CategoryID = ?," +
"TypeID = ?," +
"OwnerUserID = ?," +
"ExpDate = ?" +
"WHERE ExpID = ?"
res, err := db.Exec(query,
exp.Description, exp.Value, exp.ExpStore.StoreID,
exp.ExpCategory.CategoryID, exp.ExpType.TypeID, 0, exp.ExpDate, exp.ExpID,
)
if err != nil {
return err
}
rowsAffected, err := res.RowsAffected()
if err != nil {
return err
} else if rowsAffected == 0 {
return fmt.Errorf("no rows were updated")
}
return nil
}
+49 -64
View File
@@ -1,13 +1,12 @@
package pages
import (
"encoding/json"
"expenses/config"
"expenses/expenses"
"expenses/templating"
"fmt"
"log"
"strconv"
"time"
"net/http"
fp "path/filepath"
@@ -79,10 +78,31 @@ func expensePage(c *gin.Context) {
}
expense, err := expenses.GetExpense(expenseID)
categories, err := expenses.GetAllCategories()
if err != nil {
ServerErrorView(c, "failed to fetch categories")
return
}
stores, err := expenses.GetAllStores()
if err != nil {
ServerErrorView(c, "failed to fetch stores")
return
}
types, err := expenses.GetAllTypes()
if err != nil {
ServerErrorView(c, "failed to fetch types")
return
}
content := templating.HtmlTemplate(
fp.Join(cfg.AssetsDir, "/htmx/expense.html"),
map[string]any{
"expense": expense,
"expense": expense,
"categories": categories,
"stores": stores,
"types": types,
},
)
@@ -136,72 +156,12 @@ func newExpensePage(c *gin.Context) {
}
func createExpense(c *gin.Context) {
newDescription := c.PostForm("expense-desc")
newDate := c.PostForm("expense-date")
formattedDate, err := time.Parse("02-Jan-2006", newDate)
newExp, err := expenseFromForm(c)
if err != nil {
// TODO
// Change this to something the user can see
c.Header("HX-Redirect", "/500")
return
}
date := formattedDate.Unix()
newValue := c.PostForm("expense-value")
value, err := strconv.ParseFloat(newValue, 32)
if err != nil {
// TODO
// Change this to something the user can see
c.Header("HX-Redirect", "/500")
return
}
newTyp := c.PostForm("newexp-type-dropdown")
typID, err := strconv.Atoi(newTyp)
if err != nil {
// TODO
// Change this to something the user can see
log.Println("failed to parse newType:", newTyp)
c.Header("HX-Redirect", "/500")
return
}
newCat := c.PostForm("newexp-cat-dropdown")
catID, err := strconv.Atoi(newCat)
if err != nil {
// TODO
// Change this to something the user can see
log.Println("failed to parse catID:", newCat)
c.Header("HX-Redirect", "/500")
return
}
newStore := c.PostForm("newexp-store-dropdown")
storeID, err := strconv.Atoi(newStore)
if err != nil {
// TODO
// Change this to something the user can see
log.Println("failed to parse storeID:", newStore)
c.Header("HX-Redirect", "/500")
return
}
newExp := expenses.Expense{
Description: newDescription,
ExpDate: date,
Value: float32(value),
ExpType: expenses.Type{
TypeID: typID,
},
ExpCategory: expenses.Category{
CategoryID: catID,
},
ExpStore: expenses.Store{
StoreID: storeID,
},
}
log.Println(newExp)
err = newExp.Insert()
if err != nil {
@@ -212,6 +172,30 @@ func createExpense(c *gin.Context) {
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
}
func updateExpense(c *gin.Context) {
expenseID, err := strconv.Atoi(c.Param("id"))
if err != nil {
c.Redirect(404, "/404")
}
newExp, err := expenseFromForm(c)
if err != nil {
// TODO
// Change this to something the user can see
c.Header("HX-Redirect", "/500")
}
newExp.ExpID = expenseID
err = newExp.Update()
if err != nil {
errMsg, _ := json.Marshal(err.Error())
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg))
return
}
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
}
func RouteExpenses(router *gin.Engine) {
router.GET(ExpensesPath, ExpensesGlobalPage)
router.GET(ExpensesPath+"/:id", expensePage)
@@ -219,4 +203,5 @@ func RouteExpenses(router *gin.Engine) {
router.GET(ExpensesPath+"/new", newExpensePage)
router.POST(ExpensesPath+"/new", createExpense)
router.PUT(ExpensesPath+"/:id", updateExpense)
}
+60
View File
@@ -0,0 +1,60 @@
package pages
import (
"expenses/expenses"
"strconv"
"time"
"github.com/gin-gonic/gin"
)
func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
newDescription := c.PostForm("expense-desc")
newDate := c.PostForm("expense-date")
formattedDate, err := time.Parse("02-Jan-2006", newDate)
if err != nil {
return nil, err
}
date := formattedDate.Unix()
newValue := c.PostForm("expense-value")
value, err := strconv.ParseFloat(newValue, 32)
if err != nil {
return nil, err
}
newTyp := c.PostForm("newexp-type-dropdown")
typID, err := strconv.Atoi(newTyp)
if err != nil {
return nil, err
}
newCat := c.PostForm("newexp-cat-dropdown")
catID, err := strconv.Atoi(newCat)
if err != nil {
return nil, err
}
newStore := c.PostForm("newexp-store-dropdown")
storeID, err := strconv.Atoi(newStore)
if err != nil {
return nil, err
}
newExp := expenses.Expense{
Description: newDescription,
ExpDate: date,
Value: float32(value),
ExpType: expenses.Type{
TypeID: typID,
},
ExpCategory: expenses.Category{
CategoryID: catID,
},
ExpStore: expenses.Store{
StoreID: storeID,
},
}
return &newExp, nil
}