The data stuff is here, now I have to refine it
This commit is contained in:
@@ -8,22 +8,22 @@
|
||||
<p>
|
||||
<label class="" for="expense-desc">Description:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="expense-name"
|
||||
id="expense-name"><br><br>
|
||||
class="tui-input underline fullwidth" type="text" name="expense-desc"
|
||||
id="expense-desc"><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="expense-date">Date:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="expense-description"
|
||||
id="expense-description"><br><br>
|
||||
class="tui-input underline fullwidth" type="text" name="expense-date"
|
||||
id="expense-date"><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="expense-date">Value:</label>
|
||||
<label for="expense-value">Value:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="expense-date"
|
||||
id="expense-date"><br><br>
|
||||
class="tui-input underline fullwidth" type="text" name="expense-value"
|
||||
id="expense-value"><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
||||
@@ -2,6 +2,7 @@ package expenses
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
|
||||
@@ -13,10 +14,11 @@ type Expense struct {
|
||||
Description string
|
||||
Value float32
|
||||
ExpStore Store
|
||||
ExpType Type
|
||||
ExpCategory Category
|
||||
OwnerUser User
|
||||
ExpDate int
|
||||
CreationDate int
|
||||
ExpDate int64
|
||||
CreationDate int64
|
||||
}
|
||||
|
||||
func NewExpense() Expense {
|
||||
@@ -110,3 +112,32 @@ func GetExpense(expID int) (Expense, error) {
|
||||
|
||||
return exp, nil
|
||||
}
|
||||
|
||||
func (exp *Expense) Insert() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "INSERT INTO expenses(" +
|
||||
"Description,Value,StoreID,CategoryID,TypeID,OwnerUserID,ExpDate" +
|
||||
") " +
|
||||
"VALUES(?, ?, ? , ?, ?, ?, ?)"
|
||||
|
||||
res, err := db.Exec(query, exp.Description, exp.Value, exp.ExpStore.StoreID,
|
||||
exp.ExpCategory.CategoryID, exp.ExpType.TypeID, 0, exp.ExpDate,
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
+73
-9
@@ -5,7 +5,9 @@ import (
|
||||
"expenses/expenses"
|
||||
"expenses/templating"
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"net/http"
|
||||
fp "path/filepath"
|
||||
@@ -134,16 +136,78 @@ func newExpensePage(c *gin.Context) {
|
||||
}
|
||||
|
||||
func createExpense(c *gin.Context) {
|
||||
// newCatName := c.PostForm("category-name")
|
||||
newDescription := c.PostForm("expense-desc")
|
||||
newDate := c.PostForm("expense-date")
|
||||
|
||||
// newExp := expenses.Expense{
|
||||
// CategoryName: newCatName,
|
||||
// }
|
||||
//
|
||||
// err := newExp.Insert()
|
||||
// if err != nil {
|
||||
// c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
|
||||
// }
|
||||
formattedDate, err := time.Parse("02-Jan-2006", newDate)
|
||||
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 {
|
||||
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
|
||||
func createTemplateEngine(name string) *template.Template {
|
||||
funcMap := template.FuncMap{
|
||||
"formatDate": func(ts int) string {
|
||||
return time.Unix(int64(ts), 0).Format("02-Jan-2006")
|
||||
"formatDate": func(ts int64) string {
|
||||
return time.Unix(ts, 0).Format("02-Jan-2006")
|
||||
},
|
||||
"formatPrice": func(v float32) string {
|
||||
return fmt.Sprintf("%.2f", v)
|
||||
|
||||
Reference in New Issue
Block a user