Skip to content
Open
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
1 change: 0 additions & 1 deletion apps/blog/graphql/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ class BlogType:
slug: strawberry.auto
department: strawberry.auto
directive: strawberry.auto
work: strawberry.auto
17 changes: 17 additions & 0 deletions apps/blog/migrations/0003_remove_blog_work.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 5.1.8 on 2025-09-02 06:10

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('blog', '0002_alter_blog_department_alter_blog_directive_and_more'),
]

operations = [
migrations.RemoveField(
model_name='blog',
name='work',
),
]
8 changes: 0 additions & 8 deletions apps/blog/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from apps.common.models import StatusEnum, UserResource
from apps.department.models import Department
from apps.strategic.models import StrategicDirectives
from apps.work.models import Work
from utils.common import unique_slugify


Expand Down Expand Up @@ -39,13 +38,6 @@ class Blog(UserResource):
blank=True,
verbose_name=_("Strategic Directive"),
)
work = models.ForeignKey(
Work,
on_delete=models.SET_NULL,
null=True,
blank=True,
verbose_name=_("Work"),
)

def save(self, *args, **kwargs):
if not self.slug:
Expand Down
6 changes: 0 additions & 6 deletions apps/blog/tests/queries_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ class Query:
slug
status
title
work {
pk
}
}
}
"""
Expand Down Expand Up @@ -64,7 +61,6 @@ def _query():
published_date="2023-01-01",
directive=None,
cover_image=None,
work=None,
),
BlogFactory.create(
title="Blog One",
Expand All @@ -79,7 +75,6 @@ def _query():
published_date="2023-01-01",
directive=None,
cover_image=None,
work=None,
),
]

Expand All @@ -100,7 +95,6 @@ def _query():
content=blog.content,
directive=None,
coverImage=None,
work=None,
)
for blog in blog_items
],
Expand Down
3 changes: 2 additions & 1 deletion apps/resources/graphql/filters.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import strawberry
import strawberry_django

from apps.resources.models import Resource
from apps.resources.models import Resource, ResourcesType


@strawberry_django.filters.filter(Resource, lookups=True)
Expand All @@ -10,3 +10,4 @@ class ResourceFilter:
slug: str | None = strawberry.UNSET
id: strawberry.ID | None = strawberry.UNSET
directive: strawberry.ID | None = None
type: ResourcesType | None = strawberry.UNSET
1 change: 1 addition & 0 deletions apps/resources/graphql/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ class ResourceType:
directive: strawberry.auto
slug: strawberry.auto
cover_image: DjangoFileType | None
type: strawberry.auto
20 changes: 20 additions & 0 deletions apps/resources/migrations/0004_resource_type.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 5.1.8 on 2025-09-02 08:32

import apps.resources.models
import django_choices_field.fields
from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('resources', '0003_resource_cover_image'),
]

operations = [
migrations.AddField(
model_name='resource',
name='type',
field=django_choices_field.fields.IntegerChoicesField(choices=[(10, 'Report'), (20, 'Policy And Guidelines')], choices_enum=apps.resources.models.ResourcesType, default=10),
),
]
7 changes: 7 additions & 0 deletions apps/resources/models.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
from django.db import models
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from django_choices_field import IntegerChoicesField
from mdeditor.fields import MDTextField

from apps.common.models import UserResource
from apps.strategic.models import StrategicDirectives
from utils.common import unique_slugify


class ResourcesType(models.IntegerChoices):
REPORT = 10, "Report"
POLICY_AND_GUIDELINES = 20, "Policy And Guidelines"


class Resource(UserResource):
title = models.CharField(max_length=255)
content = MDTextField(blank=True, null=True)
Expand All @@ -22,6 +28,7 @@ class Resource(UserResource):
)
slug = models.SlugField(unique=True, max_length=250, blank=True, verbose_name=_("Slug"))
cover_image = models.ImageField(upload_to="resources/", null=True, blank=True)
type = IntegerChoicesField(choices_enum=ResourcesType, default=ResourcesType.REPORT)

def __str__(self):
return self.title
Expand Down
4 changes: 2 additions & 2 deletions apps/strategic/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class StrategicDirectivesAdmin(UserResourceAdmin):
list_display = ("title", "description", "contact_person_name", "contact_person_email")
search_fields = ("title", "description", "contact_person_name", "contact_person_email")
list_filter = ("title", "description", "contact_person_name", "contact_person_email")
list_filter = ("title", "contact_person_name", "contact_person_email")
ordering = ("title",)
readonly_fields = ("slug",)

Expand All @@ -19,7 +19,7 @@ class StrategicDirectivesAdmin(UserResourceAdmin):
class MajorResponsibilitiesAdmin(UserResourceAdmin):
list_display = ("title", "description", "directive")
search_fields = ("title", "description", "directive__title")
list_filter = ("title", "description", "directive")
list_filter = ("title", "directive")
ordering = ("title",)
list_select_related = True
readonly_fields = ("slug",)
1 change: 1 addition & 0 deletions apps/strategic/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
class StrategicConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "apps.strategic"
verbose_name = "Works"
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated by Django 5.1.8 on 2025-09-02 06:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('strategic', '0002_strategicdirectives_cover_image'),
]

operations = [
migrations.AlterModelOptions(
name='strategicdirectives',
options={'verbose_name': 'Work', 'verbose_name_plural': 'Works'},
),
migrations.AlterField(
model_name='strategicdirectives',
name='description',
field=models.TextField(verbose_name='Description'),
),
migrations.AlterField(
model_name='strategicdirectives',
name='title',
field=models.CharField(max_length=255, verbose_name='Title'),
),
]
9 changes: 5 additions & 4 deletions apps/strategic/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
from utils.common import unique_slugify


# FIXME: rename strategicDirective model name into works
class StrategicDirectives(UserResource):
title = models.CharField(max_length=255, verbose_name=_("Strategic Directive Title"))
description = models.TextField(verbose_name=_("Strategic Directive Description"))
title = models.CharField(max_length=255, verbose_name=_("Title"))
description = models.TextField(verbose_name=_("Description"))
cover_image = models.ImageField(
upload_to="strategic_directives/cover_images",
verbose_name=_("Cover Image"),
Expand All @@ -28,8 +29,8 @@ def save(self, *args, **kwargs):
super().save(*args, **kwargs)

class Meta: # type: ignore[reportIncompatibleVariableOverride]
verbose_name = _("Strategic Directive")
verbose_name_plural = _("Strategic Directives")
verbose_name = _("Work")
verbose_name_plural = _("Works")


class MajorResponsibilities(UserResource):
Expand Down
14 changes: 0 additions & 14 deletions apps/work/admin.py
Original file line number Diff line number Diff line change
@@ -1,14 +0,0 @@
from django.contrib import admin

from apps.common.admin import UserResourceAdmin

# Register your models here.
from apps.work.models import Work


@admin.register(Work)
class WorkAdmin(UserResourceAdmin):
list_display = ("title", "department", "strategic_directive", "start_date", "end_date")
search_fields = ("title", "department__title", "strategic_directive__title")
list_filter = ["department", "strategic_directive"]
list_select_related = True
11 changes: 0 additions & 11 deletions apps/work/graphql/filters.py

This file was deleted.

9 changes: 0 additions & 9 deletions apps/work/graphql/orders.py

This file was deleted.

15 changes: 0 additions & 15 deletions apps/work/graphql/queries.py

This file was deleted.

19 changes: 0 additions & 19 deletions apps/work/graphql/types.py

This file was deleted.

Empty file removed apps/work/tests/__init__.py
Empty file.
100 changes: 0 additions & 100 deletions apps/work/tests/queries_test.py

This file was deleted.

Loading
Loading