customize date formats

This commit is contained in:
Akhil Gupta
2021-07-14 06:47:16 +05:30
parent fdec3cd78e
commit 19ab2a59dd
10 changed files with 49 additions and 10 deletions

View File

@@ -51,7 +51,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)
err := service.UpdateUserSettings(c.MustGet("userId").(string), model.Currency, *model.DistanceUnit, model.DateFormat)
if err != nil {
c.JSON(http.StatusUnprocessableEntity, common.NewError("udpateMySettings", err))
return

View File

@@ -138,6 +138,7 @@ func MigrateClarkson(connectionString string) (bool, error) {
DistanceUnit: distanceUnitMap[v.DistanceUnit],
Role: role,
Name: v.Username,
DateFormat: "MM/dd/yyyy",
}
user.SetPassword("hammond")
err = CreateUser(&user)

View File

@@ -14,6 +14,7 @@ type User struct {
Password string `json:"-"`
Currency string `json:"currency"`
DistanceUnit DistanceUnit `json:"distanceUnit"`
DateFormat string `json:"dateFormat"`
Role Role `json:"role"`
Name string `json:"name"`
Vehicles []Vehicle `gorm:"many2many:user_vehicles;" json:"vehicles"`

View File

@@ -4,6 +4,7 @@ import "github.com/akhilrex/hammond/db"
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" `
}

View File

@@ -14,7 +14,7 @@ func UpdateSettings(currency string, distanceUnit db.DistanceUnit) error {
setting.DistanceUnit = distanceUnit
return db.UpdateSettings(setting)
}
func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit) error {
func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit, dateFormat string) error {
user, err := db.GetUserById(userId)
if err != nil {
return err
@@ -22,6 +22,7 @@ func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit) e
user.Currency = currency
user.DistanceUnit = distanceUnit
user.DateFormat = dateFormat
return db.UpdateUser(user)
}

View File

@@ -13,6 +13,7 @@ func CreateUser(userModel *models.RegisterRequest, role db.Role) error {
Role: role,
Currency: setting.Currency,
DistanceUnit: setting.DistanceUnit,
DateFormat: "MM/dd/yyyy",
}
toCreate.SetPassword(userModel.Password)