From 4794eb63392023162cc435de3d57bfc00520b9e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Frias?= <josefrias@bmd-software.com>
Date: Thu, 4 Apr 2024 15:06:03 +0100
Subject: [PATCH 1/5] Add support to upload and visualize onboarding reports -
 New button on catalogue uploader to upload an onboarding report -  
 normalization goal to place all uploads in the same page - New table that
 stores information about the onboarding upload files,   including a reference
 to the raw file that was uploaded - New page on the uploader side to
 visualize the imported   files(/OnboardingReport) - Adjust js to place the
 error/success messages in the last column of the   table of the upload
 history

---
 .../uploader/file_handler/checks.py           |  9 ++-
 dashboard_viewer/uploader/forms.py            |  5 +-
 .../migrations/0014_onboardingreport.py       | 26 +++++++
 .../0015_onboardingreport_upload_date.py      | 20 +++++
 dashboard_viewer/uploader/models.py           | 22 ++++++
 .../uploader/static/js/uploader.js            | 12 +--
 .../uploader/templates/onboarding_report.html | 78 +++++++++++++++++++
 .../templates/upload_achilles_results.html    |  6 +-
 .../templates/upload_onboarding_report.html   | 13 ++++
 .../uploader/templates/uploader_base.html     | 13 +++-
 dashboard_viewer/uploader/urls.py             |  5 ++
 dashboard_viewer/uploader/views.py            | 65 ++++++++++++----
 12 files changed, 244 insertions(+), 30 deletions(-)
 create mode 100644 dashboard_viewer/uploader/migrations/0014_onboardingreport.py
 create mode 100644 dashboard_viewer/uploader/migrations/0015_onboardingreport_upload_date.py
 create mode 100644 dashboard_viewer/uploader/templates/onboarding_report.html
 create mode 100644 dashboard_viewer/uploader/templates/upload_onboarding_report.html

diff --git a/dashboard_viewer/uploader/file_handler/checks.py b/dashboard_viewer/uploader/file_handler/checks.py
index aa9e49d0..8a83fb95 100644
--- a/dashboard_viewer/uploader/file_handler/checks.py
+++ b/dashboard_viewer/uploader/file_handler/checks.py
@@ -270,8 +270,10 @@ def _get_upload_attr(analysis, stratum):
 
 
 def check_for_duplicated_files(uploaded_file, data_source_id):
+    #### Added For Checksum ##########################
+
     try:
-        # Upload History only stores the succeded files
+        # Upload History only stores the succesded files
 
         pd = UploadHistory.objects.filter(data_source_id=data_source_id).latest()
 
@@ -281,8 +283,8 @@ def check_for_duplicated_files(uploaded_file, data_source_id):
             .first()
         )
 
-        if data_source_hash is not None and bool(pd.uploaded_file):
-            # Go to the path where success files are stored
+        if data_source_hash is not None:
+            # Go to the path where sucess filea are stored
 
             latest_file_path = os.path.join(settings.MEDIA_ROOT, pd.uploaded_file.path)
 
@@ -315,6 +317,7 @@ def check_for_duplicated_files(uploaded_file, data_source_id):
     except UploadHistory.DoesNotExist:
         pass
 
+    #### Added For Checksum ##########################
 
 def upload_data_to_tmp_table(data_source_id, file_metadata, pending_upload):
 
diff --git a/dashboard_viewer/uploader/forms.py b/dashboard_viewer/uploader/forms.py
index 67daaee3..bfa7df06 100644
--- a/dashboard_viewer/uploader/forms.py
+++ b/dashboard_viewer/uploader/forms.py
@@ -33,4 +33,7 @@ class Meta(SourceForm.Meta):
 
 
 class AchillesResultsForm(forms.Form):
