Update prof.py

prof.py

@@ -93,10 +93,6 @@ def set_two_column_layout(doc, add_separator_line=True, balance_columns=True):
     # Set space between columns (reduced for better space utilization)
     cols.set(qn('w:space'), '432')  # 0.3 inch in twentieths of a point (was 708)
 
-    # Add separator line between columns if requested
-    if add_separator_line:
-        cols.set(qn('w:sep'), '1')  # This adds the vertical separator line
-
     # Enable column balancing if requested
     if balance_columns:
         cols.set(qn('w:equalWidth'), '1')  # Equal width columns
@@ -162,27 +158,138 @@ def add_page_break(doc):
     doc.add_page_break()
 
 
-def create_course_title(doc, course_number, course_title, theme_color=None):
-    """Create a course title section in the document and return the paragraph object"""
+def create_course_title(doc, course_number, course_title, theme_color=None, theme_hex=None):
+    """Create a course title section with rounded frame (unfilled) matching module style
+    Automatically wraps to two lines and doubles height if text is too long"""
+    if theme_hex is None:
+        theme_hex = THEME_COLOR_HEX
     if theme_color is None:
-        theme_color = THEME_COLOR
+        theme_color = RGBColor.from_string(theme_hex)
 
     # Add minimal space before course title
     course_para = doc.add_paragraph()
     course_para.alignment = WD_ALIGN_PARAGRAPH.CENTER
 
-    # Reduce spacing before and after
-    course_para.paragraph_format.space_before = Pt(6)
-    course_para.paragraph_format.space_after = Pt(3)
-    course_para.paragraph_format.keep_with_next = True  # Keep course title with first question
-    course_para.paragraph_format.keep_together = True  # Prevent splitting within paragraph
+    # Remove all spacing before and after
+    course_para.paragraph_format.space_before = Pt(0)
+    course_para.paragraph_format.space_after = Pt(0)
+    course_para.paragraph_format.keep_with_next = True
+    course_para.paragraph_format.keep_together = True
+
+    # Format the text
+    full_text = f"{course_number}. {course_title}"
+    text_length = len(full_text)
+
+    # ========== CUSTOMIZE COURSE TITLE APPEARANCE HERE ==========
+    MAX_CHARS_SINGLE_LINE = 40  # Threshold for wrapping to two lines
+    SINGLE_LINE_HEIGHT = 31  # Frame height for single line
+    DOUBLE_LINE_HEIGHT = 55  # Frame height for two lines (almost double)
+    COURSE_ROUNDNESS = 50  # Corner roundness %
+    COURSE_FONT_SIZE = 26  # Font size in half-points (26=13pt)
+    COURSE_TEXT_COLOR = theme_hex
+    COURSE_STROKE_COLOR = theme_hex
+    COURSE_STROKE_WEIGHT = "2pt"
+    MAX_WIDTH_PT = 280  # Maximum width in points for the frame
+    # ============================================================
+
+    # Determine if we need two lines
+    needs_two_lines = text_length > MAX_CHARS_SINGLE_LINE
+
+    if needs_two_lines:
+        # Split text intelligently at a good breaking point
+        words = course_title.split()
+        mid_point = len(words) // 2
+
+        # Try to split at middle, but prefer breaking after shorter first line
+        first_line = f"{course_number}. " + " ".join(words[:mid_point])
+        second_line = " ".join(words[mid_point:])
+
+        # Adjust if first line is too long
+        while len(first_line) > MAX_CHARS_SINGLE_LINE and mid_point > 1:
+            mid_point -= 1
+            first_line = f"{course_number}. " + " ".join(words[:mid_point])
+            second_line = " ".join(words[mid_point:])
+
+        text_escaped_line1 = html.escape(first_line)
+        text_escaped_line2 = html.escape(second_line)
+
+        # Use max of both lines for width calculation
+        max_line_length = max(len(first_line), len(second_line))
+        estimated_width = min((max_line_length * 8), MAX_WIDTH_PT)
+        frame_height = DOUBLE_LINE_HEIGHT
+
+        print(f'Text: {course_title}, charachters: {text_length}')
+        print(f'split: {first_line}, {len(first_line)}, {second_line}, {len(second_line)}')
+
+        # Two-line XML
+        text_content = f'''
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="Montserrat" w:hAnsi="Montserrat"/>
+                                        <w:b/>
+                                        <w:sz w:val="{COURSE_FONT_SIZE}"/>
+                                        <w:color w:val="{COURSE_TEXT_COLOR}"/>
+                                    </w:rPr>
+                                    <w:t>{text_escaped_line1}</w:t>
+                                </w:r>
+                                <w:r>
+                                    <w:br/>
+                                </w:r>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="Montserrat" w:hAnsi="Montserrat"/>
+                                        <w:b/>
+                                        <w:sz w:val="{COURSE_FONT_SIZE}"/>
+                                        <w:color w:val="{COURSE_TEXT_COLOR}"/>
+                                    </w:rPr>
+                                    <w:t>{text_escaped_line2}</w:t>
+                                </w:r>'''
+    else:
+        # Single line
+        estimated_width = min((text_length * 9) + 20, MAX_WIDTH_PT)
+        frame_height = SINGLE_LINE_HEIGHT
+        text_escaped = html.escape(full_text)
+
+        print(f'Text: {text_escaped}, charachters: {text_length}')
 
