Its not pretty but expenses can be added with shares and payments, kinda
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
class="tui-input underline fullwidth" type="text" name="expense-value"
|
||||
value="{{ .expense.Value }}" id="expense-value"><br>
|
||||
</p>
|
||||
<br>
|
||||
|
||||
<p>
|
||||
<label for="newexp-type-dropdown">Type:</label>
|
||||
@@ -68,6 +69,67 @@
|
||||
{{ end}}
|
||||
</select>
|
||||
</p>
|
||||
<br>
|
||||
|
||||
<p>
|
||||
<button
|
||||
type="button"
|
||||
onclick="addShareRow()"
|
||||
>+ Share</button>
|
||||
</p>
|
||||
<table>
|
||||
<tr>
|
||||
<th>USER</th>
|
||||
<th>SHARE</th>
|
||||
<th>PAYED</th>
|
||||
</tr>
|
||||
|
||||
<tr id="default-payment-row">
|
||||
<td>
|
||||
<select name="shares-user-ids[]">
|
||||
{{ range .users }}
|
||||
<option
|
||||
{{ if eq .UserID $.expense.OwnerUser.UserID }}selected{{ end }}
|
||||
value="{{ .UserID }}">{{ .UserName }}</option>
|
||||
{{ end}}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="shares-percent[]" value="1">
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="payments-payment[]" value="0">
|
||||
</td>
|
||||
<td class="row-delete-button">
|
||||
<button type="button" onclick="deleteShareRow(this)">X</button>
|
||||
</td>
|
||||
</tr>
|
||||
{{ range .summary }}
|
||||
{{ $summary := . }}
|
||||
<tr>
|
||||
<td>
|
||||
<select name="shares-user-ids[]">
|
||||
{{ range $.users }}
|
||||
<option
|
||||
value="{{ .UserID }}"
|
||||
{{ if eq .UserID $summary.User.UserID }}selected{{ end }}>
|
||||
{{ .UserName }}
|
||||
</option>
|
||||
{{ end }}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="shares-percent[]" value="{{ $summary.Share }}">
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="payments-payment[]" value="{{ $summary.PayedTotal }}">
|
||||
</td>
|
||||
<td class="row-delete-button">
|
||||
<button type="button" onclick="deleteShareRow(this)">X</button>
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
<br><br>
|
||||
|
||||
<button
|
||||
@@ -83,24 +145,16 @@
|
||||
id="expense-submit-button">
|
||||
{{- if eq .method "put" }}UPDATE{{- end }}
|
||||
{{- if eq .method "post" }}CREATE{{- end }}</button>
|
||||
<br>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Shares:
|
||||
<table>
|
||||
<tr>
|
||||
<th>USER</th>
|
||||
<th>SHARE</th>
|
||||
<th>PAYED</th>
|
||||
</tr>
|
||||
{{- range .summary }}
|
||||
<tr>
|
||||
<td>{{ .User.UserName }}</td>
|
||||
<td>{{ .Share }}</td>
|
||||
<td>{{ .PayedTotal }}</td>
|
||||
</tr>
|
||||
{{- end }}
|
||||
</table>
|
||||
<script>
|
||||
function deleteShareRow(btn) {
|
||||
const row = btn.closest("tr");
|
||||
if (row) {
|
||||
row.remove();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,3 +1,28 @@
|
||||
function addShareRow() {
|
||||
const templateRow = document.getElementById("default-payment-row");
|
||||
|
||||
if (!templateRow) {
|
||||
console.error("Example row not found");
|
||||
return;
|
||||
}
|
||||
|
||||
// Clone the hidden row
|
||||
const newRow = templateRow.cloneNode(true);
|
||||
newRow.removeAttribute("id"); // IDs must be unique
|
||||
newRow.style.display = ""; // Make it visible
|
||||
|
||||
// Optional: Reset input values if needed
|
||||
const inputs = newRow.querySelectorAll("input");
|
||||
inputs.forEach(input => {
|
||||
if (input.type === "number") {
|
||||
input.value = "";
|
||||
}
|
||||
});
|
||||
|
||||
// Insert the cloned row after the template row
|
||||
templateRow.parentNode.appendChild(newRow);
|
||||
}
|
||||
|
||||
// forms main function
|
||||
document.addEventListener("DOMContentLoaded", function() {
|
||||
document.body.addEventListener("formState", function(evt) {
|
||||
|
||||
@@ -3,6 +3,7 @@ package expenses
|
||||
import (
|
||||
"database/sql"
|
||||
"log"
|
||||
"fmt"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
@@ -44,3 +45,32 @@ func (e *Expense) GetPayments() error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *ExpensePayment) Insert(expID int) error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "INSERT INTO expensesPayments(" +
|
||||
"ExpID,UserID,Payed" +
|
||||
") " +
|
||||
"VALUES(?, ?, ?)"
|
||||
|
||||
log.Println(query, expID, p.User.UserID, p.PayedAmount)
|
||||
|
||||
res, err := db.Exec(query, expID, p.User.UserID, p.PayedAmount)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
} else if rowsAffected == 0 {
|
||||
return fmt.Errorf("no rows were created")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package expenses
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
@@ -44,3 +45,31 @@ func (e *Expense) GetShares() error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (sh *ExpenseShare) Insert(expID int) error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "INSERT INTO expensesShares(" +
|
||||
"ExpID,UserID,Share" +
|
||||
") " +
|
||||
"VALUES(?, ?, ?)"
|
||||
|
||||
log.Println(query, expID, sh.User.UserID, sh.Share)
|
||||
res, err := db.Exec(query, expID, sh.User.UserID, sh.Share)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
} else if rowsAffected == 0 {
|
||||
return fmt.Errorf("no rows were created")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -131,6 +131,8 @@ func (exp *Expense) Insert() error {
|
||||
") " +
|
||||
"VALUES(?, ?, ? , ?, ?, ?, ?)"
|
||||
|
||||
// TODO
|
||||
// Add a transaction here so that it fails when necessary
|
||||
res, err := db.Exec(query, exp.Description, exp.Value, exp.ExpStore.StoreID,
|
||||
exp.ExpCategory.CategoryID, exp.ExpType.TypeID, 0, exp.ExpDate,
|
||||
)
|
||||
@@ -138,6 +140,24 @@ func (exp *Expense) Insert() error {
|
||||
return err
|
||||
}
|
||||
|
||||
expenseID, err := res.LastInsertId()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to retrieve last inserted expense ID: %v", err)
|
||||
}
|
||||
exp.ExpID = int(expenseID)
|
||||
for _, share := range exp.Shares {
|
||||
err := share.Insert(exp.ExpID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
for _, paym := range exp.Payments {
|
||||
err := paym.Insert(exp.ExpID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
package expenses
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"log"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
UserID int
|
||||
UserName string
|
||||
@@ -11,3 +18,31 @@ func NewUser() User {
|
||||
UserName: "",
|
||||
}
|
||||
}
|
||||
|
||||
func GetAllUsers() ([]User, error) {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "SELECT UserID,UserName " +
|
||||
"FROM users"
|
||||
|
||||
var userList []User
|
||||
rows, err := db.Query(query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
user := &User{}
|
||||
err := rows.Scan(&user.UserID, &user.UserName)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to parse data from db: %v", err)
|
||||
}
|
||||
userList = append(userList, *user)
|
||||
}
|
||||
|
||||
return userList, nil
|
||||
}
|
||||
|
||||
+22
-3
@@ -91,7 +91,6 @@ func expensePage(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
categories, err := expenses.GetAllCategories()
|
||||
if err != nil {
|
||||
ServerErrorView(c, "failed to fetch categories")
|
||||
@@ -110,8 +109,11 @@ func expensePage(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
log.Println(expense.Shares)
|
||||
log.Println(expense.Payments)
|
||||
users, err := expenses.GetAllUsers()
|
||||
if err != nil {
|
||||
ServerErrorView(c, "failed to fetch users")
|
||||
return
|
||||
}
|
||||
|
||||
summary, err := expense.GetSummary()
|
||||
if err != nil {
|
||||
@@ -119,6 +121,15 @@ func expensePage(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
log.Println("Users:")
|
||||
log.Println(users)
|
||||
|
||||
log.Println("Payments:")
|
||||
log.Println(expense.Payments)
|
||||
|
||||
log.Println("Shares:")
|
||||
log.Println(expense.Shares)
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/expense.html"),
|
||||
map[string]any{
|
||||
@@ -128,6 +139,7 @@ func expensePage(c *gin.Context) {
|
||||
"stores": stores,
|
||||
"types": types,
|
||||
"summary": summary,
|
||||
"users": users,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -164,6 +176,12 @@ func newExpensePage(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
users, err := expenses.GetAllUsers()
|
||||
if err != nil {
|
||||
ServerErrorView(c, "failed to fetch users")
|
||||
return
|
||||
}
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/expense.html"), map[string]any{
|
||||
"method": "post",
|
||||
@@ -171,6 +189,7 @@ func newExpensePage(c *gin.Context) {
|
||||
"categories": categories,
|
||||
"stores": stores,
|
||||
"types": types,
|
||||
"users": users,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@@ -42,6 +42,46 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
shares := []expenses.ExpenseShare{}
|
||||
payments := []expenses.ExpensePayment{}
|
||||
|
||||
sharesUserIDs := c.PostFormArray("shares-user-ids[]")
|
||||
formShares := c.PostFormArray("shares-percent[]")
|
||||
formPayments := c.PostFormArray("payments-payment[]")
|
||||
|
||||
for i := range sharesUserIDs {
|
||||
userID, err := strconv.Atoi(sharesUserIDs[i])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
share, err := strconv.ParseFloat(formShares[i], 32)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
payed, err := strconv.ParseFloat(formPayments[i], 32)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newShare := expenses.ExpenseShare{
|
||||
User: expenses.User{
|
||||
UserID: userID,
|
||||
},
|
||||
Share: float32(share),
|
||||
}
|
||||
shares = append(shares, newShare)
|
||||
|
||||
newPayment := expenses.ExpensePayment{
|
||||
User: expenses.User{
|
||||
UserID: userID,
|
||||
},
|
||||
PayedAmount: float32(payed),
|
||||
}
|
||||
payments = append(payments, newPayment)
|
||||
}
|
||||
|
||||
newExp := expenses.Expense{
|
||||
Description: newDescription,
|
||||
ExpDate: date,
|
||||
@@ -55,6 +95,8 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
|
||||
ExpStore: expenses.Store{
|
||||
StoreID: storeID,
|
||||
},
|
||||
Shares: shares,
|
||||
Payments: payments,
|
||||
}
|
||||
return &newExp, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user