MVP
This commit is contained in:
@@ -0,0 +1 @@
|
||||
build/
|
||||
@@ -0,0 +1,8 @@
|
||||
build_release_alpine:
|
||||
rm -rf build && mkdir build
|
||||
GIN_MODE=RELEASE CGO_ENABLED=1 GOOS=linux CC=musl-gcc \
|
||||
go build -o ./build/expensesweb
|
||||
cp -r ./assets ./build/
|
||||
cp ./config.yaml ./build/
|
||||
cp ./data/data.db ./build/
|
||||
find build -name "*.ttf" ! -name DejaVuSansMono.ttf -delete
|
||||
@@ -30,7 +30,7 @@
|
||||
opacity: 0.9;
|
||||
}
|
||||
20% {
|
||||
opacity: 1.1;
|
||||
opacity: 0.9;
|
||||
}
|
||||
40% {
|
||||
opacity: 1.1;
|
||||
@@ -42,7 +42,7 @@
|
||||
opacity: 1;
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
opacity: 0.9;
|
||||
}
|
||||
}
|
||||
@keyframes beam {
|
||||
@@ -136,6 +136,81 @@ th {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#form-box-boundaries {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.form-container {
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.form-container.form-left {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.fullwidth-label {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.tui-input {
|
||||
width: 50%;
|
||||
max-width: 15ch;
|
||||
font-family: dejavu_monospace;
|
||||
font-size: var(--html_font_size);
|
||||
border: solid 2px;
|
||||
overflow: hide;
|
||||
outline: none;
|
||||
resize: horizontal;
|
||||
background-color: var(--background-color);
|
||||
color: var(--text-color);
|
||||
}
|
||||
|
||||
.tui-input.fullwidth {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.tui-input.underline {
|
||||
border: none;
|
||||
border-bottom: 2px solid;
|
||||
}
|
||||
|
||||
.subbutton:focus::before {
|
||||
content: ">";
|
||||
}
|
||||
|
||||
.subbutton:focus::after {
|
||||
content: "<";
|
||||
}
|
||||
|
||||
.form-container.form-inline {
|
||||
text-align: left;
|
||||
display: table;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.form-inline p {
|
||||
display: table-row;
|
||||
}
|
||||
|
||||
.form-inline label {
|
||||
display: table-cell;
|
||||
padding-right: 1em;
|
||||
white-space: nowrap;
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
.form-inline .input.tui-input {
|
||||
display: table-cell;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.form-inline .subbutton {
|
||||
display: block;
|
||||
}
|
||||
|
||||
:root {
|
||||
--html_font_size: 20px;
|
||||
--html_mobile_font_size: 15px;
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"sourceRoot":"","sources":["crt.scss","expensesTable.scss","main.scss"],"names":[],"mappings":";AAMA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EAIA;EACA;EACA;EACA;EAEA;;;AAGF;EAII;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;;AAKN;EACE;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;;ACtJJ;EACE;EACA;EACA;;;AAGF;EACE;;;ACJF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EAEA;EAEA;EACA;AAEA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EAEA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAEF;AAEA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA,aACE;;;AAGJ;EACE;EACA;EAEA;EACA;;;AAGF;AACE;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA;EAEA;;;AAGF;EACE;EAEA;AAEA;EACA;AACA;EACA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACA;AACA;AACA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;IACE","file":"aesthetic.css"}
|
||||
{"version":3,"sourceRoot":"","sources":["crt.scss","expensesTable.scss","forms.scss","main.scss"],"names":[],"mappings":";AAMA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EAIA;EACA;EACA;EACA;EAEA;;;AAGF;EAII;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;;AAKN;EACE;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;;ACtJJ;EACE;EACA;EACA;;;AAGF;EACE;;;ACPF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAIF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;ACrEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EAEA;EAEA;EACA;AAEA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EAEA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;AAEA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA,aACE;;;AAGJ;EACE;EACA;EAEA;EACA;;;AAGF;AACE;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA;EAEA;;;AAGF;EACE;EAEA;AAEA;EACA;AACA;EACA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACA;AACA;AACA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;IACE","file":"aesthetic.css"}
|
||||
+107
-22
@@ -71,58 +71,64 @@
|
||||
</p>
|
||||
<br>
|
||||
|
||||
<p>
|
||||
<button
|
||||
type="button"
|
||||
onclick="addShareRow()"
|
||||
>+ Share</button>
|
||||
</p>
|
||||
<table>
|
||||
<button
|
||||
type="button"
|
||||
onclick="addShareRow()"
|
||||
>+ Share</button>
|
||||
<table id="shares-table">
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>USER</th>
|
||||
<th>SHARE</th>
|
||||
<th>PAYED</th>
|
||||
</tr>
|
||||
|
||||
<tr id="default-payment-row">
|
||||
<!-- Data row to be copied -->
|
||||
<tr
|
||||
id="template-share-row"
|
||||
style="display: none;"
|
||||
>
|
||||
<td>
|
||||
<select name="shares-user-ids[]">
|
||||
<input type="number" name="shares-ids[]" disabled readonly
|
||||
value="">
|
||||
</td>
|
||||
<td>
|
||||
<select name="shares-user-ids[]" disabled>
|
||||
{{ range .users }}
|
||||
<option
|
||||
{{ if eq .UserID $.expense.OwnerUser.UserID }}selected{{ end }}
|
||||
value="{{ .UserID }}">{{ .UserName }}</option>
|
||||
{{ end}}
|
||||
{{ end }}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="shares-percent[]" value="1">
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="payments-payment[]" value="0">
|
||||
<input type="number" name="shares-percent[]" value="1" disabled>
|
||||
</td>
|
||||
<td class="row-delete-button">
|
||||
<button type="button" onclick="deleteShareRow(this)">X</button>
|
||||
</td>
|
||||
</tr>
|
||||
{{ range .summary }}
|
||||
{{ $summary := . }}
|
||||
|
||||
{{ range .expense.Shares }}
|
||||
{{ $share := . }}
|
||||
<tr>
|
||||
<td>
|
||||
<input
|
||||
type="number" name="shares-ids[]" readonly
|
||||
value="{{ $share.ExpShareID }}">
|
||||
</td>
|
||||
<td>
|
||||
<select name="shares-user-ids[]">
|
||||
{{ range $.users }}
|
||||
<option
|
||||
value="{{ .UserID }}"
|
||||
{{ if eq .UserID $summary.User.UserID }}selected{{ end }}>
|
||||
{{ if eq .UserID $share.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 }}">
|
||||
<input type="number" name="shares-percent[]" value="{{ $share.Share }}">
|
||||
</td>
|
||||
<td class="row-delete-button">
|
||||
<button type="button" onclick="deleteShareRow(this)">X</button>
|
||||
@@ -130,6 +136,78 @@
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
<br>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onclick="addPaymentRow()"
|
||||
>+ Payment</button>
|
||||
<div id="operation-state" class="warning"> </div><br>
|
||||
<table id="payments-table">
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>USER</th>
|
||||
<th>PAYED</th>
|
||||
</tr>
|
||||
|
||||
<!-- Data row to be copied -->
|
||||
<tr
|
||||
id="template-payment-row"
|
||||
style="display: none;"
|
||||
>
|
||||
<td >
|
||||
<input type="number" name="payments-ids[]" disabled readonly
|
||||
value="">
|
||||
</td>
|
||||
<td>
|
||||
<select name="payments-user-ids[]" disabled>
|
||||
{{ range .users }}
|
||||
<option
|
||||
{{ if eq .UserID $.expense.OwnerUser.UserID }}selected{{ end }}
|
||||
value="{{ .UserID }}">{{ .UserName }}</option>
|
||||
{{ end }}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="payments-payment[]" value="0" disabled>
|
||||
</td>
|
||||
<td class="row-delete-button">
|
||||
<button type="button" onclick="deleteShareRow(this)">X</button>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
{{ range .expense.Payments }}
|
||||
{{ $payment := . }}
|
||||
<tr data-id="{{ $payment.ExpPaymID }}">
|
||||
<td>
|
||||
<input type="number" name="payments-ids[]" readonly
|
||||
value="{{ $payment.ExpPaymID }}">
|
||||
</td>
|
||||
<td>
|
||||
<select name="payments-user-ids[]">
|
||||
{{ range $.users }}
|
||||
<option
|
||||
value="{{ .UserID }}"
|
||||
{{ if eq .UserID $payment.User.UserID }}selected{{ end }}>
|
||||
{{ .UserName }}
|
||||
</option>
|
||||
{{ end }}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type="number" name="payments-payment[]" value="{{ $payment.PayedAmount }}">
|
||||
</td>
|
||||
<td class="row-delete-button">
|
||||
<!-- <button type="button" onclick="deleteShareRow(this)">X</button> -->
|
||||
<button
|
||||
type="button"
|
||||
class="delete-button"
|
||||
hx-delete="/payments/{{ $payment.ExpPaymID }}"
|
||||
hx-target="closest tr">X</button>
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
<br><br>
|
||||
|
||||
<button
|
||||
@@ -145,6 +223,13 @@
|
||||
id="expense-submit-button">
|
||||
{{- if eq .method "put" }}UPDATE{{- end }}
|
||||
{{- if eq .method "post" }}CREATE{{- end }}</button>
|
||||
{{ if eq .method "put" }}
|
||||
<button
|
||||
hx-delete="/expenses/{{ .expense.ExpID }}"
|
||||
hx-swap="none"
|
||||
type="button"
|
||||
id="expense-delete-button">DELETE</button>
|
||||
{{ end }}
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
<th>Date</th>
|
||||
<th>Store</th>
|
||||
<th>Category</th>
|
||||
<th>Owner</th>
|
||||
</tr>
|
||||
{{ range .expenses }}
|
||||
<tr>
|
||||
@@ -16,7 +15,6 @@
|
||||
<th spellcheck="false" contenteditable>{{ formatDate .ExpDate }}</th>
|
||||
<th spellcheck="false">{{ .ExpStore.StoreName }}</th>
|
||||
<th spellcheck="false">{{ .ExpCategory.CategoryName }}</th>
|
||||
<th spellcheck="false">{{ .OwnerUser.UserName }}</th>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
|
||||
+20
-21
@@ -1,26 +1,25 @@
|
||||
function addRow(tableNameID, templateRowID) {
|
||||
const table = document.getElementById(tableNameID);
|
||||
const templateRow = document.getElementById(templateRowID);
|
||||
const clone = templateRow.cloneNode(true);
|
||||
|
||||
// Remove the ID so we don't end up duplicating it and unhide it
|
||||
clone.removeAttribute("id");
|
||||
clone.style.display = "";
|
||||
|
||||
// Enable all the disabled input fields
|
||||
// They are disabled so that they don't get grabbed by the backend
|
||||
clone.querySelectorAll('input, select').forEach(el => el.disabled = false);
|
||||
|
||||
table.appendChild(clone);
|
||||
}
|
||||
|
||||
function addShareRow() {
|
||||
const templateRow = document.getElementById("default-payment-row");
|
||||
addRow("shares-table", "template-share-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);
|
||||
function addPaymentRow() {
|
||||
addRow("payments-table", "template-payment-row");
|
||||
}
|
||||
|
||||
// forms main function
|
||||
|
||||
@@ -58,8 +58,6 @@ func (p *ExpensePayment) Insert(expID int) error {
|
||||
") " +
|
||||
"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
|
||||
@@ -74,3 +72,56 @@ func (p *ExpensePayment) Insert(expID int) error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *ExpensePayment) Update() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "UPDATE expensesPayments " +
|
||||
"SET " +
|
||||
"UserID = ?," +
|
||||
"Payed = ? " +
|
||||
"WHERE ExpPaymID = ?"
|
||||
|
||||
res, err := db.Exec(query, p.User.UserID, p.PayedAmount, p.ExpPaymID)
|
||||
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
|
||||
}
|
||||
|
||||
func (p *ExpensePayment) Delete() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "DELETE FROM expensesPayments " +
|
||||
"WHERE ExpPaymID = ?"
|
||||
|
||||
res, err := db.Exec(query, p.ExpPaymID)
|
||||
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
|
||||
}
|
||||
|
||||
@@ -58,7 +58,6 @@ func (sh *ExpenseShare) Insert(expID int) error {
|
||||
") " +
|
||||
"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
|
||||
@@ -73,3 +72,31 @@ func (sh *ExpenseShare) Insert(expID int) error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (sh *ExpenseShare) Update() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "UPDATE expensesShares " +
|
||||
"SET " +
|
||||
"UserID = ?," +
|
||||
"Share = ? " +
|
||||
"WHERE ExpShareID = ?"
|
||||
|
||||
res, err := db.Exec(query, sh.User.UserID, sh.Share, sh.ExpShareID)
|
||||
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
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package expenses
|
||||
|
||||
import "log"
|
||||
|
||||
type UserExpenseSummary struct {
|
||||
User User
|
||||
Share float32
|
||||
@@ -30,7 +28,6 @@ func (e *Expense) GetSummary() ([]UserExpenseSummary, error) {
|
||||
}
|
||||
}
|
||||
|
||||
log.Println(curSummary)
|
||||
summary = append(summary, curSummary)
|
||||
}
|
||||
|
||||
|
||||
@@ -112,7 +112,6 @@ func GetExpense(expID int) (Expense, error) {
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return Expense{}, err
|
||||
}
|
||||
|
||||
@@ -187,13 +186,36 @@ func (exp *Expense) Update() error {
|
||||
"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,
|
||||
exp.Description, exp.Value, exp.ExpStore.StoreID,
|
||||
exp.ExpCategory.CategoryID, exp.ExpType.TypeID, exp.OwnerUser.UserID,
|
||||
exp.ExpDate, exp.ExpID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, share := range exp.Shares {
|
||||
if share.ExpShareID == -1 {
|
||||
err := share.Insert(exp.ExpID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
share.Update()
|
||||
}
|
||||
}
|
||||
|
||||
for _, paym := range exp.Payments {
|
||||
if paym.ExpPaymID == -1 {
|
||||
err := paym.Insert(exp.ExpID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
paym.Update()
|
||||
}
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -203,3 +225,28 @@ func (exp *Expense) Update() error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *Expense) Delete() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "DELETE FROM expenses " +
|
||||
"WHERE ExpID = ?"
|
||||
|
||||
res, err := db.Exec(query, e.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 created")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ func main() {
|
||||
pages.RouteCategories(router)
|
||||
pages.RouteStores(router)
|
||||
pages.RouteTypes(router)
|
||||
pages.RoutePayments(router)
|
||||
pages.RouteNotFound(router)
|
||||
pages.RouteServerError(router)
|
||||
|
||||
|
||||
+29
-9
@@ -121,15 +121,6 @@ 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{
|
||||
@@ -232,6 +223,7 @@ func updateExpense(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
newExp.ExpID = expenseID
|
||||
log.Println(newExp)
|
||||
|
||||
err = newExp.Update()
|
||||
if err != nil {
|
||||
@@ -243,6 +235,33 @@ func updateExpense(c *gin.Context) {
|
||||
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
|
||||
}
|
||||
|
||||
func deleteExpense(c *gin.Context) {
|
||||
expenseID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.Header("HX-Redirect", "/404")
|
||||
return
|
||||
}
|
||||
|
||||
payment := expenses.Expense{
|
||||
ExpID: expenseID,
|
||||
}
|
||||
|
||||
err = payment.Delete()
|
||||
if err == expenses.ErrNotFound {
|
||||
errMsg := fmt.Sprintf("category %d not found", expenseID)
|
||||
c.String(http.StatusNotFound, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
errMsg := fmt.Sprintf("error deleting category %d", expenseID)
|
||||
c.String(http.StatusInternalServerError, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
c.Status(http.StatusNoContent)
|
||||
}
|
||||
|
||||
func RouteExpenses(router *gin.Engine) {
|
||||
router.GET(ExpensesPath, ExpensesGlobalPage)
|
||||
router.GET(ExpensesPath+"/:id", expensePage)
|
||||
@@ -251,4 +270,5 @@ func RouteExpenses(router *gin.Engine) {
|
||||
router.GET(ExpensesPath+"/new", newExpensePage)
|
||||
router.POST(ExpensesPath+"/new", createExpense)
|
||||
router.PUT(ExpensesPath+"/:id", updateExpense)
|
||||
router.DELETE(ExpensesPath+"/:id", deleteExpense)
|
||||
}
|
||||
|
||||
+92
-38
@@ -8,6 +8,86 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func processFormShares(c *gin.Context) ([]expenses.ExpenseShare, error) {
|
||||
shares := []expenses.ExpenseShare{}
|
||||
|
||||
sharesUserIDs := c.PostFormArray("shares-user-ids[]")
|
||||
formSharesIDs := c.PostFormArray("shares-ids[]")
|
||||
formShares := c.PostFormArray("shares-percent[]")
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
newShare := expenses.ExpenseShare{
|
||||
ExpShareID: -1,
|
||||
User: expenses.User{
|
||||
UserID: userID,
|
||||
},
|
||||
Share: float32(share),
|
||||
}
|
||||
|
||||
if formSharesIDs[i] != "" {
|
||||
id, err := strconv.Atoi(formSharesIDs[i])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
newShare.ExpShareID = id
|
||||
}
|
||||
|
||||
shares = append(shares, newShare)
|
||||
}
|
||||
|
||||
return shares, nil
|
||||
}
|
||||
|
||||
func processFormPayments(c *gin.Context) ([]expenses.ExpensePayment, error) {
|
||||
payments := []expenses.ExpensePayment{}
|
||||
|
||||
paymentsUserIDs := c.PostFormArray("payments-user-ids[]")
|
||||
formPaymentsIDs := c.PostFormArray("payments-ids[]")
|
||||
formPaymentsValues := c.PostFormArray("payments-payment[]")
|
||||
|
||||
for k := range paymentsUserIDs {
|
||||
userID, err := strconv.Atoi(paymentsUserIDs[k])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
payed, err := strconv.ParseFloat(formPaymentsValues[k], 32)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newPayment := expenses.ExpensePayment{
|
||||
ExpPaymID: -1,
|
||||
User: expenses.User{
|
||||
UserID: userID,
|
||||
},
|
||||
PayedAmount: float32(payed),
|
||||
}
|
||||
|
||||
if formPaymentsIDs[k] != "" {
|
||||
id, err := strconv.Atoi(formPaymentsIDs[k])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
newPayment.ExpPaymID = id
|
||||
}
|
||||
|
||||
payments = append(payments, newPayment)
|
||||
}
|
||||
|
||||
return payments, nil
|
||||
}
|
||||
|
||||
func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
|
||||
newDescription := c.PostForm("expense-desc")
|
||||
newDate := c.PostForm("expense-date")
|
||||
@@ -42,44 +122,13 @@ 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)
|
||||
payments, err := processFormPayments(c)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
shares, err := processFormShares(c)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newExp := expenses.Expense{
|
||||
@@ -95,6 +144,11 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
|
||||
ExpStore: expenses.Store{
|
||||
StoreID: storeID,
|
||||
},
|
||||
OwnerUser: expenses.User{
|
||||
// TODO
|
||||
// This needs to be dynamic - to be added once we have logins and whatnot
|
||||
UserID: 1,
|
||||
},
|
||||
Shares: shares,
|
||||
Payments: payments,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package pages
|
||||
|
||||
import (
|
||||
"expenses/expenses"
|
||||
"strconv"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func deletePayment(c *gin.Context) {
|
||||
paymentID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.Header("HX-Redirect", "/404")
|
||||
return
|
||||
}
|
||||
|
||||
payment := expenses.ExpensePayment{
|
||||
ExpPaymID: paymentID,
|
||||
}
|
||||
|
||||
err = payment.Delete()
|
||||
if err == expenses.ErrNotFound {
|
||||
errMsg := fmt.Sprintf("category %d not found", paymentID)
|
||||
c.String(http.StatusNotFound, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
errMsg := fmt.Sprintf("error deleting category %d", paymentID)
|
||||
c.String(http.StatusInternalServerError, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
c.Status(http.StatusNoContent)
|
||||
}
|
||||
|
||||
func RoutePayments(router *gin.Engine) {
|
||||
router.DELETE("/payments/:id", deletePayment)
|
||||
}
|
||||
Reference in New Issue
Block a user