-    course_run = course_para.add_run(f"{course_number}. {course_title}")
-    course_run.font.name = 'Montserrat'
-    course_run.font.size = Pt(13)
-    course_run.font.bold = True
-    course_run.font.color.rgb = None
-    course_run.font.color.rgb = theme_color
+        text_content = f'''
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="Montserrat" w:hAnsi="Montserrat"/>
+                                        <w:b/>
+                                        <w:sz w:val="{COURSE_FONT_SIZE}"/>
+                                        <w:color w:val="{COURSE_TEXT_COLOR}"/>
+                                    </w:rPr>
+                                    <w:t>{text_escaped}</w:t>
+                                </w:r>'''
+
+    # Create rounded rectangle shape (UNFILLED with stroke)
+    shape_xml = f'''
+    <w:r xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+         xmlns:v="urn:schemas-microsoft-com:vml">
+        <w:pict>
+            <v:roundrect style="width:{estimated_width}pt;height:{frame_height}pt" 
+                         arcsize="{COURSE_ROUNDNESS}%" 
+                         filled="f" 
+                         strokecolor="#{COURSE_STROKE_COLOR}" 
+                         strokeweight="{COURSE_STROKE_WEIGHT}">
+                <v:textbox inset="0pt,3pt,0pt,3pt" style="v-text-anchor:middle">
+                    <w:txbxContent>
+                        <w:p>
+                            <w:pPr>
+                                <w:jc w:val="center"/>
+                                <w:spacing w:before="0" w:after="0"/>
+                            </w:pPr>{text_content}
+                        </w:p>
+                    </w:txbxContent>
+                </v:textbox>
+            </v:roundrect>
+        </w:pict>
+    </w:r>
+    '''
+
+    shape_element = parse_xml(shape_xml)
+    course_para._p.append(shape_element)
 
     return course_para
 
