file transfer occurred #1

Open
huseyindervis wants to merge 19 commits from bordorBot into main
2 changed files with 24 additions and 4 deletions
Showing only changes of commit 0f51cd2848 - Show all commits

View File

@@ -636,6 +636,7 @@ func (l *Luca) BordroYaz(month, year int, b *LucaBordro, lastItem bool) error {
for i := 0; i < len(rsp); i++ { for i := 0; i < len(rsp); i++ {
if k == rsp[i].Value { if k == rsp[i].Value {
Wait(frame3, 200)
if rsp[i].itemType == "selectBox" { if rsp[i].itemType == "selectBox" {
elemBox, err := frame3.Element("#" + rsp[i].Index) elemBox, err := frame3.Element("#" + rsp[i].Index)
if err != nil { if err != nil {
@@ -653,7 +654,18 @@ func (l *Luca) BordroYaz(month, year int, b *LucaBordro, lastItem bool) error {
if err != nil { if err != nil {
return err 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 elementInsertControl = false
break break
} }

View File

@@ -6,6 +6,7 @@ import (
"bordrobot/lib/run" "bordrobot/lib/run"
"fmt" "fmt"
"log/slog" "log/slog"
"strings"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/wailsapp/wails/v3/pkg/application" "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() b.ClosingBrowserFromExternalLink()
return nil return nil
} }
if rows[0][0] == "" { // if rows[0][0] == "" {
rows = rows[1:] // rows = rows[1:]
} // }
var lastItem bool = false var lastItem bool = false
// data := make([]*model.Bordro, 0) // []*Bordro türünde bir dilim oluştur // data := make([]*model.Bordro, 0) // []*Bordro türünde bir dilim oluştur
for i := 1; i < len(rows); i++ { 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] key := rows[0][ndx]
brd.Ucretler[key], err = decimal.NewFromString(col) brd.Ucretler[key], err = decimal.NewFromString(col)
if err != nil { 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`) // emitLog(`excel okunurken sorun oluştu`)
fmt.Println(err) fmt.Println(err)
} }