Compare commits
2 Commits
51969141e7
...
b0725fb385
| Author | SHA1 | Date | |
|---|---|---|---|
| b0725fb385 | |||
| c77e8c0432 |
@@ -1,7 +1,7 @@
|
|||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
from datetime import datetime
|
from dokumente.models import Dokument
|
||||||
from dokumente.models import Dokument, Vorgabe, VorgabeKurztext, VorgabeLangtext, Checklistenfrage
|
from dokumente.utils import build_dokument_xml_element, prettify_xml
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
@@ -26,110 +26,10 @@ class Command(BaseCommand):
|
|||||||
root = ET.Element('Vorgabendokumente')
|
root = ET.Element('Vorgabendokumente')
|
||||||
|
|
||||||
for dokument in dokumente:
|
for dokument in dokumente:
|
||||||
doc_element = ET.SubElement(root, 'Vorgabendokument')
|
build_dokument_xml_element(dokument, root)
|
||||||
|
|
||||||
ET.SubElement(doc_element, 'Typ').text = dokument.dokumententyp.name if dokument.dokumententyp else ""
|
|
||||||
ET.SubElement(doc_element, 'Nummer').text = dokument.nummer
|
|
||||||
ET.SubElement(doc_element, 'Name').text = dokument.name
|
|
||||||
|
|
||||||
autoren_element = ET.SubElement(doc_element, 'Autoren')
|
|
||||||
for autor in dokument.autoren.all():
|
|
||||||
ET.SubElement(autoren_element, 'Autor').text = autor.name
|
|
||||||
|
|
||||||
pruefende_element = ET.SubElement(doc_element, 'Pruefende')
|
|
||||||
for pruefender in dokument.pruefende.all():
|
|
||||||
ET.SubElement(pruefende_element, 'Pruefender').text = pruefender.name
|
|
||||||
|
|
||||||
gueltigkeit_element = ET.SubElement(doc_element, 'Gueltigkeit')
|
|
||||||
ET.SubElement(gueltigkeit_element, 'Von').text = dokument.gueltigkeit_von.strftime("%Y-%m-%d") if dokument.gueltigkeit_von else ""
|
|
||||||
ET.SubElement(gueltigkeit_element, 'Bis').text = dokument.gueltigkeit_bis.strftime("%Y-%m-%d") if dokument.gueltigkeit_bis else None
|
|
||||||
|
|
||||||
ET.SubElement(doc_element, 'SignaturCSO').text = dokument.signatur_cso
|
|
||||||
|
|
||||||
geltungsbereich_sections = dokument.geltungsbereich_set.all().order_by('order')
|
|
||||||
if geltungsbereich_sections:
|
|
||||||
geltungsbereich_element = ET.SubElement(doc_element, 'Geltungsbereich')
|
|
||||||
abschnitt_element = ET.SubElement(geltungsbereich_element, 'Abschnitt')
|
|
||||||
for gb in geltungsbereich_sections:
|
|
||||||
section = ET.SubElement(abschnitt_element, 'Teil')
|
|
||||||
section.set('typ', gb.abschnitttyp.abschnitttyp if gb.abschnitttyp else "text")
|
|
||||||
section.text = gb.inhalt
|
|
||||||
|
|
||||||
einleitung_sections = dokument.einleitung_set.all().order_by('order')
|
|
||||||
if einleitung_sections:
|
|
||||||
einleitung_element = ET.SubElement(doc_element, 'Einleitung')
|
|
||||||
abschnitt_element = ET.SubElement(einleitung_element, 'Abschnitt')
|
|
||||||
for ei in einleitung_sections:
|
|
||||||
section = ET.SubElement(abschnitt_element, 'Teil')
|
|
||||||
section.set('typ', ei.abschnitttyp.abschnitttyp if ei.abschnitttyp else "text")
|
|
||||||
section.text = ei.inhalt
|
|
||||||
|
|
||||||
ET.SubElement(doc_element, 'Ziel').text = ""
|
|
||||||
ET.SubElement(doc_element, 'Grundlagen').text = ""
|
|
||||||
|
|
||||||
changelog_element = ET.SubElement(doc_element, 'Changelog')
|
|
||||||
for cl in dokument.changelog.all().order_by('-datum'):
|
|
||||||
entry = ET.SubElement(changelog_element, 'Eintrag')
|
|
||||||
ET.SubElement(entry, 'Datum').text = cl.datum.strftime("%Y-%m-%d")
|
|
||||||
autoren = ET.SubElement(entry, 'Autoren')
|
|
||||||
for autor in cl.autoren.all():
|
|
||||||
ET.SubElement(autoren, 'Autor').text = autor.name
|
|
||||||
ET.SubElement(entry, 'Aenderung').text = cl.aenderung
|
|
||||||
|
|
||||||
anhaenge_element = ET.SubElement(doc_element, 'Anhaenge')
|
|
||||||
ET.SubElement(anhaenge_element, 'Anhang').text = dokument.anhaenge
|
|
||||||
|
|
||||||
ET.SubElement(doc_element, 'Verantwortlich').text = "Information Security Management BIT"
|
|
||||||
ET.SubElement(doc_element, 'Klassifizierung').text = ""
|
|
||||||
|
|
||||||
glossar_element = ET.SubElement(doc_element, 'Glossar')
|
|
||||||
|
|
||||||
vorgaben_element = ET.SubElement(doc_element, 'Vorgaben')
|
|
||||||
|
|
||||||
for vorgabe in dokument.vorgaben.all().order_by('order'):
|
|
||||||
vorgabe_el = ET.SubElement(vorgaben_element, 'Vorgabe')
|
|
||||||
|
|
||||||
ET.SubElement(vorgabe_el, 'Nummer').text = str(vorgabe.nummer)
|
|
||||||
ET.SubElement(vorgabe_el, 'Titel').text = vorgabe.titel
|
|
||||||
ET.SubElement(vorgabe_el, 'Thema').text = vorgabe.thema.name if vorgabe.thema else ""
|
|
||||||
|
|
||||||
kurztext_sections = vorgabe.vorgabekurztext_set.all().order_by('order')
|
|
||||||
if kurztext_sections:
|
|
||||||
kurztext_element = ET.SubElement(vorgabe_el, 'Kurztext')
|
|
||||||
abschnitt = ET.SubElement(kurztext_element, 'Abschnitt')
|
|
||||||
for kt in kurztext_sections:
|
|
||||||
teil = ET.SubElement(abschnitt, 'Teil')
|
|
||||||
teil.set('typ', kt.abschnitttyp.abschnitttyp if kt.abschnitttyp else "text")
|
|
||||||
teil.text = kt.inhalt
|
|
||||||
|
|
||||||
langtext_sections = vorgabe.vorgabelangtext_set.all().order_by('order')
|
|
||||||
if langtext_sections:
|
|
||||||
langtext_element = ET.SubElement(vorgabe_el, 'Langtext')
|
|
||||||
abschnitt = ET.SubElement(langtext_element, 'Abschnitt')
|
|
||||||
for lt in langtext_sections:
|
|
||||||
teil = ET.SubElement(abschnitt, 'Teil')
|
|
||||||
teil.set('typ', lt.abschnitttyp.abschnitttyp if lt.abschnitttyp else "text")
|
|
||||||
teil.text = lt.inhalt
|
|
||||||
|
|
||||||
referenz_element = ET.SubElement(vorgabe_el, 'Referenzen')
|
|
||||||
for ref in vorgabe.referenzen.all():
|
|
||||||
ref_text = f"{ref.name_nummer}: {ref.name_text}" if ref.name_text else ref.name_nummer
|
|
||||||
ET.SubElement(referenz_element, 'Referenz').text = ref_text
|
|
||||||
|
|
||||||
vorgabe_gueltigkeit = ET.SubElement(vorgabe_el, 'Gueltigkeit')
|
|
||||||
ET.SubElement(vorgabe_gueltigkeit, 'Von').text = vorgabe.gueltigkeit_von.strftime("%Y-%m-%d") if vorgabe.gueltigkeit_von else ""
|
|
||||||
ET.SubElement(vorgabe_gueltigkeit, 'Bis').text = vorgabe.gueltigkeit_bis.strftime("%Y-%m-%d") if vorgabe.gueltigkeit_bis else None
|
|
||||||
|
|
||||||
checklistenfragen_element = ET.SubElement(vorgabe_el, 'Checklistenfragen')
|
|
||||||
for cf in vorgabe.checklistenfragen.all():
|
|
||||||
ET.SubElement(checklistenfragen_element, 'Frage').text = cf.frage
|
|
||||||
|
|
||||||
stichworte_element = ET.SubElement(vorgabe_el, 'Stichworte')
|
|
||||||
for stw in vorgabe.stichworte.all():
|
|
||||||
ET.SubElement(stichworte_element, 'Stichwort').text = stw.stichwort
|
|
||||||
|
|
||||||
xml_str = ET.tostring(root, encoding='unicode', method='xml')
|
xml_str = ET.tostring(root, encoding='unicode', method='xml')
|
||||||
xml_output = self._prettify_xml(xml_str)
|
xml_output = prettify_xml(xml_str)
|
||||||
|
|
||||||
if options['output']:
|
if options['output']:
|
||||||
with open(options['output'], 'w', encoding='utf-8') as f:
|
with open(options['output'], 'w', encoding='utf-8') as f:
|
||||||
@@ -137,8 +37,3 @@ class Command(BaseCommand):
|
|||||||
self.stdout.write(self.style.SUCCESS(f'XML exported to {options["output"]}'))
|
self.stdout.write(self.style.SUCCESS(f'XML exported to {options["output"]}'))
|
||||||
else:
|
else:
|
||||||
self.stdout.write(xml_output)
|
self.stdout.write(xml_output)
|
||||||
|
|
||||||
def _prettify_xml(self, xml_string):
|
|
||||||
import xml.dom.minidom
|
|
||||||
dom = xml.dom.minidom.parseString(xml_string)
|
|
||||||
return dom.toprettyxml(indent=" ", encoding="UTF-8").decode('utf-8')
|
|
||||||
|
|||||||
@@ -1676,6 +1676,54 @@ class ExportXMLCommandTest(TestCase):
|
|||||||
self.assertIn('TEST-001', output)
|
self.assertIn('TEST-001', output)
|
||||||
self.assertIn('Test Standard', output)
|
self.assertIn('Test Standard', output)
|
||||||
|
|
||||||
|
def test_export_xml_command_table_structure(self):
|
||||||
|
"""Test export_xml command converts markdown tables to proper XML structure"""
|
||||||
|
# Create document with table
|
||||||
|
table_doc = Dokument.objects.create(
|
||||||
|
nummer="TABLE-001",
|
||||||
|
dokumententyp=self.dokumententyp,
|
||||||
|
name="Table Test Document",
|
||||||
|
aktiv=True
|
||||||
|
)
|
||||||
|
table_doc.autoren.add(self.autor1)
|
||||||
|
|
||||||
|
table_vorgabe = Vorgabe.objects.create(
|
||||||
|
order=1,
|
||||||
|
nummer=1,
|
||||||
|
dokument=table_doc,
|
||||||
|
thema=self.thema,
|
||||||
|
titel="Table Test Vorgabe",
|
||||||
|
gueltigkeit_von=date(2023, 1, 1),
|
||||||
|
gueltigkeit_bis=date(2025, 12, 31)
|
||||||
|
)
|
||||||
|
|
||||||
|
table_content = "| Spalte1 | Spalte2 |\n|---------|---------|\n| Wert1 | Wert2 |\n| Wert3 | Wert4 |"
|
||||||
|
|
||||||
|
self.langtext_table = VorgabeLangtext.objects.create(
|
||||||
|
abschnitt=table_vorgabe,
|
||||||
|
abschnitttyp=self.abschnitttyp_table,
|
||||||
|
inhalt=table_content,
|
||||||
|
order=1
|
||||||
|
)
|
||||||
|
|
||||||
|
out = StringIO()
|
||||||
|
call_command('export_xml', stdout=out)
|
||||||
|
|
||||||
|
output = out.getvalue()
|
||||||
|
|
||||||
|
# Check that table structure is properly exported
|
||||||
|
self.assertIn('<table>', output)
|
||||||
|
self.assertIn('<header>', output)
|
||||||
|
self.assertIn('<column>Spalte1</column>', output)
|
||||||
|
self.assertIn('<column>Spalte2</column>', output)
|
||||||
|
self.assertIn('<row>', output)
|
||||||
|
self.assertIn('<column>Wert1</column>', output)
|
||||||
|
self.assertIn('<column>Wert2</column>', output)
|
||||||
|
self.assertIn('<column>Wert3</column>', output)
|
||||||
|
self.assertIn('<column>Wert4</column>', output)
|
||||||
|
# Should not contain the markdown table content as plain text
|
||||||
|
self.assertNotIn('| Spalte1 | Spalte2 |', output)
|
||||||
|
|
||||||
|
|
||||||
class StandardJSONViewTest(TestCase):
|
class StandardJSONViewTest(TestCase):
|
||||||
"""Test cases for standard_json view"""
|
"""Test cases for standard_json view"""
|
||||||
@@ -1915,6 +1963,7 @@ class StandardXMLViewTest(TestCase):
|
|||||||
|
|
||||||
# Create text sections
|
# Create text sections
|
||||||
self.abschnitttyp_text = AbschnittTyp.objects.create(abschnitttyp="text")
|
self.abschnitttyp_text = AbschnittTyp.objects.create(abschnitttyp="text")
|
||||||
|
self.abschnitttyp_table = AbschnittTyp.objects.create(abschnitttyp="table")
|
||||||
|
|
||||||
self.geltungsbereich = Geltungsbereich.objects.create(
|
self.geltungsbereich = Geltungsbereich.objects.create(
|
||||||
geltungsbereich=self.dokument,
|
geltungsbereich=self.dokument,
|
||||||
@@ -2050,6 +2099,71 @@ class StandardXMLViewTest(TestCase):
|
|||||||
self.assertIn('\n', response.content.decode())
|
self.assertIn('\n', response.content.decode())
|
||||||
self.assertIn(' ', response.content.decode()) # Check for indentation
|
self.assertIn(' ', response.content.decode()) # Check for indentation
|
||||||
|
|
||||||
|
def test_standard_xml_view_table_structure(self):
|
||||||
|
"""Test standard_xml view converts markdown tables to proper XML structure"""
|
||||||
|
# Create document with table
|
||||||
|
table_doc = Dokument.objects.create(
|
||||||
|
nummer="TABLE-XML-001",
|
||||||
|
dokumententyp=self.dokumententyp,
|
||||||
|
name="Table XML Test Document",
|
||||||
|
aktiv=True
|
||||||
|
)
|
||||||
|
table_doc.autoren.add(self.autor)
|
||||||
|
|
||||||
|
table_vorgabe = Vorgabe.objects.create(
|
||||||
|
order=1,
|
||||||
|
nummer=1,
|
||||||
|
dokument=table_doc,
|
||||||
|
thema=self.thema,
|
||||||
|
titel="Table XML Test Vorgabe",
|
||||||
|
gueltigkeit_von=date(2023, 1, 1),
|
||||||
|
gueltigkeit_bis=date(2025, 12, 31)
|
||||||
|
)
|
||||||
|
|
||||||
|
table_content = "| Col1 | Col2 |\n|------|------|\n| A | B |\n| C | D |"
|
||||||
|
|
||||||
|
langtext_table = VorgabeLangtext.objects.create(
|
||||||
|
abschnitt=table_vorgabe,
|
||||||
|
abschnitttyp=self.abschnitttyp_table,
|
||||||
|
inhalt=table_content,
|
||||||
|
order=1
|
||||||
|
)
|
||||||
|
|
||||||
|
url = reverse('standard_xml', kwargs={'nummer': 'TABLE-XML-001'})
|
||||||
|
response = self.client.get(url)
|
||||||
|
|
||||||
|
# Parse XML response
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
root = ET.fromstring(response.content)
|
||||||
|
|
||||||
|
# Find table element
|
||||||
|
table = root.find('.//table')
|
||||||
|
self.assertIsNotNone(table, 'Table element should exist')
|
||||||
|
|
||||||
|
# Check header structure
|
||||||
|
header = table.find('header')
|
||||||
|
self.assertIsNotNone(header, 'Header should exist')
|
||||||
|
header_cols = header.findall('column')
|
||||||
|
self.assertEqual(len(header_cols), 2, 'Header should have 2 columns')
|
||||||
|
self.assertEqual(header_cols[0].text, 'Col1')
|
||||||
|
self.assertEqual(header_cols[1].text, 'Col2')
|
||||||
|
|
||||||
|
# Check row structure
|
||||||
|
rows = table.findall('row')
|
||||||
|
self.assertEqual(len(rows), 2, 'Should have 2 data rows')
|
||||||
|
|
||||||
|
# Check first row
|
||||||
|
row1_cols = rows[0].findall('column')
|
||||||
|
self.assertEqual(len(row1_cols), 2)
|
||||||
|
self.assertEqual(row1_cols[0].text, 'A')
|
||||||
|
self.assertEqual(row1_cols[1].text, 'B')
|
||||||
|
|
||||||
|
# Check second row
|
||||||
|
row2_cols = rows[1].findall('column')
|
||||||
|
self.assertEqual(len(row2_cols), 2)
|
||||||
|
self.assertEqual(row2_cols[0].text, 'C')
|
||||||
|
self.assertEqual(row2_cols[1].text, 'D')
|
||||||
|
|
||||||
|
|
||||||
class VorgabeCommentModelTest(TestCase):
|
class VorgabeCommentModelTest(TestCase):
|
||||||
"""Test cases for VorgabeComment model"""
|
"""Test cases for VorgabeComment model"""
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
"""
|
"""
|
||||||
Utility functions for Vorgaben sanity checking
|
Utility functions for Vorgaben sanity checking and XML export
|
||||||
"""
|
"""
|
||||||
import datetime
|
import datetime
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
import xml.dom.minidom
|
||||||
from django.db.models import Count
|
from django.db.models import Count
|
||||||
from itertools import combinations
|
from itertools import combinations
|
||||||
from dokumente.models import Vorgabe
|
from dokumente.models import Vorgabe
|
||||||
@@ -121,3 +123,190 @@ def format_conflict_report(conflicts, verbose=False):
|
|||||||
lines.append(f" Overlap starts: {overlap_start} (no end)")
|
lines.append(f" Overlap starts: {overlap_start} (no end)")
|
||||||
|
|
||||||
return "\n".join(lines)
|
return "\n".join(lines)
|
||||||
|
|
||||||
|
|
||||||
|
# XML Export utilities
|
||||||
|
|
||||||
|
def parse_markdown_table(markdown_content):
|
||||||
|
"""
|
||||||
|
Parse markdown table content and return XML element with <table><header><row><column> structure
|
||||||
|
"""
|
||||||
|
lines = [line.strip() for line in markdown_content.strip().split('\n') if line.strip()]
|
||||||
|
if not lines:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Create table element
|
||||||
|
table = ET.Element('table')
|
||||||
|
|
||||||
|
# Parse first row as header
|
||||||
|
header_row = [cell.strip() for cell in lines[0].split('|') if cell.strip()]
|
||||||
|
header = ET.SubElement(table, 'header')
|
||||||
|
for cell in header_row:
|
||||||
|
column = ET.SubElement(header, 'column')
|
||||||
|
column.text = cell
|
||||||
|
|
||||||
|
# Parse remaining rows (skip separator row if it exists)
|
||||||
|
for line in lines[2:] if len(lines) > 1 and all(c in '-| ' for c in lines[1]) else lines[1:]:
|
||||||
|
# Check if this is a separator row
|
||||||
|
if all(c in '-| ' for c in line):
|
||||||
|
continue
|
||||||
|
|
||||||
|
row = ET.SubElement(table, 'row')
|
||||||
|
row_cells = [cell.strip() for cell in line.split('|') if cell.strip()]
|
||||||
|
for cell in row_cells:
|
||||||
|
column = ET.SubElement(row, 'column')
|
||||||
|
column.text = cell
|
||||||
|
|
||||||
|
return table
|
||||||
|
|
||||||
|
|
||||||
|
def prettify_xml(xml_string):
|
||||||
|
"""
|
||||||
|
Prettify XML string with proper indentation
|
||||||
|
"""
|
||||||
|
dom = xml.dom.minidom.parseString(xml_string)
|
||||||
|
return dom.toprettyxml(indent=" ", encoding="UTF-8").decode('utf-8')
|
||||||
|
|
||||||
|
|
||||||
|
def build_dokument_xml_element(dokument, parent_element):
|
||||||
|
"""
|
||||||
|
Build XML element for a single Dokument and append it to parent_element.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dokument: Dokument instance (should be prefetched with related data)
|
||||||
|
parent_element: Parent XML element to append to
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The created document element
|
||||||
|
"""
|
||||||
|
doc_element = ET.SubElement(parent_element, 'Vorgabendokument')
|
||||||
|
|
||||||
|
ET.SubElement(doc_element, 'Typ').text = dokument.dokumententyp.name if dokument.dokumententyp else ""
|
||||||
|
ET.SubElement(doc_element, 'Nummer').text = dokument.nummer
|
||||||
|
ET.SubElement(doc_element, 'Name').text = dokument.name
|
||||||
|
|
||||||
|
autoren_element = ET.SubElement(doc_element, 'Autoren')
|
||||||
|
for autor in dokument.autoren.all():
|
||||||
|
ET.SubElement(autoren_element, 'Autor').text = autor.name
|
||||||
|
|
||||||
|
pruefende_element = ET.SubElement(doc_element, 'Pruefende')
|
||||||
|
for pruefender in dokument.pruefende.all():
|
||||||
|
ET.SubElement(pruefende_element, 'Pruefender').text = pruefender.name
|
||||||
|
|
||||||
|
gueltigkeit_element = ET.SubElement(doc_element, 'Gueltigkeit')
|
||||||
|
ET.SubElement(gueltigkeit_element, 'Von').text = dokument.gueltigkeit_von.strftime("%Y-%m-%d") if dokument.gueltigkeit_von else ""
|
||||||
|
ET.SubElement(gueltigkeit_element, 'Bis').text = dokument.gueltigkeit_bis.strftime("%Y-%m-%d") if dokument.gueltigkeit_bis else None
|
||||||
|
|
||||||
|
ET.SubElement(doc_element, 'SignaturCSO').text = dokument.signatur_cso
|
||||||
|
|
||||||
|
geltungsbereich_sections = dokument.geltungsbereich_set.all().order_by('order')
|
||||||
|
if geltungsbereich_sections:
|
||||||
|
geltungsbereich_element = ET.SubElement(doc_element, 'Geltungsbereich')
|
||||||
|
for gb in geltungsbereich_sections:
|
||||||
|
section_type = gb.abschnitttyp.abschnitttyp if gb.abschnitttyp else "text"
|
||||||
|
if section_type in ('tabelle', 'table'):
|
||||||
|
table = parse_markdown_table(gb.inhalt)
|
||||||
|
if table is not None:
|
||||||
|
abschnitt_element = ET.SubElement(geltungsbereich_element, 'Abschnitt')
|
||||||
|
abschnitt_element.set('typ', section_type)
|
||||||
|
abschnitt_element.append(table)
|
||||||
|
else:
|
||||||
|
abschnitt_element = ET.SubElement(geltungsbereich_element, 'Abschnitt')
|
||||||
|
abschnitt_element.set('typ', section_type)
|
||||||
|
abschnitt_element.text = gb.inhalt
|
||||||
|
|
||||||
|
einleitung_sections = dokument.einleitung_set.all().order_by('order')
|
||||||
|
if einleitung_sections:
|
||||||
|
einleitung_element = ET.SubElement(doc_element, 'Einleitung')
|
||||||
|
for ei in einleitung_sections:
|
||||||
|
section_type = ei.abschnitttyp.abschnitttyp if ei.abschnitttyp else "text"
|
||||||
|
if section_type in ('tabelle', 'table'):
|
||||||
|
table = parse_markdown_table(ei.inhalt)
|
||||||
|
if table is not None:
|
||||||
|
abschnitt_element = ET.SubElement(einleitung_element, 'Abschnitt')
|
||||||
|
abschnitt_element.set('typ', section_type)
|
||||||
|
abschnitt_element.append(table)
|
||||||
|
else:
|
||||||
|
abschnitt_element = ET.SubElement(einleitung_element, 'Abschnitt')
|
||||||
|
abschnitt_element.set('typ', section_type)
|
||||||
|
abschnitt_element.text = ei.inhalt
|
||||||
|
|
||||||
|
ET.SubElement(doc_element, 'Ziel').text = ""
|
||||||
|
ET.SubElement(doc_element, 'Grundlagen').text = ""
|
||||||
|
|
||||||
|
changelog_element = ET.SubElement(doc_element, 'Changelog')
|
||||||
|
for cl in dokument.changelog.all().order_by('-datum'):
|
||||||
|
entry = ET.SubElement(changelog_element, 'Eintrag')
|
||||||
|
ET.SubElement(entry, 'Datum').text = cl.datum.strftime("%Y-%m-%d")
|
||||||
|
autoren = ET.SubElement(entry, 'Autoren')
|
||||||
|
for autor in cl.autoren.all():
|
||||||
|
ET.SubElement(autoren, 'Autor').text = autor.name
|
||||||
|
ET.SubElement(entry, 'Aenderung').text = cl.aenderung
|
||||||
|
|
||||||
|
anhaenge_element = ET.SubElement(doc_element, 'Anhaenge')
|
||||||
|
ET.SubElement(anhaenge_element, 'Anhang').text = dokument.anhaenge
|
||||||
|
|
||||||
|
ET.SubElement(doc_element, 'Verantwortlich').text = "Information Security Management BIT"
|
||||||
|
ET.SubElement(doc_element, 'Klassifizierung').text = ""
|
||||||
|
|
||||||
|
glossar_element = ET.SubElement(doc_element, 'Glossar')
|
||||||
|
|
||||||
|
vorgaben_element = ET.SubElement(doc_element, 'Vorgaben')
|
||||||
|
|
||||||
|
for vorgabe in dokument.vorgaben.all().order_by('order'):
|
||||||
|
vorgabe_el = ET.SubElement(vorgaben_element, 'Vorgabe')
|
||||||
|
|
||||||
|
ET.SubElement(vorgabe_el, 'Nummer').text = str(vorgabe.nummer)
|
||||||
|
ET.SubElement(vorgabe_el, 'Titel').text = vorgabe.titel
|
||||||
|
ET.SubElement(vorgabe_el, 'Thema').text = vorgabe.thema.name if vorgabe.thema else ""
|
||||||
|
|
||||||
|
kurztext_sections = vorgabe.vorgabekurztext_set.all().order_by('order')
|
||||||
|
if kurztext_sections:
|
||||||
|
kurztext_element = ET.SubElement(vorgabe_el, 'Kurztext')
|
||||||
|
for kt in kurztext_sections:
|
||||||
|
section_type = kt.abschnitttyp.abschnitttyp if kt.abschnitttyp else "text"
|
||||||
|
if section_type in ('tabelle', 'table'):
|
||||||
|
table = parse_markdown_table(kt.inhalt)
|
||||||
|
if table is not None:
|
||||||
|
abschnitt = ET.SubElement(kurztext_element, 'Abschnitt')
|
||||||
|
abschnitt.set('typ', section_type)
|
||||||
|
abschnitt.append(table)
|
||||||
|
else:
|
||||||
|
abschnitt = ET.SubElement(kurztext_element, 'Abschnitt')
|
||||||
|
abschnitt.set('typ', section_type)
|
||||||
|
abschnitt.text = kt.inhalt
|
||||||
|
|
||||||
|
langtext_sections = vorgabe.vorgabelangtext_set.all().order_by('order')
|
||||||
|
if langtext_sections:
|
||||||
|
langtext_element = ET.SubElement(vorgabe_el, 'Langtext')
|
||||||
|
for lt in langtext_sections:
|
||||||
|
section_type = lt.abschnitttyp.abschnitttyp if lt.abschnitttyp else "text"
|
||||||
|
if section_type in ('tabelle', 'table'):
|
||||||
|
table = parse_markdown_table(lt.inhalt)
|
||||||
|
if table is not None:
|
||||||
|
abschnitt = ET.SubElement(langtext_element, 'Abschnitt')
|
||||||
|
abschnitt.set('typ', section_type)
|
||||||
|
abschnitt.append(table)
|
||||||
|
else:
|
||||||
|
abschnitt = ET.SubElement(langtext_element, 'Abschnitt')
|
||||||
|
abschnitt.set('typ', section_type)
|
||||||
|
abschnitt.text = lt.inhalt
|
||||||
|
|
||||||
|
referenz_element = ET.SubElement(vorgabe_el, 'Referenzen')
|
||||||
|
for ref in vorgabe.referenzen.all():
|
||||||
|
ref_text = f"{ref.name_nummer}: {ref.name_text}" if ref.name_text else ref.name_nummer
|
||||||
|
ET.SubElement(referenz_element, 'Referenz').text = ref_text
|
||||||
|
|
||||||
|
vorgabe_gueltigkeit = ET.SubElement(vorgabe_el, 'Gueltigkeit')
|
||||||
|
ET.SubElement(vorgabe_gueltigkeit, 'Von').text = vorgabe.gueltigkeit_von.strftime("%Y-%m-%d") if vorgabe.gueltigkeit_von else ""
|
||||||
|
ET.SubElement(vorgabe_gueltigkeit, 'Bis').text = vorgabe.gueltigkeit_bis.strftime("%Y-%m-%d") if vorgabe.gueltigkeit_bis else None
|
||||||
|
|
||||||
|
checklistenfragen_element = ET.SubElement(vorgabe_el, 'Checklistenfragen')
|
||||||
|
for cf in vorgabe.checklistenfragen.all():
|
||||||
|
ET.SubElement(checklistenfragen_element, 'Frage').text = cf.frage
|
||||||
|
|
||||||
|
stichworte_element = ET.SubElement(vorgabe_el, 'Stichworte')
|
||||||
|
for stw in vorgabe.stichworte.all():
|
||||||
|
ET.SubElement(stichworte_element, 'Stichwort').text = stw.stichwort
|
||||||
|
|
||||||
|
return doc_element
|
||||||
@@ -9,6 +9,7 @@ from django.utils.safestring import SafeString
|
|||||||
import json
|
import json
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
from .models import Dokument, Vorgabe, VorgabeKurztext, VorgabeLangtext, Checklistenfrage, VorgabeComment
|
from .models import Dokument, Vorgabe, VorgabeKurztext, VorgabeLangtext, Checklistenfrage, VorgabeComment
|
||||||
|
from .utils import build_dokument_xml_element, prettify_xml
|
||||||
from abschnitte.utils import render_textabschnitte
|
from abschnitte.utils import render_textabschnitte
|
||||||
|
|
||||||
from datetime import date
|
from datetime import date
|
||||||
@@ -271,122 +272,21 @@ def standard_xml(request, nummer):
|
|||||||
nummer=nummer
|
nummer=nummer
|
||||||
)
|
)
|
||||||
|
|
||||||
root = ET.Element('Vorgabendokument')
|
# Create a temporary root element to build the document
|
||||||
|
root = ET.Element('root')
|
||||||
|
build_dokument_xml_element(dokument, root)
|
||||||
|
|
||||||
ET.SubElement(root, 'Typ').text = dokument.dokumententyp.name if dokument.dokumententyp else ""
|
# Get the actual document element (first child of root)
|
||||||
ET.SubElement(root, 'Nummer').text = dokument.nummer
|
doc_element = root[0]
|
||||||
ET.SubElement(root, 'Name').text = dokument.name
|
|
||||||
|
|
||||||
autoren_element = ET.SubElement(root, 'Autoren')
|
xml_str = ET.tostring(doc_element, encoding='unicode', method='xml')
|
||||||
for autor in dokument.autoren.all():
|
xml_output = prettify_xml(xml_str)
|
||||||
ET.SubElement(autoren_element, 'Autor').text = autor.name
|
|
||||||
|
|
||||||
pruefende_element = ET.SubElement(root, 'Pruefende')
|
|
||||||
for pruefender in dokument.pruefende.all():
|
|
||||||
ET.SubElement(pruefende_element, 'Pruefender').text = pruefender.name
|
|
||||||
|
|
||||||
gueltigkeit_element = ET.SubElement(root, 'Gueltigkeit')
|
|
||||||
ET.SubElement(gueltigkeit_element, 'Von').text = dokument.gueltigkeit_von.strftime("%Y-%m-%d") if dokument.gueltigkeit_von else ""
|
|
||||||
ET.SubElement(gueltigkeit_element, 'Bis').text = dokument.gueltigkeit_bis.strftime("%Y-%m-%d") if dokument.gueltigkeit_bis else None
|
|
||||||
|
|
||||||
ET.SubElement(root, 'SignaturCSO').text = dokument.signatur_cso
|
|
||||||
|
|
||||||
geltungsbereich_sections = dokument.geltungsbereich_set.all().order_by('order')
|
|
||||||
if geltungsbereich_sections:
|
|
||||||
geltungsbereich_element = ET.SubElement(root, 'Geltungsbereich')
|
|
||||||
abschnitt_element = ET.SubElement(geltungsbereich_element, 'Abschnitt')
|
|
||||||
for gb in geltungsbereich_sections:
|
|
||||||
section = ET.SubElement(abschnitt_element, 'Teil')
|
|
||||||
section.set('typ', gb.abschnitttyp.abschnitttyp if gb.abschnitttyp else "text")
|
|
||||||
section.text = gb.inhalt
|
|
||||||
|
|
||||||
einleitung_sections = dokument.einleitung_set.all().order_by('order')
|
|
||||||
if einleitung_sections:
|
|
||||||
einleitung_element = ET.SubElement(root, 'Einleitung')
|
|
||||||
abschnitt_element = ET.SubElement(einleitung_element, 'Abschnitt')
|
|
||||||
for ei in einleitung_sections:
|
|
||||||
section = ET.SubElement(abschnitt_element, 'Teil')
|
|
||||||
section.set('typ', ei.abschnitttyp.abschnitttyp if ei.abschnitttyp else "text")
|
|
||||||
section.text = ei.inhalt
|
|
||||||
|
|
||||||
ET.SubElement(root, 'Ziel').text = ""
|
|
||||||
ET.SubElement(root, 'Grundlagen').text = ""
|
|
||||||
|
|
||||||
changelog_element = ET.SubElement(root, 'Changelog')
|
|
||||||
for cl in dokument.changelog.all().order_by('-datum'):
|
|
||||||
entry = ET.SubElement(changelog_element, 'Eintrag')
|
|
||||||
ET.SubElement(entry, 'Datum').text = cl.datum.strftime("%Y-%m-%d")
|
|
||||||
autoren = ET.SubElement(entry, 'Autoren')
|
|
||||||
for autor in cl.autoren.all():
|
|
||||||
ET.SubElement(autoren, 'Autor').text = autor.name
|
|
||||||
ET.SubElement(entry, 'Aenderung').text = cl.aenderung
|
|
||||||
|
|
||||||
anhaenge_element = ET.SubElement(root, 'Anhaenge')
|
|
||||||
ET.SubElement(anhaenge_element, 'Anhang').text = dokument.anhaenge
|
|
||||||
|
|
||||||
ET.SubElement(root, 'Verantwortlich').text = "Information Security Management BIT"
|
|
||||||
ET.SubElement(root, 'Klassifizierung').text = ""
|
|
||||||
|
|
||||||
glossar_element = ET.SubElement(root, 'Glossar')
|
|
||||||
|
|
||||||
vorgaben_element = ET.SubElement(root, 'Vorgaben')
|
|
||||||
|
|
||||||
for vorgabe in dokument.vorgaben.all().order_by('order'):
|
|
||||||
vorgabe_el = ET.SubElement(vorgaben_element, 'Vorgabe')
|
|
||||||
|
|
||||||
ET.SubElement(vorgabe_el, 'Nummer').text = str(vorgabe.nummer)
|
|
||||||
ET.SubElement(vorgabe_el, 'Titel').text = vorgabe.titel
|
|
||||||
ET.SubElement(vorgabe_el, 'Thema').text = vorgabe.thema.name if vorgabe.thema else ""
|
|
||||||
|
|
||||||
kurztext_sections = vorgabe.vorgabekurztext_set.all().order_by('order')
|
|
||||||
if kurztext_sections:
|
|
||||||
kurztext_element = ET.SubElement(vorgabe_el, 'Kurztext')
|
|
||||||
abschnitt = ET.SubElement(kurztext_element, 'Abschnitt')
|
|
||||||
for kt in kurztext_sections:
|
|
||||||
teil = ET.SubElement(abschnitt, 'Teil')
|
|
||||||
teil.set('typ', kt.abschnitttyp.abschnitttyp if kt.abschnitttyp else "text")
|
|
||||||
teil.text = kt.inhalt
|
|
||||||
|
|
||||||
langtext_sections = vorgabe.vorgabelangtext_set.all().order_by('order')
|
|
||||||
if langtext_sections:
|
|
||||||
langtext_element = ET.SubElement(vorgabe_el, 'Langtext')
|
|
||||||
abschnitt = ET.SubElement(langtext_element, 'Abschnitt')
|
|
||||||
for lt in langtext_sections:
|
|
||||||
teil = ET.SubElement(abschnitt, 'Teil')
|
|
||||||
teil.set('typ', lt.abschnitttyp.abschnitttyp if lt.abschnitttyp else "text")
|
|
||||||
teil.text = lt.inhalt
|
|
||||||
|
|
||||||
referenz_element = ET.SubElement(vorgabe_el, 'Referenzen')
|
|
||||||
for ref in vorgabe.referenzen.all():
|
|
||||||
ref_text = f"{ref.name_nummer}: {ref.name_text}" if ref.name_text else ref.name_nummer
|
|
||||||
ET.SubElement(referenz_element, 'Referenz').text = ref_text
|
|
||||||
|
|
||||||
vorgabe_gueltigkeit = ET.SubElement(vorgabe_el, 'Gueltigkeit')
|
|
||||||
ET.SubElement(vorgabe_gueltigkeit, 'Von').text = vorgabe.gueltigkeit_von.strftime("%Y-%m-%d") if vorgabe.gueltigkeit_von else ""
|
|
||||||
ET.SubElement(vorgabe_gueltigkeit, 'Bis').text = vorgabe.gueltigkeit_bis.strftime("%Y-%m-%d") if vorgabe.gueltigkeit_bis else None
|
|
||||||
|
|
||||||
checklistenfragen_element = ET.SubElement(vorgabe_el, 'Checklistenfragen')
|
|
||||||
for cf in vorgabe.checklistenfragen.all():
|
|
||||||
ET.SubElement(checklistenfragen_element, 'Frage').text = cf.frage
|
|
||||||
|
|
||||||
stichworte_element = ET.SubElement(vorgabe_el, 'Stichworte')
|
|
||||||
for stw in vorgabe.stichworte.all():
|
|
||||||
ET.SubElement(stichworte_element, 'Stichwort').text = stw.stichwort
|
|
||||||
|
|
||||||
xml_str = ET.tostring(root, encoding='unicode', method='xml')
|
|
||||||
xml_output = _prettify_xml(xml_str)
|
|
||||||
|
|
||||||
response = HttpResponse(xml_output, content_type='application/xml; charset=utf-8')
|
response = HttpResponse(xml_output, content_type='application/xml; charset=utf-8')
|
||||||
response['Content-Disposition'] = f'attachment; filename="{dokument.nummer}.xml"'
|
response['Content-Disposition'] = f'attachment; filename="{dokument.nummer}.xml"'
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
def _prettify_xml(xml_string):
|
|
||||||
import xml.dom.minidom
|
|
||||||
dom = xml.dom.minidom.parseString(xml_string)
|
|
||||||
return dom.toprettyxml(indent=" ", encoding="UTF-8").decode('utf-8')
|
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def get_vorgabe_comments(request, vorgabe_id):
|
def get_vorgabe_comments(request, vorgabe_id):
|
||||||
"""Get comments for a specific Vorgabe"""
|
"""Get comments for a specific Vorgabe"""
|
||||||
|
|||||||
Reference in New Issue
Block a user