-    results_file = forms.FileField()
+    results_file = forms.FileField(required=False, label='Catalogue Export File')
+
+class OnboardingReportForm(forms.Form):
+    onboarding_results_file = forms.FileField(required=False, label='Onboarding Report file (Optional)')
\ No newline at end of file
diff --git a/dashboard_viewer/uploader/migrations/0014_onboardingreport.py b/dashboard_viewer/uploader/migrations/0014_onboardingreport.py
new file mode 100644
index 00000000..685386ad
--- /dev/null
+++ b/dashboard_viewer/uploader/migrations/0014_onboardingreport.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.13 on 2024-03-27 12:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uploader.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uploader', '0013_auto_20210721_1715'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OnBoardingReport',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('uploaded_file', models.FileField(null=True, upload_to=uploader.models.onboarding_folder)),
+                ('data_source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='uploader.datasource')),
+            ],
+            options={
+                'db_table': 'onboarding_report',
+            },
+        ),
+    ]
diff --git a/dashboard_viewer/uploader/migrations/0015_onboardingreport_upload_date.py b/dashboard_viewer/uploader/migrations/0015_onboardingreport_upload_date.py
new file mode 100644
index 00000000..83021284
--- /dev/null
+++ b/dashboard_viewer/uploader/migrations/0015_onboardingreport_upload_date.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2.13 on 2024-03-28 12:35
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uploader', '0014_onboardingreport'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='onboardingreport',
+            name='upload_date',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]
diff --git a/dashboard_viewer/uploader/models.py b/dashboard_viewer/uploader/models.py
index fc247d35..149ecc2c 100644
--- a/dashboard_viewer/uploader/models.py
+++ b/dashboard_viewer/uploader/models.py
@@ -175,6 +175,15 @@ def success_data_source_directory(instance, filename):
 
     return datetime.datetime.now().strftime(file_path)
 
