This repository has been archived by the owner on Jan 18, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
feat: add print console #37
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,18 +27,9 @@ def __eq__(self, other: Any): | |
return self.plate == other.plate | ||
return False | ||
|
||
def __str__(self): | ||
# TODO: Handle show details later when main updates that option | ||
def __str__(self) -> str: | ||
def create_violation_str(violation: ViolationDetail, index: int) -> str: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. create str method in violation model instead in this big class |
||
resolution_offices: str | None = ( | ||
"Nơi giải quyết vụ việc:" | ||
+ "\n" | ||
+ "\n".join( | ||
resolution_office_detail.strip() | ||
for resolution_office_detail in violation.resolution_offices_details | ||
) | ||
if violation.resolution_offices_details | ||
else None | ||
) | ||
violation_str: str = ( | ||
f"Lỗi vi phạm thứ {index}:" | ||
+ (f"\nMàu biển: {violation.color}" if violation.color else "") | ||
|
@@ -64,29 +55,21 @@ def create_violation_str(violation: ViolationDetail, index: int) -> str: | |
else "" | ||
) | ||
) | ||
# violation_str = "\n".join( | ||
# line | ||
# for line in f""" | ||
# Lỗi vi phạm thứ {index}: | ||
# Màu biển: {violation.color if violation.color else " "} | ||
# Thời điểm vi phạm: {violation.date if violation.date else " "} | ||
# Vị trí vi phạm: {violation.location if violation.location else " "} | ||
# Hành vi vi phạm: {violation.violation if violation.violation else " "} | ||
# Trạng thái: {"Đã xử phạt" if violation.status else ("Chưa xử phạt" if not violation.status else " ")} | ||
# Đơn vị phát hiện vi phạm: {violation.enforcement_unit if violation.enforcement_unit else " "} | ||
# """.splitlines() | ||
# if line.strip() | ||
# ) | ||
return ( | ||
"\n".join([violation_str, resolution_offices]) | ||
if resolution_offices | ||
else violation_str | ||
resolution_offices: str | None = ( | ||
"\n" | ||
+ "Nơi giải quyết vụ việc:" | ||
+ "\n" | ||
+ "\n".join( | ||
resolution_office_detail.strip() | ||
for resolution_office_detail in violation.resolution_offices_details | ||
) | ||
if violation.resolution_offices_details | ||
else None | ||
) | ||
return violation_str + (resolution_offices if resolution_offices else "") | ||
|
||
plate_detail: str = ( | ||
f"Biển số: {self.plate}" + f"\nChủ sở hữu: {self.owner}" | ||
if self.owner | ||
else "" | ||
plate_detail: str = f"Biển số: {self.plate}" + ( | ||
f"\nChủ sở hữu: {self.owner}" if self.owner else "" | ||
) | ||
|
||
if self.violations: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
You are viewing a condensed version of this merge commit. You can view the full changes here.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle show details later when main updates that option