Skip to content

Refactor project to comply with PEP8 standards #88

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

Open
MarcusStill wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Refactor project to comply with PEP8 standards #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions db/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from .base import Base
from .client import Client
from .holiday import Holiday
from .price import Price
from .sale import Sale
from .ticket import Ticket
from .user import User
from .workday import Workday
from .base import Base as Base
from .client import Client as Client
from .holiday import Holiday as Holiday
from .price import Price as Price
from .sale import Sale as Sale
from .ticket import Ticket as Ticket
from .user import User as User
from .workday import Workday as Workday
2 changes: 1 addition & 1 deletion design/logic/main_form.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
QPushButton,
QRadioButton,
QStatusBar,
QTabWidget,
QTableWidget,
QTableWidgetItem,
QTabWidget,
QWidget,
)

Expand Down
2 changes: 1 addition & 1 deletion design/logic/pay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from PySide6.QtCore import QCoreApplication, QMetaObject, QRect, QSize, Qt
from PySide6.QtGui import QFont
from PySide6.QtWidgets import QGroupBox, QLabel, QPushButton, QCheckBox
from PySide6.QtWidgets import QCheckBox, QGroupBox, QLabel, QPushButton


class Ui_Dialog_Pay(object):
Expand Down
34 changes: 23 additions & 11 deletions design/logic/progress_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,50 @@
from PySide6.QtCore import (QCoreApplication, QMetaObject, QSize, Qt)
from PySide6.QtWidgets import (QLabel, QProgressBar,
QVBoxLayout)
from PySide6.QtCore import QCoreApplication, QMetaObject, QSize, Qt
from PySide6.QtWidgets import QLabel, QProgressBar, QVBoxLayout


class Ui_ProgressDialog(object):
def setupUi(self, ProgressDialog):
if not ProgressDialog.objectName():
ProgressDialog.setObjectName(u"ProgressDialog")
ProgressDialog.setObjectName("ProgressDialog")
ProgressDialog.resize(300, 127)
ProgressDialog.setMinimumSize(QSize(300, 100))
self.verticalLayout = QVBoxLayout(ProgressDialog)
self.verticalLayout.setObjectName(u"verticalLayout")
self.verticalLayout.setObjectName("verticalLayout")
self.label_status = QLabel(ProgressDialog)
self.label_status.setObjectName(u"label_status")
self.label_status.setObjectName("label_status")
self.label_status.setAlignment(Qt.AlignmentFlag.AlignCenter)

self.verticalLayout.addWidget(self.label_status)

self.progressBar = QProgressBar(ProgressDialog)
self.progressBar.setObjectName(u"progressBar")
self.progressBar.setObjectName("progressBar")
self.progressBar.setMinimum(0)
self.progressBar.setMaximum(100)
self.progressBar.setValue(0)
self.progressBar.setTextVisible(True)

self.verticalLayout.addWidget(self.progressBar)


self.retranslateUi(ProgressDialog)

QMetaObject.connectSlotsByName(ProgressDialog)

# setupUi

def retranslateUi(self, ProgressDialog):
ProgressDialog.setWindowTitle(QCoreApplication.translate("ProgressDialog", u"\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435...", None))
self.label_status.setText(QCoreApplication.translate("ProgressDialog", u"\u041d\u0430\u0447\u0430\u043b\u043e \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438...", None))
# retranslateUi
ProgressDialog.setWindowTitle(
QCoreApplication.translate(
"ProgressDialog",
"\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435...",
None,
)
)
self.label_status.setText(
QCoreApplication.translate(
"ProgressDialog",
"\u041d\u0430\u0447\u0430\u043b\u043e \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438...",
None,
)
)

# retranslateUi
296 changes: 190 additions & 106 deletions main.py
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions modules/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import os
from configparser import (
ConfigParser,
NoSectionError,
NoOptionError,
MissingSectionHeaderError,
NoOptionError,
NoSectionError,
)
from typing import List, Optional

Expand Down Expand Up @@ -122,7 +122,6 @@ def load_config(self):
)
config_data[key] = config.get(section, key)


return config_data
except (NoSectionError, NoOptionError) as e:
logger.error(f"Ошибка в конфигурационном файле: {e}")
Expand Down
Loading