Mantém o main_ingress atualizado com conteúdo de main

article/models.py

@@ -117,13 +117,25 @@ class Meta:
 
     base_form_class = ArticleForm
 
-    autocomplete_search_field = "pid_v3"
+    autocomplete_search_field = "sps_pkg__sps_pkg_name"
 
     def autocomplete_label(self):
-        return self.pid_v3
+        return self.sps_pkg.sps_pkg_name
 
     def __str__(self):
-        return f"{self.pid_v3}"
+        return f"{self.sps_pkg.sps_pkg_name}"
+
+    @property
+    def data(self):
+        # TODO completar com itens que identifique o artigo
+        return dict(
+            xml=self.sps_pkg and self.sps_pkg.xml_uri,
+            issue=self.issue.data,
+            journal=self.journal.data,
+            pid_v3=self.pid_v3,
+            created=created.isoformat(),
+            updated=updated.isoformat(),
+        )
 
     @classmethod
     def get(cls, pid_v3):

article/wagtail_hooks.py

@@ -120,7 +120,7 @@ class ArticleModelAdmin(ModelAdmin):
     inspect_view_enabled = True
     inspect_view_class = ArticleAdminInspectView
     menu_icon = "doc-full"
-    menu_order = 200
+    menu_order = get_menu_order("article")
     add_to_settings_menu = False
     exclude_from_explorer = False
 

bigbang/tasks_scheduler.py

@@ -251,6 +251,8 @@ def _schedule_migrate_document_files_and_records(username, enabled):
         name="task_migrate_document_files",
         kwargs=dict(
             username=username,
+            journal_acron=None,
+            publication_year=None,
             force_update=False,
         ),
         description=_("Migra arquivos dos documentos"),
@@ -266,6 +268,8 @@ def _schedule_migrate_document_files_and_records(username, enabled):
         name="task_migrate_document_records",
         kwargs=dict(
             username=username,
+            journal_acron=None,
+            publication_year=None,
             force_update=False,
         ),
         description=_("Migra registros dos documentos"),

collection/wagtail_hooks.py

@@ -122,8 +122,8 @@ class ClassicWebsiteConfigurationModelAdmin(ModelAdmin):
 class CollectionModelAdminGroup(ModelAdminGroup):
     menu_label = _("Collections")
     menu_icon = "folder-open-inverse"
-    # menu_order = get_menu_order("collection")
-    menu_order = 100
+    menu_order = get_menu_order("collection")
+    # menu_order = 100
     items = (
         CollectionModelAdmin,
         WebSiteConfigurationModelAdmin,

config/menu.py

@@ -1,14 +1,27 @@
-WAGTAIL_MENU_APPS_ORDER = {
-    "collection": 400,
-    "journal": 500,
-    "issue": 510,
-    "article": 520,
-    "upload": 700,
-    "migration": 710,
-    "location": 800,
-    "institution": 810,
-}
 
+WAGTAIL_MENU_APPS_ORDER = [
+    "Tarefas",
+    "unexpected-error",
+    "processing",
+    "migration",
+    "journal",
+    "issue",
+    "article",
+    "institution",
+    "location",
+    "researcher",
+    "collection",
+    "pid_provider",
+    "Configurações",
+    "Relatórios",
+    "Images",
+    "Documentos",
+    "Ajuda",
+]
 
 def get_menu_order(app_name):
-    return WAGTAIL_MENU_APPS_ORDER.get(app_name) or 100
+    try:
+        return WAGTAIL_MENU_APPS_ORDER.index(app_name) + 1
+    except:
+        return 9000
+

config/settings/base.py

@@ -101,7 +101,7 @@
     "allauth.account",
     "allauth.socialaccount",
     "django_celery_beat",
-    "captcha",
+    # "captcha",
     "wagtailcaptcha",
     "wagtailmenus",
     "rest_framework",

core/wagtail_hooks.py

@@ -8,7 +8,7 @@
 from collection.models import Collection
 from article.models import Article
 from wagtail.admin.navigation import get_site_for_user
-
+from config.menu import get_menu_order, WAGTAIL_MENU_APPS_ORDER
 
 # @hooks.register("insert_global_admin_css", order=100)
 # def global_admin_css():
@@ -77,3 +77,16 @@ def add_items_summary_items(request, items):
     items.append(CollectionSummaryItem(request))
     items.append(JournalSummaryItem(request))
     items.append(ArticleSummaryItem(request))
+
+
+@hooks.register('construct_main_menu')
+def reorder_menu_items(request, menu_items):
+    for item in menu_items:
+        if item.label in WAGTAIL_MENU_APPS_ORDER:
+            item.order = get_menu_order(item.label)
+
+
+@hooks.register('construct_main_menu')
+def remove_menu_items(request, menu_items):
+    if not request.user.is_superuser:
+        menu_items[:] = [item for item in menu_items if item.name not in ['documents', 'explorer', 'reports']]

htmlxml/migrations/0002_alter_htmlxml_options.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.0.3 on 2024-03-29 17:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("htmlxml", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="htmlxml",
+            options={"ordering": ["-updated"]},
+        ),
+    ]

