Implement switching language (but doesn't persist)

.github/workflows/hub.yml

@@ -12,18 +12,25 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
       - name: Available platforms
         run: echo ${{ steps.qemu.outputs.platforms }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
+      - name: Set up build cache
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: Parse the git tag
         id: get_tag
         run: echo ::set-output name=TAG::$(echo $GITHUB_REF | cut -d / -f 3)
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
@@ -34,10 +41,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           context: .
           file: ./Dockerfile
+          #platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          #platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           # cache-from: type=local,src=/tmp/.buildx-cache

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.6
+ARG GO_VERSION=1.16.2
 FROM golang:${GO_VERSION}-alpine AS builder
 RUN apk update && apk add alpine-sdk git && rm -rf /var/cache/apk/*
 RUN mkdir -p /api
@@ -9,11 +9,9 @@ RUN go mod download
 COPY ./server .
 RUN go build -o ./app ./main.go
 
-FROM node:16-alpine as build-stage
+FROM node:14 as build-stage
 WORKDIR /app
 COPY ./ui/package*.json ./
-RUN apk add --no-cache autoconf automake build-base nasm libc6-compat python3 py3-pip make g++ libpng-dev zlib-dev pngquant
-
 RUN npm install
 COPY ./ui .
 RUN npm run build

README.md

@@ -1,5 +1,6 @@
 <p align="center">
   <h1 align="center" style="margin-bottom:0">Hammond</h1>
+  <p align="center">Current Version - 2022.07.06</p>
 
   <p align="center">
     A self-hosted vehicle expense tracking system with support for multiple users.

server/controllers/import.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"strconv"
 
-	"hammond/models"
 	"hammond/service"
 
 	"github.com/gin-gonic/gin"
@@ -13,7 +12,6 @@ import (
 func RegisteImportController(router *gin.RouterGroup) {
 	router.POST("/import/fuelly", fuellyImport)
 	router.POST("/import/drivvo", drivvoImport)
-	router.POST("/import/generic", genericImport)
 }
 
 func fuellyImport(c *gin.Context) {
@@ -54,21 +52,3 @@ func drivvoImport(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, gin.H{})
 }
-
-func genericImport(c *gin.Context) {
-	var json models.ImportData
-	if err := c.ShouldBindJSON(&json); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
-	}
-	if json.VehicleId == "" {
-		c.JSON(http.StatusUnprocessableEntity, "Missing Vehicle ID")
-		return
-	}
-	errors := service.GenericImport(json, c.MustGet("userId").(string))
-	if len(errors) > 0 {
-		c.JSON(http.StatusUnprocessableEntity, gin.H{"errors": errors})
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{})
-}

server/controllers/masters.go

@@ -19,6 +19,7 @@ func RegisterAnonMasterConroller(router *gin.RouterGroup) {
 			"distanceUnits": db.DistanceUnitDetails,
 			"roles":         db.RoleDetails,
 			"currencies":    models.GetCurrencyMasterList(),
+			"languages": 	 models.GetLanguageMastersList(),
 		})
 	})
 }
@@ -52,7 +53,7 @@ func udpateSettings(c *gin.Context) {
 func udpateMySettings(c *gin.Context) {
 	var model models.UpdateSettingModel
 	if err := c.ShouldBind(&model); err == nil {
-		err := service.UpdateUserSettings(c.MustGet("userId").(string), model.Currency, *model.DistanceUnit, model.DateFormat)
+		err := service.UpdateUserSettings(c.MustGet("userId").(string), model.Currency, *model.DistanceUnit, model.DateFormat, model.Language)
 		if err != nil {
 			c.JSON(http.StatusUnprocessableEntity, common.NewError("udpateMySettings", err))
 			return

server/db/dbModels.go

@@ -19,6 +19,7 @@ type User struct {
 	Name         string       `json:"name"`
 	Vehicles     []Vehicle    `gorm:"many2many:user_vehicles;" json:"vehicles"`
 	IsDisabled   bool         `json:"isDisabled"`
+	Language     string       `json:"language"`
 }
 
 func (b *User) MarshalJSON() ([]byte, error) {

server/db/migrations.go

@@ -27,6 +27,10 @@ var migrations = []localMigration{
 		Name:  "2022_03_08_13_16_AddVIN",
 		Query: "ALTER TABLE vehicles ADD COLUMN vin text",
 	},
+	{
+		Name:  "2023_02_26_13_42_AddLanguage",
+		Query: "ALTER TABLE users ADD COLUMN language text default 'en'",
+	},
 }
 
 func RunMigrations() {

server/models/import.go

@@ -1,22 +0,0 @@
-package models
-
-type ImportData struct {
-	Data 			[]ImportFillup `json:"data" binding:"required"`
-	VehicleId string `json:"vehicleId" binding:"required"`
-	TimeZone	string `json:"timezone" binding:"required"`
-}
-
-type ImportFillup struct {
-	VehicleID       string       `json:"vehicleId"`
-	FuelQuantity    float32      `json:"fuelQuantity"`
-	PerUnitPrice    float32      `json:"perUnitPrice"`
-	TotalAmount     float32      `json:"totalAmount"`
-	OdoReading      int          `json:"odoReading"`
-	IsTankFull      *bool        `json:"isTankFull"`
-	HasMissedFillup *bool        `json:"hasMissedFillup"`
-	Comments        string       `json:"comments"`
-	FillingStation  string       `json:"fillingStation"`
-	UserID          string       `json:"userId"`
-	Date            string       `json:"date"`
-	FuelSubType     string       `json:"fuelSubType"`
-}

server/models/language.go

@@ -0,0 +1,24 @@
+package models
+
+type LanguageModel struct {
+	Emoji		string `json:"emoji"`
+	Name		string `json:"name"`
+	NameNative	string `json:"nameNative"`
+	Shorthand	string `json:"shorthand"`
+}
+
+func GetLanguageMastersList() []LanguageModel {
+	return []LanguageModel{
+		{
+			Emoji: "🇬🇧",
+			Name: "English",
+			NameNative: "English",
+			Shorthand: "en",
+		}, {
+			Emoji: "🇩🇪",
+			Name: "German",
+			NameNative: "Deutsch",
+			Shorthand: "de",
+		},
+	}
+}

server/models/misc.go

@@ -6,6 +6,7 @@ type UpdateSettingModel struct {
 	Currency     string           `json:"currency" form:"currency" query:"currency"`
 	DateFormat   string           `json:"dateFormat" form:"dateFormat" query:"dateFormat"`
 	DistanceUnit *db.DistanceUnit `json:"distanceUnit" form:"distanceUnit" query:"distanceUnit" `
+	Language     string           `json:"language" form:"language" query:"language"`
 }
 
 type ClarksonMigrationModel struct {

server/service/genericImportService.go

@@ -1,47 +0,0 @@
-package service
-
-import (
-	"hammond/db"
-	"hammond/models"
-	"time"
-)
-
-func GenericParseRefuelings(content []models.ImportFillup, user *db.User, vehicle *db.Vehicle, timezone string) ([]db.Fillup, []string) {
-	var errors []string
-	var fillups []db.Fillup
-	dateLayout := "2006-01-02T15:04:05.000Z"
-	loc, _ := time.LoadLocation(timezone)
-	for _, record := range content {
-		date, err := time.ParseInLocation(dateLayout, record.Date, loc)
-		if err != nil {
-			date = time.Date(2000, time.December, 0, 0, 0, 0, 0, loc)
-		}
-
-		var missedFillup bool
-		if record.HasMissedFillup == nil {
-			missedFillup = false
-		} else {
-			missedFillup = *record.HasMissedFillup
-		}
-
-		fillups = append(fillups, db.Fillup{
-			VehicleID:       vehicle.ID,
-			UserID:          user.ID,
-			Date:            date,
-			IsTankFull:      record.IsTankFull,
-			HasMissedFillup: &missedFillup,
-			FuelQuantity:    float32(record.FuelQuantity),
-			PerUnitPrice:    float32(record.PerUnitPrice),
-			FillingStation:  record.FillingStation,
-			OdoReading:      record.OdoReading,
-			TotalAmount:     float32(record.TotalAmount),
-			FuelUnit:        vehicle.FuelUnit,
-			Currency:        user.Currency,
-			DistanceUnit:    user.DistanceUnit,
-			Comments:        record.Comments,
-			Source:          "Generic Import",
-		})
-	}
-
-	return fillups, errors
-}

server/service/importService.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 
 	"hammond/db"
-	"hammond/models"
 )
 
 func WriteToDB(fillups []db.Fillup, expenses []db.Expense) []string {
@@ -106,27 +105,3 @@ func FuellyImport(content []byte, userId string) []string {
 
 	return WriteToDB(fillups, expenses)
 }
-
-func GenericImport(content models.ImportData, userId string) []string {
-	var errors []string
-	user, err := GetUserById(userId)
-	if err != nil {
-		errors = append(errors, err.Error())
-		return errors
-	}
-
-	vehicle, err := GetVehicleById(content.VehicleId)
-	if err != nil {
-		errors = append(errors, err.Error())
-		return errors
-	}
-
-	var fillups []db.Fillup
-	fillups, errors = GenericParseRefuelings(content.Data, user, vehicle, content.TimeZone)
-
-	if len(errors) != 0 {
-		return errors
-	}
-
-	return WriteToDB(fillups, nil)
-}

server/service/miscService.go

@@ -1,7 +1,9 @@
 package service
 
 import (
+	"errors"
 	"hammond/db"
+	"hammond/models"
 )
 
 func CanInitializeSystem() (bool, error) {
@@ -14,15 +16,30 @@ func UpdateSettings(currency string, distanceUnit db.DistanceUnit) error {
 	setting.DistanceUnit = distanceUnit
 	return db.UpdateSettings(setting)
 }
-func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit, dateFormat string) error {
+func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit, dateFormat string, language string) error {
 	user, err := db.GetUserById(userId)
 	if err != nil {
 		return err
 	}
 
+	// TODO: Pull into function
+	languageExists := false
+	languages := models.GetLanguageMastersList();
+	for _, lang := range languages {
+		if (language == lang.Shorthand){
+			languageExists = true
+		}
+	}
+
+	if (!languageExists) {
+		return errors.New("Language not in masters list")
+	}
+
+
 	user.Currency = currency
 	user.DistanceUnit = distanceUnit
 	user.DateFormat = dateFormat
+	user.Language = language
 	return db.UpdateUser(user)
 }
 

ui/package.json

@@ -36,7 +36,6 @@
     "node-gyp": "^9.3.1",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
-    "papaparse": "^5.4.1",
     "vue": "^2.6.11",
     "vue-chartjs": "^3.5.1",
     "vue-i18n": "^8.28.2",

ui/src/locales/de.json

@@ -137,7 +137,7 @@
     "dontimportagain": "Achte darauf, dass du die Datei nicht erneut importierst, da dies zu mehrfachen Einträgen führen würde.",
     "checkpointsimportcsv": "Wenn du alle diese Punkte überprüft hast kannst du unten die CSV importieren.",
     "importhintunits": "Vergewissere dich ebenfalls, dass die <u>Kraftstoffeinheit</u> und der <u>Kraftstofftyp</u> im Fahrzeug richtig eingestellt sind.",
-    "importhintcurrdist": "Stelle sicher, dass die <u>Währung</u> und die <u>Entfernungseinheit</u> in Hammond korrekt eingestellt sind. Der Import erkennt die Währung nicht automatisch aus der datei, sondern verwendet die für den Benutzer eingestellte Währung.",
+    "importhintcurrdist": "Stelle sicher, dass die <u>Währung</u> und die <u>Entfernungseinheit</u> in Hammond korrekt eingestellt sind. Der Import erkennt die Währung nicht automatisch aus der CSV-Datei, sondern verwendet die für den Benutzer eingestellte Währung.",
     "importhintnickname": "Vergewissere dich, dass der Fahrzeugname in Hammond genau mit dem Namen in der Fuelly-CSV-Datei übereinstimmt, sonst funktioniert der Import nicht.",
     "importhintvehiclecreated": "Vergewissere dich, dass du die Fahrzeuge bereits in Hammond erstellt hast.",
     "importhintcreatecsv": "Exportiere deine Daten aus {name} im CSV-Format. Die Schritte dazu findest du",

ui/src/locales/en.json

@@ -5,7 +5,7 @@
     "thismonth": "This month",
     "pastxdays": "Past one day | Past {count} days",
     "pastxmonths": "Past one month | Past {count} months",
-    "thisyear": "This year",
+    "thisyear": "This year", 
     "alltime": "All Time",
     "noattachments": "No Attachments so far",
     "attachments": "Attachments",
@@ -43,15 +43,15 @@
     "createnow": "Create Now",
     "yourvehicles": "Your Vehicles",
     "menu": {
-        "quickentries": "Quick Entries",
-        "logout": "Log out",
-        "import": "Import",
-        "home": "Home",
-        "settings": "Settings",
-        "admin": "Admin",
-        "sitesettings": "Site Settings",
-        "users": "Users",
-        "login": "Log in"
+      "quickentries": "Quick Entries",
+      "logout": "Log out",
+      "import": "Import",
+      "home": "Home",
+      "settings": "Settings",
+      "admin": "Admin",
+      "sitesettings": "Site Settings",
+      "users": "Users",
+      "login": "Log in"
     },
     "enterusername": "Enter your username",
     "enterpassword": "Enter your password",
@@ -81,34 +81,34 @@
     "quantity": "Quantity",
     "gasstation": "Gas Station",
     "fuel": {
-        "petrol": "Petrol",
-        "diesel": "Diesel",
-        "cng": "CNG",
-        "lpg": "LPG",
-        "electric": "Electric",
-        "ethanol": "Ethanol"
+      "petrol": "Petrol",
+      "diesel": "Diesel",
+      "cng": "CNG",
+      "lpg": "LPG",
+      "electric": "Electric",
+      "ethanol": "Ethanol"
     },
     "unit": {
-        "long": {
-            "litre": "Litre",
-            "gallon": "Gallon",
-            "kilowatthour": "Kilowatt Hour",
-            "kilogram": "Kilogram",
-            "usgallon": "US Gallon",
-            "minutes": "Minutes",
-            "kilometers": "Kilometers",
-            "miles": "Miles"
-        },
-        "short": {
-            "litre": "Lt",
-            "gallon": "Gal",
-            "kilowatthour": "KwH",
-            "kilogram": "Kg",
-            "usgallon": "US Gal",
-            "minutes": "Mins",
-            "kilometers": "Km",
-            "miles": "Mi"
-        }
+      "long": {
+        "litre": "Litre",
+        "gallon": "Gallon",
+        "kilowatthour": "Kilowatt Hour",
+        "kilogram": "Kilogram",
+        "usgallon": "US Gallon",
+        "minutes": "Minutes",
+        "kilometers": "Kilometers",
+        "miles": "Miles"
+      },
+      "short": {
+        "litre": "Lt",
+        "gallon": "Gal",
+        "kilowatthour": "KwH",
+        "kilogram": "Kg",
+        "usgallon": "US Gal",
+        "minutes": "Mins",
+        "kilometers": "Km",
+        "miles": "Mi"
+      }
     },
     "avgfillupqty": "Avg Fillup Qty",
     "avgfillupexpense": "Avg Fillup Expense",
@@ -117,9 +117,7 @@
     "price": "Price",
     "total": "Total",
     "fulltank": "Tank Full",
-    "partialfillup": "Partial Fillup",
     "getafulltank": "Did you get a full tank?",
-    "tankpartialfull": "Which do you track?",
     "by": "By",
     "expenses": "Expenses",
     "expensetype": "Expense Type",
@@ -132,8 +130,6 @@
     "importdatadesc": "Choose from the following options to import data into Hammond",
     "import": "Import",
     "importcsv": "If you have been using {name} to store your vehicle data, export the CSV file from {name} and click here to import.",
-    "importgeneric": "Generic Fillups Import",
-    "importgenericdesc": "Fillups CSV import.",
     "choosecsv": "Choose CSV",
     "choosephoto": "Choose Photo",
     "importsuccessfull": "Data Imported Successfully",
@@ -141,15 +137,13 @@
     "importfrom": "Import from {0}",
     "stepstoimport": "Steps to import data from {name}",
     "choosecsvimport": "Choose the {name} CSV and press the import button.",
-    "choosedatafile": "Choose the CSV file and then press the import button.",
     "dontimportagain": "Make sure that you do not import the file again because that will create repeat entries.",
     "checkpointsimportcsv": "Once you have checked all these points, just import the CSV below.",
     "importhintunits": "Similiarly, make sure that the <u>Fuel Unit</u> and <u>Fuel Type</u> are correctly set in the Vehicle.",
-    "importhintcurrdist": "Make sure that the <u>Currency</u> and <u>Distance Unit</u> are set correctly in Hammond. Import will not autodetect Currency from the file but use the one set for the user.",
+    "importhintcurrdist": "Make sure that the <u>Currency</u> and <u>Distance Unit</u> are set correctly in Hammond. Import will not autodetect Currency from the CSV but use the one set for the user.",
     "importhintnickname": "Make sure that the Vehicle nickname in Hammond is exactly the same as the name on Fuelly CSV or the import will not work.",
     "importhintvehiclecreated": "Make sure that you have already created the vehicles in Hammond platform.",
     "importhintcreatecsv": "Export your data from {name} in the CSV format. Steps to do that can be found",
-    "importgenerichintdata": "Data must be in CSV format.",
     "here": "here",
     "unprocessedquickentries": "You have one quick entry to be processed. | You have {0} quick entries pending to be processed.",
     "show": "Show",
@@ -184,7 +178,6 @@
     "fillingstation": "Filling Station Name",
     "comments": "Comments",
     "missfillupbefore": "Did you miss the fillup entry before this one?",
-    "missedfillup": "Missed Fillup",
     "fillupdate": "Fillup Date",
     "fillupsavedsuccessfully": "Fillup Saved Successfully",
     "expensesavedsuccessfully": "Expense Saved Successfully",
@@ -202,25 +195,25 @@
     "testconn": "Test Connection",
     "migrate": "Migrate",
     "init": {
-        "migrateclarkson": "Migrate from Clarkson",
-        "migrateclarksondesc": "If you have an existing Clarkson deployment and you want to migrate your data from that, press the following button.",
-        "freshinstall": "Fresh Install",
-        "freshinstalldesc": "If you want a fresh install of Hammond, press the following button.",
-        "clarkson": {
-            "desc": "<p>You need to make sure that this deployment of Hammond can access the MySQL database used by Clarkson.</p><p>If that is not directly possible, you can make a copy of that database somewhere accessible from this instance.</p><p>Once that is done, enter the connection string to the MySQL instance in the following format.</p><p>All the users imported from Clarkson will have their username as their email in Clarkson database and pasword set to<span class='' style='font-weight:bold'>hammond</span></p><code>user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local</code><br/><br/>",
-            "success": "We have successfully migrated the data from Clarkson. You will be redirected to the login screen shortly where you can login using your existing email and password : hammond"
-        },
-        "fresh": {
-            "setupadminuser": "Setup Admin Users",
-            "yourpassword": "Your Password",
-            "youremail": "Your Email",
-            "yourname": "Your Name",
-            "success": "You have been registered successfully. You will be redirected to the login screen shortly where you can login and start using the system."
-        }
+      "migrateclarkson": "Migrate from Clarkson",
+      "migrateclarksondesc": "If you have an existing Clarkson deployment and you want to migrate your data from that, press the following button.",
+      "freshinstall": "Fresh Install",
+      "freshinstalldesc": "If you want a fresh install of Hammond, press the following button.",
+      "clarkson": {
+        "desc": "<p>You need to make sure that this deployment of Hammond can access the MySQL database used by Clarkson.</p><p>If that is not directly possible, you can make a copy of that database somewhere accessible from this instance.</p><p>Once that is done, enter the connection string to the MySQL instance in the following format.</p><p>All the users imported from Clarkson will have their username as their email in Clarkson database and pasword set to<span class='' style='font-weight:bold'>hammond</span></p><code>user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local</code><br/><br/>",
+        "success": "We have successfully migrated the data from Clarkson. You will be redirected to the login screen shortly where you can login using your existing email and password : hammond"
+      },
+      "fresh": {
+        "setupadminuser": "Setup Admin Users",
+        "yourpassword": "Your Password",
+        "youremail": "Your Email",
+        "yourname": "Your Name",
+        "success": "You have been registered successfully. You will be redirected to the login screen shortly where you can login and start using the system."
+      }
     },
     "roles": {
-        "ADMIN": "ADMIN",
-        "USER": "USER"
+      "ADMIN": "ADMIN",
+      "USER": "USER"
     },
     "profile": "Profile",
     "processedon": "Processed on",
@@ -228,4 +221,4 @@
     "disable": "Disable",
     "confirm": "Go Ahead",
     "labelforfile": "Label for this file"
-}
+  }

ui/src/main.js

@@ -7,7 +7,6 @@ import {
   faCheck,
   faTimes,
   faArrowUp,
-  faArrowRotateLeft,
   faAngleLeft,
   faAngleRight,
   faCalendar,
@@ -39,7 +38,6 @@ library.add(
   faCheck,
   faTimes,
   faArrowUp,
-  faArrowRotateLeft,
   faAngleLeft,
   faAngleRight,
   faCalendar,

ui/src/router/routes.js

@@ -419,15 +419,6 @@ export default [
     },
     props: (route) => ({ user: store.state.auth.currentUser || {} }),
   },
-  {
-    path: '/import/generic',
-    name: 'import-generic',
-    component: () => lazyLoadView(import('@views/import-generic.vue')),
-    meta: {
-      authRequired: true,
-    },
-    props: (route) => ({ user: store.state.auth.currentUser || {} }),
-  },
   {
     path: '/logout',
     name: 'logout',

ui/src/router/views/createFillup.vue

@@ -76,9 +76,6 @@ export default {
     this.fetchVehicleFuelSubTypes()
     if (!this.fillup.id) {
       this.fillupModel = this.getEmptyFillup()
-      if (this.vehicle.fillups.length > 0) {
-        this.fillupModel.odoReading = this.vehicle.fillups[0].odoReading
-      }
       this.fillupModel.userId = this.me.id
     }
   },
@@ -280,15 +277,7 @@ export default {
       </b-field>
       <br />
       <b-field>
-        <b-button
-          tag="button"
-          native-type="submit"
-          :disabled="tryingToCreate"
-          type="is-primary"
-          :value="$t('save')"
-          :label="$t('createfillup')"
-          expanded
-        />
+        <b-button tag="button" native-type="submit" :disabled="tryingToCreate" type="is-primary" :value="$t('save')" :label="$t('createfillup')" expanded/> 
         <p v-if="authError">
           There was an error logging in to your account.
         </p>

ui/src/router/views/import-generic.unit.js

@@ -1,7 +0,0 @@
-import ImportGeneric from './import-generic'
-
-describe('@views/import-generic', () => {
-  it('is a valid view', () => {
-    expect(ImportGeneric).toBeAViewComponent()
-  })
-})

ui/src/router/views/import-generic.vue

@@ -1,411 +0,0 @@
-<script>
-import Layout from '@layouts/main.vue'
-import { mapState } from 'vuex'
-import axios from 'axios'
-import Papa from 'papaparse'
-
-export default {
-  page: {
-    title: 'Generic Import',
-    meta: [{ name: 'description', content: 'The Generic Import page.' }],
-  },
-  components: { Layout },
-  props: {
-    user: {
-      type: Object,
-      required: true,
-    },
-  },
-  data: function () {
-    return {
-      file: null,
-      tryingToCreate: false,
-      errors: [],
-      papaConfig: { dynamicTyping: true, skipEmptyLines: true, complete: this.assignResults },
-      fileData: null,
-      fileHeadings: null,
-      myVehicles: [],
-      selectedVehicle: null,
-      invertFullTank: null,
-      filledValueString: '',
-      notFilledValueString: '',
-      isFullTankString: false,
-      fileHeadingMap: {
-        fuelQuantity: null,
-        perUnitPrice: null,
-        totalAmount: null,
-        odoReading: null,
-        isTankFull: null,
-        hasMissedFillup: null,
-        comments: [], // [int]
-        fillingStation: null,
-        date: null,
-        fuelSubType: null,
-      },
-    }
-  },
-  computed: {
-    ...mapState('utils', ['isMobile']),
-    ...mapState('vehicles', ['vehicles']),
-    uploadButtonLabel() {
-      if (this.isMobile) {
-        if (this.file == null) {
-          return this.$t('choosephoto')
-        } else {
-          return ''
-        }
-      } else {
-        if (this.file == null) {
-          return this.$t('choosefile')
-        } else {
-          return ''
-        }
-      }
-    },
-  },
-  mounted() {
-    this.myVehicles = this.vehicles
-  },
-  methods: {
-    assignResults(results, file) {
-      this.fileData = results.data
-      this.fileHeadings = results.data[0]
-    },
-    parseCSV() {
-      if (this.file == null) {
-        return
-      }
-      this.errorMessage = ''
-      Papa.parse(this.file, this.papaConfig)
-    },
-    getUsedHeadings() {
-      return Object.keys(this.fileHeadingMap).filter((k) => this.fileHeadingMap[k] != null) // filter non-null properties
-    },
-    getTimezone() {
-      return Intl.DateTimeFormat().resolvedOptions().timeZone
-    },
-    csvToJson() {
-      const data = []
-      const headings = this.getUsedHeadings().reduce((a, k) => ({ ...a, [k]: this.fileHeadingMap[k] }), {}) // create new object from filter
-      const comments = (row) => {
-        return this.fileHeadingMap.comments.reduce((a, fi) => {
-          // TODO: sanitize to prevent XSS
-          return `${a}${this.fileHeadings[fi]}: ${row[fi]}\n`
-        }, '')
-      }
-      const calculateTotal = (row) => {
-        return this.fileHeadingMap.totalAmount === -1
-          ? row[this.fileHeadingMap.fuelQuantity] * row[this.fileHeadingMap.perUnitPrice]
-          : row[this.fileHeadingMap.totalAmount]
-      }
-
-      const setFullTank = (row) => {
-        if (row[this.fileHeadingMap.isTankFull].toLowerCase() === this.filledValueString.toLowerCase()) {
-          return true
-        } else if (row[this.fileHeadingMap.isTankFull].toLowerCase() === this.notFilledValueString.toLowerCase()) {
-          return false
-        } else {
-          // TODO: need to handle errors better
-          throw Error
-        }
-      }
-
-      for (let r = 1; r < this.fileData.length; r++) {
-        const row = this.fileData[r]
-        const item = {}
-        Object.keys(headings).forEach((k) => {
-          if (k === 'comments') {
-            item[k] = comments(row)
-          } else if (k === 'totalAmount') {
-            item[k] = calculateTotal(row)
-          } else if (k === 'isTankFull') {
-            if (this.isFullTankString) {
-              item[k] = setFullTank(row)
-            } else {
-              if (this.invertFullTank) {
-                item[k] = Boolean(!row[headings[k]])
-              } else {
-                item[k] = Boolean(row[headings[k]])
-              }
-            }
-          } else if (k === 'hasMissedFillup') {
-            // TODO: need to account for this field being a string
-            item[k] = Boolean(row[headings[k]])
-          } else if (k === 'date') {
-            item[k] = new Date(row[headings[k]]).toISOString()
-          } else {
-            item[k] = row[headings[k]]
-          }
-        })
-        data.push(item)
-      }
-      return data
-    },
-    importData() {
-      if (this.errors.length === 0) {
-        try {
-          const content = {
-            data: this.csvToJson(),
-            vehicleId: this.selectedVehicle.id,
-            timezone: this.getTimezone(),
-          }
-          axios
-            .post('/api/import/generic', content)
-            .then((data) => {
-              this.$buefy.toast.open({
-                message: this.$t('importsuccessfull'),
-                type: 'is-success',
-                duration: 3000,
-              })
-              setTimeout(() => this.$router.push({ name: 'home' }), 1000)
-            })
-            .catch((ex) => {
-              this.$buefy.toast.open({
-                duration: 5000,
-                message: this.$t('importerror'),
-                position: 'is-bottom',
-                type: 'is-danger',
-              })
-              console.log(ex)
-              if (ex.response && ex.response.data.error) {
-                this.errors.push(ex.response.data.error)
-              }
-            })
-        } catch (e) {
-          // TODO: handle error
-          this.errors.push(e)
-        }
-      } else {
-        this.errors.push('fix errors')
-      }
-    },
-    checkFieldString() {
-      const tankFull = this.fileData[1][this.fileHeadingMap.isTankFull]
-      if (typeof tankFull !== 'boolean' && typeof tankFull === 'string') {
-        this.isFullTankString = true
-      }
-    },
-    clearHeadingProperty(property) {
-      if (property === 'comments') {
-        this.fileHeadingMap[property] = []
-      } else {
-        this.fileHeadingMap[property] = null
-      }
-    },
-  },
-}
-</script>
-
-<template>
-  <Layout>
-    <div class="columns box">
-      <div class="column">
-        <h1 class="title">{{ $t('importgeneric') }}</h1>
-      </div>
-    </div>
-    <br />
-    <div v-if="fileData === null" class="columns">
-      <div class="column">
-        <p class="subtitle"> {{ $t('stepstoimport', { name: 'CSV' }) }}</p>
-        <ol>
-          <!-- <li>{{ $t('importhintcreatecsv', { 'name': 'Fuelly' }) }} <a href="http://docs.fuelly.com/acar-import-export-center" target="_nofollow">{{ $t('here') }}</a>.</li> -->
-          <li>{{ $t('importgenerichintdata') }}</li>
-          <li>{{ $t('importhintvehiclecreated') }}</li>
-          <li v-html="$t('importhintcurrdist')"></li>
-          <li v-html="$t('importhintunits')"></li>
-          <li>
-            <b>{{ $t('dontimportagain') }}</b>
-          </li>
-        </ol>
-      </div>
-    </div>
-    <div v-if="fileData === null" class="section box">
-      <div class="columns">
-        <div class="column is-two-thirds">
-          <p class="subtitle">{{ $t('choosedatafile') }}</p>
-        </div>
-        <div class="column is-one-third is-flex is-align-content-center">
-          <form @submit.prevent="parseCSV">
-            <div class="columns">
-              <div class="column">
-                <b-field class="file is-primary" :class="{ 'has-name': !!file }">
-                  <b-upload v-model="file" class="file-label" accept=".csv" required>
-                    <span class="file-cta">
-                      <b-icon class="file-icon" icon="upload"></b-icon>
-                      <span class="file-label">{{ uploadButtonLabel }}</span>
-                    </span>
-                    <span v-if="file" class="file-name" :class="isMobile ? 'file-name-mobile' : 'file-name-desktop'">
-                      {{ file.name }}
-                    </span>
-                  </b-upload>
-                </b-field>
-              </div>
-              <div class="column">
-                <b-button tag="button" native-type="submit" type="is-primary" class="control">
-                  {{ $t('import') }}
-                </b-button>
-              </div>
-            </div>
-          </form>
-        </div>
-      </div>
-    </div>
-    <div v-else class="columns">
-      <div class="column">
-        <p class="subtitle">Map Fields</p>
-        <form class="" @submit.prevent="importData">
-          <b-field :label="$t('selectvehicle')">
-            <b-select v-model="selectedVehicle" :placeholder="$t('vehicle')" required expanded>
-              <option v-for="option in myVehicles" :key="option.id" :value="option">
-                {{ option.nickname }}
-              </option>
-            </b-select>
-          </b-field>
-          <span v-if="selectedVehicle !== null">
-            <b-field :label="$t('fillupdate')">
-              <b-select v-model="fileHeadingMap.date" required expanded>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field>
-              <template v-slot:label>
-                {{ $t('fuelsubtype') }}
-                <b-tooltip type="is-dark" label="Clear selection">
-                  <b-button
-                    type="is-ghost"
-                    size="is-small"
-                    icon-pack="fas"
-                    icon-right="arrow-rotate-left"
-                    @click="clearHeadingProperty('fuelSubType')"
-                  ></b-button>
-                </b-tooltip>
-              </template>
-              <b-select v-model="fileHeadingMap.fuelSubType" expanded>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field :label="$t('quantity')">
-              <b-select v-model="fileHeadingMap.fuelQuantity" expanded required>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field :label="$t('per', { '0': $t('price'), '1': $t('unit.short.' + selectedVehicle.fuelUnitDetail.key) })">
-              <b-select v-model.number="fileHeadingMap.perUnitPrice" type="number" min="0" step=".001" expanded required>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field :label="$t('totalamountpaid')">
-              <b-select v-model.number="fileHeadingMap.totalAmount" expanded required>
-                <option value="-1">Calculated</option>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field :label="$t('odometer')">
-              <b-select v-model.number="fileHeadingMap.odoReading" expanded required>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field :label="$t('tankpartialfull')">
-              <b-radio-button v-model="invertFullTank" native-value="false">{{ $t('fulltank') }}</b-radio-button>
-              <b-radio-button v-model="invertFullTank" native-value="true">{{ $t('partialfillup') }}</b-radio-button>
-            </b-field>
-            <b-field>
-              <b-select v-model="fileHeadingMap.isTankFull" required @input="checkFieldString">
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <span v-if="isFullTankString === true" required>
-              <b-field label="Value when tank is filled">
-                <b-input v-model="filledValueString"></b-input>
-              </b-field>
-              <b-field label="Value when tank was not completely filled">
-                <b-input v-model="notFilledValueString"></b-input>
-              </b-field>
-            </span>
-            <b-field>
-              <template v-slot:label>
-                {{ $t('missedfillup') }}
-                <b-tooltip type="is-dark" label="Clear selection">
-                  <b-button
-                    type="is-ghost"
-                    size="is-small"
-                    icon-pack="fas"
-                    icon-right="arrow-rotate-left"
-                    @click="clearHeadingProperty('hasMissedFillup')"
-                  ></b-button>
-                </b-tooltip>
-              </template>
-              <b-select v-model="fileHeadingMap.hasMissedFillup">
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field>
-              <template v-slot:label>
-                {{ $t('fillingstation') }}
-                <b-tooltip type="is-dark" label="Clear selection">
-                  <b-button
-                    type="is-ghost"
-                    size="is-small"
-                    icon-pack="fas"
-                    icon-right="arrow-rotate-left"
-                    @click="clearHeadingProperty('fillingStation')"
-                  ></b-button>
-                </b-tooltip>
-              </template>
-              <b-select v-model="fileHeadingMap.fillingStation">
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <b-field>
-              <template v-slot:label>
-                {{ $t('comments') }}
-                <b-tooltip type="is-dark" label="Clear selection">
-                  <b-button
-                    type="is-ghost"
-                    size="is-small"
-                    icon-pack="fas"
-                    icon-right="arrow-rotate-left"
-                    @click="clearHeadingProperty('comments')"
-                  ></b-button>
-                </b-tooltip>
-              </template>
-              <b-select v-model="fileHeadingMap.comments" type="textarea" multiple expanded>
-                <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
-                  {{ option }}
-                </option>
-              </b-select>
-            </b-field>
-            <br />
-            <b-field>
-              <b-button tag="button" native-type="submit" type="is-primary" :value="$t('save')" :label="$t('import')" expanded />
-              <p v-if="authError"> There was an error logging in to your account. </p>
-            </b-field>
-          </span>
-        </form>
-      </div>
-    </div>
-    <b-message v-if="errors.length" type="is-danger">
-      <ul>
-        <li v-for="error in errors" :key="error">{{ error }}</li>
-      </ul>
-    </b-message>
-  </Layout>
-</template>

ui/src/router/views/import.vue

@@ -18,19 +18,18 @@ export default {
 
 <template>
   <Layout>
-    <div class="columns box">
-      <div class="column">
+    <div class="columns box"
+      ><div class="column">
         <h1 class="title">{{ $t('importdata') }}</h1>
         <p class="subtitle">{{ $t('importdatadesc') }}</p>
-      </div>
-    </div>
+      </div></div
+    >
     <br />
     <div class="columns">
       <div class="column is-one-third">
         <div class="box">
           <h1 class="title">Fuelly</h1>
-          <p>If you have been using Fuelly to store your vehicle data, export the CSV file from Fuelly and click here to
-            import.</p>
+          <p>If you have been using Fuelly to store your vehicle data, export the CSV file from Fuelly and click here to import.</p>
           <br />
           <b-button type="is-primary" tag="router-link" to="/import/fuelly">{{ $t('import') }}</b-button>
         </div>
@@ -44,16 +43,6 @@ export default {
           <b-button type="is-primary" tag="router-link" to="/import/drivvo">{{ $t('import') }}</b-button>
         </div>
       </div>
-
-
-      <div class="column is-one-third" to="/import-generic">
-        <div class="box">
-          <h1 class="title">{{ $t('importgeneric') }}</h1>
-          <p>{{ $t('importgenericdesc') }}</p>
-          <br />
-          <b-button type="is-primary" tag="router-link" to="/import/generic">{{ $t('import') }}</b-button>
-        </div>
-      </div>
     </div>
   </Layout>
 </template>

ui/src/router/views/settings.vue

@@ -22,11 +22,13 @@ export default {
   data: function() {
     return {
       settingsModel: {
+        language: this.me.language,
         currency: this.me.currency,
         distanceUnit: this.me.distanceUnit,
         dateFormat: this.me.dateFormat,
       },
       tryingToSave: false,
+      selectedLanguage: "",
       changePassModel: {
         old: '',
         new: '',
@@ -36,7 +38,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('vehicles', ['currencyMasters', 'distanceUnitMasters']),
+    ...mapState('masters', ['currencyMasters', 'languageMasters', 'distanceUnitMasters']),
     passwordValid() {
       if (this.changePassModel.new === '' || this.changePassModel.renew === '') {
         return true
@@ -59,6 +61,9 @@ export default {
       })
     },
   },
+  mounted() {
+    this.selectedLanguage = this.formatLanguage(this.languageMasters.filter(x => x.shorthand === this.me.language)[0])
+  },
   methods: {
     changePassword() {
       if (!this.passwordValid) {
@@ -110,6 +115,7 @@ export default {
             type: 'is-success',
             duration: 3000,
           })
+          this.$i18n.locale = this.settingsModel.language
         })
         .catch((ex) => {
           this.$buefy.toast.open({
@@ -126,6 +132,9 @@ export default {
     formatCurrency(option) {
       return `${option.namePlural} (${option.code})`
     },
+    formatLanguage(option) {
+      return `${option.nameNative} ${option.emoji}`
+    },
   },
 }
 </script>
@@ -136,9 +145,18 @@ export default {
     <div class="columns"
       ><div class="column">
         <form class="box " @submit.prevent="saveSettings">
-          <h1 class="subtitle">
-            {{ $t('settingdesc') }}
-          </h1>
+          <b-field :label="$t('language')">
+          <b-autocomplete 
+            v-model="selectedLanguage"
+            :placeholder="$t('language')"
+            :keep-first="true"
+            :custom-formatter="formatLanguage"
+            :data="languageMasters"
+            :open-on-focus="true"
+            required
+            @select="(option) => (settingsModel.language = option.shorthand)"
+          />
+            </b-field>
           <b-field :label="$t('currency')">
             <b-autocomplete
               v-model="settingsModel.currency"

ui/src/state/modules/masters.js

@@ -0,0 +1,52 @@
+import axios from 'axios'
+
+export const state = {
+  languageMasters: [],
+  fuelUnitMasters: [],
+  distanceUnitMasters: [],
+  currencyMasters: [],
+  fuelTypeMasters: [],
+  roleMasters: [],
+}
+export const mutations = {
+  CACHE_LANGUAGE_MASTERS(state, masters) {
+    state.languageMasters = masters
+  },
+  CACHE_FUEL_UNIT_MASTERS(state, masters) {
+    state.fuelUnitMasters = masters
+  },
+  CACHE_DISTANCE_UNIT_MASTERS(state, masters) {
+    state.distanceUnitMasters = masters
+  },
+  CACHE_FUEL_TYPE_MASTERS(state, masters) {
+    state.fuelTypeMasters = masters
+  },
+  CACHE_CURRENCY_MASTERS(state, masters) {
+    state.currencyMasters = masters
+  },
+  CACHE_ROLE_MASTERS(state, roles) {
+    state.roleMasters = roles
+  },
+}
+
+export const getters = {}
+
+export const actions = {
+  init({ dispatch, rootState }) {
+    const { currentUser } = rootState.auth
+    if (currentUser) {
+      dispatch('fetchMasters')
+    }
+  },
+  fetchMasters({ commit, state, rootState }) {
+    return axios.get('/api/masters').then((response) => {
+      commit('CACHE_LANGUAGE_MASTERS', response.data.languages)
+      commit('CACHE_FUEL_UNIT_MASTERS', response.data.fuelUnits)
+      commit('CACHE_FUEL_TYPE_MASTERS', response.data.fuelTypes)
+      commit('CACHE_CURRENCY_MASTERS', response.data.currencies)
+      commit('CACHE_DISTANCE_UNIT_MASTERS', response.data.distanceUnits)
+      commit('CACHE_ROLE_MASTERS', response.data.roles)
+      return response.data
+    })
+  },
+}

ui/src/state/modules/vehicles.js

@@ -4,11 +4,6 @@ import { filter } from 'lodash'
 import parseISO from 'date-fns/parseISO'
 export const state = {
   vehicles: [],
-  roleMasters: [],
-  fuelUnitMasters: [],
-  distanceUnitMasters: [],
-  currencyMasters: [],
-  fuelTypeMasters: [],
   quickEntries: [],
   vehicleStats: new Map(),
 }
@@ -29,24 +24,9 @@ export const mutations = {
   CACHE_VEHICLE_STATS(state, stats) {
     state.vehicleStats.set(stats.vehicleId, stats)
   },
-  CACHE_FUEL_UNIT_MASTERS(state, masters) {
-    state.fuelUnitMasters = masters
-  },
-  CACHE_DISTANCE_UNIT_MASTERS(state, masters) {
-    state.distanceUnitMasters = masters
-  },
-  CACHE_FUEL_TYPE_MASTERS(state, masters) {
-    state.fuelTypeMasters = masters
-  },
-  CACHE_CURRENCY_MASTERS(state, masters) {
-    state.currencyMasters = masters
-  },
   CACHE_QUICK_ENTRIES(state, entries) {
     state.quickEntries = entries
   },
-  CACHE_ROLE_MASTERS(state, roles) {
-    state.roleMasters = roles
-  },
 }
 
 export const actions = {
@@ -54,22 +34,9 @@ export const actions = {
     const { currentUser } = rootState.auth
     if (currentUser) {
       dispatch('fetchVehicles')
-      dispatch('fetchMasters')
       dispatch('fetchQuickEntries', { force: true })
     }
   },
-  fetchMasters({ commit, state, rootState }) {
-    return axios.get('/api/masters').then((response) => {
-      const fuelUnitMasters = response.data.fuelUnits
-      const fuelTypeMasters = response.data.fuelTypes
-      commit('CACHE_FUEL_UNIT_MASTERS', fuelUnitMasters)
-      commit('CACHE_FUEL_TYPE_MASTERS', fuelTypeMasters)
-      commit('CACHE_CURRENCY_MASTERS', response.data.currencies)
-      commit('CACHE_DISTANCE_UNIT_MASTERS', response.data.distanceUnits)
-      commit('CACHE_ROLE_MASTERS', response.data.roles)
-      return response.data
-    })
-  },
   fetchVehicles({ commit, state, rootState }) {
     return axios.get('/api/me/vehicles').then((response) => {
       const data = response.data