diff --git a/src/assets/htmx/overview.html b/src/assets/htmx/overview.html
new file mode 100644
index 0000000..9a3af6f
--- /dev/null
+++ b/src/assets/htmx/overview.html
@@ -0,0 +1,25 @@
+
+
+
+
diff --git a/src/assets/htmx/overviewResults.html b/src/assets/htmx/overviewResults.html
new file mode 100644
index 0000000..5ebdd5e
--- /dev/null
+++ b/src/assets/htmx/overviewResults.html
@@ -0,0 +1,32 @@
+
+
+ | ID |
+ Desc |
+ Value |
+
+ {{ range .expenses }}
+
+ | {{ .ExpID }} |
+ {{ .Description }} |
+ {{ formatPrice .Value }} |
+
+ {{ end }}
+
+
+
+
+
+ | UserID |
+ Owes |
+
+ {{ range $key, $value := .summary }}
+
+ |
+ {{ $key }}
+ |
+
+ {{ $value }}
+ |
+
+ {{ end }}
+
diff --git a/src/assets/js/pager.js b/src/assets/js/pager.js
index 085bf1e..30199cc 100644
--- a/src/assets/js/pager.js
+++ b/src/assets/js/pager.js
@@ -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;
+ // }
});
}
diff --git a/src/expenses/expenses.go b/src/expenses/expenses.go
index 68457bf..6afb055 100644
--- a/src/expenses/expenses.go
+++ b/src/expenses/expenses.go
@@ -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
+}
diff --git a/src/main.go b/src/main.go
index 94f9776..9283744 100644
--- a/src/main.go
+++ b/src/main.go
@@ -27,6 +27,8 @@ func main() {
pages.RouteStores(router)
pages.RouteTypes(router)
pages.RoutePayments(router)
+ pages.RouteOverview(router)
+
pages.RouteNotFound(router)
pages.RouteServerError(router)
diff --git a/src/pages/overview.go b/src/pages/overview.go
new file mode 100644
index 0000000..8ad70a1
--- /dev/null
+++ b/src/pages/overview.go
@@ -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)
+}