Merge branch 'master' of https://github.com/akhilrex/hammond

2022-04-26 11:54:59 +05:30
parent dcb58bbbdb 24105dbaaf
commit cea2566e2a
8 changed files with 9 additions and 4 deletions
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
  </a> -->

  <h1 align="center" style="margin-bottom:0">Hammond</h1>
-  <p align="center">Current Version - 2021.08.13</p>
+  <p align="center">Current Version - 2021.09.20</p>

  <p align="center">
    A self-hosted vehicle expense tracking system with support for multiple users.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
    image: akhilrex/hammond
    container_name: hammond
    environment:
-      - JWT_SECRET = somethingverystrong
+      - JWT_SECRET=somethingverystrong
    volumes:
      - /path/to/config:/config
      - /path/to/data:/assets
--- a/server/models/vehicle.go
+++ b/server/models/vehicle.go
@@ -64,7 +64,7 @@ type UpdateExpenseRequest struct {
 type CreateExpenseRequest struct {
 	VehicleID string `form:"vehicleId" json:"vehicleId" binding:"required"`

-	Amount     float32 `form:"amount" json:"amount" binding:"required"`
+	Amount     float32 `form:"amount" json:"amount"`
 	OdoReading int     `form:"odoReading" json:"odoReading"`

 	Comments    string    `form:"comments" json:"comments" `
--- a/server/service/reportService.go
+++ b/server/service/reportService.go
@@ -1,6 +1,7 @@
 package service

 import (
+	"sort"
 	"time"

 	"github.com/akhilrex/hammond/db"
@@ -15,6 +16,9 @@ func GetMileageByVehicleId(vehicleId string, since time.Time) (mileage []models.

 	fillups := make([]db.Fillup, len(*data))
 	copy(fillups, *data)
+	sort.Slice(fillups, func(i, j int) bool {
+		return fillups[i].OdoReading > fillups[j].OdoReading
+	})

 	var mileages []models.MileageModel

--- a/ui/public/hammond.png
+++ b/ui/public/hammond.png
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -5,6 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
    <link rel="shortcut icon" href="<%= webpackConfig.output.publicPath %>hammond.png" />
+    <link rel="apple-touch-icon" href="<%= webpackConfig.output.publicPath %>touch-icon.png" />
    <title><%= webpackConfig.name %></title>
  </head>
  <body>
--- a/ui/public/touch-icon.png
+++ b/ui/public/touch-icon.png
--- a/ui/src/router/views/settings.vue
+++ b/ui/src/router/views/settings.vue
@@ -181,7 +181,7 @@ export default {
        <table class="table is-hoverable">
          <tr>
            <td>Current Version</td>
-            <td>2021.08.13</td>
+            <td>2021.09.20</td>
          </tr>
          <tr>
            <td>Website</td>