tom/arbeitszeitmessung
3
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Releases 9 Wiki Activity

CHANGE: added timezone to db connection

Browse Source
This commit is contained in:
Tom Tröger
2025-02-22 01:02:10 +01:00
parent 5f886a46c5
commit 4a0d3a850a
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/database.go
View File

@@ -13,7 +13,7 @@ func OpenDatabase() (*sql.DB, error) {
dbUser := helper.GetEnv("POSTGRES_USER", "arbeit_zeit") dbUser := helper.GetEnv("POSTGRES_USER", "arbeit_zeit")
dbPassword := helper.GetEnv("POSTGRES_PASS", "password") dbPassword := helper.GetEnv("POSTGRES_PASS", "password")
connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable", dbUser, dbPassword, dbHost, dbName) connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName)
return sql.Open("postgres", connStr) return sql.Open("postgres", connStr)
} }

2
Backend/models/booking.go
View File

@@ -209,7 +209,7 @@ func checkLastBooking(b Booking) bool {
func (b *Booking) UpdateTime(newTime time.Time){ func (b *Booking) UpdateTime(newTime time.Time){
hour, minute, _ := newTime.Clock() hour, minute, _ := newTime.Clock()
if(hour == b.Timestamp.Local().Hour() && minute == b.Timestamp.Local().Minute()){ if(hour == b.Timestamp.Hour() && minute == b.Timestamp.Minute()){
return return
} }
// TODO: add check for time overlap // TODO: add check for time overlap

2
Backend/templates/timeComponents.templ
View File

@@ -122,7 +122,7 @@ templ lineComponent(){
templ bookingComponent(booking models.Booking) { templ bookingComponent(booking models.Booking) {
<div> <div>
<p class="text-neutral-500"> <p class="text-neutral-500">
<span class="text-neutral-700 group-[.edit]:hidden inline">{booking.Timestamp.Local().Format("15:04")}</span> <span class="text-neutral-700 group-[.edit]:hidden inline">{booking.Timestamp.Format("15:04")}</span>
<input name={"booking_" + strconv.Itoa(booking.CounterId)} class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" type="time" value={booking.Timestamp.Local().Format("15:04")} /> <input name={"booking_" + strconv.Itoa(booking.CounterId)} class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" type="time" value={booking.Timestamp.Local().Format("15:04")} />
{booking.GetBookingType()}</p> {booking.GetBookingType()}</p>
</div> </div>

4
Backend/templates/timeComponents_templ.go
View File

@@ -430,9 +430,9 @@ func bookingComponent(booking models.Booking) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var20 string var templ_7745c5c3_Var20 string
templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Local().Format("15:04")) templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 125, Col: 103} return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 125, Col: 95}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {

8
Docker/.env.example
View File

@@ -1,7 +1,7 @@
POSTGRES_ADMIN=root POSTGRES_USER=root
POSTGRES_ADMIN_PASS=very_secure POSTGRES_PASSWORD=very_secure
POSTGRES_USER=api_nuter POSTGRES_API_USER=api_nuter
POSTGRES_PASSWORD=password POSTGRES_API_PASSWORD=password
POSTGRES_PATH=../DB POSTGRES_PATH=../DB
POSTGRES_DB=arbeitszeitmessung POSTGRES_DB=arbeitszeitmessung
EXPOSED_PORT=8000 EXPOSED_PORT=8000