diff --git a/core/admin.py b/core/admin.py index 0bcceb9..e3ebc93 100644 --- a/core/admin.py +++ b/core/admin.py @@ -9,7 +9,6 @@ def get_app_list(self, request): """Sorts the data registry's models in a logical order.""" order = [ "Collection", - "Issue", "License", "Job", "Task", diff --git a/data_registry/admin.py b/data_registry/admin.py index 4dfe663..53c53e8 100644 --- a/data_registry/admin.py +++ b/data_registry/admin.py @@ -8,11 +8,11 @@ from django.utils.html import escape from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ -from modeltranslation.admin import TabbedDjangoJqueryTranslationAdmin, TranslationTabularInline +from modeltranslation.admin import TabbedDjangoJqueryTranslationAdmin from data_registry import forms from data_registry.exceptions import RecoverableError -from data_registry.models import Collection, Issue, Job, License, Task +from data_registry.models import Collection, Job, License, Task from data_registry.util import partialclass logger = logging.getLogger(__name__) @@ -111,11 +111,6 @@ def __init__(self, *args, **kwargs): ) -class IssueInLine(TranslationTabularInline): - model = Issue - extra = 0 - - @admin.register(Collection) class CollectionAdmin(CascadeTaskMixin, TabbedDjangoJqueryTranslationAdmin): form = forms.CollectionAdminForm @@ -203,8 +198,6 @@ class CollectionAdmin(CascadeTaskMixin, TabbedDjangoJqueryTranslationAdmin): readonly_fields = ["last_retrieved"] - inlines = [IssueInLine] - def get_form(self, request, obj=None, **kwargs): kwargs["form"] = partialclass(self.form, request=request) form = super().get_form(request, obj, **kwargs) diff --git a/data_registry/forms.py b/data_registry/forms.py index 93babbb..9b8f8c6 100644 --- a/data_registry/forms.py +++ b/data_registry/forms.py @@ -77,11 +77,6 @@ def __init__(self, *args, request=None, **kwargs): self.fields["country_flag"].choices += sorted((f.name, f.name) for f in FLAGS_DIR.iterdir() if f.is_file()) -class IssueAdminForm(forms.ModelForm): - class Meta: - widgets = {"description": MarkdownWidget(attrs={"rows": 1})} - - class LicenseAdminForm(forms.ModelForm): class Meta: widgets = { diff --git a/data_registry/locale/en/LC_MESSAGES/django.po b/data_registry/locale/en/LC_MESSAGES/django.po index fc5eb44..35a93ae 100644 --- a/data_registry/locale/en/LC_MESSAGES/django.po +++ b/data_registry/locale/en/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-05 20:23+0000\n" +"POT-Creation-Date: 2024-11-06 05:01+0000\n" "PO-Revision-Date: 2021-08-04 17:44+0000\n" "Last-Translator: Yohanna Lisnichuk , 2023\n" "Language-Team: English (https://app.transifex.com/open-contracting-" @@ -24,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data_registry/admin.py:27 +#: data_registry/admin.py:21 msgid "" "Remember to provide information in all languages. You can use the " "dropdown at the top of the page to toggle the language for all fields." @@ -32,117 +32,117 @@ msgstr "" "Remember to provide information in all languages. You can use the " "dropdown at the top of the page to toggle the language for all fields." -#: data_registry/admin.py:102 +#: data_registry/admin.py:43 msgid "incomplete" msgstr "incomplete" -#: data_registry/admin.py:106 data_registry/admin.py:127 -#: data_registry/admin.py:278 +#: data_registry/admin.py:47 data_registry/admin.py:68 +#: data_registry/admin.py:213 msgid "Yes" msgstr "Yes" -#: data_registry/admin.py:123 +#: data_registry/admin.py:64 msgid "untranslated" msgstr "untranslated" -#: data_registry/admin.py:158 +#: data_registry/admin.py:99 msgid "Previous year" msgstr "Past year" -#: data_registry/admin.py:165 +#: data_registry/admin.py:106 msgid "More than a year ago" msgstr "More than a year ago" -#: data_registry/admin.py:203 data_registry/admin.py:319 +#: data_registry/admin.py:134 data_registry/admin.py:254 msgid "Management" msgstr "Management" -#: data_registry/admin.py:209 +#: data_registry/admin.py:147 msgid "Basics" msgstr "Basics" -#: data_registry/admin.py:225 data_registry/admin.py:334 +#: data_registry/admin.py:163 data_registry/admin.py:269 #: data_registry/templates/detail.html:117 msgid "Overview" msgstr "Overview" -#: data_registry/admin.py:240 +#: data_registry/admin.py:177 msgid "Details" msgstr "Details" -#: data_registry/admin.py:274 +#: data_registry/admin.py:209 msgid "failed" msgstr "failed" -#: data_registry/admin.py:345 +#: data_registry/admin.py:280 msgid "Data availability" msgstr "Data availability" -#: data_registry/models.py:139 +#: data_registry/models.py:138 msgid "Africa and Middle East" msgstr "Africa and Middle East" -#: data_registry/models.py:141 +#: data_registry/models.py:140 msgid "Asia" msgstr "Asia" -#: data_registry/models.py:143 +#: data_registry/models.py:142 msgid "Eastern Europe & Central Asia" msgstr "Eastern Europe & Central Asia" -#: data_registry/models.py:145 +#: data_registry/models.py:144 msgid "Europe" msgstr "Europe" -#: data_registry/models.py:147 +#: data_registry/models.py:146 msgid "Latin America & Caribbean" msgstr "Latin America & Caribbean" -#: data_registry/models.py:149 +#: data_registry/models.py:148 msgid "North America" msgstr "North America" -#: data_registry/models.py:151 +#: data_registry/models.py:150 msgid "Oceania" msgstr "Oceania" -#: data_registry/models.py:155 data_registry/models.py:175 +#: data_registry/models.py:154 data_registry/models.py:174 msgid "Monthly" msgstr "Monthly" -#: data_registry/models.py:157 data_registry/models.py:179 +#: data_registry/models.py:156 data_registry/models.py:178 msgid "Every 6 months" msgstr "Every 6 months" -#: data_registry/models.py:159 data_registry/models.py:181 +#: data_registry/models.py:158 data_registry/models.py:180 msgid "Annually" msgstr "Annually" -#: data_registry/models.py:161 +#: data_registry/models.py:160 msgid "This dataset is no longer updated by the publisher" msgstr "This dataset is no longer updated by the publisher" -#: data_registry/models.py:165 +#: data_registry/models.py:164 msgid "Unknown" msgstr "Unknown" -#: data_registry/models.py:167 +#: data_registry/models.py:166 msgid "Real time" msgstr "Real time" -#: data_registry/models.py:169 +#: data_registry/models.py:168 msgid "Hourly" msgstr "Hourly" -#: data_registry/models.py:171 +#: data_registry/models.py:170 msgid "Daily" msgstr "Daily" -#: data_registry/models.py:173 +#: data_registry/models.py:172 msgid "Weekly" msgstr "Weekly" -#: data_registry/models.py:177 +#: data_registry/models.py:176 msgid "Every 3 months" msgstr "Every 3 months" @@ -326,23 +326,19 @@ msgstr "Data quality" msgid "Summary" msgstr "Summary" -#: data_registry/templates/detail.html:269 +#: data_registry/templates/detail.html:274 msgid "We have not yet prepared a data quality summary for this dataset." msgstr "We have not yet prepared a data quality summary for this dataset." -#: data_registry/templates/detail.html:275 +#: data_registry/templates/detail.html:280 msgid "Last reviewed:" msgstr "Last reviewed:" -#: data_registry/templates/detail.html:280 -msgid "Issues found" -msgstr "Issues found" - -#: data_registry/templates/detail.html:302 +#: data_registry/templates/detail.html:289 msgid "Access data" msgstr "Access data" -#: data_registry/templates/detail.html:304 +#: data_registry/templates/detail.html:291 msgid "" "This OCDS dataset is available for download in JSON, Excel or CSV format. " "You can download the data for contracting processes in a specific year or " @@ -352,7 +348,7 @@ msgstr "" "You can download the data for contracting processes in a specific year or " "for all time." -#: data_registry/templates/detail.html:309 +#: data_registry/templates/detail.html:296 msgid "" "Each contracting process is represented as one line of JSON text in the " ".jsonl file." @@ -360,7 +356,7 @@ msgstr "" "Each contracting process is represented as one line of JSON text in the " ".jsonl file." -#: data_registry/templates/detail.html:314 +#: data_registry/templates/detail.html:301 msgid "" "The .jsonl file is compressed using Gzip. Windows users need 7-Zip, WinZip to decompress " "the .gz file." -#: data_registry/templates/detail.html:323 +#: data_registry/templates/detail.html:310 msgid "" "Each contracting process is represented as one row in the main " "sheet. Other sheets link to it via the _link_main column." @@ -382,7 +378,7 @@ msgstr "" "Each contracting process is represented as one row in the main " "sheet. Other sheets link to it via the _link_main column." -#: data_registry/templates/detail.html:328 +#: data_registry/templates/detail.html:315 msgid "" "Excel files can have at most . If a year is missing, it had too many rows. Download the CSV " "files, instead." -#: data_registry/templates/detail.html:337 +#: data_registry/templates/detail.html:324 msgid "" "Each contracting process is represented as one row in the main.csv file. Other files link to it via the _link_main column." @@ -404,7 +400,7 @@ msgstr "" "Each contracting process is represented as one row in the main.csv file. Other files link to it via the _link_main column." -#: data_registry/templates/detail.html:342 +#: data_registry/templates/detail.html:329 msgid "" "The .csv files are archived using tar and compressed using " "Gzip. Windows users need WinRAR or WinZip to decompress the .tar.gz file." -#: data_registry/templates/detail.html:361 +#: data_registry/templates/detail.html:348 msgid "Have questions, feedback on this dataset or content on this page?" msgstr "" "Do you have any questions or feedback on this dataset or any other content " "on this page?" -#: data_registry/templates/detail.html:366 +#: data_registry/templates/detail.html:353 msgid "Contact Data Support Team" msgstr "Contact Data Support Team" @@ -631,12 +627,12 @@ msgstr "See details" msgid "Back to Top" msgstr "Back to Top" -#: data_registry/templatetags/registry.py:106 +#: data_registry/templatetags/registry.py:112 #, python-format msgid "[data-registry] Re: %(collection)s" msgstr "[data-registry] Re: %(collection)s" -#: data_registry/views.py:59 data_registry/views.py:238 +#: data_registry/views.py:59 data_registry/views.py:233 msgid "All" msgstr "All" @@ -688,9 +684,6 @@ msgstr "Milestones data" msgid "Amendments data" msgstr "Amendments data" -#: data_registry/views.py:278 +#: data_registry/views.py:273 msgid "OCP Kingfisher Database" msgstr "OCP Kingfisher Database" - -#~ msgid "no active job" -#~ msgstr "no active job" diff --git a/data_registry/locale/en_US/LC_MESSAGES/django.po b/data_registry/locale/en_US/LC_MESSAGES/django.po index d24db6b..ccac7b4 100644 --- a/data_registry/locale/en_US/LC_MESSAGES/django.po +++ b/data_registry/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-05 20:23+0000\n" +"POT-Creation-Date: 2024-11-06 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,123 +17,123 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: data_registry/admin.py:27 +#: data_registry/admin.py:21 msgid "" "Remember to provide information in all languages. You can use the " "dropdown at the top of the page to toggle the language for all fields." msgstr "" -#: data_registry/admin.py:102 +#: data_registry/admin.py:43 msgid "incomplete" msgstr "" -#: data_registry/admin.py:106 data_registry/admin.py:127 -#: data_registry/admin.py:278 +#: data_registry/admin.py:47 data_registry/admin.py:68 +#: data_registry/admin.py:213 msgid "Yes" msgstr "" -#: data_registry/admin.py:123 +#: data_registry/admin.py:64 msgid "untranslated" msgstr "" -#: data_registry/admin.py:158 +#: data_registry/admin.py:99 msgid "Previous year" msgstr "" -#: data_registry/admin.py:165 +#: data_registry/admin.py:106 msgid "More than a year ago" msgstr "" -#: data_registry/admin.py:203 data_registry/admin.py:319 +#: data_registry/admin.py:134 data_registry/admin.py:254 msgid "Management" msgstr "" -#: data_registry/admin.py:209 +#: data_registry/admin.py:147 msgid "Basics" msgstr "" -#: data_registry/admin.py:225 data_registry/admin.py:334 +#: data_registry/admin.py:163 data_registry/admin.py:269 #: data_registry/templates/detail.html:117 msgid "Overview" msgstr "" -#: data_registry/admin.py:240 +#: data_registry/admin.py:177 msgid "Details" msgstr "" -#: data_registry/admin.py:274 +#: data_registry/admin.py:209 msgid "failed" msgstr "" -#: data_registry/admin.py:345 +#: data_registry/admin.py:280 msgid "Data availability" msgstr "" -#: data_registry/models.py:139 +#: data_registry/models.py:138 msgid "Africa and Middle East" msgstr "" -#: data_registry/models.py:141 +#: data_registry/models.py:140 msgid "Asia" msgstr "" -#: data_registry/models.py:143 +#: data_registry/models.py:142 msgid "Eastern Europe & Central Asia" msgstr "" -#: data_registry/models.py:145 +#: data_registry/models.py:144 msgid "Europe" msgstr "" -#: data_registry/models.py:147 +#: data_registry/models.py:146 msgid "Latin America & Caribbean" msgstr "" -#: data_registry/models.py:149 +#: data_registry/models.py:148 msgid "North America" msgstr "" -#: data_registry/models.py:151 +#: data_registry/models.py:150 msgid "Oceania" msgstr "" -#: data_registry/models.py:155 data_registry/models.py:175 +#: data_registry/models.py:154 data_registry/models.py:174 msgid "Monthly" msgstr "" -#: data_registry/models.py:157 data_registry/models.py:179 +#: data_registry/models.py:156 data_registry/models.py:178 msgid "Every 6 months" msgstr "" -#: data_registry/models.py:159 data_registry/models.py:181 +#: data_registry/models.py:158 data_registry/models.py:180 msgid "Annually" msgstr "" -#: data_registry/models.py:161 +#: data_registry/models.py:160 msgid "This dataset is no longer updated by the publisher" msgstr "" -#: data_registry/models.py:165 +#: data_registry/models.py:164 msgid "Unknown" msgstr "" -#: data_registry/models.py:167 +#: data_registry/models.py:166 msgid "Real time" msgstr "" -#: data_registry/models.py:169 +#: data_registry/models.py:168 msgid "Hourly" msgstr "" -#: data_registry/models.py:171 +#: data_registry/models.py:170 msgid "Daily" msgstr "" -#: data_registry/models.py:173 +#: data_registry/models.py:172 msgid "Weekly" msgstr "" -#: data_registry/models.py:177 +#: data_registry/models.py:176 msgid "Every 3 months" msgstr "" @@ -311,36 +311,32 @@ msgstr "" msgid "Summary" msgstr "" -#: data_registry/templates/detail.html:269 +#: data_registry/templates/detail.html:274 msgid "We have not yet prepared a data quality summary for this dataset." msgstr "" -#: data_registry/templates/detail.html:275 -msgid "Last reviewed:" -msgstr "" - #: data_registry/templates/detail.html:280 -msgid "Issues found" +msgid "Last reviewed:" msgstr "" -#: data_registry/templates/detail.html:302 +#: data_registry/templates/detail.html:289 msgid "Access data" msgstr "" -#: data_registry/templates/detail.html:304 +#: data_registry/templates/detail.html:291 msgid "" "This OCDS dataset is available for download in JSON, Excel or CSV format. " "You can download the data for contracting processes in a specific year or " "for all time." msgstr "" -#: data_registry/templates/detail.html:309 +#: data_registry/templates/detail.html:296 msgid "" "Each contracting process is represented as one line of JSON text in the " ".jsonl file." msgstr "" -#: data_registry/templates/detail.html:314 +#: data_registry/templates/detail.html:301 msgid "" "The .jsonl file is compressed using Gzip. Windows users need 7-Zip, .gz file." msgstr "" -#: data_registry/templates/detail.html:323 +#: data_registry/templates/detail.html:310 msgid "" "Each contracting process is represented as one row in the main " "sheet. Other sheets link to it via the _link_main column." msgstr "" -#: data_registry/templates/detail.html:328 +#: data_registry/templates/detail.html:315 msgid "" "Excel files can have at most main.csv file. Other files link to it via the _link_main column." msgstr "" -#: data_registry/templates/detail.html:342 +#: data_registry/templates/detail.html:329 msgid "" "The .csv files are archived using tar and compressed using " "Gzip. Windows users need WinZip to decompress the .tar.gz file." msgstr "" -#: data_registry/templates/detail.html:361 +#: data_registry/templates/detail.html:348 msgid "Have questions, feedback on this dataset or content on this page?" msgstr "" -#: data_registry/templates/detail.html:366 +#: data_registry/templates/detail.html:353 msgid "Contact Data Support Team" msgstr "" @@ -575,12 +571,12 @@ msgstr "" msgid "Back to Top" msgstr "" -#: data_registry/templatetags/registry.py:106 +#: data_registry/templatetags/registry.py:112 #, python-format msgid "[data-registry] Re: %(collection)s" msgstr "" -#: data_registry/views.py:59 data_registry/views.py:238 +#: data_registry/views.py:59 data_registry/views.py:233 msgid "All" msgstr "" @@ -632,6 +628,6 @@ msgstr "" msgid "Amendments data" msgstr "" -#: data_registry/views.py:278 +#: data_registry/views.py:273 msgid "OCP Kingfisher Database" msgstr "" diff --git a/data_registry/locale/es/LC_MESSAGES/django.po b/data_registry/locale/es/LC_MESSAGES/django.po index e298978..df0935d 100644 --- a/data_registry/locale/es/LC_MESSAGES/django.po +++ b/data_registry/locale/es/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-05 20:23+0000\n" +"POT-Creation-Date: 2024-11-06 05:01+0000\n" "PO-Revision-Date: 2021-08-04 17:44+0000\n" "Last-Translator: Yohanna Lisnichuk , 2023\n" "Language-Team: Spanish (https://app.transifex.com/open-contracting-" @@ -24,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? " "1 : 2;\n" -#: data_registry/admin.py:27 +#: data_registry/admin.py:21 msgid "" "Remember to provide information in all languages. You can use the " "dropdown at the top of the page to toggle the language for all fields." @@ -33,117 +33,117 @@ msgstr "" "lista desplegable de arriba de la página para cambiar el idioma para todos " "los campos" -#: data_registry/admin.py:102 +#: data_registry/admin.py:43 msgid "incomplete" msgstr "incompleto" -#: data_registry/admin.py:106 data_registry/admin.py:127 -#: data_registry/admin.py:278 +#: data_registry/admin.py:47 data_registry/admin.py:68 +#: data_registry/admin.py:213 msgid "Yes" msgstr "Sí" -#: data_registry/admin.py:123 +#: data_registry/admin.py:64 msgid "untranslated" msgstr "sin traducir" -#: data_registry/admin.py:158 +#: data_registry/admin.py:99 msgid "Previous year" msgstr "Año anterior" -#: data_registry/admin.py:165 +#: data_registry/admin.py:106 msgid "More than a year ago" msgstr "Hace más de un año" -#: data_registry/admin.py:203 data_registry/admin.py:319 +#: data_registry/admin.py:134 data_registry/admin.py:254 msgid "Management" msgstr "Administración" -#: data_registry/admin.py:209 +#: data_registry/admin.py:147 msgid "Basics" msgstr "Básicos" -#: data_registry/admin.py:225 data_registry/admin.py:334 +#: data_registry/admin.py:163 data_registry/admin.py:269 #: data_registry/templates/detail.html:117 msgid "Overview" msgstr "Resumen" -#: data_registry/admin.py:240 +#: data_registry/admin.py:177 msgid "Details" msgstr "Detalles" -#: data_registry/admin.py:274 +#: data_registry/admin.py:209 msgid "failed" msgstr "fallido" -#: data_registry/admin.py:345 +#: data_registry/admin.py:280 msgid "Data availability" msgstr "Disponibilidad de datos" -#: data_registry/models.py:139 +#: data_registry/models.py:138 msgid "Africa and Middle East" msgstr "África y Medio Oriente" -#: data_registry/models.py:141 +#: data_registry/models.py:140 msgid "Asia" msgstr "Asia" -#: data_registry/models.py:143 +#: data_registry/models.py:142 msgid "Eastern Europe & Central Asia" msgstr "Europa del Este & Asia Central" -#: data_registry/models.py:145 +#: data_registry/models.py:144 msgid "Europe" msgstr "Europa" -#: data_registry/models.py:147 +#: data_registry/models.py:146 msgid "Latin America & Caribbean" msgstr "América Latina y el Caribe" -#: data_registry/models.py:149 +#: data_registry/models.py:148 msgid "North America" msgstr "Norteamérica" -#: data_registry/models.py:151 +#: data_registry/models.py:150 msgid "Oceania" msgstr "Oceanía" -#: data_registry/models.py:155 data_registry/models.py:175 +#: data_registry/models.py:154 data_registry/models.py:174 msgid "Monthly" msgstr "Mensual" -#: data_registry/models.py:157 data_registry/models.py:179 +#: data_registry/models.py:156 data_registry/models.py:178 msgid "Every 6 months" msgstr "Cada 6 meses" -#: data_registry/models.py:159 data_registry/models.py:181 +#: data_registry/models.py:158 data_registry/models.py:180 msgid "Annually" msgstr "Anual" -#: data_registry/models.py:161 +#: data_registry/models.py:160 msgid "This dataset is no longer updated by the publisher" msgstr "Los datos ya no son actualizados por el publicador" -#: data_registry/models.py:165 +#: data_registry/models.py:164 msgid "Unknown" msgstr "Desconocido" -#: data_registry/models.py:167 +#: data_registry/models.py:166 msgid "Real time" msgstr "En tiempo real" -#: data_registry/models.py:169 +#: data_registry/models.py:168 msgid "Hourly" msgstr "Cada hora" -#: data_registry/models.py:171 +#: data_registry/models.py:170 msgid "Daily" msgstr "Diaria" -#: data_registry/models.py:173 +#: data_registry/models.py:172 msgid "Weekly" msgstr "Semanal" -#: data_registry/models.py:177 +#: data_registry/models.py:176 msgid "Every 3 months" msgstr "Cada 3 meses" @@ -327,25 +327,21 @@ msgstr "Calidad de los datos" msgid "Summary" msgstr "Resumen" -#: data_registry/templates/detail.html:269 +#: data_registry/templates/detail.html:274 msgid "We have not yet prepared a data quality summary for this dataset." msgstr "" "Aún no hemos preparado un resumen de calidad de datos para este conjunto de " "datos." -#: data_registry/templates/detail.html:275 +#: data_registry/templates/detail.html:280 msgid "Last reviewed:" msgstr "Revisado por última vez:" -#: data_registry/templates/detail.html:280 -msgid "Issues found" -msgstr "Issues encontrados" - -#: data_registry/templates/detail.html:302 +#: data_registry/templates/detail.html:289 msgid "Access data" msgstr "Acceso a los datos" -#: data_registry/templates/detail.html:304 +#: data_registry/templates/detail.html:291 msgid "" "This OCDS dataset is available for download in JSON, Excel or CSV format. " "You can download the data for contracting processes in a specific year or " @@ -355,7 +351,7 @@ msgstr "" "JSON, Excel o CSV. Puedes descargar los datos de los procesos de " "contratación de un año específico o de todos los años." -#: data_registry/templates/detail.html:309 +#: data_registry/templates/detail.html:296 msgid "" "Each contracting process is represented as one line of JSON text in the " ".jsonl file." @@ -363,7 +359,7 @@ msgstr "" "Cada proceso de contratación está representado como una línea de texto JSON " "en el archivo .jsonl." -#: data_registry/templates/detail.html:314 +#: data_registry/templates/detail.html:301 msgid "" "The .jsonl file is compressed using Gzip. Windows users need 7-Zip, WinZip para " "descomprimir el archivo .gz." -#: data_registry/templates/detail.html:323 +#: data_registry/templates/detail.html:310 msgid "" "Each contracting process is represented as one row in the main " "sheet. Other sheets link to it via the _link_main column." @@ -386,7 +382,7 @@ msgstr "" "main. Otras hojas pueden enlazarse a esta a través de la " "columna _link_main." -#: data_registry/templates/detail.html:328 +#: data_registry/templates/detail.html:315 msgid "" "Excel files can have at most . Si un año no está, es que tiene demasiadas filas. Descargue los " "archivos CSV en su lugar." -#: data_registry/templates/detail.html:337 +#: data_registry/templates/detail.html:324 msgid "" "Each contracting process is represented as one row in the main.csv file. Other files link to it via the _link_main column." @@ -409,7 +405,7 @@ msgstr "" "main.csv. Otros archivos pueden enlazarse a este a través de la " "columna _link_main." -#: data_registry/templates/detail.html:342 +#: data_registry/templates/detail.html:329 msgid "" "The .csv files are archived using tar and compressed using " "Gzip. Windows users need WinZip para descomprimir el archivo .tar.gz file." -#: data_registry/templates/detail.html:361 +#: data_registry/templates/detail.html:348 msgid "Have questions, feedback on this dataset or content on this page?" msgstr "" "Tiene alguna pregunta o retroalimentación sobre este conjunto de datos u " "otro contenido en esta página? " -#: data_registry/templates/detail.html:366 +#: data_registry/templates/detail.html:353 msgid "Contact Data Support Team" msgstr "Contacta al Equipo de Datos" @@ -646,12 +642,12 @@ msgstr "Ver detalles" msgid "Back to Top" msgstr "Volver arriba" -#: data_registry/templatetags/registry.py:106 +#: data_registry/templatetags/registry.py:112 #, python-format msgid "[data-registry] Re: %(collection)s" msgstr "[data-registry] Re: %(collection)s" -#: data_registry/views.py:59 data_registry/views.py:238 +#: data_registry/views.py:59 data_registry/views.py:233 msgid "All" msgstr "Todos" @@ -703,9 +699,6 @@ msgstr "Datos de hitos" msgid "Amendments data" msgstr "Datos de enmiendas" -#: data_registry/views.py:278 +#: data_registry/views.py:273 msgid "OCP Kingfisher Database" msgstr "Base de datos Kingfisher de OCP" - -#~ msgid "no active job" -#~ msgstr "no disponible" diff --git a/data_registry/locale/ru/LC_MESSAGES/django.po b/data_registry/locale/ru/LC_MESSAGES/django.po index a4bff8f..858c829 100644 --- a/data_registry/locale/ru/LC_MESSAGES/django.po +++ b/data_registry/locale/ru/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-05 20:23+0000\n" +"POT-Creation-Date: 2024-11-06 05:01+0000\n" "PO-Revision-Date: 2021-08-04 17:44+0000\n" "Last-Translator: Yohanna Lisnichuk , 2023\n" "Language-Team: Russian (https://app.transifex.com/open-contracting-" @@ -25,7 +25,7 @@ msgstr "" "n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || " "(n%100>=11 && n%100<=14)? 2 : 3);\n" -#: data_registry/admin.py:27 +#: data_registry/admin.py:21 msgid "" "Remember to provide information in all languages. You can use the " "dropdown at the top of the page to toggle the language for all fields." @@ -34,117 +34,117 @@ msgstr "" "использовать выпадающий список в верхней части страницы, чтобы переключить " "язык для всех полей." -#: data_registry/admin.py:102 +#: data_registry/admin.py:43 msgid "incomplete" msgstr "неполный" -#: data_registry/admin.py:106 data_registry/admin.py:127 -#: data_registry/admin.py:278 +#: data_registry/admin.py:47 data_registry/admin.py:68 +#: data_registry/admin.py:213 msgid "Yes" msgstr "Да" -#: data_registry/admin.py:123 +#: data_registry/admin.py:64 msgid "untranslated" msgstr "непереведенный" -#: data_registry/admin.py:158 +#: data_registry/admin.py:99 msgid "Previous year" msgstr "Предыдущий год" -#: data_registry/admin.py:165 +#: data_registry/admin.py:106 msgid "More than a year ago" msgstr "Больше года тому назад" -#: data_registry/admin.py:203 data_registry/admin.py:319 +#: data_registry/admin.py:134 data_registry/admin.py:254 msgid "Management" msgstr "Управление" -#: data_registry/admin.py:209 +#: data_registry/admin.py:147 msgid "Basics" msgstr "Основы" -#: data_registry/admin.py:225 data_registry/admin.py:334 +#: data_registry/admin.py:163 data_registry/admin.py:269 #: data_registry/templates/detail.html:117 msgid "Overview" msgstr "Обзор" -#: data_registry/admin.py:240 +#: data_registry/admin.py:177 msgid "Details" msgstr "Подробности" -#: data_registry/admin.py:274 +#: data_registry/admin.py:209 msgid "failed" msgstr "Провалена" -#: data_registry/admin.py:345 +#: data_registry/admin.py:280 msgid "Data availability" msgstr "Доступность данных" -#: data_registry/models.py:139 +#: data_registry/models.py:138 msgid "Africa and Middle East" msgstr "Африка и Средний Восток" -#: data_registry/models.py:141 +#: data_registry/models.py:140 msgid "Asia" msgstr "Азия" -#: data_registry/models.py:143 +#: data_registry/models.py:142 msgid "Eastern Europe & Central Asia" msgstr "Восточная Европа и Центральная Азия" -#: data_registry/models.py:145 +#: data_registry/models.py:144 msgid "Europe" msgstr "Европа" -#: data_registry/models.py:147 +#: data_registry/models.py:146 msgid "Latin America & Caribbean" msgstr "Латинская Америка и Карибский бассейн" -#: data_registry/models.py:149 +#: data_registry/models.py:148 msgid "North America" msgstr "Северная Америка" -#: data_registry/models.py:151 +#: data_registry/models.py:150 msgid "Oceania" msgstr "Океания" -#: data_registry/models.py:155 data_registry/models.py:175 +#: data_registry/models.py:154 data_registry/models.py:174 msgid "Monthly" msgstr "Ежемесячно" -#: data_registry/models.py:157 data_registry/models.py:179 +#: data_registry/models.py:156 data_registry/models.py:178 msgid "Every 6 months" msgstr "Каждые 6 месяцев" -#: data_registry/models.py:159 data_registry/models.py:181 +#: data_registry/models.py:158 data_registry/models.py:180 msgid "Annually" msgstr "Раз в год" -#: data_registry/models.py:161 +#: data_registry/models.py:160 msgid "This dataset is no longer updated by the publisher" msgstr "Этот набор данных больше не обновляется издателем." -#: data_registry/models.py:165 +#: data_registry/models.py:164 msgid "Unknown" msgstr "Неизвестный" -#: data_registry/models.py:167 +#: data_registry/models.py:166 msgid "Real time" msgstr "Реальное время" -#: data_registry/models.py:169 +#: data_registry/models.py:168 msgid "Hourly" msgstr "Ежечасно" -#: data_registry/models.py:171 +#: data_registry/models.py:170 msgid "Daily" msgstr "Ежедневно" -#: data_registry/models.py:173 +#: data_registry/models.py:172 msgid "Weekly" msgstr "Еженедельно" -#: data_registry/models.py:177 +#: data_registry/models.py:176 msgid "Every 3 months" msgstr "каждые 3 месяца" @@ -330,24 +330,20 @@ msgstr "Качество данных" msgid "Summary" msgstr "Резюме" -#: data_registry/templates/detail.html:269 +#: data_registry/templates/detail.html:274 msgid "We have not yet prepared a data quality summary for this dataset." msgstr "" "Мы еще не подготовили сводку по качеству данных для этого набора данных." -#: data_registry/templates/detail.html:275 +#: data_registry/templates/detail.html:280 msgid "Last reviewed:" msgstr "Последний отзыв:" -#: data_registry/templates/detail.html:280 -msgid "Issues found" -msgstr "Проблем обнаружено" - -#: data_registry/templates/detail.html:302 +#: data_registry/templates/detail.html:289 msgid "Access data" msgstr "Доступ к данным" -#: data_registry/templates/detail.html:304 +#: data_registry/templates/detail.html:291 msgid "" "This OCDS dataset is available for download in JSON, Excel or CSV format. " "You can download the data for contracting processes in a specific year or " @@ -357,7 +353,7 @@ msgstr "" "Вы можете загрузить данные о процессах заключения договоров за определенный " "год или за все время." -#: data_registry/templates/detail.html:309 +#: data_registry/templates/detail.html:296 msgid "" "Each contracting process is represented as one line of JSON text in the " ".jsonl file." @@ -365,7 +361,7 @@ msgstr "" "Каждый процесс заключения контракта представлен в виде одной строки текста " "JSON в .jsonl файле." -#: data_registry/templates/detail.html:314 +#: data_registry/templates/detail.html:301 msgid "" "The .jsonl file is compressed using Gzip. Windows users need 7-Zip, WinZip для распаковки " "файла .gz file." -#: data_registry/templates/detail.html:323 +#: data_registry/templates/detail.html:310 msgid "" "Each contracting process is represented as one row in the main " "sheet. Other sheets link to it via the _link_main column." @@ -388,7 +384,7 @@ msgstr "" "основном листе. Другие листы ссылаются на него через столбец " "_link_main." -#: data_registry/templates/detail.html:328 +#: data_registry/templates/detail.html:315 msgid "" "Excel files can have at most . Если год отсутствует, в нем было слишком много строк. В таком " "случае загрузите файлы в формате CSV." -#: data_registry/templates/detail.html:337 +#: data_registry/templates/detail.html:324 msgid "" "Each contracting process is represented as one row in the main.csv file. Other files link to it via the _link_main column." @@ -411,7 +407,7 @@ msgstr "" "main.csv. Другие файлы ссылаются на него через столбец " "_link_main." -#: data_registry/templates/detail.html:342 +#: data_registry/templates/detail.html:329 msgid "" "The .csv files are archived using tar and compressed using " "Gzip. Windows users need WinRAR или WinZip для распаковки файла .tar.gz." -#: data_registry/templates/detail.html:361 +#: data_registry/templates/detail.html:348 msgid "Have questions, feedback on this dataset or content on this page?" msgstr "" "Есть ли у вас вопросы, отзывы об этом наборе данных или содержимом этой " "страницы?" -#: data_registry/templates/detail.html:366 +#: data_registry/templates/detail.html:353 msgid "Contact Data Support Team" msgstr "Связаться со службой поддержки данных" @@ -645,12 +641,12 @@ msgstr "Смотреть детали" msgid "Back to Top" msgstr "вернуться наверх" -#: data_registry/templatetags/registry.py:106 +#: data_registry/templatetags/registry.py:112 #, python-format msgid "[data-registry] Re: %(collection)s" msgstr "[Реестр данных]: %(collection)s" -#: data_registry/views.py:59 data_registry/views.py:238 +#: data_registry/views.py:59 data_registry/views.py:233 msgid "All" msgstr "Все" @@ -702,9 +698,6 @@ msgstr "Данные о этапах" msgid "Amendments data" msgstr "Данные о изменениях" -#: data_registry/views.py:278 +#: data_registry/views.py:273 msgid "OCP Kingfisher Database" msgstr "База данных OCP Kingfisher" - -#~ msgid "no active job" -#~ msgstr "недоступен" diff --git a/data_registry/migrations/0053_delete_issue.py b/data_registry/migrations/0053_delete_issue.py new file mode 100644 index 0000000..a7fbd11 --- /dev/null +++ b/data_registry/migrations/0053_delete_issue.py @@ -0,0 +1,15 @@ +# Generated by Django 4.2.16 on 2024-11-06 05:00 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("data_registry", "0052_alter_collection_additional_data_and_more"), + ] + + operations = [ + migrations.DeleteModel( + name="Issue", + ), + ] diff --git a/data_registry/models.py b/data_registry/models.py index 021b2c9..39a449d 100644 --- a/data_registry/models.py +++ b/data_registry/models.py @@ -231,8 +231,7 @@ class UpdateFrequency(models.TextChoices): summary = models.TextField( blank=True, verbose_name="quality summary", - help_text="A short summary of quality issues, as Markdown text. Individual issues can be described below, " - "which will be rendered as a bullet list.", + help_text="A short summary of quality issues, as Markdown text.", ) last_reviewed = models.DateField( blank=True, @@ -360,21 +359,6 @@ def __str__(self): return f"{self.name} ({self.id})" -class Issue(models.Model): - description = models.TextField(help_text="A one-line description of the quality issue, as Markdown text.") - collection = models.ForeignKey("Collection", on_delete=models.CASCADE, db_index=True) - - # Timestamps - created = models.DateTimeField(auto_now_add=True) - modified = models.DateTimeField(auto_now=True) - - class Meta: - verbose_name = "quality issue" - - def __str__(self): - return f"{self.description[:32]} ({self.id})" - - class Task(models.Model): class Status(models.TextChoices): #: The task has started, but work has not yet started in the application. diff --git a/data_registry/templates/detail.html b/data_registry/templates/detail.html index 8b4a57b..6ada8c8 100644 --- a/data_registry/templates/detail.html +++ b/data_registry/templates/detail.html @@ -243,7 +243,7 @@

{% include "includes/check_icon.html" with checked=job.amendments {% if collection.additional_data %}
{# https://icons.getbootstrap.com/icons/gem/ #} -
@@ -260,8 +260,13 @@

{% translate "Data quality" %}

{% translate "Summary" %}

-
+
{% if collection.summary %} + {# https://icons.getbootstrap.com/icons/exclamation-circle/ #} +
{{ collection.summary|markdownify }}
@@ -275,24 +280,6 @@

{% translate "Summary" %}

{% translate "Last reviewed:" %} {{ collection.last_reviewed|date:"M Y" }}

{% endif %} - -{% if collection.issues %} -

{% translate "Issues found" %}

- -
    -{% for issue in collection.issues %} -
  • - {# https://icons.getbootstrap.com/icons/exclamation-circle/ #} - - {{ issue|markdownify }} -
    • -{% endfor %} -
-{% endif %} -
diff --git a/data_registry/translation.py b/data_registry/translation.py index af2261a..c7cf2d6 100644 --- a/data_registry/translation.py +++ b/data_registry/translation.py @@ -17,13 +17,6 @@ class CollectionTranslation(TranslationOptions): fallback_undefined = "" -@register(models.Issue) -class IssueTranslation(TranslationOptions): - fields = ["description"] - required_languages = {language: ("description",) for language, _ in settings.LANGUAGES} - fallback_undefined = "" - - @register(models.License) class LicenseTranslation(TranslationOptions): fields = ["name", "description"] diff --git a/data_registry/views.py b/data_registry/views.py index 2b24143..b3928c4 100644 --- a/data_registry/views.py +++ b/data_registry/views.py @@ -8,7 +8,6 @@ import requests from dateutil.relativedelta import relativedelta from django.conf import settings -from django.contrib.postgres.aggregates import ArrayAgg from django.db.models import Count, F, Q from django.db.models.functions import Substr from django.http.response import FileResponse, HttpResponse, HttpResponseBadRequest, HttpResponseNotFound, JsonResponse @@ -154,12 +153,7 @@ def facet_counts(qs, key): def detail(request, pk): - collection = get_object_or_404( - collection_queryset(request) - .select_related("license_custom") - .annotate(issues=ArrayAgg("issue__description", filter=Q(issue__isnull=False), default=None)), - pk=pk, - ) + collection = get_object_or_404(collection_queryset(request).select_related("license_custom"), pk=pk) job = collection.active_job files = Export.get_files(collection.active_job_id) diff --git a/docs/admin/siteadmin.rst b/docs/admin/siteadmin.rst index 8ea7115..a5c6623 100644 --- a/docs/admin/siteadmin.rst +++ b/docs/admin/siteadmin.rst @@ -323,9 +323,9 @@ On the next form: #. Assign *Groups* (multiple can be selected, as they have non-overlapping permissions) Viewer - Can view publications, quality issues, licenses, jobs and job tasks + Can view publications, licenses, jobs and job tasks Contributor - Can add/change publications, quality issues and licenses + Can add/change publications and licenses #. Click *SAVE*