+def onboarding_folder(instance, filename):
+    file_path = os.path.join(
+        settings.ACHILLES_RESULTS_STORAGE_PATH,
+        instance.data_source.hash,
+        "onboarding",
+        "%Y%m%d%H%M%S%f" + "".join(pathlib.Path(filename).suffixes),
+    )
+    return datetime.datetime.now().strftime(file_path)
+
 
 class UploadHistory(models.Model):
     """
@@ -266,3 +275,16 @@ class Meta:
     p25_value = models.FloatField(null=True)
     p75_value = models.FloatField(null=True)
     p90_value = models.FloatField(null=True)
+
+class OnboardingReport(models.Model):
+    class Meta:
+        db_table = "onboarding_report"
+    
+    data_source = models.ForeignKey(DataSource, on_delete=models.CASCADE)
+    upload_date = models.DateTimeField(auto_now_add=True)
+    uploaded_file = models.FileField(
+        null=True, upload_to=onboarding_folder
+    )
+
+    def get_status(self):
+        return "Done"
\ No newline at end of file
diff --git a/dashboard_viewer/uploader/static/js/uploader.js b/dashboard_viewer/uploader/static/js/uploader.js
index cb0f8df5..f6ff00f5 100644
--- a/dashboard_viewer/uploader/static/js/uploader.js
+++ b/dashboard_viewer/uploader/static/js/uploader.js
@@ -26,8 +26,8 @@ document.addEventListener("DOMContentLoaded", () => {
         const tbody = tbodys[0];
 
         for (const tr of tbody.children) {
-            const status_td = tr.children[5];
-
+            const status_td = tr.children[6];
+               
             if (status_td.dataset.failed === "yes") {
                 add_failure_message_popup(status_td, status_td.dataset.failureMsg);
             }
@@ -37,10 +37,10 @@ document.addEventListener("DOMContentLoaded", () => {
                         .then(r => r.json())
                         .then(r => {
                             if (r.status === "Done") {
-                                tr.children[1].innerText = r.data.r_package_version;
-                                tr.children[2].innerText = r.data.generation_date;
-                                tr.children[3].innerText = r.data.cdm_version;
-                                tr.children[4].innerText = r.data.vocabulary_version;
+                                tr.children[2].innerText = r.data.r_package_version;
+                                tr.children[3].innerText = r.data.generation_date;
+                                tr.children[4].innerText = r.data.cdm_version;
+                                tr.children[5].innerText = r.data.vocabulary_version;
 
                                 update_upload_status(status_td, "Done", "fas fa-check", "status-done");
 
diff --git a/dashboard_viewer/uploader/templates/onboarding_report.html b/dashboard_viewer/uploader/templates/onboarding_report.html
new file mode 100644
index 00000000..f6059e20
--- /dev/null
+++ b/dashboard_viewer/uploader/templates/onboarding_report.html
@@ -0,0 +1,78 @@
+{% extends 'base.html' %}
+{% load static %}
+{% load bootstrap4 %}
+{% load markdownify %}
+
+{% block head_tail %}
+    {{ form.media.css }}
+    <link rel="stylesheet" href='{% static "pages.css" %}' >
+    <link rel="stylesheet" href='{% static "header.css" %}' >
+    <link rel="stylesheet" href='{% static "css/uploader.css" %}' >
+{% endblock %}
+
+
+{% block content %}
+<div>
+    {% include "header.html" %}
+    
+    {# Achilles resutls file form #}
+    <div class="content-container" >
+        <div class="row">
+            <h3 class="col">Data Source: {{ obj_data_source.name }}</h3>
+        </div>
+        <div class="row">
+            <div class="col">
+                <p><b>Database type:</b> {{ obj_data_source.database_type }}</p>
+            </div>
+            <div class="col">
+                <p><b>Country:</b> {{ obj_data_source.country }}</p>
+            </div>
+            <div class="col-auto">
+                <p><b>Release date:</b> {{ obj_data_source.release_date }}</p>
+            </div>
+        </div>
+        
+        <hr/>
+        <h3 style="margin-top: 15px;">Onboarding Report</h3>
+        <div style="margin-top: 15px;text-align: center;">
+            {% if body|length > 0 %}
+                <table class="table center table-stripped" style="font-size: 14px;margin-top: 20px;width: 95%;">
+                    <thead style="background-color: #023E8a;color: white">
+                        <tr>
+                            {% for header in headers %}
+                            <th> {{ header }}</th>
+                            {% endfor %}
+                        </tr>
+                    </thead>
+                    <tbody style="background-color: #f5fbff;">
+                    {% for list in body %}
+                        <tr>
+                            {% for el in list %}
+                                <td>{{ el }}</td>
+                            {% endfor %}
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            {% else %}
+                <p>Onboarding report is not available.</p>
+            {% endif %}
+        </div>
+    </div>
+</div>
+{% endblock %}
+{% block body_before_bootstrap %}
+<style>
+    table
+    {        
+        margin-left: auto;
+        margin-right: auto;
+        border-collapse : collapse;  
+    }
+    table td, table th  
+    {         
+        max-width: 100px;
+        word-wrap: break-word;
+    }
+  </style>
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard_viewer/uploader/templates/upload_achilles_results.html b/dashboard_viewer/uploader/templates/upload_achilles_results.html
index ce14b80b..ce737e79 100644
--- a/dashboard_viewer/uploader/templates/upload_achilles_results.html
+++ b/dashboard_viewer/uploader/templates/upload_achilles_results.html
@@ -29,7 +29,7 @@ <h3>Upload new database characteristics</h3>
         For more information see the CatalogueExport R-package
         <a href="https://github.com/EHDEN/CatalogueExport">
             <i class="fas fa-link"></i>
-        </a>
+        </a><br> You can also upload an Onboarding Report
     </span>
 
 {% endblock %}
@@ -43,6 +43,7 @@ <h3>Upload history</h3>
             <table class="table">
                 <thead>
                     <tr>
+                        <th>Type</th>
                         <th>Upload Date</th>
                         <th>R Package Version</th>
                         <th>Generation Date</th>
@@ -52,8 +53,9 @@ <h3>Upload history</h3>
                     </tr>
                 </thead>
                 <tbody>
-                {% for up_hi, status in upload_history %}
+                {% for up_hi, status, type in upload_history %}
                     <tr>
+                        <td>{{ type }}</td>
                         <td>{{ up_hi.upload_date }}</td>
                         <td>{% if up_hi.r_package_version %}{{ up_hi.r_package_version }}{% else %}--{% endif %}</td>
                         <td>{% if up_hi.generation_date %}{{ up_hi.generation_date }}{% else %}--{% endif %}</td>
diff --git a/dashboard_viewer/uploader/templates/upload_onboarding_report.html b/dashboard_viewer/uploader/templates/upload_onboarding_report.html
new file mode 100644
index 00000000..72cfb028
--- /dev/null
+++ b/dashboard_viewer/uploader/templates/upload_onboarding_report.html
@@ -0,0 +1,13 @@
+{% extends "uploader_base.html" %}
+
+{% block onboarding_report %}
+<hr/>
+<h3>Upload Onboarding Report</h3>
+<span>
+    For more information see the CatalogueExport R-package
+    <a href="https://github.com/EHDEN/CatalogueExport">
+        <i class="fas fa-link"></i>
+    </a>
+    It is now also possible to add an Onboarding report.
+</span>
+{% endblock %}
\ No newline at end of file
diff --git a/dashboard_viewer/uploader/templates/uploader_base.html b/dashboard_viewer/uploader/templates/uploader_base.html
index 59f4e252..5d654a58 100644
--- a/dashboard_viewer/uploader/templates/uploader_base.html
+++ b/dashboard_viewer/uploader/templates/uploader_base.html
@@ -36,7 +36,18 @@
             {% block title %}{% endblock %}
 
             <form id="uploadForm" method="POST" enctype="multipart/form-data">
-                {% bootstrap_form form %}
+                {% if onboarding_form %}
+                    <div class="row">
+                        <div class="col-6 col-sm-3">
+                            {% bootstrap_form form %}
+                        </div>
+                        <div class="col-6 col-sm-3">
+                            {% bootstrap_form onboarding_form %}
+                        </div>
+                    </div>
+                {% else %}
+                    {% bootstrap_form form %}
+                {% endif %}
 
                 {% buttons %}
                     <button type="submit" class="btn btn-primary btn-sm-lg" >
diff --git a/dashboard_viewer/uploader/urls.py b/dashboard_viewer/uploader/urls.py
index bf2236a1..80ee2b80 100644
--- a/dashboard_viewer/uploader/urls.py
+++ b/dashboard_viewer/uploader/urls.py
@@ -23,4 +23,9 @@
         views.data_source_dashboard,
         name="data_source_dashboard",
     ),
+    path(
+        "<str:data_source>/OnboardingReport/",
+        views.show_onboarding_csv,
+        name="show_onboarding_csv"
+    )
 ]
diff --git a/dashboard_viewer/uploader/views.py b/dashboard_viewer/uploader/views.py
index 94648d35..6380b225 100644
--- a/dashboard_viewer/uploader/views.py
+++ b/dashboard_viewer/uploader/views.py
@@ -15,12 +15,12 @@
 from materialized_queries_manager.tasks import refresh_materialized_views_task
 from . import serializers
 from .decorators import uploader_decorator
-from .forms import AchillesResultsForm, EditSourceForm, SourceForm
-from .models import Country, DataSource, PendingUpload, UploadHistory
+from .forms import AchillesResultsForm, EditSourceForm, SourceForm, OnboardingReportForm
+from .models import Country, DataSource, PendingUpload, UploadHistory, OnboardingReport
 from .tasks import upload_results_file
-
+import pandas as pd
 PAGE_TITLE = "Dashboard Data Upload"
-
+ONBOARDING_TITLE = "Onboarding Page"
 
 @uploader_decorator
 @xframe_options_exempt
@@ -33,41 +33,53 @@ def upload_achilles_results(request, *args, **kwargs):
 
     if request.method == "POST":
         form = AchillesResultsForm(request.POST, request.FILES)
+        onboarding_form = OnboardingReportForm(request.POST, request.FILES)
 
         if form.is_valid():
-            pending_upload = PendingUpload.objects.create(
-                data_source=obj_data_source, uploaded_file=request.FILES["results_file"]
-            )
-
-            messages.success(
-                request,
-                "File uploaded with success. The file is being processed and its status, on the upload history table "
-                "should update in the meantime.",
+            if (request.FILES.get('results_file', None) != None):
+                pending_upload = PendingUpload.objects.create(
+                    data_source=obj_data_source, uploaded_file=request.FILES["results_file"]
+                )
+
+                messages.success(
+                    request,
+                    "File uploaded with success. The file is being processed and its status, on the upload history table "
+                    "should update in the meantime.",
+                )
+
+                task = upload_results_file.delay(pending_upload.id)
+
+                pending_upload.task_id = task.task_id
+                pending_upload.save()
+
+        # save onboarding csv if it exists
+        if (request.FILES.get('onboarding_results_file', None) != None):
+            OnboardingReport.objects.create(
+                data_source=obj_data_source, uploaded_file=request.FILES["onboarding_results_file"]
             )
 
-            task = upload_results_file.delay(pending_upload.id)
-
-            pending_upload.task_id = task.task_id
-            pending_upload.save()
     else:
         form = AchillesResultsForm()
+        onboarding_form = OnboardingReportForm()
 
     upload_history = sorted(
         itertools.chain(
             UploadHistory.objects.filter(data_source=obj_data_source),
             PendingUpload.objects.filter(data_source=obj_data_source),
+            OnboardingReport.objects.filter(data_source=obj_data_source)
         ),
         key=lambda upload: upload.upload_date,
         reverse=True,
     )
 
-    upload_history = list(map(lambda obj: (obj, obj.get_status()), upload_history))
+    upload_history = list(map(lambda obj: (obj, obj.get_status(), 'Onboarding' if isinstance(obj, OnboardingReport) else 'Catalogue'), upload_history))
 
     return render(
         request,
         "upload_achilles_results.html",
         {
             "form": form,
+            "onboarding_form": onboarding_form,
             "obj_data_source": obj_data_source,
             "upload_history": upload_history,
             "submit_button_text": mark_safe("<i class='fas fa-upload'></i> Upload"),
@@ -229,6 +241,7 @@ def create_data_source(request, *_, **kwargs):
         "data_source.html",
         {
             "form": form,
+            "onboarding_form": None,
             "editing": False,
             "submit_button_text": mark_safe(
                 "<i class='fas fa-plus-circle'></i> Create"
@@ -333,6 +346,24 @@ def data_source_dashboard(request, data_source):
 
     return render(request, "no_uploads_dashboard.html")
 
+@uploader_decorator
+@xframe_options_exempt
+def show_onboarding_csv(request, data_source):
+    df = None
+    data_source_obj = None
+    try:
+        data_source_obj = DataSource.objects.get(hash=data_source)
+        on_boarding_file = OnboardingReport.objects.filter(data_source=data_source_obj.id).latest('id').uploaded_file
+        df = pd.read_csv(on_boarding_file, index_col=0)
+    except:
+        df = pd.DataFrame([])
+
+    context = {'headers': df.columns.tolist(),
+               'body': df.values.tolist(),
+               'constance_config': constance.config,
+               'obj_data_source': data_source_obj,
+               'page_title': ONBOARDING_TITLE}
+    return render(request, "onboarding_report.html", context)
 
 class DataSourceUpdate(viewsets.GenericViewSet):
     # since the edit and upload views don't have authentication, also disable

From 86c227303dd29b06a1b3dc9ef26195496fb8fc0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Frias?= <josefrias@bmd-software.com>
Date: Thu, 4 Apr 2024 15:12:16 +0100
Subject: [PATCH 2/5] Remove unwanted changes

---
 dashboard_viewer/uploader/file_handler/checks.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dashboard_viewer/uploader/file_handler/checks.py b/dashboard_viewer/uploader/file_handler/checks.py
index 8a83fb95..aa9e49d0 100644
--- a/dashboard_viewer/uploader/file_handler/checks.py
+++ b/dashboard_viewer/uploader/file_handler/checks.py
@@ -270,10 +270,8 @@ def _get_upload_attr(analysis, stratum):
 
 
 def check_for_duplicated_files(uploaded_file, data_source_id):
-    #### Added For Checksum ##########################
-
     try:
-        # Upload History only stores the succesded files
+        # Upload History only stores the succeded files
 
         pd = UploadHistory.objects.filter(data_source_id=data_source_id).latest()
 
@@ -283,8 +281,8 @@ def check_for_duplicated_files(uploaded_file, data_source_id):
             .first()
         )
 
-        if data_source_hash is not None:
-            # Go to the path where sucess filea are stored
+        if data_source_hash is not None and bool(pd.uploaded_file):
+            # Go to the path where success files are stored
 
             latest_file_path = os.path.join(settings.MEDIA_ROOT, pd.uploaded_file.path)
 
@@ -317,7 +315,6 @@ def check_for_duplicated_files(uploaded_file, data_source_id):
     except UploadHistory.DoesNotExist:
         pass
 
-    #### Added For Checksum ##########################
 
 def upload_data_to_tmp_table(data_source_id, file_metadata, pending_upload):
 

From 818075bf865ed6deebb65c31802aed28c1945b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Frias?= <josefrias@bmd-software.com>
Date: Fri, 19 Apr 2024 18:05:45 +0100
Subject: [PATCH 3/5] Enable configuration to hide/show upload of onboarding
 reports on the uploader base, adapt js accordingly, add caption to onboarding
 reports

---
 dashboard_viewer/dashboard_viewer/settings.py | 20 ++++++++++++++++++-
 .../uploader/static/js/uploader.js            | 12 ++++++-----
 .../uploader/templates/onboarding_report.html |  2 ++
 .../templates/upload_achilles_results.html    |  4 ++++
 .../uploader/templates/uploader_base.html     |  2 +-
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/dashboard_viewer/dashboard_viewer/settings.py b/dashboard_viewer/dashboard_viewer/settings.py
index f80c7bb3..9d8922a1 100644
--- a/dashboard_viewer/dashboard_viewer/settings.py
+++ b/dashboard_viewer/dashboard_viewer/settings.py
@@ -345,6 +345,23 @@ def locks_make_key(key, key_prefix, version):  # noqa
         "Css for the img tag displaying the app logo",
         str,
     ),
+    "ALLOW_ONBOARDING_UPLOAD" :(
+        False,
+        "If Onboarding reports are allowed to be uploaded, which shows a button in the uploader page if true to allow these kind of files",
+        bool,
+    ),
+    "CAPTION_ONBOARDING" :(
+        "Drug Exposure Diagnostics results for selected ingredients. Executed with minCellCount = 5, sample = 1e+06, "
+        "earliestStartDate = 2010-01-01. # = Number of records. Type (n,%) = Frequency and percentage of available drug types."
+        "Route (n,%) = Frequency and percentage of available routes. Dose Form present n (%) = Frequency and percentage with dose form present."
+        "Fixed amount dose form n (%) = Frequency and percentage of missing denominator unit concept id. Amount distrib. [null or missing] = Distribution of amount (median q05-q95),"
+        "frequency and percentage of null or missing amount. Quantity distrib. [null or missing] = Distribution of quantity (median q05-q95), frequency and percentage of null or missing quantity."
+        "Exposure days distrib. [null or missing] = Distribution of exposure days (median q05-q95), frequency and percentage of null days_supply or missing exposure dates."
+        "Neg. Days n (%) = Frequency and percentage of negative exposure days.",
+        "Caption Text for the table in the Onboarding Report Page",
+        "markdown",
+    ),
+    
 }
 
 CONSTANCE_CONFIG_FIELDSETS = OrderedDict(
@@ -356,9 +373,10 @@ def locks_make_key(key, key_prefix, version):  # noqa
                 "UPLOADER_EXECUTE_EXPORT_PACKAGE",
                 "UPLOADER_UPLOAD",
                 "UPLOADER_AUTO_UPDATE",
+                "CAPTION_ONBOARDING"
             ),
         ),
-        ("Uploader Settings", ("UPLOADER_ALLOW_EDIT_DRAFT_STATUS",)),
+        ("Uploader Settings", ("UPLOADER_ALLOW_EDIT_DRAFT_STATUS", "ALLOW_ONBOARDING_UPLOAD")),
         (
             "Superset",
             ("SUPERSET_HOST", "DATABASE_DASHBOARD_IDENTIFIER", "DATABASE_FILTER_ID"),
diff --git a/dashboard_viewer/uploader/static/js/uploader.js b/dashboard_viewer/uploader/static/js/uploader.js
index f6ff00f5..bd8340c7 100644
--- a/dashboard_viewer/uploader/static/js/uploader.js
+++ b/dashboard_viewer/uploader/static/js/uploader.js
@@ -26,7 +26,9 @@ document.addEventListener("DOMContentLoaded", () => {
         const tbody = tbodys[0];
 
         for (const tr of tbody.children) {
-            const status_td = tr.children[6];
+            const numberOfColumns = tr.children.length;
+            const status_td = tr.children[numberOfColumns-1];
+            
                
             if (status_td.dataset.failed === "yes") {
                 add_failure_message_popup(status_td, status_td.dataset.failureMsg);
@@ -37,10 +39,10 @@ document.addEventListener("DOMContentLoaded", () => {
                         .then(r => r.json())
                         .then(r => {
                             if (r.status === "Done") {
-                                tr.children[2].innerText = r.data.r_package_version;
-                                tr.children[3].innerText = r.data.generation_date;
-                                tr.children[4].innerText = r.data.cdm_version;
-                                tr.children[5].innerText = r.data.vocabulary_version;
+                                tr.children[numberOfColumns - 5].innerText = r.data.r_package_version;
+                                tr.children[numberOfColumns - 4].innerText = r.data.generation_date;
+                                tr.children[numberOfColumns - 3].innerText = r.data.cdm_version;
+                                tr.children[numberOfColumns - 2].innerText = r.data.vocabulary_version;
 
                                 update_upload_status(status_td, "Done", "fas fa-check", "status-done");
 
diff --git a/dashboard_viewer/uploader/templates/onboarding_report.html b/dashboard_viewer/uploader/templates/onboarding_report.html
index f6059e20..da3912a8 100644
--- a/dashboard_viewer/uploader/templates/onboarding_report.html
+++ b/dashboard_viewer/uploader/templates/onboarding_report.html
@@ -37,6 +37,7 @@ <h3 style="margin-top: 15px;">Onboarding Report</h3>
         <div style="margin-top: 15px;text-align: center;">
             {% if body|length > 0 %}
                 <table class="table center table-stripped" style="font-size: 14px;margin-top: 20px;width: 95%;">
+                    <caption style="text-align:left"> {{ constance_config.CAPTION_ONBOARDING|markdownify  }}</caption>
                     <thead style="background-color: #023E8a;color: white">
                         <tr>
                             {% for header in headers %}
@@ -69,6 +70,7 @@ <h3 style="margin-top: 15px;">Onboarding Report</h3>
         margin-right: auto;
         border-collapse : collapse;  
     }
+    caption { caption-side:top; }
     table td, table th  
     {         
         max-width: 100px;
diff --git a/dashboard_viewer/uploader/templates/upload_achilles_results.html b/dashboard_viewer/uploader/templates/upload_achilles_results.html
index ce737e79..e6b873df 100644
--- a/dashboard_viewer/uploader/templates/upload_achilles_results.html
+++ b/dashboard_viewer/uploader/templates/upload_achilles_results.html
@@ -43,7 +43,9 @@ <h3>Upload history</h3>
             <table class="table">
                 <thead>
                     <tr>
+                        {% if constance_config.ALLOW_ONBOARDING_UPLOAD %}
                         <th>Type</th>
+                        {% endif %}
                         <th>Upload Date</th>
                         <th>R Package Version</th>
                         <th>Generation Date</th>
@@ -55,7 +57,9 @@ <h3>Upload history</h3>
                 <tbody>
                 {% for up_hi, status, type in upload_history %}
                     <tr>
+                        {% if constance_config.ALLOW_ONBOARDING_UPLOAD %}
                         <td>{{ type }}</td>
+                        {% endif %}
                         <td>{{ up_hi.upload_date }}</td>
                         <td>{% if up_hi.r_package_version %}{{ up_hi.r_package_version }}{% else %}--{% endif %}</td>
                         <td>{% if up_hi.generation_date %}{{ up_hi.generation_date }}{% else %}--{% endif %}</td>
diff --git a/dashboard_viewer/uploader/templates/uploader_base.html b/dashboard_viewer/uploader/templates/uploader_base.html
index 5d654a58..8efe3ffd 100644
--- a/dashboard_viewer/uploader/templates/uploader_base.html
+++ b/dashboard_viewer/uploader/templates/uploader_base.html
@@ -36,7 +36,7 @@
             {% block title %}{% endblock %}
 
             <form id="uploadForm" method="POST" enctype="multipart/form-data">
-                {% if onboarding_form %}
+                {% if constance_config.ALLOW_ONBOARDING_UPLOAD and onboarding_form %}
                     <div class="row">
                         <div class="col-6 col-sm-3">
                             {% bootstrap_form form %}

From dad15d39d8a9203ea86d401cebf92b7a19fe984d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Frias?= <josefrias@bmd-software.com>
Date: Fri, 19 Apr 2024 18:12:11 +0100
Subject: [PATCH 4/5] Remove message of onboarding in uploader when config is
 not set to upload onboarding report, delete not needed file
 upload_onboarding_report.html

---
 .../uploader/templates/upload_achilles_results.html |  2 +-
 .../templates/upload_onboarding_report.html         | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 dashboard_viewer/uploader/templates/upload_onboarding_report.html

diff --git a/dashboard_viewer/uploader/templates/upload_achilles_results.html b/dashboard_viewer/uploader/templates/upload_achilles_results.html
index e6b873df..6733e71b 100644
--- a/dashboard_viewer/uploader/templates/upload_achilles_results.html
+++ b/dashboard_viewer/uploader/templates/upload_achilles_results.html
@@ -29,7 +29,7 @@ <h3>Upload new database characteristics</h3>
         For more information see the CatalogueExport R-package
         <a href="https://github.com/EHDEN/CatalogueExport">
             <i class="fas fa-link"></i>
-        </a><br> You can also upload an Onboarding Report
+        </a> {%if constance_config.ALLOW_ONBOARDING_UPLOAD %}<br> You can also upload an Onboarding Report {% endif %}
     </span>
 
 {% endblock %}
diff --git a/dashboard_viewer/uploader/templates/upload_onboarding_report.html b/dashboard_viewer/uploader/templates/upload_onboarding_report.html
deleted file mode 100644
index 72cfb028..00000000
--- a/dashboard_viewer/uploader/templates/upload_onboarding_report.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "uploader_base.html" %}
-
-{% block onboarding_report %}
-<hr/>
-<h3>Upload Onboarding Report</h3>
-<span>
-    For more information see the CatalogueExport R-package
-    <a href="https://github.com/EHDEN/CatalogueExport">
-        <i class="fas fa-link"></i>
-    </a>
-    It is now also possible to add an Onboarding report.
-</span>
-{% endblock %}
\ No newline at end of file

From 2330255e3cc0918e0366081934e7800670c98332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Frias?= <josefrias@bmd-software.com>
Date: Mon, 22 Apr 2024 09:40:36 +0100
Subject: [PATCH 5/5] Verify onboarding config also when creating the upload
 button for achilles

---
 dashboard_viewer/uploader/forms.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dashboard_viewer/uploader/forms.py b/dashboard_viewer/uploader/forms.py
index bfa7df06..5cef36af 100644
--- a/dashboard_viewer/uploader/forms.py
+++ b/dashboard_viewer/uploader/forms.py
@@ -33,7 +33,10 @@ class Meta(SourceForm.Meta):
 
 
 class AchillesResultsForm(forms.Form):
-    results_file = forms.FileField(required=False, label='Catalogue Export File')
+    if constance.config.ALLOW_ONBOARDING_UPLOAD:
+        results_file = forms.FileField(required=False, label='Catalogue Export File')
+    else:
+        results_file = forms.FileField()
 
 class OnboardingReportForm(forms.Form):
     onboarding_results_file = forms.FileField(required=False, label='Onboarding Report file (Optional)')
\ No newline at end of file