@@ -211,14 +318,14 @@ def format_question_block(doc, question_num, question_text, choices, correct_ans
     # Question number in Axiforma Black
     num_run = question_para.add_run(f"{question_num}. ")
     num_run.font.name = 'Inter ExtraBold'
-    num_run.font.size = Pt(10)
+    num_run.font.size = Pt(11)
     num_run.font.bold = True
     num_run.font.color.rgb = theme_color
 
     # Question text in SF UI Display Med
     text_run = question_para.add_run(question_text)
     text_run.font.name = 'Inter ExtraBold'
-    text_run.font.size = Pt(10)
+    text_run.font.size = Pt(11)
 
     # Display ALL choices for this question with minimal spacing
     choice_paragraphs = []
@@ -242,7 +349,7 @@ def format_question_block(doc, question_num, question_text, choices, correct_ans
 
         choice_run = choice_para.add_run(f"{choice_letter}- {choice_text}")
         choice_run.font.name = 'Inter Display Medium'
-        choice_run.font.size = Pt(10)
+        choice_run.font.size = Pt(11)
 
         choice_paragraphs.append(choice_para)
 
@@ -298,13 +405,13 @@ def format_question_block(doc, question_num, question_text, choices, correct_ans
 
     answer_run = left_para.add_run("Réponse:")
     answer_run.font.name = 'Inter SemiBold'
-    answer_run.font.size = Pt(8)
+    answer_run.font.size = Pt(9)
     answer_run.font.bold = True
     answer_run.font.underline = True
 
     answer_run = left_para.add_run(f' {correct_answers}')
-    answer_run.font.name = 'Inter Display Medium'
-    answer_run.font.size = Pt(8)
+    answer_run.font.name = 'Inter SemiBold'
+    answer_run.font.size = Pt(9)
     answer_run.font.color.rgb = theme_color
 
     # RIGHT cell - Source
@@ -315,13 +422,13 @@ def format_question_block(doc, question_num, question_text, choices, correct_ans
 
     source_run = right_para.add_run("Source:")
     source_run.font.name = 'Inter SemiBold'
-    source_run.font.size = Pt(8)
+    source_run.font.size = Pt(9)
     source_run.font.bold = True
     source_run.font.underline = True
 
     source_value_run = right_para.add_run(f" {source}")
-    source_value_run.font.name = 'Inter Display Medium'
-    source_value_run.font.size = Pt(8)
+    source_value_run.font.name = 'Inter SemiBold'
+    source_value_run.font.size = Pt(9)
     source_value_run.font.color.rgb = theme_color
 
     # Keep with comment if exists
@@ -331,9 +438,9 @@ def format_question_block(doc, question_num, question_text, choices, correct_ans
     empty_para = doc.add_paragraph(' ', style='TinySpace')
     empty_para.paragraph_format.space_before = Pt(0)
     empty_para.paragraph_format.space_after = Pt(0)
-    empty_para.paragraph_format.line_spacing = Pt(5)
+    empty_para.paragraph_format.line_spacing = Pt(7)
     empty_run = empty_para.add_run(' ')
-    empty_run.font.size = Pt(5)
+    empty_run.font.size = Pt(7)
 
     # Add comment if exists
     if comment and str(comment).strip() and str(comment).lower() != 'nan':
@@ -359,7 +466,7 @@ def add_page_numbers(doc, theme_hex=None):
         # ===== HEADER (keep existing text like module name) =====
         header = section.header
         header.is_linked_to_previous = False
-        section.header_distance = Cm(0.6)
+        section.header_distance = Cm(0.3)
 
         # If header is empty, add a blank paragraph
         if not header.paragraphs:
@@ -422,7 +529,7 @@ def add_page_numbers(doc, theme_hex=None):
         run._r.append(fldChar2)
 
         run.font.name = 'Montserrat'
-        run.font.size = Pt(12)
+        run.font.size = Pt(14)
         run.font.bold = True
         run.font.color.rgb = RGBColor(0, 0, 0)
 
@@ -445,7 +552,7 @@ def add_page_numbers(doc, theme_hex=None):
                                     <w:r>
                                         <w:rPr>
                                             <w:rFonts w:ascii="Aptos" w:hAnsi="Aptos"/>
-                                            <w:sz w:val="28"/>
+                                            <w:sz w:val="44"/>
                                             <w:color w:val="{theme_hex}"/>
                                             <w:u w:val="single"/>
                                         </w:rPr>
@@ -455,7 +562,7 @@ def add_page_numbers(doc, theme_hex=None):
                                         <w:rPr>
                                             <w:rFonts w:ascii="Montserrat" w:hAnsi="Montserrat"/>
                                             <w:b/>
-                                            <w:sz w:val="18"/>
+                                            <w:sz w:val="28"/>
                                             <w:color w:val="{theme_hex}"/>
                                             <w:u w:val="single"/>
                                         </w:rPr>
@@ -778,7 +885,7 @@ def create_flexible_header(section, module_name, sheet_name, display_name=None,
                                     <w:rPr>
                                         <w:rFonts w:ascii="Montserrat" w:hAnsi="Montserrat"/>
                                         <w:b/>
-                                        <w:sz w:val="20"/>
+                                        <w:sz w:val="26"/>
                                         <w:color w:val="{theme_hex}"/>
                                     </w:rPr>
                                     <w:t>{module_name_str}</w:t>
@@ -809,7 +916,7 @@ def create_flexible_header(section, module_name, sheet_name, display_name=None,
                                     <w:rPr>
                                         <w:rFonts w:ascii="Montserrat" w:hAnsi="Montserrat"/>
                                         <w:b/>
-                                        <w:sz w:val="20"/>
+                                        <w:sz w:val="26"/>
                                         <w:color w:val="{theme_hex}"/>
                                     </w:rPr>
                                     <w:t>{sheet_name_str}</w:t>
@@ -831,6 +938,45 @@ def create_flexible_header(section, module_name, sheet_name, display_name=None,
     header_para._p.append(right_textbox_element)
 
 
+def add_colored_column_separator(section, theme_hex=None):
+    """Add a custom colored vertical line between columns"""
+    if theme_hex is None:
+        theme_hex = THEME_COLOR_HEX
+
+    header = section.header
+
+    # Find or create the first paragraph in header
+    if not header.paragraphs:
+        header.add_paragraph()
+
+    header_para = header.paragraphs[0]
+
+    # Create a vertical line using VML shape
+    # The line starts AFTER the header and goes to the bottom
+    # Adjust the "from" value to start below header (e.g., 0.8in from top)
+    line_xml = f'''
+    <w:r xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+         xmlns:v="urn:schemas-microsoft-com:vml"
+         xmlns:o="urn:schemas-microsoft-com:office:office">
+        <w:pict>
+            <v:line id="columnSeparator" 
+                    style="position:absolute;left:0;text-align:left;z-index:-1;
+                           mso-position-horizontal:center;
+                           mso-position-horizontal-relative:margin;
+                           mso-position-vertical-relative:page"
+                    from="0,0.49in" to="0,11.05in"
+                    strokecolor="#{theme_hex}" 
+                    strokeweight="0.75pt">
+                <o:lock v:ext="edit" aspectratio="f"/>
+            </v:line>
+        </w:pict>
+    </w:r>
+    '''
+
+    line_element = parse_xml(line_xml)
+    header_para._p.append(line_element)
+
+
 def process_excel_to_word(excel_file_path, output_word_path, display_name=None, use_two_columns=True, add_separator_line=True, balance_method="dynamic", theme_hex=None):
     """Main function to process Excel and create a Word document with TOC on the first page"""
 
@@ -918,9 +1064,9 @@ def process_excel_to_word(excel_file_path, output_word_path, display_name=None,
     # ========================================
     # ADD THREE EMPTY PAGES AT THE BEGINNING
     # ========================================
-    for i in range(4):
+    for i in range(3):
         doc.add_paragraph()  # Add empty paragraph
-        if i < 3:  # Add page breaks for first 2 pages (3rd page leads to TOC)
+        if i < 2:  # Add page breaks for first 2 pages (3rd page leads to TOC)
             doc.add_page_break()
 
     # TOC helpers
@@ -1121,8 +1267,6 @@ def process_excel_to_word(excel_file_path, output_word_path, display_name=None,
                 sectPr.append(cols)
             cols.set(qn('w:num'), '2')
             cols.set(qn('w:space'), '432')
-            if add_separator_line:
-                cols.set(qn('w:sep'), '1')
             cols.set(qn('w:equalWidth'), '1')
 
             if use_two_columns:
@@ -1133,13 +1277,15 @@ def process_excel_to_word(excel_file_path, output_word_path, display_name=None,
                     sectPr.append(cols)
                 cols.set(qn('w:num'), '2')
                 cols.set(qn('w:space'), '432')
-                if add_separator_line:
-                    cols.set(qn('w:sep'), '1')
                 cols.set(qn('w:equalWidth'), '1')
 
                 # Use the new flexible header function
                 create_flexible_header(section, module_name, first_sheet_name, display_name, theme_hex=theme_hex)
 
+                # ADD THE COLORED SEPARATOR
+                if add_separator_line:
+                    add_colored_column_separator(section, theme_hex)
+
         # ========== CUSTOMIZE MODULE TITLE APPEARANCE HERE ==========
         MODULE_HEIGHT = 31  # Frame height in points
         MODULE_ROUNDNESS = 50  # Corner roundness % (0=square, 50=pill)
@@ -1208,7 +1354,7 @@ def process_excel_to_word(excel_file_path, output_word_path, display_name=None,
             course_question_count = 1
 
             course_title = cours_titles.get(cours_num, f"COURSE {cours_num}")
-            course_para = create_course_title(doc, natural_num, course_title, theme_color)
+            course_para = create_course_title(doc, natural_num, course_title, theme_color, theme_hex=theme_hex)
 
             bm_course_name = sanitize_bookmark_name(f"COURSE_{module_name}_{cours_num}")
             add_bookmark_to_paragraph(course_para, bm_course_name, bookmark_id)