Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: recovery features #423

Merged
merged 12 commits into from
Dec 20, 2023
Merged

feat: recovery features #423

merged 12 commits into from
Dec 20, 2023

Conversation

sergeikobelev
Copy link
Member

No description provided.

@sergeikobelev sergeikobelev self-assigned this Dec 17, 2023
@daxartio daxartio changed the title Recovery features feat: recovery features Dec 18, 2023
daxartio
daxartio reviewed Dec 18, 2023
View reviewed changes
sportorg/modules/recovery/recovery_si_master_csv.py Outdated
)

for line in lines:
print(line)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

принты надо везде убрать

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ок, сейчас снесем

daxartio
daxartio reviewed Dec 18, 2023
View reviewed changes
sportorg/modules/recovery/recovery_si_master_csv.py Outdated
False,
)

text_file = open(file_name, 'r')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

from pathlib import Path

Path(...).read_lines()

Лучше сделать так. Ты же здесь файл даже не закрываешь)
Те если сделал open, надо делать close, можно было через контекстный менеджер with ..., но лучше Path использовать в этом кейсе

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ОК, согласен, можно было бы и закрыть файл ) Переделаю на Path

daxartio
daxartio reviewed Dec 18, 2023
View reviewed changes
sportorg/modules/recovery/recovery_si_master_csv.py Outdated

"""
from sportorg.common.otime import OTime
from sportorg.gui.dialogs.file_dialog import get_open_file_name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

эта функция не должна быть в modules. Лучше передай в recovery готовый путь. Должна быть правильная работа с зависимостями

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ОК, хорошо, буду передавать путь

daxartio
daxartio reviewed Dec 18, 2023
View reviewed changes
sportorg/modules/recovery/recovery_si_master_csv.py Outdated
)

for line in lines:
tokens = line.split(separator)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

лучше использовать модуль csv в питоне, он вообще в питоне из коробки доступен)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

принято

daxartio
daxartio reviewed Dec 18, 2023
View reviewed changes
sportorg/modules/recovery/recovery_sportorg_html.py Outdated
from tempfile import gettempdir

from sportorg.gui.dialogs.file_dialog import get_open_file_name
from sportorg.gui.dialogs.sportorg_import_dialog import SportOrgImportDialog
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тут тоже самое. Надо инверсию зависимостей или передать готовые значения

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ок

@daxartio daxartio merged commit 8d8435a into master Dec 20, 2023
2 checks passed
@daxartio daxartio deleted the recovery_features branch December 20, 2023 08:10
alex-karpov pushed a commit to alex-karpov/pysport that referenced this pull request Dec 27, 2023
@sergeikobelev
feat: recovery features (sportorg#423)
53679df
alex-karpov pushed a commit to alex-karpov/pysport that referenced this pull request Dec 29, 2023
Squashed commit of the following:
10c820e 
commit 06102cc
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Thu Dec 28 16:28:21 2023 +0500

    Ignore punches before start (for people who like to test start gates and my favorite triathlon organizers, who deliver activated SIACs through start/controls/finish) (sportorg#425)

commit 8d8435a
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Wed Dec 20 13:10:15 2023 +0500

    feat: recovery features (sportorg#423)

commit 698011f
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:16:09 2023 +0700

    fix: shorter tab titles in the settings window (sportorg#424)

commit 4ab5f11
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:04:43 2023 +0700

    feat: new features for a marked track with penalty loops (sportorg#421)

    Co-authored-by: Aleksandr Karpov <alex.nsk.karpov@gmail.com>
alex-karpov added a commit to alex-karpov/pysport that referenced this pull request Dec 30, 2023
@alex-karpov
chore: squash dev-ank commits into one
b7b8d63 
feat: new features for a marked track with penalty loops (sportorg#421)

Co-authored-by: Aleksandr Karpov <alex.nsk.karpov@gmail.com>

Squashed commit of the following:

commit 06102cc
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Thu Dec 28 16:28:21 2023 +0500

    Ignore punches before start (for people who like to test start gates and my favorite triathlon organizers, who deliver activated SIACs through start/controls/finish) (sportorg#425)

commit 8d8435a
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Wed Dec 20 13:10:15 2023 +0500

    feat: recovery features (sportorg#423)

commit 698011f
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:16:09 2023 +0700

    fix: shorter tab titles in the settings window (sportorg#424)

commit 4ab5f11
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:04:43 2023 +0700

    feat: new features for a marked track with penalty loops (sportorg#421)

    Co-authored-by: Aleksandr Karpov <alex.nsk.karpov@gmail.com>

fix: remove unused changes
alex-karpov added a commit to alex-karpov/pysport that referenced this pull request Jul 29, 2024
@alex-karpov
chore: squash dev-ank commits into one
5a06780 
feat: new features for a marked track with penalty loops (sportorg#421)

Co-authored-by: Aleksandr Karpov <alex.nsk.karpov@gmail.com>

Squashed commit of the following:

commit 06102cc
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Thu Dec 28 16:28:21 2023 +0500

    Ignore punches before start (for people who like to test start gates and my favorite triathlon organizers, who deliver activated SIACs through start/controls/finish) (sportorg#425)

commit 8d8435a
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Wed Dec 20 13:10:15 2023 +0500

    feat: recovery features (sportorg#423)

commit 698011f
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:16:09 2023 +0700

    fix: shorter tab titles in the settings window (sportorg#424)

commit 4ab5f11
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:04:43 2023 +0700

    feat: new features for a marked track with penalty loops (sportorg#421)

    Co-authored-by: Aleksandr Karpov <alex.nsk.karpov@gmail.com>

fix: remove unused changes
alex-karpov pushed a commit to alex-karpov/pysport that referenced this pull request Jul 29, 2024
@alex-karpov
Squashed commit of the following:
8f7f70e 
commit 06102cc
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Thu Dec 28 16:28:21 2023 +0500

    Ignore punches before start (for people who like to test start gates and my favorite triathlon organizers, who deliver activated SIACs through start/controls/finish) (sportorg#425)

commit 8d8435a
Author: Sergei Kobelev <lorez@mail.ru>
Date:   Wed Dec 20 13:10:15 2023 +0500

    feat: recovery features (sportorg#423)

commit 698011f
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:16:09 2023 +0700

    fix: shorter tab titles in the settings window (sportorg#424)

commit 4ab5f11
Author: Aleksandr Karpov <31531412+alex-karpov@users.noreply.github.com>
Date:   Wed Dec 20 14:04:43 2023 +0700

    feat: new features for a marked track with penalty loops (sportorg#421)

    Co-authored-by: Aleksandr Karpov <alex.nsk.karpov@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daxartio daxartio daxartio left review comments

Assignees

@sergeikobelev sergeikobelev

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sergeikobelev @daxartio