Skip to content

Commit efa2298

Browse files
committed
๐Ÿ› ๏ธ context_processors.py -> Updated results dictionary
๐Ÿ› ๏ธ models.py -> Updated return statements ๐Ÿ› ๏ธ conf.py -> Updated templates_path and exclude_patterns ๐Ÿ› ๏ธ filters.py -> Modified query assignment ๐Ÿ› ๏ธ forms.py -> Modified __init__ method ๐Ÿ› ๏ธ tools.py -> Modified format_date method ๐Ÿ› ๏ธ views.py -> Modified paginate_by and get_queryset
1 parent edab7f9 commit efa2298

File tree

7 files changed

+23
-21
lines changed

7 files changed

+23
-21
lines changed

โ€Žsrc/base/context_processors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def filters_descriptions(request) -> dict[str, list[dict[str, Any]]]:
1010
"""
1111
descripted_filters = DescriptedFilter.objects.all()
1212

13-
results: dict[str, dict[dict[str, dict[str, str]]]] = {
13+
results: dict = {
1414
'filters_descriptions': {
1515
split_class_name(str(df.filter_name))[-1]: df.descriptions
1616
} for df in descripted_filters

โ€Žsrc/base/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __str__(self) -> str:
3131
Returns the name of the filter and the filter field
3232
that associated with description.
3333
"""
34-
return self.filter_field
34+
return str(self.filter_field)
3535

3636

3737
class DescriptedFilter(models.Model):
@@ -45,7 +45,7 @@ def __str__(self) -> str:
4545
Returns the name of the filter and the filter field
4646
that associated with description.
4747
"""
48-
return self.filter_name
48+
return str(self.filter_name)
4949

5050
def save(self, *args, **kwargs) -> None:
5151
"""

โ€Žsrc/docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
'sphinx.ext.autodoc',
2626
]
2727

28-
templates_path = ['_templates']
29-
exclude_patterns = []
28+
templates_path: list[str] = ['_templates']
29+
exclude_patterns: list = []
3030

3131

3232
# -- Options for HTML output -------------------------------------------------
3333
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
3434

3535
html_theme = "sphinx_rtd_theme"
36-
html_static_path = ['_static']
36+
html_static_path: list[str] = ['_static']

โ€Žsrc/signals/filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def filter_search(self, queryset, name, value) -> Any:
100100
query &= item
101101
queries.append(query)
102102

103-
query: Q = queries.pop()
103+
query = queries.pop()
104104

105105
for item in queries:
106106
query |= item

โ€Žsrc/signals/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class Meta:
8181
}),
8282
}
8383

84-
def __init__(self, *args, **kwargs):
84+
def __init__(self, *args, **kwargs) -> None:
8585
"""
8686
Initialize the form.
8787
"""
@@ -91,4 +91,4 @@ def __init__(self, *args, **kwargs):
9191
for field_name, field in self.fields.items():
9292
field.required = False
9393
field.help_text = ''
94-
field.label = False
94+
field.label = ''

โ€Žsrc/signals/tools.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@ def __init__(self, covidcast_meta_data: list) -> None:
1010
self.year_month_date_format = '%Y%m'
1111
self.year_month_day_date_format = '%Y%m%d'
1212

13-
def format_date(self, date: str,) -> str:
13+
def format_date(self, date: str,) -> datetime:
1414
"""
1515
Format the date string to a specific format.
1616
1717
:param date: The date string to format.
1818
:return: The formatted date string.
1919
:rtype: str
2020
"""
21+
formated_date: datetime
2122
if len(date) == 6:
22-
return datetime.strptime(date, self.year_month_date_format)
23+
formated_date = datetime.strptime(date, self.year_month_date_format)
2324
elif len(date) == 8:
24-
return datetime.strptime(date, self.year_month_day_date_format)
25+
formated_date = datetime.strptime(date, self.year_month_day_date_format)
26+
return formated_date
2527

2628
def set_data(self) -> None:
2729
"""

โ€Žsrc/signals/views.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class SignalsListView(ListView):
2020

2121
model = Signal
2222
template_name = "signals/signals.html"
23-
paginate_by = settings.PAGE_SIZE
23+
paginate_by: int = settings.PAGE_SIZE
2424

2525
def get_queryset(self) -> Any:
2626
"""
@@ -39,22 +39,22 @@ def get_url_params(self):
3939
"id": self.request.GET.get("id"),
4040
"search": self.request.GET.get("search"),
4141
"order_by": self.request.GET.get("order_by"),
42-
"pathogen": [int(el) for el in self.request.GET._getlist("pathogen")],
43-
"active": [el for el in self.request.GET._getlist("active")],
42+
"pathogen": [int(el) for el in self.request.GET.getlist("pathogen")],
43+
"active": [el for el in self.request.GET.getlist("active")],
4444
"available_geography": [
45-
int(el) for el in self.request.GET._getlist("available_geography")
45+
int(el) for el in self.request.GET.getlist("available_geography")
4646
]
4747
if self.request.GET.get("available_geography")
4848
else None,
49-
"signal_type": [int(el) for el in self.request.GET._getlist("signal_type")]
49+
"signal_type": [int(el) for el in self.request.GET.getlist("signal_type")]
5050
if self.request.GET.get("signal_type")
5151
else None,
52-
"category": self.request.GET._getlist("category")
52+
"category": self.request.GET.getlist("category")
5353
if self.request.GET.get("category")
5454
else None,
55-
"format_type": [el for el in self.request.GET._getlist("format_type")],
56-
"source": [int(el) for el in self.request.GET._getlist("source")],
57-
"time_label": [el for el in self.request.GET._getlist("time_label")]
55+
"format_type": [el for el in self.request.GET.getlist("format_type")],
56+
"source": [int(el) for el in self.request.GET.getlist("source")],
57+
"time_label": [el for el in self.request.GET.getlist("time_label")]
5858
}
5959
url_params_str = ""
6060
for param_name, param_value in url_params_dict.items():

0 commit comments

Comments
ย (0)