From 0045ca255f592ee88062ea2bee276cd1c1cebff0 Mon Sep 17 00:00:00 2001 From: Roberta Takenaka Date: Wed, 23 Feb 2022 14:08:54 -0300 Subject: [PATCH 01/10] =?UTF-8?q?Remove=20trecho=20e=20cria=20um=20templat?= =?UTF-8?q?e=20com=20ele=20para=20tratar=20da=20=C3=A1rea=20do=20t=C3=ADtu?= =?UTF-8?q?lo=20da=20tabela?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htmlgenerator/v2.0/html-modals-tables.xsl | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl b/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl index 0e7aca65e..194f5c154 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl @@ -6,23 +6,9 @@ - - + @@ -54,6 +38,28 @@ + + + + + + From 99341a7130159965fc209a54781e4469e05c87f7 Mon Sep 17 00:00:00 2001 From: Roberta Takenaka Date: Wed, 23 Feb 2022 17:23:17 -0300 Subject: [PATCH 03/10] =?UTF-8?q?Inibe=20a=20apresenta=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20`table-wrap[not(@id)]`=20e=20inclui=20a=20apresenta=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20`table-wrap-group[@id]`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htmlgenerator/v2.0/html-modals-tables.xsl | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl b/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl index 216908fc9..c5580fdee 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/html-modals-tables.xsl @@ -2,7 +2,11 @@ - + + + + + - + + + + + + + + + + + + +
+
+ From aa58d933494dd9c8bafe113bb67d27265e76a66e Mon Sep 17 00:00:00 2001 From: Roberta Takenaka Date: Wed, 23 Feb 2022 17:56:58 -0300 Subject: [PATCH 05/10] Cria o modal para `table-wrap-group[@id]` --- .../htmlgenerator/v2.0/html-modals.xsl | 2 +- tests/test_htmlgenerator.py | 95 ++++++++++++++++++- 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/packtools/catalogs/htmlgenerator/v2.0/html-modals.xsl b/packtools/catalogs/htmlgenerator/v2.0/html-modals.xsl index 99bcf2e49..552203825 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/html-modals.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/html-modals.xsl @@ -44,7 +44,7 @@ - + diff --git a/tests/test_htmlgenerator.py b/tests/test_htmlgenerator.py index e33537f48..2b9de4365 100644 --- a/tests/test_htmlgenerator.py +++ b/tests/test_htmlgenerator.py @@ -78,7 +78,7 @@ def test_language_missing_data(self): """ et = get_xml_tree_from_string(sample) - self.assertEquals(domain.HTMLGenerator.parse( + self.assertEqual(domain.HTMLGenerator.parse( et, valid_only=False).language, None) @unittest.skip('aguardando definicao') @@ -642,7 +642,7 @@ def test_article_meta_doi_should_be_an_explicit_link(self): html_string = etree.tostring(html, encoding="unicode", method="html") article_header_dois = html.xpath("//span[contains(@class, 'group-doi')]//a[contains(@class, '_doi')]") - self.assertEquals(len(article_header_dois), 1) + self.assertEqual(len(article_header_dois), 1) class HTMLGeneratorDispFormulaTests(unittest.TestCase): @@ -1231,3 +1231,94 @@ def test_generate_html_for_pt_trans_abstract(self): ) p_texts = [p.text for p in html.findall('//p')] self.assertIn(find_text, p_texts) + + +class HTMLGeneratorTableGroupTests(unittest.TestCase): + + def test_table_wrap(self): + sample = u"""
+ + + + + + Classificação Sucessional adotada por alguns autores ao longo dos anos. + + + + + + Sucessional classification adopted by some authors over the years. + + + + + + + + + + + + + + + + + + + + + + + + + + +
AnoAutorClassificação
1965BudowskiPioneira, secundária inicial, secundária tardia e clímax
1971Gómez-PompaPrimária e secundária
2017Moura & MantovaniPioneira, secundária inicial, secundária tardia e sub-bosque
+
+
+
+ """ + et = get_xml_tree_from_string(sample) + + html = domain.HTMLGenerator.parse(et, valid_only=False).generate('pt') + div_modal_tables = html.xpath( + '//div[@id="ModalTablet1"]' + ) + self.assertIsNotNone(div_modal_tables) + table = div_modal_tables[0].find( + './/div[@class="modal-body"]//table' + ) + self.assertIsNotNone(table) + found_text = div_modal_tables[0].findtext( + './/div[@class="modal-body"]//table/thead/tr/th' + ) + self.assertEqual("Ano", found_text) + found_nodes = div_modal_tables[0].findall( + './/h4[@class="modal-title"]//strong' + ) + self.assertEqual("Tabela 1", found_nodes[0].text) + self.assertEqual("Table 1", found_nodes[1].text) + +""" +