Added a simple overview page for my current needs
also did a small change for the JS because the input handling was not gud
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
<form>
|
||||
<p>
|
||||
<label for="range-start">Start date:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="range-start"
|
||||
value="" id="expense-date"><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="range-end">End date:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="range-end"
|
||||
value="" id="expense-date"><br>
|
||||
</p>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
hx-post="/overview/ranged"
|
||||
hx-target="#query-results"
|
||||
hx-swap="innerHTML"
|
||||
id="expenses">QUERY</button>
|
||||
</form>
|
||||
|
||||
<div id="query-results">
|
||||
</div>
|
||||
@@ -0,0 +1,32 @@
|
||||
<table>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Desc</th>
|
||||
<th>Value</th>
|
||||
</tr>
|
||||
{{ range .expenses }}
|
||||
<tr>
|
||||
<td><a href="/expenses/{{ .ExpID }}">{{ .ExpID }}</td>
|
||||
<td spellcheck="false" contenteditable>{{ .Description }}</td>
|
||||
<td spellcheck="false" contenteditable>{{ formatPrice .Value }}</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
|
||||
<br>
|
||||
<table>
|
||||
<tr>
|
||||
<th>UserID</th>
|
||||
<th>Owes</th>
|
||||
</tr>
|
||||
{{ range $key, $value := .summary }}
|
||||
<tr>
|
||||
<td>
|
||||
{{ $key }}
|
||||
</td>
|
||||
<td>
|
||||
{{ $value }}
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
+20
-20
@@ -189,26 +189,26 @@ function customScroller() {
|
||||
|
||||
document.addEventListener("keydown", (e) => {
|
||||
const key = e.key;
|
||||
switch (key) {
|
||||
case 'j':
|
||||
elem.scrollBy(0, fontHeight);
|
||||
break;
|
||||
case 'k':
|
||||
elem.scrollBy(0, -fontHeight);
|
||||
break;
|
||||
case 'g':
|
||||
elem.scrollTo(0, 0)
|
||||
break;
|
||||
case 'G':
|
||||
elem.scrollTo(0, elem.scrollHeight)
|
||||
break;
|
||||
case 'l':
|
||||
moveTab(1)
|
||||
break;
|
||||
case 'h':
|
||||
moveTab(-1)
|
||||
break;
|
||||
}
|
||||
// switch (key) {
|
||||
// case 'j':
|
||||
// elem.scrollBy(0, fontHeight);
|
||||
// break;
|
||||
// case 'k':
|
||||
// elem.scrollBy(0, -fontHeight);
|
||||
// break;
|
||||
// case 'g':
|
||||
// elem.scrollTo(0, 0)
|
||||
// break;
|
||||
// case 'G':
|
||||
// elem.scrollTo(0, elem.scrollHeight)
|
||||
// break;
|
||||
// case 'l':
|
||||
// moveTab(1)
|
||||
// break;
|
||||
// case 'h':
|
||||
// moveTab(-1)
|
||||
// break;
|
||||
// }
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -250,3 +250,46 @@ func (e *Expense) Delete() error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// SHITTY QUERIES THAT I NEED TO PUT IN SOMEWHERE MORE OGRANHJASLD
|
||||
func GetExpensesRange(start int64, end int64) ([]Expense, error) {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "SELECT ExpID,Description,Value," +
|
||||
"Stores.StoreID,Stores.StoreName," +
|
||||
"Categories.CategoryID,Categories.CategoryName," +
|
||||
"Users.UserID,Users.UserName," +
|
||||
"ExpDate,CreationDate " +
|
||||
"FROM expenses " +
|
||||
"JOIN Stores ON stores.StoreID = expenses.StoreID " +
|
||||
"JOIN Categories ON categories.CategoryID = expenses.CategoryID " +
|
||||
"JOIN Users ON UserID = OwnerUserId "+
|
||||
"WHERE ExpDate >= ? and ExpDate <= ?"
|
||||
|
||||
var expList []Expense
|
||||
rows, err := db.Query(query, start, end)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
exp := &Expense{}
|
||||
err := rows.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.ExpDate, &exp.CreationDate,
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to parse data from db: %v", err)
|
||||
}
|
||||
expList = append(expList, *exp)
|
||||
}
|
||||
|
||||
return expList, nil
|
||||
}
|
||||
|
||||
@@ -27,6 +27,8 @@ func main() {
|
||||
pages.RouteStores(router)
|
||||
pages.RouteTypes(router)
|
||||
pages.RoutePayments(router)
|
||||
pages.RouteOverview(router)
|
||||
|
||||
pages.RouteNotFound(router)
|
||||
pages.RouteServerError(router)
|
||||
|
||||
|
||||
@@ -0,0 +1,147 @@
|
||||
package pages
|
||||
|
||||
import (
|
||||
"expenses/config"
|
||||
"expenses/expenses"
|
||||
"expenses/templating"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"html/template"
|
||||
"net/http"
|
||||
fp "path/filepath"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func overviewContent() template.HTML {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "htmx/overview.html"),
|
||||
map[string]any{},
|
||||
)
|
||||
|
||||
return content
|
||||
}
|
||||
|
||||
func overviewPartialPage(c *gin.Context) {
|
||||
content := overviewContent()
|
||||
c.String(http.StatusOK, string(content))
|
||||
}
|
||||
|
||||
func overviewPage(c *gin.Context) {
|
||||
content := overviewContent()
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "expenses",
|
||||
"renderNavBar": true,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func getResults(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
startDateStr := c.PostForm("range-start") + " 00:00:00"
|
||||
endDateStr := c.PostForm("range-end") + " 23:59:59"
|
||||
|
||||
startDateTime, err := time.ParseInLocation("02-Jan-2006 15:04:05", startDateStr, time.UTC)
|
||||
if err != nil {
|
||||
log.Printf("error startDate: %v", err)
|
||||
return
|
||||
}
|
||||
startDate := startDateTime.Unix()
|
||||
|
||||
endDateTime, err := time.ParseInLocation("02-Jan-2006 15:04:05", endDateStr, time.UTC)
|
||||
if err != nil {
|
||||
log.Printf("error endDate: %v", err)
|
||||
return
|
||||
}
|
||||
endDate := endDateTime.Unix()
|
||||
|
||||
queriedExpenses, err := expenses.GetExpensesRange(startDate, endDate)
|
||||
if err != nil {
|
||||
log.Printf("getting expenses: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
// Get the expenses and shares for each expense
|
||||
for k := range queriedExpenses {
|
||||
err = queriedExpenses[k].GetShares()
|
||||
if err != nil {
|
||||
log.Printf("failed to get shares: %v", err)
|
||||
return
|
||||
}
|
||||
err = queriedExpenses[k].GetPayments()
|
||||
if err != nil {
|
||||
log.Printf("failed to get payments: %v", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Now we are going to try and get how much each user paid and how much
|
||||
// it owes
|
||||
summary := make(map[int]float32)
|
||||
expensesWithDebts := []expenses.Expense{}
|
||||
for _, exp := range queriedExpenses {
|
||||
if len(exp.Shares) <= 1 {
|
||||
continue
|
||||
}
|
||||
|
||||
log.Printf("ID: %d, Value: %.2f", exp.ExpID, exp.Value)
|
||||
if len(exp.Shares) > 1 {
|
||||
userShares := userShares(&exp)
|
||||
userPayments := userPayments(&exp)
|
||||
|
||||
for userID, payment := range userPayments {
|
||||
owed := (userShares[userID] * exp.Value) - userPayments[userID]
|
||||
log.Printf(" [%d] %.2f - %.2f", userID, payment, owed)
|
||||
if owed > 0 {
|
||||
summary[userID] += owed
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
expensesWithDebts = append(expensesWithDebts, exp)
|
||||
}
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "htmx/overviewResults.html"),
|
||||
map[string]any{
|
||||
"expenses": expensesWithDebts,
|
||||
"summary": summary,
|
||||
},
|
||||
)
|
||||
|
||||
log.Println("Summary:")
|
||||
log.Println(summary)
|
||||
c.String(http.StatusOK, string(content))
|
||||
}
|
||||
|
||||
func userPayments(e *expenses.Expense) map[int]float32 {
|
||||
userPayments := make(map[int]float32)
|
||||
|
||||
for _, payment := range e.Payments {
|
||||
userPayments[payment.User.UserID] += payment.PayedAmount
|
||||
}
|
||||
|
||||
return userPayments
|
||||
}
|
||||
|
||||
func userShares(e *expenses.Expense) map[int]float32 {
|
||||
userShares := make(map[int]float32)
|
||||
|
||||
for _, share := range e.Shares {
|
||||
userShares[share.User.UserID] = share.Share
|
||||
}
|
||||
|
||||
return userShares
|
||||
}
|
||||
|
||||
func RouteOverview(router *gin.Engine) {
|
||||
router.GET("/overview", overviewPage)
|
||||
router.POST("/overview", overviewPartialPage)
|
||||
|
||||
router.POST("/overview/ranged", getResults)
|
||||
}
|
||||
Reference in New Issue
Block a user