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.

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

feat: schedule verified at #22

Merged
merged 7 commits into from
Aug 30, 2024
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
21 changes: 13 additions & 8 deletions missas/core/admin.py
Original file line number Diff line number Diff line change
@@ -1,38 +1,43 @@
from django.contrib import admin # noqa
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin

from missas.core.models import City, State, User, Parish, Schedule, Source
from missas.core.models import City, Parish, Schedule, Source, State, User

admin.site.register(User, UserAdmin)


@admin.register(City)
class CityAdmin(admin.ModelAdmin):
list_display = ("name", "state", "slug")
search_fields = ("name", "state__name", "slug")
ordering = ("name",)
search_fields = ("name", "state__name", "slug")


@admin.register(Parish)
class ParishAdmin(admin.ModelAdmin):
list_display = ("name", "city", "slug")
search_fields = ("name", "city__name", "slug")
autocomplete_fields = ("city",)
list_display = ("name", "city", "slug")
prepopulated_fields = {"slug": ("name",)}
search_fields = ("name", "city__name", "slug")


@admin.register(Schedule)
class ScheduleAdmin(admin.ModelAdmin):
list_display = ("parish", "type", "day", "start_time")
search_fields = ("parish__name", "day", "start_time")
autocomplete_fields = ("parish",)
list_display = ("parish", "type", "day", "start_time", "observation")
list_filter = (
("type", admin.ChoicesFieldListFilter),
("day", admin.ChoicesFieldListFilter),
("observation", admin.EmptyFieldListFilter),
)
search_fields = ("parish__name", "day", "start_time")


@admin.register(State)
class StateAdmin(admin.ModelAdmin):
list_display = ("name", "short_name", "slug")
search_fields = ("name", "short_name", "slug")
ordering = ("name",)
search_fields = ("name", "short_name", "slug")


@admin.register(Source)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Generated by Django 5.1 on 2024-08-30 09:17

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("core", "0016_alter_schedule_source"),
]

