add search bar for agenda items and suggestion marks in .txt files

api/docs.py

@@ -35,6 +35,59 @@ NSMAP = {
     'v': 'urn:schemas-microsoft-com:vml'
 }
 
+SUGGESTION_START = '[[SUGGESTION_START]]'
+SUGGESTION_END = '[[SUGGESTION_END]]'
+
+def extract_docx_text_with_suggestions(docx_stream: io.BytesIO) -> str:
+    try:
+        with zipfile.ZipFile(docx_stream) as z:
+            xml = z.read('word/document.xml')
+    except KeyError:
+        raise FileNotFoundError('word/document.xml not found in the DOCX archive.')
+
+    root = etree.fromstring(xml)
+    body = root.find('w:body', NSMAP)
+
+    out: list[str] = []
+
+    def walk(el, collector: list[str]):
+        tag = etree.QName(el).localname
+        if tag == 'del':
+            return
+        if tag == 'ins':
+            temp: list[str] = []
+            for child in el:
+                walk(child, temp)
+            joined = ''.join(temp)
+            if joined.strip():
+                collector.append(SUGGESTION_START)
+                collector.append(joined)
+                collector.append(SUGGESTION_END)
+            else:
+                collector.append(joined)
+            return
+        if tag == 'p':
+            for child in el:
+                walk(child, collector)
+            collector.append('\n')
+            return
+        if tag == 't':
+            collector.append(el.text or '')
+            return
+        if tag == 'tab':
+            collector.append('\t')
+            return
+        if tag == 'br':
+            collector.append('\n')
+            return
+        for child in el:
+            walk(child, collector)
+
+    if body is not None:
+        walk(body, out)
+    text = ''.join(out).replace('\r', '')
+    return text
+
 # ================================== Converting of files to .txt ====================================
 
 KREUZBERG_CONFIG: ExtractionConfig = ExtractionConfig(
@@ -124,19 +177,14 @@ async def extract_text_contents(filename: str, ext: str, bytes: io.BytesIO) -> l
     if ext == ".doc":
         logging.debug(f"Converting {filename} .doc --> .docx")
         docx_bytes = await convert_file_type(bytes, filename, "doc", "docx")
-        logging.debug(
-            f"Extracting content for filename: {filename}, ext: {ext} with converted doc")
-        extracted_data = await extract_bytes(docx_bytes.read(), FORMAT_MIME_TYPES[".docx"], config=KREUZBERG_CONFIG)
-        final_text = extracted_data.content
+        logging.debug(f"Extracting content with suggestion markers for filename: {filename}, ext: {ext} (converted)")
+        docx_bytes.seek(0)
+        final_text = extract_docx_text_with_suggestions(docx_bytes)
         logging.debug(f"Got text content for filename: {filename}, ext: {ext}")
     elif ext == ".docx":
-        # Applying doc revisions to docx files (especially for pCR / draftCR files)
-        logging.debug(f"Updating .docx revisions for {filename}.")
-        applied_revision = apply_docx_revisions(zipfile.ZipFile(bytes))
-        logging.debug(
-            f"Extracting content for filename: {filename}, ext: {ext} with converted docx")
-        extracted_data = await extract_bytes(applied_revision.read(), FORMAT_MIME_TYPES[".docx"], config=KREUZBERG_CONFIG)
-        final_text = extracted_data.content
+        logging.debug(f"Extracting .docx with suggestion markers for {filename}.")
+        bytes.seek(0)
+        final_text = extract_docx_text_with_suggestions(bytes)
         logging.debug(f"Got text content for filename: {filename}, ext: {ext}")
     elif ext == ".ppt":
         logging.debug(f"Converting {filename} .ppt --> .pptx")

static/index.html

@@ -167,6 +167,9 @@
                                     <span class="font-semibold">Tous</span>
                                 </label>
                             </li>
+                            <li class="pb-2">
+                                <input id="agenda-search-input" type="text" placeholder="Search agenda..." class="input input-bordered w-full" />
+                            </li>
                             <div id="agenda-options" class="flex flex-col gap-1"></div>
                         </ul>
                     </div>

static/js/ui.js

@@ -81,10 +81,9 @@ export function populateSelect(selectId, options, defaultText = 'Sélectionner..
 export function populateCheckboxDropdown(optionsContainerId, options, filterType, labelId, selectionSet, onSelect) {
     const container = document.getElementById(optionsContainerId);
     container.innerHTML = '';
-    selectionSet.clear(); // reset all
+    selectionSet.clear();
 
-    // Ajoute chaque option
-    options.forEach(option => {
+    const buildOptionLabel = (option) => {
         const safeId = `${filterType}-${encodeURIComponent(option).replace(/[%\s]/g, '_')}`;
         const label = document.createElement('label');
         label.className = "flex items-center gap-2 cursor-pointer py-1";
@@ -92,42 +91,51 @@ export function populateCheckboxDropdown(optionsContainerId, options, filterType
             <input type="checkbox" class="${filterType}-checkbox option-checkbox" id="${safeId}" value="${option}">
             <span>${option}</span>
         `;
-        label.querySelector('input').addEventListener('change', function () {
-            if (this.checked) {
-                selectionSet.add(this.value);
-            } else {
-                selectionSet.delete(this.value);
-            }
-
-            // Gestion du label "Tous"
+        const inputEl = label.querySelector('input');
+        inputEl.checked = selectionSet.has(option);
+        inputEl.addEventListener('change', function () {
+            if (this.checked) selectionSet.add(this.value); else selectionSet.delete(this.value);
             updateCheckboxDropdownLabel(filterType, labelId, selectionSet, options.length);
-            // Gestion du "Tous" global
             const allBox = document.querySelector(`.${filterType}-checkbox[value="all"]`);
             if (allBox && allBox.checked) allBox.checked = false;
-            // Si plus rien n'est coché, recoche "Tous"
             if (selectionSet.size === 0 && allBox) allBox.checked = true;
             onSelect?.();
         });
-        container.appendChild(label);
-    });
+        return label;
+    };
+
+    const renderOptions = (list) => {
+        container.innerHTML = '';
+        list.forEach(option => container.appendChild(buildOptionLabel(option)));
+    };
+
+    renderOptions(options);
 
-    // Réinitialise le label
     updateCheckboxDropdownLabel(filterType, labelId, selectionSet, options.length);
 
-    // Gestion de "Tous"
     const allBox = document.querySelector(`.${filterType}-checkbox[value="all"]`);
     if (allBox) {
         allBox.addEventListener('change', function () {
             if (this.checked) {
-                // Décoche tout le reste
                 selectionSet.clear();
                 container.querySelectorAll('input[type="checkbox"]').forEach(cb => cb.checked = false);
-                this.checked = true; // reste coché
+                this.checked = true;
                 updateCheckboxDropdownLabel(filterType, labelId, selectionSet, options.length);
                 applyFilters();
             }
         });
     }
+
+    if (filterType === 'agenda') {
+        const searchInput = document.getElementById('agenda-search-input');
+        if (searchInput) {
+            searchInput.addEventListener('input', () => {
+                const q = searchInput.value.toLowerCase();
+                const filtered = options.filter(o => o.toLowerCase().includes(q));
+                renderOptions(filtered);
+            });
+        }
+    }
 }
 
 export function updateCheckboxDropdownLabel(type, labelId, set, totalCount) {