htmlxml/models.py

@@ -23,6 +23,7 @@
 from core.models import CommonControlField
 from package.models import BasicXMLFile
 from migration.models import MigratedArticle
+
 # from tracker.models import EventLogger
 from tracker import choices as tracker_choices
 
@@ -84,6 +85,7 @@ class BodyAndBackFile(BasicXMLFile, Orderable):
     ]
 
     class Meta:
+
         indexes = [
             models.Index(fields=["version"]),
         ]
@@ -133,9 +135,9 @@ def create_or_update(cls, user, bb_parent, version, file_content, pkg_name):
             return obj
         except Exception as e:
             raise exceptions.CreateOrUpdateBodyAndBackFileError(
-                _(
-                    "Unable to create_or_update_body and back file {} {} {} {}"
-                ).format(bb_parent, version, type(e), e)
+                _("Unable to create_or_update_body and back file {} {} {} {}").format(
+                    bb_parent, version, type(e), e
+                )
             )
 
 
@@ -214,6 +216,7 @@ def data(self):
     ]
 
     class Meta:
+
         indexes = [
             models.Index(fields=["attention_demands"]),
         ]
@@ -491,6 +494,8 @@ def autocomplete_label(self):
         return self.migrated_article
 
     class Meta:
+        ordering = ['-updated']
+
         indexes = [
             models.Index(fields=["html2xml_status"]),
             models.Index(fields=["quality"]),
@@ -561,14 +566,25 @@ def html_to_xml(
     ):
         try:
             self.html2xml_status = tracker_choices.PROGRESS_STATUS_DOING
-            self.html_translation_langs = "-".join(sorted(article_proc.translations.keys()))
-            self.pdf_langs = "-".join(sorted([item.lang or article_proc.main_lang for item in article_proc.renditions]))
+            self.html_translation_langs = "-".join(
+                sorted(article_proc.translations.keys())
+            )
+            self.pdf_langs = "-".join(
+                sorted(
+                    [
+                        item.lang or article_proc.main_lang
+                        for item in article_proc.renditions
+                    ]
+                )
+            )
             self.save()
 
             document = Document(article_proc.migrated_data.data)
             document._translated_html_by_lang = article_proc.translations
 
-            body_and_back = self._generate_xml_body_and_back(user, article_proc, document)
+            body_and_back = self._generate_xml_body_and_back(
+                user, article_proc, document
+            )
             xml_content = self._generate_xml_from_html(user, article_proc, document)
 
             if xml_content and body_and_back:
@@ -615,7 +631,14 @@ def generate_report(self, user, article_proc):
             else:
                 self.quality = choices.HTML2XML_QA_NOT_EVALUATED
             self.save()
-            op.finish(user, completed=True)
+            op.finish(
+                user,
+                completed=True,
+                detail={
+                    "attention_demands": self.attention_demands,
+                    "quality": self.quality,
+                },
+            )
         except Exception as e:
             op.finish(user, completed=False, detail={"error": str(e)})
 
@@ -625,9 +648,12 @@ def _generate_xml_body_and_back(self, user, article_proc, document):
         """
         done = False
         operation = article_proc.start(user, "generate xml body and back")
+
+        languages = document._translated_html_by_lang
         detail = {}
+        detail.update(languages)
         try:
-            document.generate_body_and_back_from_html(document._translated_html_by_lang)
+            document.generate_body_and_back_from_html(languages)
             done = True
         except GenerateBodyAndBackFromHTMLError as e:
             # cria xml_body_and_back padrão
@@ -645,7 +671,7 @@ def _generate_xml_body_and_back(self, user, article_proc, document):
                     file_content=xml_body_and_back,
                     pkg_name=article_proc.pkg_name,
                 )
-
+                detail["xml_to_html_steps"] = i
         operation.finish(user, done, detail=detail)
         return done
 
@@ -655,7 +681,9 @@ def _generate_xml_from_html(self, user, article_proc, document):
         detail = {}
         try:
             xml_content = document.generate_full_xml(None).decode("utf-8")
-            self.save_file(article_proc.pkg_name + ".xml", xml_content)
+            xml_file = article_proc.pkg_name + ".xml"
+            self.save_file(xml_file, xml_content)
+            detail["xml"] = xml_file
         except Exception as e:
             detail = {"error": str(e)}
         operation.finish(user, bool(xml_content), detail=detail)

institution/models.py

@@ -2,6 +2,7 @@
 from django.utils.translation import gettext as _
 from modelcluster.models import ClusterableModel
 from wagtail.admin.panels import FieldPanel, InlinePanel
+from wagtailautocomplete.edit_handlers import AutocompletePanel
 
 from core.models import CommonControlField
 from location.models import Location
@@ -48,8 +49,13 @@ class Institution(CommonControlField, ClusterableModel):
         FieldPanel("logo"),
     ]
 
+    autocomplete_search_field = "name"
+
+    def autocomplete_label(self):
+        return str(self)
+
     def __unicode__(self):
-        return "%s | %s | %s | %s | %s" % (
+        return "%s | %s | %s | %s | %s | %s" % (
             self.name,
             self.acronym,
             self.level_1,
@@ -59,7 +65,7 @@ def __unicode__(self):
         )
 
     def __str__(self):
-        return "%s | %s | %s | %s | %s" % (
+        return "%s | %s | %s | %s | %s | %s" % (
             self.name,
             self.acronym,
             self.level_1,
@@ -133,7 +139,7 @@ class InstitutionHistory(models.Model):
     final_date = models.DateField(_("Final Date"), null=True, blank=True)
 
     panels = [
-        FieldPanel("institution", heading=_("Institution")),
+        AutocompletePanel("institution", heading=_("Institution")),
         FieldPanel("initial_date"),
         FieldPanel("final_date"),
     ]

issue/models.py

@@ -47,6 +47,18 @@ def __str__(self):
     supplement = models.CharField(_("Supplement"), max_length=16, null=True, blank=True)
     publication_year = models.CharField(_("Year"), max_length=4, null=True, blank=True)
 
+    @property
+    def data(self):
+        return dict(
+            journal=self.journal.data,
+            volume=self.volume,
+            number=self.number,
+            supplement=self.supplement,
+            publication_year=self.publication_year,
+            created=created.isoformat(),
+            updated=updated.isoformat(),
+        )
+
     @staticmethod
     def autocomplete_custom_queryset_filter(search_term):
         parts = search_term.split()
@@ -60,7 +72,12 @@ def autocomplete_custom_queryset_filter(search_term):
         )
 
     def autocomplete_label(self):
-        return f"{self.journal.title} {self.volume or self.number}"
+        return "%s %s%s%s" % (
+            self.journal,
+            self.volume and f"v{self.volume}",
+            self.number and f"n{self.number}",
+            self.supplement and f"s{self.supplement}",
+        )
 
     panels = [
         AutocompletePanel("journal"),

issue/wagtail_hooks.py

@@ -24,8 +24,7 @@ class IssueAdmin(ModelAdmin):
     menu_label = _("Issues")
     create_view_class = IssueCreateView
     menu_icon = "folder"
-    # menu_order = get_menu_order("issue")
-    menu_order = 300
+    menu_order = get_menu_order("issue")
     add_to_settings_menu = False
     exclude_from_explorer = False
 
@@ -63,7 +62,6 @@ class IssueModelAdminGroup(ModelAdminGroup):
         IssueAdmin,
         # IssueProcAdmin,
     )
-    menu_order = get_menu_order("journal")
 
 
 # modeladmin_register(IssueModelAdminGroup)