Skip to content
This repository has been archived by the owner on Oct 2, 2023. It is now read-only.

Adota o portugu锚s #117

Merged
merged 1 commit into from
May 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions core/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Common(Configuration):
"django.contrib.sessions",
"django.contrib.messages",
"django.contrib.staticfiles",
"datasets",
"datasets.apps.DatasetsConfig",
"home",
]

Expand Down Expand Up @@ -69,14 +69,15 @@ class Common(Configuration):
{"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
]

LANGUAGE_CODE = "en-us"
LANGUAGE_CODE = "pt-br"
USE_L10N = False
DATE_FORMAT = "d/m/Y"
DATETIME_FORMAT = "d/m/Y H:i"

TIME_ZONE = "America/Fortaleza"

USE_I18N = True

USE_L10N = True

USE_TZ = True

STATIC_ROOT = os.path.join(BASE_DIR, "static")
Expand Down
39 changes: 25 additions & 14 deletions datasets/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class GazetteAdmin(PublicModelAdmin):
"events",
"url",
"crawled_at",
"page",
"crawled_from",
)

@mark_safe
Expand All @@ -38,13 +38,15 @@ def events(self, obj):
]
)

events.short_description = "Eventos"

@mark_safe
def url(self, obj):
return f"<a href={obj.file_url}>{obj.file_url}</a>"
if obj.file_url:
return f"<a href={obj.file_url}>{obj.file_url}</a>"
return ""

@mark_safe
def page(self, obj):
return f"<a href={obj.crawled_from}>{obj.crawled_from}</a>"
url.short_description = "Endere莽o (URL)"

def get_search_results(self, request, queryset, search_term):
if not search_term:
Expand Down Expand Up @@ -126,6 +128,7 @@ class CityCouncilExpenseAdmin(PublicModelAdmin):
"date",
"phase",
"company_or_person",
"document",
"summary",
"value",
"legal_status",
Expand All @@ -150,7 +153,11 @@ class CityCouncilMinuteAdmin(PublicModelAdmin):

@mark_safe
def url(self, obj):
return f"<a href={obj.file_url}>{obj.file_url}</a>"
if obj.file_url:
return f"<a href={obj.file_url}>{obj.file_url}</a>"
return ""

url.short_description = "Endere莽o (URL)"


class CityHallBidAdmin(PublicModelAdmin):
Expand All @@ -169,19 +176,23 @@ class CityHallBidAdmin(PublicModelAdmin):

@mark_safe
def url(self, obj):
return f"<a href={obj.file_url}>{obj.file_url}</a>"
if obj.file_url:
return f"<a href={obj.file_url}>{obj.file_url}</a>"
return ""

url.short_description = "Arquivo"

@mark_safe
def events(self, obj):
return "<br><br>".join(
[
f"{event.published_at}: {event.summary} "
f"{event.file_url if event.file_url else ''}"
for event in obj.events.all()
]
)
formatted_events = []
for event in obj.events.all():
formatted_date = event.published_at.strftime("%d/%m/%Y %H:%m")
url = ""
if event.file_url:
url = f"<a href={event.file_url}>{event.file_url}</a>"

formatted_events.append(f"{formatted_date}<br>{event.summary}<br>{url}")
return "<br><br>".join(formatted_events)

events.short_description = "Hist贸rico"

Expand Down
1 change: 1 addition & 0 deletions datasets/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@

class DatasetsConfig(AppConfig):
name = "datasets"
verbose_name = "Bases de dados"
Loading