From 9e6f6535c0187945fdf69f8251d665e3fca03fe6 Mon Sep 17 00:00:00 2001
From: Fabian Wolf <fabian@fawolf.de>
Date: Tue, 3 Sep 2024 10:52:35 +0200
Subject: [PATCH] Report Redaction: Minor visual adjustments

---
 webapp/llm_processing/forms.py                 |  4 +++-
 webapp/main/routes.py                          |  2 +-
 webapp/templates/llm_processing.html           |  4 ++--
 webapp/templates/report_redaction_form.html    | 15 ++++++++++-----
 webapp/templates/report_redaction_metrics.html |  7 ++++---
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/webapp/llm_processing/forms.py b/webapp/llm_processing/forms.py
index 36afd68..1b089a4 100644
--- a/webapp/llm_processing/forms.py
+++ b/webapp/llm_processing/forms.py
@@ -11,7 +11,9 @@
     patientsex: The sex of the patient. Use "m" for male, "w" for female, and "d" for diverse.
 
 This is the medical report:
-{report}"""
+{report}
+
+The JSON:"""
 
 
 default_grammar = r"""root ::= allrecords
diff --git a/webapp/main/routes.py b/webapp/main/routes.py
index 058bf4e..debf279 100644
--- a/webapp/main/routes.py
+++ b/webapp/main/routes.py
@@ -22,7 +22,7 @@ def set_mode_route():
     else:
         flash(f"Cannot change mode: The application was launched with --mode {current_app.config['MODE']} option.", "danger")
 
-    if session['mode'] == 'anonymizer' and "labelannotation" in request.referrer:
+    if session['mode'] == 'anonymizer' and "labelannotation" in request.referrer or "annotationhelper" in request.referrer:
         flash("Switched to Anonymizer", "info")
         return redirect(url_for("report_redaction.main"))
     
diff --git a/webapp/templates/llm_processing.html b/webapp/templates/llm_processing.html
index 6a4fb91..61014b2 100644
--- a/webapp/templates/llm_processing.html
+++ b/webapp/templates/llm_processing.html
@@ -127,8 +127,8 @@ <h1 class="display-4 text-center mb-3">LLM Information Extraction</h1>
                 <div class="col-md-4">
                     <div class="form-floating">
                         {% if form.n_predict.errors %}
-                        {{ form.n_predict(class="form-control is-invalid", placeholder="Number of Predictions") }}
-                        <label for="n_predict">Number of Predictions</label>
+                        {{ form.n_predict(class="form-control is-invalid", placeholder="Max. Number of Tokens to Predict") }}
+                        <label for="n_predict">Max. Number of Tokens to Predict</label>
                         <div class="invalid-feedback">
                             {% for error in form.n_predict.errors %}
                             <span>{{ error }}</span>
diff --git a/webapp/templates/report_redaction_form.html b/webapp/templates/report_redaction_form.html
index 7703591..b40b484 100644
--- a/webapp/templates/report_redaction_form.html
+++ b/webapp/templates/report_redaction_form.html
@@ -180,7 +180,7 @@ <h5 class="d-flex align-items-center">
     
         <!-- Submit Buttons -->
         <div class="row mb-4">
-            <div class="col-md-4 mb-3">
+            <div class="col-md-6 mb-3">
                 <button type="submit" name="submit-metrics" class="btn btn-primary w-100">
                     <i class="bi bi-bar-chart-line me-2"></i> Report Redaction Metrics
                 </button>
@@ -191,7 +191,7 @@ <h5 class="d-flex align-items-center">
                     <i class="bi bi-eye me-2"></i> Report Redaction Viewer (document-wise)
                 </button>
             </div>-->
-            <div class="col-md-4 mb-3">
+            <div class="col-md-6 mb-3">
                 <button type="submit" name="submit-redaction-download" class="btn btn-primary w-100">
                     <i class="bi bi-download me-2"></i> Download Redacted Reports
                 </button>
@@ -263,11 +263,11 @@ <h3 class="h5 mb-0">Job {{ job_id }}</h3>
                 </div>
                 <div class="progress" style="height: 25px;">
                     {% if progress_tuple[2] %}
-                    <div class="progress-bar bg-success" role="progressbar" style="width: {{ (progress_tuple[0] / progress_tuple[1]) * 100 }}%;" aria-valuenow="{{ progress_tuple[0] }}" aria-valuemin="0" aria-valuemax="{{ progress_tuple[1] }}">
+                    <div id="progress-{{ job_id }}" class="progress-bar bg-success" role="progressbar" style="width: {{ (progress_tuple[0] / progress_tuple[1]) * 100 }}%;" aria-valuenow="{{ progress_tuple[0] }}" aria-valuemin="0" aria-valuemax="{{ progress_tuple[1] }}">
                         {{ progress_tuple[0] }} / {{ progress_tuple[1] }}
                     </div>
                     {% else %}
-                    <div class="progress-bar bg-danger" role="progressbar" style="width: 100%;" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
+                    <div id="progress-{{ job_id }}" class="progress-bar bg-danger" role="progressbar" style="width: 100%;" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
                         {{ progress_tuple[0] }} / {{ progress_tuple[1] }} FAILED
                     </div>
                     {% endif %}
@@ -348,8 +348,13 @@ <h3 class="h5 mb-0">Job {{ job_id }}</h3>
         var downloadLink = document.getElementById('download-' + job_id);
         downloadLink.href = '/reportredactionmetrics/' + job_id;
         downloadLink.classList.remove('disabled');
-        downloadLink.innerText = 'View Metrics';
+        downloadLink.innerText = '<i class="bi bi-bar-chart-line"></i> View Metrics';
         downloadLink.removeAttribute('disabled');
+
+        var progressbar = document.getElementById('progress-' + job_id);
+        progressbar.className = 'progress-bar bg-success';
+        progressbar.innerText = 'Completed';
+        progressbar.style.width = '100%';
     });
 
     socket.on('progress_failed', function (data) {
diff --git a/webapp/templates/report_redaction_metrics.html b/webapp/templates/report_redaction_metrics.html
index effcb6e..d4fb65b 100644
--- a/webapp/templates/report_redaction_metrics.html
+++ b/webapp/templates/report_redaction_metrics.html
@@ -251,8 +251,8 @@ <h3>Metrics</h3>
             <div class="card-header">
                 <h3>Experiment Metadata</h3>
             </div>
-            <div class="card-body">
-                <table class="table table-bordered table-hover">
+            <div class="card-body p-0">
+                <table class="table table-bordered table-hover mb-0">
                     <tbody>
                         <tr>
                             <th>Preprocessing Date</th>
@@ -270,10 +270,11 @@ <h3>Experiment Metadata</h3>
                             <th>Prompt</th>
                             <td style="overflow:hidden">{{ metadata['llm_processing']['prompt']}}</td>
                         </tr>
+                        <!--
                         <tr>
                             <th>Symptoms</th>
                             <td>{{ metadata['llm_processing']['symptoms']}}</td>
-                        </tr>
+                        </tr>-->
                         <tr>
                             <th>Temperature</th>
                             <td>{{ metadata['llm_processing']['temperature']}}</td>