From 0f51cd2848c5412650b55a29b7ce74b097b65930 Mon Sep 17 00:00:00 2001 From: hysn99 Date: Fri, 26 Apr 2024 15:01:18 +0300 Subject: [PATCH] decimal price bug solved --- app/lib/bot/luca.go | 14 +++++++++++++- app/lib/srv/srv.go | 14 +++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/lib/bot/luca.go b/app/lib/bot/luca.go index 406dfaa..1d52659 100644 --- a/app/lib/bot/luca.go +++ b/app/lib/bot/luca.go @@ -636,6 +636,7 @@ func (l *Luca) BordroYaz(month, year int, b *LucaBordro, lastItem bool) error { for i := 0; i < len(rsp); i++ { if k == rsp[i].Value { + Wait(frame3, 200) if rsp[i].itemType == "selectBox" { elemBox, err := frame3.Element("#" + rsp[i].Index) if err != nil { @@ -653,7 +654,18 @@ func (l *Luca) BordroYaz(month, year int, b *LucaBordro, lastItem bool) error { if err != nil { return err } - err = el.Input(v.String()) + if strings.Contains(rsp[i].Index, "Carpan") { + el, err = frame3.Element("#" + rsp[i+1].Index) + if err != nil { + return err + } + } + value := v.String() + if strings.Contains(value, ".") { + value = strings.Replace(value, ".", ",", -1) + } + + err = el.Input(value) elementInsertControl = false break } diff --git a/app/lib/srv/srv.go b/app/lib/srv/srv.go index af6dc52..4f7f516 100644 --- a/app/lib/srv/srv.go +++ b/app/lib/srv/srv.go @@ -6,6 +6,7 @@ import ( "bordrobot/lib/run" "fmt" "log/slog" + "strings" "github.com/shopspring/decimal" "github.com/wailsapp/wails/v3/pkg/application" @@ -115,9 +116,9 @@ func (s *Srv) Rpa(companyID float64, month float64, year float64, devMode bool) b.ClosingBrowserFromExternalLink() return nil } - if rows[0][0] == "" { - rows = rows[1:] - } + // if rows[0][0] == "" { + // rows = rows[1:] + // } var lastItem bool = false // data := make([]*model.Bordro, 0) // []*Bordro türünde bir dilim oluştur for i := 1; i < len(rows); i++ { @@ -134,6 +135,13 @@ func (s *Srv) Rpa(companyID float64, month float64, year float64, devMode bool) key := rows[0][ndx] brd.Ucretler[key], err = decimal.NewFromString(col) if err != nil { + if strings.Contains(col, ",") { + col = strings.Replace(col, ",", "", -1) + brd.Ucretler[key], err = decimal.NewFromString(col) + if err != nil { + fmt.Print(err) + } + } // emitLog(`excel okunurken sorun oluştu`) fmt.Println(err) }