Feature/OCR Scan

backend/pkg/web/server.go

@@ -12,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"os"
+
 	"github.com/fastenhealth/fasten-onprem/backend/pkg"
 	"github.com/fastenhealth/fasten-onprem/backend/pkg/config"
 	"github.com/fastenhealth/fasten-onprem/backend/pkg/database"
@@ -22,14 +24,13 @@ import (
 	"github.com/fastenhealth/fasten-onprem/backend/pkg/web/middleware"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"os"
 )
 
 type AppEngine struct {
-	Config     config.Interface
-	Logger     *logrus.Entry
-	EventBus   event_bus.Interface
-	deviceRepo database.DatabaseRepository
+	Config      config.Interface
+	Logger      *logrus.Entry
+	EventBus    event_bus.Interface
+	deviceRepo  database.DatabaseRepository
 	StandbyMode bool
 
 	RelatedVersions map[string]string //related versions metadata provided & embedded by the build process
@@ -99,8 +100,8 @@ func (ae *AppEngine) Setup() (*gin.RouterGroup, *gin.Engine) {
 					c.JSON(http.StatusOK, gin.H{
 						"success": true,
 						"data": gin.H{
-							"first_run_wizard":   firstRunWizard,
-							"standby_mode":       true,
+							"first_run_wizard": firstRunWizard,
+							"standby_mode":     true,
 						},
 					})
 					return
@@ -125,8 +126,8 @@ func (ae *AppEngine) Setup() (*gin.RouterGroup, *gin.Engine) {
 				c.JSON(http.StatusOK, gin.H{
 					"success": true,
 					"data": gin.H{
-						"first_run_wizard":   firstRunWizard,
-						"standby_mode":       false,
+						"first_run_wizard": firstRunWizard,
+						"standby_mode":     false,
 					},
 				})
 			})
@@ -178,13 +179,16 @@ func (ae *AppEngine) Setup() (*gin.RouterGroup, *gin.Engine) {
 					secure.GET("/resource/fhir/:sourceId/:resourceId", handler.GetResourceFhir)
 					secure.PATCH("/resource/fhir/:resourceType/:resourceId", handler.UpdateResourceFhir)
 					secure.DELETE("/resource/fhir/:resourceType/:resourceId", handler.DeleteResourceFhir)
+					secure.POST("/resource/ocr", handler.OcrFileUploadHandler)
+
+					secure.GET("/dashboards", handler.GetDashboard)
+					secure.POST("/dashboards", handler.AddDashboardLocation)
+					//secure.GET("/dashboard/:dashboardId", handler.GetDashboard)
 
 					secure.POST("/resource/composition", handler.CreateResourceComposition)
 					secure.POST("/resource/related", handler.CreateRelatedResources)
 					secure.DELETE("/encounter/:encounterId/related/:resourceType/:resourceId", handler.EncounterUnlinkResource)
 
-					secure.GET("/dashboards", handler.GetDashboard)
-					secure.POST("/dashboards", handler.AddDashboardLocation)
 					//secure.GET("/dashboard/:dashboardId", handler.GetDashboard)
 
 					secure.GET("/jobs", handler.ListBackgroundJobs)

docker-compose.yml

@@ -20,3 +20,10 @@ services:
       - ./db:/opt/fasten/db
       - ./certs:/opt/fasten/certs/shared
 #      - ./config.example.yaml:/opt/fasten/config/config.yaml
+  ocr-service:
+    build:
+      context: ./ocr-service
+      dockerfile: Dockerfile
+    ports:
+      - "9091:8080"
+    restart: unless-stopped

frontend/angular.json

@@ -70,6 +70,11 @@
                 "glob": "**/*.png",
                 "input": "./node_modules/lforms/dist/lforms/webcomponent/",
                 "output": "/assets/css/lforms/"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/pdfjs-dist/build/",
+                "output": "/assets/pdfjs/"
               }
             ],
             "styles": [

frontend/package.json

@@ -56,6 +56,8 @@
     "ngx-moment": "^6.0.2",
     "parse-full-name": "^1.2.6",
     "qrcode": "^1.5.4",
+    "pdf-lib": "^1.17.1",
+    "pdfjs-dist": "^2.14.305",
     "rtf.js": "^3.0.9",
     "rxjs": "~6.5.4",
     "tslib": "^2.0.0",
@@ -78,6 +80,7 @@
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/qrcode": "^1.5.5",
+    "@types/pdfjs-dist": "^2.10.377",
     "chromatic": "^6.19.8",
     "codelyzer": "^5.1.2",
     "fishery": "^2.2.2",

frontend/src/app/app-routing.module.ts

@@ -30,6 +30,7 @@ import { PractitionerHistoryComponent } from "./pages/practitioner-history/pract
 import { SettingsComponent } from './pages/settings/settings.component';
 import { GetEncryptionKeyWizardComponent } from './pages/get-encryption-key-wizard/get-encryption-key-wizard.component';
 import { SetupEncryptionKeyComponent } from './pages/setup-encryption-key/setup-encryption-key.component';
+import { ResourceOcrComponent } from "./pages/resource-ocr/resource-ocr.component";
 
 const routes: Routes = [
   { path: 'auth/signup/wizard', component: AuthSignupWizardComponent },
@@ -56,6 +57,10 @@ const routes: Routes = [
   { path: 'resource/create', component: ResourceCreatorComponent, canActivate: [ IsAuthenticatedAuthGuard ] },
 
   { path: 'desktop/callback/:state', component: DesktopCallbackComponent, canActivate: [ IsAuthenticatedAuthGuard ] },
+  { path: 'resource/ocr-scan', component: ResourceOcrComponent, canActivate: [ IsAuthenticatedAuthGuard] },
+  { path: 'scan', component: ResourceOcrComponent, canActivate: [ IsAuthenticatedAuthGuard] },
+
+  { path: 'desktop/callback/:state', component: DesktopCallbackComponent, canActivate: [ IsAuthenticatedAuthGuard] },
 
   { path: 'background-jobs', component: BackgroundJobsComponent, canActivate: [ IsAuthenticatedAuthGuard ] },
   { path: 'patient-profile', component: PatientProfileComponent, canActivate: [ IsAuthenticatedAuthGuard ] },

frontend/src/app/app.module.ts

@@ -44,6 +44,11 @@ import { PractitionerHistoryComponent } from './pages/practitioner-history/pract
 import { SettingsComponent } from './pages/settings/settings.component';
 import { SetupEncryptionKeyComponent } from './pages/setup-encryption-key/setup-encryption-key.component';
 import { GetEncryptionKeyWizardComponent } from './pages/get-encryption-key-wizard/get-encryption-key-wizard.component';
+import { ResourceOcrComponent } from './pages/resource-ocr/resource-ocr.component';
+import { PdfOcrComponent } from './pages/resource-ocr/pdf-ocr/pdf-ocr.component';
+import { ImageOcrComponent } from './pages/resource-ocr/image-ocr/image-ocr.component';
+import { CameraOcrComponent } from './pages/resource-ocr/camera-ocr/camera-ocr.component';
+import { EncounterFormComponent } from './pages/resource-ocr/encounter-form/encounter-form.component';
 
 @NgModule({
   declarations: [
@@ -69,6 +74,11 @@ import { GetEncryptionKeyWizardComponent } from './pages/get-encryption-key-wiza
     PractitionerHistoryComponent,
     SetupEncryptionKeyComponent,
     GetEncryptionKeyWizardComponent,
+    ResourceOcrComponent,
+    PdfOcrComponent,
+    ImageOcrComponent,
+    CameraOcrComponent,
+    EncounterFormComponent
   ],
   imports: [
     FormsModule,

frontend/src/app/components/header/header.component.html

@@ -31,6 +31,8 @@
         </li>
         <li class="nav-item" ngbDropdown [ngClass]="{ 'active': practitioners?.isActive }">
           <a routerLink="/practitioners" routerLinkActive="active" #practitioners="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'id-card']"></fa-icon>&nbsp; Address book</a>
+        <li class="nav-item" *ngIf="isAdmin" ngbDropdown [ngClass]="{ 'active': users?.isActive }">
+          <a routerLink="/scan" routerLinkActive="active" #users="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'file']"></fa-icon>&nbsp; Scan</a>
         </li>
 
       </ul>

frontend/src/app/pages/resource-ocr/camera-ocr/camera-ocr.component.html

@@ -0,0 +1,88 @@
+<!-- LIVE CAMERA + CAPTURE -->
+<div *ngIf="isCapturingNew" class="mb-3">
+    <label class="form-label">Live Camera</label>
+    <video #video class="w-100 border rounded" autoplay playsinline></video>
+
+    <button class="btn btn-primary w-100" (click)="captureImage()" [disabled]="capturedImages.length >= 30">
+        Capture Image ({{ capturedImages.length }}/30)
+    </button>
+</div>
+
+<!-- Canvas for internal use (hidden) -->
+<canvas #canvas hidden></canvas>
+
+<!-- Error -->
+<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+
+<!-- REVIEW + SEND TO OCR -->
+<div *ngIf="capturedImages.length && !isCapturingNew && !ocrFiles.length" class="row">
+    <!-- LEFT SIDE: Image Preview -->
+    <div class="col-md-12 d-flex flex-column align-items-center">
+        <h6 class="text-muted mb-2">
+            Image {{ currentIndex + 1 }} of {{ capturedImages.length }}
+        </h6>
+
+        <img [src]="capturedImages[currentIndex]" class="img-thumbnail mb-3"
+            style="max-width: 100%; height: auto; max-height: 500px; object-fit: contain;" />
+
+        <div class="d-flex justify-content-center mb-3">
+            <button class="btn btn-outline-secondary mr-2" (click)="goToPrevious()" [disabled]="currentIndex === 0">
+                ←
+            </button>
+            <button class="btn btn-outline-secondary" (click)="goToNext()"
+                [disabled]="currentIndex === capturedImages.length - 1">
+                →
+            </button>
+        </div>
+
+        <div class="d-flex justify-content-between w-100">
+            <button class="btn btn-secondary" (click)="prepareNewCapture()" [disabled]="capturedImages.length >= 30">
+                Capture Next Image
+            </button>
+
+            <button class="btn btn-success" (click)="sendAllToOcr()" [disabled]="isProcessing">
+                <span *ngIf="isProcessing" class="spinner-border spinner-border-sm me-2"></span>
+                Send All to OCR
+            </button>
+        </div>
+    </div>
+</div>
+
+<!-- OCR RESULT + ENCOUNTER FORM -->
+<div *ngIf="ocrFiles.length" class="row">
+    <div class="col-md-6 d-flex flex-column align-items-center border-right">
+        <h6 class="text-muted mb-2">
+            Image {{ currentIndex + 1 }} of {{ capturedImages.length }}
+        </h6>
+
+        <img [src]="capturedImages[currentIndex]" class="img-thumbnail mb-3"
+            style="max-width: 100%; height: auto; max-height: 500px; object-fit: contain;" />
+
+        <div class="d-flex justify-content-center mb-3">
+            <button class="btn btn-outline-secondary mr-2" (click)="goToPrevious()" [disabled]="currentIndex === 0">
+                ←
+            </button>
+            <button class="btn btn-outline-secondary" (click)="goToNext()"
+                [disabled]="currentIndex === capturedImages.length - 1">
+                →
+            </button>
+        </div>
+        <div *ngIf="isProcessing" class="text-center mb-3">
+            <div class="spinner-border text-primary" role="status">
+                <span class="sr-only">Processing...</span>
+            </div>
+            <div class="mt-2 text-muted">Processing...</div>
+        </div>
+
+        <div *ngIf="foundKeys && foundKeys.length" class="text-center p-2 border rounded bg-light w-100">
+            <strong>Extracted:</strong> {{ foundKeys.join(', ') }}
+        </div>
+    </div>
+
+    <!-- RIGHT SIDE: Encounter form -->
+    <div class="col-md-6 d-flex flex-column">
+        <div class="form-group flex-grow-1">
+            <app-encounter-form [uploadedFiles]="ocrFiles"></app-encounter-form>
+        </div>
+    </div>
+</div>

frontend/src/app/pages/resource-ocr/camera-ocr/camera-ocr.component.scss

@@ -0,0 +1,4 @@
+video {
+  max-height: 400px;
+  object-fit: cover;
+}

frontend/src/app/pages/resource-ocr/camera-ocr/camera-ocr.component.spec.ts

@@ -0,0 +1,32 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CameraOcrComponent } from './camera-ocr.component';
+import { HTTP_CLIENT_TOKEN } from 'src/app/dependency-injection';
+import { HttpClient } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+
+describe('CameraOcrComponent', () => {
+  let component: CameraOcrComponent;
+  let fixture: ComponentFixture<CameraOcrComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [CameraOcrComponent],
+      imports: [HttpClientTestingModule],
+      providers: [
+        {
+          provide: HTTP_CLIENT_TOKEN,
+          useClass: HttpClient,
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CameraOcrComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});