#9 - Updated the UI that allows us to test the parsing functionality

imec-int · Nov 7, 2022 · 2ed6dab · 2ed6dab
1 parent a91c5d3
commit 2ed6dab
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -71,3 +71,5 @@ nvm use
 npm install
 npm run dev
 ```
+
+The website is available on `http://localhost:8080/`, the API on `http://localhost:8080/`
diff --git a/src/handlers/complianceReportPdfHandler.js b/src/handlers/complianceReportPdfHandler.js
@@ -158,4 +158,5 @@ const complianceReportPdfHandler = genericPdfHandler(parseComplianceReport);
 
 module.exports = {
   complianceReportPdfHandler,
+  parseComplianceReport,
 };
diff --git a/src/handlers/homeViewHandler.js b/src/handlers/homeViewHandler.js
@@ -1,12 +1,29 @@
 const { parseDiagnosticReportPdfFile } = require('./diagnosticReportPdfHandler');
+const { parseComplianceReport } = require('./complianceReportPdfHandler');
+
+function chooseParser(typeOfReport) {
+  switch (typeOfReport) {
+    case 'complianceReport':
+      return parseComplianceReport;
+    case 'diagnosticReport':
+    default:
+      return parseDiagnosticReportPdfFile;
+  }
+}
 
 const post = (req, res) => {
   if (!req.files) {
     res.status(400);
   } else {
     const { pdf } = req.files;
-    parseDiagnosticReportPdfFile(pdf).then((data) => {
-      res.status(200).render('index', { values: data, filename: pdf.name });
+    const { typeOfReport } = req.body;
+    const parser = chooseParser(typeOfReport);
+    parser(pdf).then((data) => {
+      if (data) {
+        res.status(200).render('index', { values: data, filename: pdf.name });
+      } else {
+        res.status(500).render('index', { error: 'Something went wrong. Are you sure this is a valid PDF of the specified type?' });
+      }
     }).catch(() => {
       res.status(500).render('index', { error: 'Something went wrong. Are you sure this is a valid PDF?' });
     });

diff --git a/src/index.js b/src/index.js
@@ -8,7 +8,6 @@ const { diagnosticReportPdfHandler } = require('./handlers/diagnosticReportPdfHa
 const homeViewHandler = require('./handlers/homeViewHandler');
 const morganMiddleware = require('./tools/morgan');
 const logger = require('./tools/logger');
-const pdfHandler = require('./handlers/pdfHandler');
 
 /** *****************
  * Express setup

diff --git a/src/views/index.handlebars b/src/views/index.handlebars
@@ -1,18 +1,46 @@
 <div class="container">
     {{#if error }}
-    <div class="alert alert-danger show" role="alert">
-        {{error}}
-    </div>
+        <div class="alert alert-danger show" role="alert">
+            {{error}}
+        </div>
     {{/if}}
 
+    <h2>Diagnostic report</h2>
+
     <form action="/" method="POST" enctype="multipart/form-data">
         <div class="mb-3">
-            <label for="formFile" class="form-label">Resmed PDF file:</label>
+            <label for="formFile" class="form-label">Type of file:</label>
+        </div>
+
+        <div class="mb-3">
+            <div class="radio">
+                <label>
+                    <input type="radio" name="typeOfReport" id="typeOfReport1" value="diagnosticReport" checked>
+                    Diagnostic
+                    report
+                </label>
+            </div>
+            <div class="radio">
+                <label class="radio">
+                    <input type="radio" name="typeOfReport" id="typeOfReport2" value="complianceReport"> Compliance
+                    report
+                </label>
+            </div>
+        </div>
+
+        <div class="mb-3">
+            <label for="formFile" class="form-label">PDF file:</label>
             <input required class="form-control" type="file" id="pdf" name="pdf">
         </div>
 
         <button type="submit" class="btn btn-primary">Submit</button>
     </form>
+    {{#if error }}
+        <div class="alert alert-danger alert-dismissible fade show" role="alert">
+            Something went wrong while parsing {{ filename }}: {{error}}
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+    {{/if }}
     {{#if values.length }}
         <hr>