From a5612d6d9e11b82c36840374f85644b4925c0d33 Mon Sep 17 00:00:00 2001 From: hysn99 Date: Thu, 4 Apr 2024 21:33:06 +0300 Subject: [PATCH] update --- app/lib/bot/luca.go | 22 +++++++++++----------- app/lib/srv/srv.go | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/lib/bot/luca.go b/app/lib/bot/luca.go index d681c88..e638d67 100644 --- a/app/lib/bot/luca.go +++ b/app/lib/bot/luca.go @@ -534,17 +534,6 @@ func (l *Luca) BordroYaz(month, year int, b *LucaBordro, lastItem bool) error { return err } var foundIndex int = -1 - if len(elems) == 0 { - err = ClickItem(frame3, "body > form > table > tbody > tr.altBar.alt-button-bar > th > table > tbody > tr > td:nth-child(1) > button:nth-child(3)", 1) - if err != nil { - return err - } - err = WaitLoad(frame3) - if err != nil { - return err - } - return errors.New("Böyle Bir Kullanıcı Bulunamadı") - } for j := 0; j < len(elems); j++ { tex, err := elems[j].Text() if err != nil { @@ -563,6 +552,17 @@ func (l *Luca) BordroYaz(month, year int, b *LucaBordro, lastItem bool) error { } fmt.Print(elems, tex) } + if foundIndex == -1 { + err = ClickItem(frame3, "body > form > table > tbody > tr.altBar.alt-button-bar > th > table > tbody > tr > td:nth-child(1) > button:nth-child(3)", 1) + if err != nil { + return err + } + err = WaitLoad(frame3) + if err != nil { + return err + } + return errors.New("Böyle Bir Kullanıcı Bulunamadı") + } if isEmpty == true { err = ClickItem(frame3, "body > form > table > tbody > tr.altBar.alt-button-bar > th > table > tbody > tr > td:nth-child(1) > button:nth-child(3)", 1) if err != nil { diff --git a/app/lib/srv/srv.go b/app/lib/srv/srv.go index f1089e0..dba03cf 100644 --- a/app/lib/srv/srv.go +++ b/app/lib/srv/srv.go @@ -136,10 +136,10 @@ func (s *Srv) Rpa(companyName string, month float64, year float64) error { err := b.BordroYaz(int(month), int(year), brd, lastItem) var str string if err != nil { - emitLog(err.Error()) + emitLog("Şube : " + brd.Sube + "Bölüm : " + brd.Bolum + "Kullanıcı Adı: " + brd.AdSoyad + err.Error()) } else { - str = "Şube : " + brd.Sube + "Bölüm : " + brd.Bolum + "işlem başarılı, " + str = "Şube : " + brd.Sube + "Bölüm : " + brd.Bolum + "işlem başarılı, " + "Kullanıcı Adı: " + brd.AdSoyad emitLog(str) }