hlsv 1.0.0 → 2.0.0

data/views/{report_template.erb → report.erb}

@@ -22,7 +22,7 @@
       margin: 0 auto;
       padding: 20px;
       padding-left: 80px; /* Space for hamburger */
-      background-color: #f5f7fa;
+      background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
       line-height: 1.6;
       color: #333;
       position: relative;
@@ -323,34 +323,40 @@
        MAIN CONTENT
        =========================== */
     .container {
-      background-color: white;
+      background: white;
       padding: 40px;
       border-radius: 8px;
-      box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+      margin-bottom: 25px;
+      box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+      transition: box-shadow 0.3s ease;
+    }
+
+    .container:hover {
+      box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15);
     }
 
     h1 {
-      color: #2c3e50;
-      border-bottom: 3px solid #3498db;
-      padding-bottom: 12px;
-      margin-bottom: 25px;
+      color: #1a1a1a;
+      border-bottom: 3px solid #007bff;
+      padding-bottom: 15px;
+      margin-bottom: 20px;
       font-size: 2em;
     }
 
     h2 {
-      color: #34495e;
-      margin-top: 40px;
+      color: #333;
+      margin-top: 0;
       margin-bottom: 20px;
-      border-bottom: 2px solid #ecf0f1;
+      border-bottom: 2px solid #e9ecef;
       padding-bottom: 10px;
-      font-size: 1.6em;
+      font-size: 1.5em;
     }
 
     h3 {
-      color: #546e7a;
-      margin-top: 25px;
-      margin-bottom: 12px;
-      font-size: 1.3em;
+      color: #495057;
+      margin-top: 20px;
+      margin-bottom: 10px;
+      font-size: 1.2em;
     }
 
     /* ===========================
@@ -358,6 +364,7 @@
        =========================== */
     .info-box {
       background: linear-gradient(135deg, #e8f4f8 0%, #d1ecf1 100%);
+      color: #3498db;
       border-left: 4px solid #3498db;
       padding: 18px;
       margin: 25px 0;
@@ -367,29 +374,32 @@
 
     .warning-box {
       background: linear-gradient(135deg, #fff3cd 0%, #ffeaa7 100%);
-      border-left: 4px solid #f39c12;
+      color: #b8860b;
+      border-left: 4px solid #ffc107;
       padding: 18px;
       margin: 25px 0;
       border-radius: 6px;
-      box-shadow: 0 2px 4px rgba(243, 156, 18, 0.1);
+      box-shadow: 0 2px 4px rgba(255, 193, 7, 0.1);
     }
 
     .error-box {
       background: linear-gradient(135deg, #f8d7da 0%, #f5c6cb 100%);
-      border-left: 4px solid #e74c3c;
+      color: #dc3545;
+      border-left: 4px solid #dc3545;
       padding: 18px;
       margin: 25px 0;
       border-radius: 6px;
-      box-shadow: 0 2px 4px rgba(231, 76, 60, 0.1);
+      box-shadow: 0 2px 4px rgba(220, 53, 69, 0.1);
     }
 
     .success-box {
       background: linear-gradient(135deg, #d4edda 0%, #c3e6cb 100%);
-      border-left: 4px solid #27ae60;
+      color: #28a745;
+      border-left: 4px solid #28a745;
       padding: 18px;
       margin: 25px 0;
       border-radius: 6px;
-      box-shadow: 0 2px 4px rgba(39, 174, 96, 0.1);
+      box-shadow: 0 2px 4px rgba(40, 167, 69, 0.1);
     }
 
     /* ===========================
@@ -447,12 +457,17 @@
        STATUS TEXT COLORS
        =========================== */
     .success-text {
-      color: #27ae60;
+      color: #28a745;
+      font-weight: 600;
+    }
+
+    .error-text {
+      color: #dc3545;
       font-weight: 600;
     }
 
     .warning-text {
-      color: #f39c12;
+      color: #b8860b;
       font-weight: 600;
     }
 
@@ -728,14 +743,11 @@
       <li><a href="#configuration">Configuration</a></li>
       <li><a href="#datasets-analysis">Datasets Analysis</a>
         <ul class="toc-sublist">
-          <% dataset_reports.each do |ds_name, report| %>
+          <% datasets.keys.each do |ds_name| %>
             <li><a href="#ds-<%= ds_name %>"><%= ds_name %></a></li>
           <% end %>
         </ul>
       </li>
-      <% if externe_file_type != 'csv' %>
-        <li><a href="#output-file">Output File</a></li>
-      <% end %>
     </ul>
   </nav>
 
@@ -761,168 +773,148 @@
       <div style="display: flex; justify-content: space-between; align-items: center;">
         <p style="margin: 0;">Report automatically generated on <%= Time.now.strftime("%Y-%m-%d at %H:%M") %></p>
         <% if @web_mode %>
-          <button class="btn-word" id="convert-btn" onclick="convertToWord()"> 📄 Word </button>
+        <button class="btn-word" id="convert-btn" onclick="convertToWord()"> 📄 Word </button>
         <% end %>
       </div>
     </div>
 
     <section id="configuration">
-      <h2>Configuration</h2>
-      <p>
-        This report is generated based on the information provided in the configuration form.
-        This configuration is saved in the file: <code><%= init_reports[:config_name] %></code>
-      </p>
-
-      <h3>Report Coverage:</h3>
-      <ul>
-        <li>Presence of non-ASCII characters in the data</li>
-        <li>Validity of keys declared in define.xml</li>
-        <li>Ad hoc search for a natural key in all datasets</li>
-      </ul>
-
-      <h3>Define.xml Information</h3>
-      <% define_info = init_reports[:define_information] %>
-      <ul>
-        <li><strong>Path:</strong> <%= define_info[:define_path] || 'Not specified' %></li>
-        <% if define_info[:load] %>
-          <li><strong>Status:</strong> <span class="success-text">Loaded successfully</span></li>
-        <% elsif define_info[:define_path] == '-' %>
-          <li><strong>Status:</strong> <span class="info-text">Not loaded (as expected)</span></li>
-        <% else %>
-          <li><strong>Status:</strong> <span class="warning-text">Not loaded</span></li>
-        <% end %>
-      </ul>
-
-      <h3>Datasets Information</h3>
-      <% data_info = init_reports[:data_information] %>
-      <ul>
-        <li><strong>Source directory:</strong> <%= data_info[:directory_name] %></li>
-        <li><strong>Number of files detected:</strong> <%= data_info[:file_number] %></li>
-      </ul>
-    </section>
-
-    <h2 id="datasets-analysis">Datasets Analysis</h2>
+    <h2>Configuration</h2>
+    <p> This report is generated based on the information provided in the configuration form.</p>
+    <p> This configuration is saved in the file: <code><%= config_file_path %></code> </p>
+
+    <h3>Report Coverage:</h3>
+    <ul>
+      <li>Presence of non-ASCII characters in the data</li>
+      <li>Validity of keys declared in define.xml</li>
+      <li>Ad hoc search for a natural key in all datasets</li>
+    </ul>
 
-    <% dataset_reports.each do |ds_name, report| %>
-      <article class="dataset-section" id="ds-<%= ds_name %>">
-        <h3>Dataset: <%= ds_name %></h3>
+    <h3>Define.xml Information</h3>
+    <ul>
+      <% define.exception.each do |e| %>
+        <li> <%= e %></li>
+      <% end %>
+      <li><strong>Path:</strong> <%= define.path || 'Not specified' %></li>
+      <% if define.status %>
+        <li><strong>Status:</strong> <span class="success-text">Loaded successfully</span></li>
+      <% elsif define.status.nil? %>
+        <li><strong>Status:</strong> <span class="error-text">Not loaded</span></li>
+      <% else %>
+        <li><strong>Status:</strong> <span class="info-text">Not loaded (as expected)</span></li>
+      <% end %>
+      <li><strong>Number of datasets detected:</strong> <%= define.datasets.size %></li>
+    </ul>
 
-        <% if report[:record_count] %>
-          <p><strong>Number of records:</strong> <%= report[:record_count] %></p>
-        <% end %>
+    <h3>Datasets Information</h3>
+    <ul>
+      <li><strong>Source directory:</strong> <%= ds_path %></li>
+      <li><strong>Number of datasets on disk detected:</strong> <%= datasets.values.reject { |ds| ds.label.nil? }.size %></li>
+      <% unless excluded_dataset.empty? %>
+        <li><strong>Excluded dataset:</strong> <span class="warning-text"><%= excluded_dataset.join(', ') %></span></li>
+      <% end %>
+    </ul>
+    </section>
 
-        <% if report[:candidates_type] %>
-          <p><strong>Dataset type:</strong> <%= report[:candidates_type] %></p>
-        <% end %>
+    <h2 id="datasets-analysis">Datasets Analysis</h2>
+    <% datasets.values.each do |ds| %>
+      <article class="dataset-section" id="ds-<%= ds.name %>">
+      <h3>Dataset: <%= ds.name %></h3>
+
+      <p><strong>Number of records:</strong> <%= ds.records.size %></p>
+      <p><strong>Dataset type:</strong> <%= ds.type_to_s(ds.name) %></p>
+
+      <!-- ASCII Check -->
+      <% if ds.ascii_status %>
+        <div class="success-box" role="status">
+          <strong>✓ ASCII Verification</strong>
+          <p>No non-ASCII characters found</p>
+        </div>
+      <% elsif ds.ascii_status.nil? %>
+        <!-- Nothing to do -->
+      <% else %>
+        <div class="error-box" role="alert">
+          <strong>✗ Non-ASCII Characters Detected</strong>
+          <ul>
+            <% ds.non_ascii_values.each do |issue| %>
+              <li><%= issue %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
 
-        <!-- ASCII Check -->
-        <% if report[:ascii_check] %>
-          <% if report[:ascii_check][:valid] %>
-            <div class="success-box" role="status">
-              <strong>✓ ASCII Verification</strong>
-              <p>No non-ASCII characters found</p>
-            </div>
-          <% else %>
+      <!-- Define Key Check -->
+      <% if define.status %>
+        <% if ds.define_status %>
+          <div class="success-box" role="status">
+            <strong>✓ Valid define.xml Key</strong>
+            <p>Key: <span class="key-info"><%= ds.define_keys.join(', ') %></span></p>
+          </div>
+        <% elsif ds.define_status.nil? %>
+          <% if ds.label.nil? %>
             <div class="error-box" role="alert">
-              <strong>✗ Non-ASCII Characters Detected</strong>
-              <ul>
-                <% report[:ascii_check][:issues].each do |issue| %>
-                  <li><%= issue %></li>
-                <% end %>
-              </ul>
+              <strong>✗ Invalid define.xml Key</strong>
+              <p> dataset not on disk, found in the define.xml </p>
             </div>
-          <% end %>
-        <% end %>
-
-        <!-- Define Key Check -->
-        <% if report[:define_key_check] %>
-          <% if report[:define_key_check][:valid]%>
-            <% if report[:define_key_check][:key] %>
-              <div class="success-box" role="status">
-                <strong>✓ Valid define.xml Key</strong>
-                <p>Key: <span class="key-info"><%= report[:define_key_check][:key].join(', ') %></span></p>
-              </div>
-              <% end %>
           <% else %>
             <div class="error-box" role="alert">
               <strong>✗ Invalid define.xml Key</strong>
-              <% if report[:define_key_check][:absent] %>
-                <p>dataset not found in the define.xml</p>
-              <% end %>
-              <% if report[:define_key_check][:key] %>
-                <p>Tested key: <span class="key-info"><%= report[:define_key_check][:key].join(', ') %></span></p>
-              <% end %>
-              <% if report[:define_key_check][:duplicate_file] %>
-                <p>File containing duplicated records:
-                  <a href="/csv_view?file=<%= URI.encode_www_form_component(report[:define_key_check][:duplicate_file]) %>"
-                     target="_blank"
-                     rel="noopener noreferrer">
-                    <%= File.basename(report[:define_key_check][:duplicate_file]) %>
-                  </a>
-                </p>
-              <% end %>
+              <p> dataset on disk, not found in the define.xml </p>
             </div>
           <% end %>
+        <% else %>
+          <div class="error-box" role="alert">
+            <strong>✗ Invalid define.xml Key</strong>
+            <p>Tested key: <span class="key-info"><%= ds.define_keys.join(', ') %></span></p>
+            <% if @web_mode %>
+              <p>File containing duplicated records:
+                <a href="<%= csv_view_url(file: ds.define_duplicate_file, study: title, dataset: ds.name, last_valid_key: ds.define_keys) %>"
+                   data-offline-href="<%= relative_report_path(ds.define_duplicate_file) %>"
+                   class="csv-link"
+                   target="_blank"
+                   rel="noopener noreferrer">
+                  <%= File.basename(ds.define_duplicate_file) %>
+                </a>
+              </p>
+            <% else %>
+              <p>File containing duplicated records: <code><%= ds.define_duplicate_file %></code> </p>
+            <% end %>
+          </div>
         <% end %>
+      <% end %>
 
-        <!-- Data Key Check -->
-        <% if report[:data_key_check] %>
-          <%
-            # Handle case where data_key_check can be an array (SE, SV)
-            checks = report[:data_key_check].is_a?(Array) ? report[:data_key_check] : [report[:data_key_check]]
-          %>
-
-          <% checks.each_with_index do |check, idx| %>
-            <% if check[:valid] %>
-              <div class="success-box" role="status">
-                <strong>✓ Minimum Key Found <%= checks.size > 1 ? "(Option #{idx + 1})" : "" %></strong>
-                <p>Key: <span class="key-info"><%= check[:key].join(', ') %></span></p>
-              </div>
+      <!-- Data Key Check -->
+      <% ds.minimal_key_status.each_with_index do |status, i| %>
+        <% if status %>
+          <div class="success-box" role="status">
+            <strong>✓ Minimum Key Found </strong> <%= ds.minimal_key_status.size > 1 ? "(Option #{i + 1})" : "" %>
+            <p>Key: <span class="key-info"><%= ds.minimal_key[i].join(', ') %></span></p>
+          </div>
+        <% else %>
+          <div class="warning-box" role="status">
+            <strong>⚠ No Valid Key Found </strong> <%= ds.minimal_key_status.size > 1 ? "(Option #{i + 1})" : "" %>
+            <p><em>Tested variables: <%= ds.tested_key[i].join(', ') %></em></p>
+            <p>Last key tested: <span class="key-info"><%= ds.minimal_key[i]&.join(', ') %></span></p>
+            <% if @web_mode %>
+              <p>File containing duplicated records:
+                <a href="<%= csv_view_url(file: ds.data_duplicate_file[i], study: title, dataset: ds.name, last_valid_key: ds.minimal_key[i]) %>"
+                   data-offline-href="<%= relative_report_path(ds.data_duplicate_file[i]) %>"
+                   class="csv-link"
+                   target="_blank"
+                   rel="noopener noreferrer">
+                  <%= File.basename(ds.data_duplicate_file[i]) %>
+                </a>
+              </p>
             <% else %>
-              <div class="warning-box" role="status">
-                <strong>⚠ No Valid Key Found <%= checks.size > 1 ? "(Option #{idx + 1})" : "" %></strong>
-                <% if check[:candidates] %>
-                  <p><em>Tested variables: <%= check[:candidates].join(', ') %></em></p>
-                <% end %>
-                <% if check[:last_valid_key] %>
-                  <p>Last key tested: <span class="key-info"><%= check[:last_valid_key].join(', ') %></span></p>
-                <% end %>
-                <% if check[:duplicate_file] %>
-                  <p>File containing duplicated records:
-                  <a href="/csv_view?file=<%= URI.encode_www_form_component(check[:duplicate_file]) %>&last_valid_key=<%= URI.encode_www_form_component(check[:last_valid_key].join(',')) %>"
-                     target="_blank"
-                     rel="noopener noreferrer">
-                    <%= File.basename(check[:duplicate_file]) %>
-                  </a>
-                  </p>
-                <% end %>
-              </div>
+              <p>File containing duplicated records: <code><%= ds.data_duplicate_file[i] %></code> </p>
             <% end %>
-          <% end %>
+          </div>
         <% end %>
+      <% end %>
 
-        <!-- Verbose Details -->
-        <% if report[:verbose_details] && report[:verbose_details].any? %>
-          <details>
-            <summary>Processing Details</summary>
-            <ul>
-              <% report[:verbose_details].each do |detail| %>
-                <li><%= detail %></li>
-              <% end %>
-            </ul>
-          </details>
-        <% end %>
       </article>
     <% end %>
 
-    <!-- Output File Section -->
-    <% if output_file %>
-      <section id="output-file">
-        <h2>Output File</h2>
-        <p>File containing duplicated records: <strong><%= File.basename(output_file) %></strong></p>
-        <p>Full path: <code><%= output_file %></code></p>
-      </section>
-    <% end %>
   </main>
 
   <!-- Report Footer with Copyright and License -->
@@ -935,18 +927,41 @@
   </footer>
 
   <script>
-    // Download HTML file as Word document
+    // Download this report as a Word document.
+    // The report is served from /report/:study/html - the docx route
+    // generates the file on click and serves it directly (no JSON round-trip
+    // needed anymore, since '/report/:study/docx' streams the file itself).
+    function isServerReachable(timeoutMs = 1500) {
+      const controller = new AbortController();
+      const timeout = setTimeout(() => controller.abort(), timeoutMs);
+      return fetch('/ping', { method: 'GET', signal: controller.signal })
+        .then(response => { clearTimeout(timeout); return response.ok; })
+        .catch(() => { clearTimeout(timeout); return false; });
+    }
+
+    const serverReachablePromise = isServerReachable();
+
     async function convertToWord() {
-      const chemin = window.location.pathname.replace(/^\/telecharger\//, '');
-      const response = await fetch('/telecharger_html_word/' + chemin);
-      const data = await response.json();
-      if (data.success) {
-        const cheminDocx = chemin.replace(/\.html$/, '.docx');
-        window.location.href = '/telecharger/' + cheminDocx;
-      } else {
-        alert('❌ ' + data.erreur);
+      const online = await serverReachablePromise;
+      if (!online) {
+        window.location.href = '<%= File.basename(@report_name) %>.docx';
+        return;
+      }
+      const match = window.location.pathname.match(/^\/report\/([^/]+)\/html$/);
+      if (!match) {
+        alert('❌ Unable to identify the study for this report.');
+        return;
       }
+      window.location.href = '/report/' + match[1] + '/docx';
     }
+
+    serverReachablePromise.then(online => {
+      if (online) return;
+      document.querySelectorAll('a.csv-link').forEach(link => {
+        link.href = link.dataset.offlineHref;
+        link.removeAttribute('target');
+      });
+    });
     // Enhanced TOC functionality with accessibility
 
     // DOM Elements
@@ -1049,7 +1064,7 @@
     }
 
     // Colour coding of datasets in the TOC according to their maximum error level
-    function coloriserTOCDatasets() {
+    function colorizeTocDatasets() {
       document.querySelectorAll('.toc-sublist a').forEach(link => {
         const href = link.getAttribute('href');
         if (!href) return;
@@ -1057,29 +1072,29 @@
         const section = document.querySelector(href);
         if (!section) return;
 
-        const aErreur  = section.querySelector('.error-box');
-        const aWarning = section.querySelector('.warning-box');
+        const errorBox = section.querySelector('.error-box');
+        const warningBox = section.querySelector('.warning-box');
 
-        if (aErreur) {
-          // Rouge - priorité maximale
+        if (errorBox) {
+          // Red - highest priority
           link.style.backgroundColor = '#f8d7da';
-          link.style.borderLeftColor  = '#e74c3c';
-          link.style.color            = '#c0392b';
-        } else if (aWarning) {
+          link.style.borderLeftColor  = '#dc3545';
+          link.style.color            = '#dc3545';
+        } else if (warningBox) {
           // Orange
           link.style.backgroundColor = '#fff3cd';
-          link.style.borderLeftColor  = '#f39c12';
-          link.style.color            = '#856404';
+          link.style.borderLeftColor  = '#ffc107';
+          link.style.color            = '#b8860b';
         }
-        // Vert (success-box uniquement) → aucune couleur appliquée
+        // Green (success-box only) → no color applied
       });
     }
 
-    // Attendre que le DOM soit prêt
+    // Wait for the DOM to be ready
     if (document.readyState === 'loading') {
-      document.addEventListener('DOMContentLoaded', coloriserTOCDatasets);
+      document.addEventListener('DOMContentLoaded', colorizeTocDatasets);
     } else {
-      coloriserTOCDatasets();
+      colorizeTocDatasets();
     }
 
     // Smooth scroll for anchor links
@@ -1141,4 +1156,4 @@
     });
   </script>
 </body>
-</html>
+</html>