operations = [
migrations.AddField(
model_name="city",
name="created_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="city",
name="updated_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="parish",
name="created_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="parish",
name="updated_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="schedule",
name="created_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="schedule",
name="updated_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="source",
name="created_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="source",
name="updated_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="state",
name="created_at",
field=models.DateTimeField(auto_now=True),
),
migrations.AddField(
model_name="state",
name="updated_at",
field=models.DateTimeField(auto_now=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Generated by Django 5.1 on 2024-08-30 09:17

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("core", "0017_city_created_at_city_updated_at_parish_created_at_and_more"),
]

operations = [
migrations.AlterField(
model_name="city",
name="created_at",
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name="parish",
name="created_at",
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name="schedule",
name="created_at",
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name="source",
name="created_at",
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name="state",
name="created_at",
field=models.DateTimeField(auto_now_add=True),
),
]
17 changes: 17 additions & 0 deletions missas/core/migrations/0019_schedule_verified_at.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 5.1 on 2024-08-30 09:56

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("core", "0018_alter_city_created_at_alter_parish_created_at_and_more"),
]

operations = [
migrations.AddField(
model_name="schedule",
name="verified_at",
field=models.DateField(blank=True, null=True),
),
]
25 changes: 18 additions & 7 deletions missas/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ class User(AbstractUser):


class State(models.Model):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
name = models.CharField(max_length=254)
short_name = models.CharField(max_length=2)
slug = models.SlugField(unique=True)
Expand All @@ -16,9 +18,11 @@ def __str__(self):


class City(models.Model):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
name = models.CharField(max_length=254)
state = models.ForeignKey(State, on_delete=models.CASCADE, related_name="cities")
slug = models.SlugField()
state = models.ForeignKey(State, on_delete=models.CASCADE, related_name="cities")

class Meta:
unique_together = ("slug", "state")
Expand All @@ -28,8 +32,10 @@ def __str__(self):


class Parish(models.Model):
name = models.CharField(max_length=254)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
city = models.ForeignKey(City, on_delete=models.CASCADE, related_name="parishes")
name = models.CharField(max_length=254)
slug = models.SlugField(max_length=254)

class Meta:
Expand All @@ -43,9 +49,11 @@ class Source(models.Model):
class Type(models.TextChoices):
SITE = ("site", "Site")

type = models.CharField(choices=Type.choices, default=Type.SITE)
link = models.URLField(null=True, blank=True)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
description = models.TextField()
link = models.URLField(null=True, blank=True)
type = models.CharField(choices=Type.choices, default=Type.SITE)

def __str__(self):
return self.description
Expand All @@ -66,15 +74,18 @@ class Type(models.TextChoices):
MASS = ("mass", "Missa")
CONFESSION = ("confession", "Confissão")

created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
day = models.IntegerField(choices=Day.choices)
observation = models.TextField(null=True, blank=True)
parish = models.ForeignKey(
Parish, on_delete=models.CASCADE, related_name="schedules"
)
day = models.IntegerField(choices=Day.choices)
source = models.ForeignKey(Source, on_delete=models.RESTRICT)
start_time = models.TimeField()
end_time = models.TimeField(null=True, blank=True)
type = models.CharField(choices=Type.choices, default=Type.MASS)
source = models.ForeignKey(Source, on_delete=models.RESTRICT)
observation = models.TextField(null=True, blank=True)
verified_at = models.DateField(blank=True, null=True)

class Meta:
unique_together = ("parish", "day", "start_time")
Expand Down
14 changes: 10 additions & 4 deletions missas/core/templates/cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<div class="card-body">
<span class="fs-5">{{ schedule.parish.name }}</span>
<div class="row">
<div class="col-6 col-sm-4 col-md-3 col-lg-2 col-xl-2">
<div class="col-auto">
<span><i class="fa-solid fa-calendar-week"></i> {{ schedule.get_day_display }}</span>
</div>
<div class="col-6 col-sm-4 col-md-3 col-lg-2 col-xl-2">
<div class="col-auto">
<span>
<i class="fa-solid fa-clock"></i>
{{ schedule.start_time|time:"H:i" }}
{% if schedule.end_time %}- {{ schedule.end_time|time:"H:i" }}{% endif %}
</span>
</div>
<div class="col-12 col-sm-4 col-md-6 col-lg-8 col-xl-8">
<div class="col-auto">
<span>
<i class="fa-solid fa-exclamation-circle"></i>
{% if schedule.source.link %}
Expand All @@ -25,13 +25,19 @@
</span>
</div>
{% if schedule.observation %}
<div class="col-12">
<div class="col-auto">
<span>
<i class="fa-solid fa-exclamation-circle"></i>
{{ schedule.observation }}
</span>
</div>
{% endif %}
{% if schedule.verified_at %}
<div class="col-12">
<i class="fa-solid fa-circle-check verified"></i>
Verificado por Missas.com.br no dia {{ schedule.verified_at|date:"SHORT_DATE_FORMAT" }}
</div>
{% endif %}
</div>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions missas/core/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
.form-range::-moz-range-track {
background-color: #2a3142;
}

.verified {
color: #2ecc71;
}
</style>
</head>
<body>
Expand Down
14 changes: 14 additions & 0 deletions missas/core/tests/test_view_by_city.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,17 @@ def test_schedule_with_source_with_link(client):
f'Fonte: <a href="{source.link}" target="_blank">{source.description}</a>'
in html
)


@pytest.mark.django_db
def test_verified_schedule(client):
schedule = baker.make(Schedule, _fill_optional=["verified_at"])

city = schedule.parish.city
response = client.get(resolve_url("by_city", state=city.state.slug, city=city.slug))

html = response.content.decode()
assert (
f"Verificado por Missas.com.br no dia {schedule.verified_at.strftime('%d/%m/%Y')}"
in html
)
2 changes: 1 addition & 1 deletion missas/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@


# Internationalization
LANGUAGE_CODE = "en-us"
LANGUAGE_CODE = "pt-BR"
TIME_ZONE = "UTC"
USE_I18N = True
USE_TZ = True
Expand Down
Loading