From c0ee7d490b5ed94c68c0c4e909e0de1757f79fc3 Mon Sep 17 00:00:00 2001
From: Paul Nhlapo <62051532+paul-nhlapo@users.noreply.github.com>
Date: Sun, 11 Aug 2024 17:38:40 +0200
Subject: [PATCH 1/7] test

---
 .../upload-document.component.spec.ts         | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/gnd-app/src/app/upload-document/upload-document.component.spec.ts b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
index 8b305675..df5e709b 100644
--- a/gnd-app/src/app/upload-document/upload-document.component.spec.ts
+++ b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
@@ -139,3 +139,117 @@
 //   expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
 // });
 // });
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { UploadDocumentComponent } from './upload-document.component';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('UploadDocumentComponent', () => {
+  let component: UploadDocumentComponent;
+  let fixture: ComponentFixture<UploadDocumentComponent>;
+  let httpMock: HttpTestingController;
+  let debugElement: DebugElement;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            paramMap: of({
+              get: (key: string) => {
+                switch (key) {
+                  case 'fileType': return 'someFileType';
+                  default: return null;
+                }
+              }
+            })
+          }
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(UploadDocumentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    debugElement = fixture.debugElement;
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it('should call onFileSelected and upload file', fakeAsync(() => {
+    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+    const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+    spyOn(component, 'onFileSelected').and.callThrough();
+
+    input.dispatchEvent(new Event('change'));
+    input.files = [file];
+
+    fixture.detectChanges();
+    tick();
+
+    expect(component.onFileSelected).toHaveBeenCalled();
+    expect(component.fileName).toBe('test.txt');
+
+    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+    expect(req.request.method).toBe('POST');
+    req.flush({
+      fileName: 'test.txt',
+      result: 'file processed',
+      documentStatus: 'Compliant',
+      nerCount: 5,
+      location: 'New York',
+      personalData: 'Present',
+      financialData: 'Present',
+      contactData: 'Present',
+      medicalData: 'Absent',
+      ethnicData: 'Absent',
+      biometricData: 'Absent',
+      consentAgreement: 'Consent obtained'
+    });
+
+    fixture.detectChanges();
+    tick();
+
+    expect(component.result).toBe('file processed');
+    expect(component.documentStatus).toBe('Compliant');
+  }));
+
+  it('should display the analysis result in the analysis window', () => {
+    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+    const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+    const dataTransfer = new DataTransfer();
+    dataTransfer.items.add(file);
+
+    input.files = dataTransfer.files;
+    input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
+
+    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+    req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
+
+    fixture.detectChanges();
+
+    const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
+    const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
+
+    expect(analysisHeader.textContent).toContain('Analysis Result:');
+    expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
+  });
+});

From 08d007962229ff61861efe3b21aaa617481f94ae Mon Sep 17 00:00:00 2001
From: Paul Nhlapo <62051532+paul-nhlapo@users.noreply.github.com>
Date: Sun, 11 Aug 2024 18:00:34 +0200
Subject: [PATCH 2/7] Updated the walkthrough

---
 gnd-app/src/app/home/home.component.ts        |   8 +
 .../upload-document.component.spec.ts         | 228 +++++++++---------
 2 files changed, 122 insertions(+), 114 deletions(-)

diff --git a/gnd-app/src/app/home/home.component.ts b/gnd-app/src/app/home/home.component.ts
index 2b25c76b..4f15e40e 100644
--- a/gnd-app/src/app/home/home.component.ts
+++ b/gnd-app/src/app/home/home.component.ts
@@ -50,6 +50,14 @@ export class HomeComponent implements OnInit, OnDestroy {
           element: '#home',
           intro: 'This button will always navigate you back to the home page'
         },
+        {
+          element:'#upload-document',
+          intro:'This button will navigate you to the upload document page. Where you can upload a document.'
+        },
+        {
+          element: '#inbox',
+          into: 'This button will navigate you to the inbox page. Where you can see all the attachments in the received inbox.'
+        },
         {
           element: '#help',
           intro: 'This button will navigate you to the help page. Where you will see how to use the app.'
diff --git a/gnd-app/src/app/upload-document/upload-document.component.spec.ts b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
index df5e709b..0c70952a 100644
--- a/gnd-app/src/app/upload-document/upload-document.component.spec.ts
+++ b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
@@ -139,117 +139,117 @@
 //   expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
 // });
 // });
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { UploadDocumentComponent } from './upload-document.component';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
-import { of } from 'rxjs';
-
-describe('UploadDocumentComponent', () => {
-  let component: UploadDocumentComponent;
-  let fixture: ComponentFixture<UploadDocumentComponent>;
-  let httpMock: HttpTestingController;
-  let debugElement: DebugElement;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
-      providers: [
-        {
-          provide: ActivatedRoute,
-          useValue: {
-            paramMap: of({
-              get: (key: string) => {
-                switch (key) {
-                  case 'fileType': return 'someFileType';
-                  default: return null;
-                }
-              }
-            })
-          }
-        }
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(UploadDocumentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    debugElement = fixture.debugElement;
-    httpMock = TestBed.inject(HttpTestingController);
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  afterEach(() => {
-    httpMock.verify();
-  });
-
-  it('should call onFileSelected and upload file', fakeAsync(() => {
-    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
-    const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
-
-    spyOn(component, 'onFileSelected').and.callThrough();
-
-    input.dispatchEvent(new Event('change'));
-    input.files = [file];
-
-    fixture.detectChanges();
-    tick();
-
-    expect(component.onFileSelected).toHaveBeenCalled();
-    expect(component.fileName).toBe('test.txt');
-
-    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
-    expect(req.request.method).toBe('POST');
-    req.flush({
-      fileName: 'test.txt',
-      result: 'file processed',
-      documentStatus: 'Compliant',
-      nerCount: 5,
-      location: 'New York',
-      personalData: 'Present',
-      financialData: 'Present',
-      contactData: 'Present',
-      medicalData: 'Absent',
-      ethnicData: 'Absent',
-      biometricData: 'Absent',
-      consentAgreement: 'Consent obtained'
-    });
-
-    fixture.detectChanges();
-    tick();
-
-    expect(component.result).toBe('file processed');
-    expect(component.documentStatus).toBe('Compliant');
-  }));
-
-  it('should display the analysis result in the analysis window', () => {
-    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
-    const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
-
-    const dataTransfer = new DataTransfer();
-    dataTransfer.items.add(file);
-
-    input.files = dataTransfer.files;
-    input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
-
-    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
-    req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
-
-    fixture.detectChanges();
-
-    const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
-    const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
-
-    expect(analysisHeader.textContent).toContain('Analysis Result:');
-    expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
-  });
-});
+// import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+// import { UploadDocumentComponent } from './upload-document.component';
+// import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+// import { DebugElement } from '@angular/core';
+// import { By } from '@angular/platform-browser';
+// import { NO_ERRORS_SCHEMA } from '@angular/core';
+// import { RouterTestingModule } from '@angular/router/testing';
+// import { ActivatedRoute } from '@angular/router';
+// import { of } from 'rxjs';
+
+// describe('UploadDocumentComponent', () => {
+//   let component: UploadDocumentComponent;
+//   let fixture: ComponentFixture<UploadDocumentComponent>;
+//   let httpMock: HttpTestingController;
+//   let debugElement: DebugElement;
+
+//   beforeEach(async () => {
+//     await TestBed.configureTestingModule({
+//       imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
+//       providers: [
+//         {
+//           provide: ActivatedRoute,
+//           useValue: {
+//             paramMap: of({
+//               get: (key: string) => {
+//                 switch (key) {
+//                   case 'fileType': return 'someFileType';
+//                   default: return null;
+//                 }
+//               }
+//             })
+//           }
+//         }
+//       ],
+//       schemas: [NO_ERRORS_SCHEMA]
+//     })
+//     .compileComponents();
+
+//     fixture = TestBed.createComponent(UploadDocumentComponent);
+//     component = fixture.componentInstance;
+//     fixture.detectChanges();
+//     debugElement = fixture.debugElement;
+//     httpMock = TestBed.inject(HttpTestingController);
+//   });
+
+//   it('should create', () => {
+//     expect(component).toBeTruthy();
+//   });
+
+//   afterEach(() => {
+//     httpMock.verify();
+//   });
+
+//   it('should call onFileSelected and upload file', fakeAsync(() => {
+//     const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+//     const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+//     spyOn(component, 'onFileSelected').and.callThrough();
+
+//     input.dispatchEvent(new Event('change'));
+//     input.files = [file];
+
+//     fixture.detectChanges();
+//     tick();
+
+//     expect(component.onFileSelected).toHaveBeenCalled();
+//     expect(component.fileName).toBe('test.txt');
+
+//     const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+//     expect(req.request.method).toBe('POST');
+//     req.flush({
+//       fileName: 'test.txt',
+//       result: 'file processed',
+//       documentStatus: 'Compliant',
+//       nerCount: 5,
+//       location: 'New York',
+//       personalData: 'Present',
+//       financialData: 'Present',
+//       contactData: 'Present',
+//       medicalData: 'Absent',
+//       ethnicData: 'Absent',
+//       biometricData: 'Absent',
+//       consentAgreement: 'Consent obtained'
+//     });
+
+//     fixture.detectChanges();
+//     tick();
+
+//     expect(component.result).toBe('file processed');
+//     expect(component.documentStatus).toBe('Compliant');
+//   }));
+
+//   it('should display the analysis result in the analysis window', () => {
+//     const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+//     const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+//     const dataTransfer = new DataTransfer();
+//     dataTransfer.items.add(file);
+
+//     input.files = dataTransfer.files;
+//     input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
+
+//     const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+//     req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
+
+//     fixture.detectChanges();
+
+//     const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
+//     const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
+
+//     expect(analysisHeader.textContent).toContain('Analysis Result:');
+//     expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
+//   });
+// });

From 8ab2df54e5eb77145f276ec42105fc84b946cb81 Mon Sep 17 00:00:00 2001
From: Paul Nhlapo <62051532+paul-nhlapo@users.noreply.github.com>
Date: Sun, 11 Aug 2024 18:02:43 +0200
Subject: [PATCH 3/7] updating the walkthrough

---
 gnd-app/src/app/home/home.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnd-app/src/app/home/home.component.ts b/gnd-app/src/app/home/home.component.ts
index 4f15e40e..5e1fee7d 100644
--- a/gnd-app/src/app/home/home.component.ts
+++ b/gnd-app/src/app/home/home.component.ts
@@ -56,7 +56,7 @@ export class HomeComponent implements OnInit, OnDestroy {
         },
         {
           element: '#inbox',
-          into: 'This button will navigate you to the inbox page. Where you can see all the attachments in the received inbox.'
+          intro: 'This button will navigate you to the inbox page. Where you can see all the attachments in the received inbox.'
         },
         {
           element: '#help',

From 610f7c8f8c11026b3b6f436050d42bc5d72ef5fc Mon Sep 17 00:00:00 2001
From: Yudi-G <133056840+Yudi-G@users.noreply.github.com>
Date: Sun, 11 Aug 2024 18:06:48 +0200
Subject: [PATCH 4/7] biometric

---
 .../Detection_Engine/biometric_detection.py    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/Detection_Engine/biometric_detection.py b/backend/Detection_Engine/biometric_detection.py
index e2cd9771..1ed6c71d 100644
--- a/backend/Detection_Engine/biometric_detection.py
+++ b/backend/Detection_Engine/biometric_detection.py
@@ -59,44 +59,50 @@ def biometric_detect_all(self,pdf_path):
         if (pdf_path.endswith('.pdf')):
             # extract_images_from_pdf(pdf_path)
 
-            images = [f'./Detection_Engine/extracted_images/pdf_images/{i}' for i in os.listdir('./Detection_Engine/extracted_images/pdf_images') if i.endswith('.png')]
+            images = [f'./Detection_Engine/extracted_images/pdf_images/{i}' for i in os.listdir('./Detection_Engine/extracted_images/pdf_images')  if i.endswith('.png') or i.endswith('.jpg')]
 
             output = []
+            count = 0
             for image in images:
+                count += 1
                 output.append(self.biometric_detect_people(image))
             
             png_files = glob.glob(os.path.join("./Detection_Engine/extracted_images/pdf_images", '*.png'))
             for file in png_files:
                 os.remove(file)
             
-            return output
+            return count
         
         elif (pdf_path.endswith('.docx')):
             # extract_images_from_docx(pdf_path)
-            images = [f'./Detection_Engine/extracted_images/docx_images/{i}' for i in os.listdir('./Detection_Engine/extracted_images/docx_images') if i.endswith('.png')]
+            images = [f'./Detection_Engine/extracted_images/docx_images/{i}' for i in os.listdir('./Detection_Engine/extracted_images/docx_images')  if i.endswith('.png') or i.endswith('.jpg')]
             output = []
+            count = 0
             for image in images:
+                count += 1
                 output.append(self.biometric_detect_people(image))
             
             png_files = glob.glob(os.path.join("./Detection_Engine/extracted_images/docx_images", '*.png'))
             for file in png_files:
                 os.remove(file)
 
-            return output
+            return count
         
         elif (pdf_path.endswith('.xlsx')):
             # extract_images_from_excel(pdf_path)
-            images = [f'./Detection_Engine/extracted_images/xlsx_images/{i}' for i in os.listdir('./Detection_Engine/extracted_images/xlsx_images') if i.endswith('.png')]
+            images = [f'./Detection_Engine/extracted_images/xlsx_images/{i}' for i in os.listdir('./Detection_Engine/extracted_images/xlsx_images')  if i.endswith('.png') or i.endswith('.jpg')]
             # images = [f'extracted_images/xlsx_images/{i}' for i in os.listdir('extracted_images/xlsx_images')]
             output = []
+            count = 0
             for image in images:
+                count += 1
                 output.append(self.biometric_detect_people(image))
             
             png_files = glob.glob(os.path.join("./Detection_Engine/extracted_images/xlsx_images", '*.png'))
             for file in png_files:
                 os.remove(file)
 
-            return output
+            return count
         
         directories = [
             "./Detection_Engine/extracted_images/xlsx_images",

From 635c43568e03d73db24db58311d025875eb6b2cf Mon Sep 17 00:00:00 2001
From: Paul Nhlapo <62051532+paul-nhlapo@users.noreply.github.com>
Date: Sun, 11 Aug 2024 18:13:45 +0200
Subject: [PATCH 5/7] Testing

---
 .../upload-document.component.html            |  12 +-
 .../upload-document.component.spec.ts         | 228 +++++++++---------
 2 files changed, 116 insertions(+), 124 deletions(-)

diff --git a/gnd-app/src/app/upload-document/upload-document.component.html b/gnd-app/src/app/upload-document/upload-document.component.html
index 6164e07b..852da539 100644
--- a/gnd-app/src/app/upload-document/upload-document.component.html
+++ b/gnd-app/src/app/upload-document/upload-document.component.html
@@ -71,13 +71,8 @@ <h2 class="analysis-header">
       </div>
 
       <div class="upload-data" *ngIf="result">
-
-        <!-- <div class="comp-status">
-          <span *ngIf="documentStatus == 'Compliant'" class="bg-green-100 text-green-800 text-4xl font-medium me-2 px-2.5 py-0.5 rounded dark:bg-green-900 dark:text-green-300">{{ documentStatus }}</span>
-          <span *ngIf="documentStatus == 'Non-Compliant'" class="bg-red-100 text-red-800 text-4xl font-medium me-2 px-2.5 py-0.5 rounded dark:bg-red-900 dark:text-red-300">{{ documentStatus }}</span>        
-        </div> -->
+        
         <div class="ner-data">
-          <!-- <strong>NER Count:</strong> {{ nerCount }} -->
           <p class="text-lg font-roboto-bold text-gray-900 dark:text-black">This document potentially references {{ nerCount }} different individuals</p>
         </div>
         
@@ -122,10 +117,7 @@ <h2 class="analysis-header">
         </div>
 
         <div class="divider-text"></div>
-
-        <!-- <div class="CA-data">
-          <strong>Consent Agreement:</strong> {{ consentAgreement }}
-        </div> -->
+    
       </div>
 
       <div class="consent-status-container" *ngIf="result">
diff --git a/gnd-app/src/app/upload-document/upload-document.component.spec.ts b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
index 0c70952a..df5e709b 100644
--- a/gnd-app/src/app/upload-document/upload-document.component.spec.ts
+++ b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
@@ -139,117 +139,117 @@
 //   expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
 // });
 // });
-// import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-// import { UploadDocumentComponent } from './upload-document.component';
-// import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-// import { DebugElement } from '@angular/core';
-// import { By } from '@angular/platform-browser';
-// import { NO_ERRORS_SCHEMA } from '@angular/core';
-// import { RouterTestingModule } from '@angular/router/testing';
-// import { ActivatedRoute } from '@angular/router';
-// import { of } from 'rxjs';
-
-// describe('UploadDocumentComponent', () => {
-//   let component: UploadDocumentComponent;
-//   let fixture: ComponentFixture<UploadDocumentComponent>;
-//   let httpMock: HttpTestingController;
-//   let debugElement: DebugElement;
-
-//   beforeEach(async () => {
-//     await TestBed.configureTestingModule({
-//       imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
-//       providers: [
-//         {
-//           provide: ActivatedRoute,
-//           useValue: {
-//             paramMap: of({
-//               get: (key: string) => {
-//                 switch (key) {
-//                   case 'fileType': return 'someFileType';
-//                   default: return null;
-//                 }
-//               }
-//             })
-//           }
-//         }
-//       ],
-//       schemas: [NO_ERRORS_SCHEMA]
-//     })
-//     .compileComponents();
-
-//     fixture = TestBed.createComponent(UploadDocumentComponent);
-//     component = fixture.componentInstance;
-//     fixture.detectChanges();
-//     debugElement = fixture.debugElement;
-//     httpMock = TestBed.inject(HttpTestingController);
-//   });
-
-//   it('should create', () => {
-//     expect(component).toBeTruthy();
-//   });
-
-//   afterEach(() => {
-//     httpMock.verify();
-//   });
-
-//   it('should call onFileSelected and upload file', fakeAsync(() => {
-//     const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
-//     const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
-
-//     spyOn(component, 'onFileSelected').and.callThrough();
-
-//     input.dispatchEvent(new Event('change'));
-//     input.files = [file];
-
-//     fixture.detectChanges();
-//     tick();
-
-//     expect(component.onFileSelected).toHaveBeenCalled();
-//     expect(component.fileName).toBe('test.txt');
-
-//     const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
-//     expect(req.request.method).toBe('POST');
-//     req.flush({
-//       fileName: 'test.txt',
-//       result: 'file processed',
-//       documentStatus: 'Compliant',
-//       nerCount: 5,
-//       location: 'New York',
-//       personalData: 'Present',
-//       financialData: 'Present',
-//       contactData: 'Present',
-//       medicalData: 'Absent',
-//       ethnicData: 'Absent',
-//       biometricData: 'Absent',
-//       consentAgreement: 'Consent obtained'
-//     });
-
-//     fixture.detectChanges();
-//     tick();
-
-//     expect(component.result).toBe('file processed');
-//     expect(component.documentStatus).toBe('Compliant');
-//   }));
-
-//   it('should display the analysis result in the analysis window', () => {
-//     const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
-//     const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
-
-//     const dataTransfer = new DataTransfer();
-//     dataTransfer.items.add(file);
-
-//     input.files = dataTransfer.files;
-//     input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
-
-//     const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
-//     req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
-
-//     fixture.detectChanges();
-
-//     const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
-//     const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
-
-//     expect(analysisHeader.textContent).toContain('Analysis Result:');
-//     expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
-//   });
-// });
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { UploadDocumentComponent } from './upload-document.component';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('UploadDocumentComponent', () => {
+  let component: UploadDocumentComponent;
+  let fixture: ComponentFixture<UploadDocumentComponent>;
+  let httpMock: HttpTestingController;
+  let debugElement: DebugElement;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            paramMap: of({
+              get: (key: string) => {
+                switch (key) {
+                  case 'fileType': return 'someFileType';
+                  default: return null;
+                }
+              }
+            })
+          }
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(UploadDocumentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    debugElement = fixture.debugElement;
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it('should call onFileSelected and upload file', fakeAsync(() => {
+    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+    const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+    spyOn(component, 'onFileSelected').and.callThrough();
+
+    input.dispatchEvent(new Event('change'));
+    input.files = [file];
+
+    fixture.detectChanges();
+    tick();
+
+    expect(component.onFileSelected).toHaveBeenCalled();
+    expect(component.fileName).toBe('test.txt');
+
+    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+    expect(req.request.method).toBe('POST');
+    req.flush({
+      fileName: 'test.txt',
+      result: 'file processed',
+      documentStatus: 'Compliant',
+      nerCount: 5,
+      location: 'New York',
+      personalData: 'Present',
+      financialData: 'Present',
+      contactData: 'Present',
+      medicalData: 'Absent',
+      ethnicData: 'Absent',
+      biometricData: 'Absent',
+      consentAgreement: 'Consent obtained'
+    });
+
+    fixture.detectChanges();
+    tick();
+
+    expect(component.result).toBe('file processed');
+    expect(component.documentStatus).toBe('Compliant');
+  }));
+
+  it('should display the analysis result in the analysis window', () => {
+    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+    const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+    const dataTransfer = new DataTransfer();
+    dataTransfer.items.add(file);
+
+    input.files = dataTransfer.files;
+    input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
+
+    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+    req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
+
+    fixture.detectChanges();
+
+    const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
+    const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
+
+    expect(analysisHeader.textContent).toContain('Analysis Result:');
+    expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
+  });
+});

From 2d0a595a62a85b3795f8e33f2fc096fd4516238e Mon Sep 17 00:00:00 2001
From: u21598012 <133052473+u21598012@users.noreply.github.com>
Date: Sun, 11 Aug 2024 18:18:41 +0200
Subject: [PATCH 6/7] fixed biometrics

---
 .../report_generation_layer.py                | 18 ++++++-------
 backend/Reports/NCEWD1_report.txt             |  1 -
 backend/Reports/NCEX1_report.txt              |  1 -
 backend/Reports/dutch.txt                     | 25 -------------------
 backend/Reports/twoBirds_report.txt           |  1 -
 backend/backend_entry.py                      |  2 +-
 6 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 backend/Reports/NCEWD1_report.txt
 delete mode 100644 backend/Reports/NCEX1_report.txt
 delete mode 100644 backend/Reports/dutch.txt
 delete mode 100644 backend/Reports/twoBirds_report.txt

diff --git a/backend/Detection_Engine/report_generation_layer.py b/backend/Detection_Engine/report_generation_layer.py
index 56963fc4..0688ebd1 100644
--- a/backend/Detection_Engine/report_generation_layer.py
+++ b/backend/Detection_Engine/report_generation_layer.py
@@ -126,17 +126,17 @@ def Image_report(self, path):
 
     def Image_report_generation(self, path):
         arr_ = self.image_classification_layer.biometric_detect_all(path)
-        # return arr_
-        if arr_ is None:
-            return 0
+        # # return arr_
+        # if arr_ is None:
+        #     return 0
         
-        count = 0
-        for detection_list in arr_:
-            for detection in detection_list:
-                if detection.get('label') == 'person':
-                    count += 1
+        # count = 0
+        # for detection_list in arr_:
+        #     for detection in detection_list:
+        #         if detection.get('label') == 'person':
+        #             count += 1
         
-        return count
+        return arr_
 
 #----------------------------------------------------------REPORT GEN END------------------------------------------------------------------#
 
diff --git a/backend/Reports/NCEWD1_report.txt b/backend/Reports/NCEWD1_report.txt
deleted file mode 100644
index 445431e6..00000000
--- a/backend/Reports/NCEWD1_report.txt
+++ /dev/null
@@ -1 +0,0 @@
-"Document potentially references 3 different individuals\nMost probable countries of origin:\nPredominant Language of Country of Origin: English, \nProbability: 0.9999971130124332\n\nViolation Report: \nCategory: General Personal Data\nTotal per category: 33\n\nCategory: Genetic Data\nTotal per category: 0\n\nCategory: Biometric Data\nTotal per category: 0\n\nCategory: Data relating to Health\nTotal per category: 0\n\nCategory: Data revealing Racial and Ethnic Origin\nTotal per category: 0\n\nCategory: Political Opinions\nTotal per category: 0\n\nCategory: Religious or Ideological Convictions\nTotal per category: 0\n\nCategory: Occupational Information\nTotal per category: 0\n\n"
\ No newline at end of file
diff --git a/backend/Reports/NCEX1_report.txt b/backend/Reports/NCEX1_report.txt
deleted file mode 100644
index 6f6308a6..00000000
--- a/backend/Reports/NCEX1_report.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"score":{"Biometric":0,"Consent Agreement":false,"Contact":30,"Ethnic":1,"Financial":0,"Genetic":1,"Location":0,"Medical":12,"NER":32,"Personal":60,"Status":0}}
\ No newline at end of file
diff --git a/backend/Reports/dutch.txt b/backend/Reports/dutch.txt
deleted file mode 100644
index 8a1447e0..00000000
--- a/backend/Reports/dutch.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Persoonlijke informatie:
-Naam: Harvey Spectre
-Geboortedatum: 18 juli 1972
-Adres: Pearsonstraat 123, New York, NY
-E-mailadres: harvey.spectre@example.com
-Telefoonnummer: (555) 555-1234
-Nationaal identificatienummer: 123-45-6789
-IP-adres: 192.168.1.100
-Social media profiel: @HarveySpectreLaw (Twitter)
-
-Speciale categorieën van persoonsgegevens:
-
-Genetische gegevens: Harvey Spectre heeft ervoor gekozen genetische tests te ondergaan voor stamboomdoeleinden. De resultaten wijzen op een diverse genetische achtergrond met afstamming uit Europese, Afrikaanse en Midden-Oosterse regio's. Daarnaast onthult de genetische test een aanleg voor hart- en vaatziekten op basis van de medische geschiedenis van de familie.
-
-Biometrische gegevens: Biometrische gegevens, waaronder vingerafdrukken en gezichtsherkenningsdata, worden verzameld als onderdeel van Harvey Spectre's toegangscontrolemaatregelen voor zijn advocatenkantoor. Deze biometrische identificatoren zorgen voor veilige toegang tot beperkte delen van het kantoor.
-
-Gezondheidsgegevens: De medische dossiers van Harvey Spectre beschrijven zijn gezondheidsgeschiedenis, waaronder behandeling van een sportblessure opgelopen tijdens zijn studiejaren en regelmatige controles voor het beheer van hypertensie. Medicatiegegevens tonen voorschriften voor bloeddrukbeheer en incidenteel pijnstillers.
-
-Gegevens die ras en etnische afkomst onthullen: Harvey Spectre identificeert zichzelf als biraciaal, met een mix van Kaukasische en Afro-Amerikaanse afkomst. Deze informatie is opgenomen in demografische enquêtes uitgevoerd door zijn werkplek en onderwijsinstellingen.
-
-Politieke opvattingen: Harvey Spectre is een actief lid van een politieke partij en heeft publiekelijk zijn standpunten over verschillende politieke kwesties geuit via sociale mediaplatforms en deelname aan lokale bijeenkomsten.
-
-Religieuze of levensbeschouwelijke overtuigingen: Hoewel Harvey Spectre's religieuze affiliatie niet expliciet wordt vermeld, wijzen zijn acties en uitspraken op een seculiere humanistische levensvisie, waarbij ethische principes en persoonlijke verantwoordelijkheid centraal staan.
-
-Vakbondslidmaatschap: Als een prominente advocaat is Harvey Spectre geen lid van een vakbond. Hij heeft echter cliënten vertegenwoordigd die betrokken zijn bij arbeidsconflicten en onderhandelingen met vakbonden in zijn juridische praktijk.
\ No newline at end of file
diff --git a/backend/Reports/twoBirds_report.txt b/backend/Reports/twoBirds_report.txt
deleted file mode 100644
index 823d455a..00000000
--- a/backend/Reports/twoBirds_report.txt
+++ /dev/null
@@ -1 +0,0 @@
-"Most probable countries of origin:\nPredominant Language of Country of Origin: German, \nProbability: 0.999995822277919\n\nViolation Report: \nCategory: General Personal Data\nTotal per category: 3\n\nCategory: Genetic Data\nTotal per category: 0\n\nCategory: Biometric Data\nTotal per category: 3\n\nCategory: Data relating to Health\nTotal per category: 0\n\nCategory: Data revealing Racial and Ethnic Origin\nTotal per category: 0\n\nCategory: Political Opinions\nTotal per category: 0\n\nCategory: Religious or Ideological Convictions\nTotal per category: 0\n\nCategory: Occupational Information\nTotal per category: 0\n\n"
\ No newline at end of file
diff --git a/backend/backend_entry.py b/backend/backend_entry.py
index 3d194e60..21d7f1e9 100644
--- a/backend/backend_entry.py
+++ b/backend/backend_entry.py
@@ -48,7 +48,7 @@ def process(self, path):
         engine = detection_engine()
         # path = input("File Name:  ")
         file = parser.process(path)
-        result = engine.process(file,path)
+        # result = engine.process(file,path)
         result_new = engine.report_generation(file, path)
         # print(result)
 

From 9bac9524a80dafc0bd42cbd84f15a3eb28f9bf4e Mon Sep 17 00:00:00 2001
From: Paul Nhlapo <62051532+paul-nhlapo@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:01:19 +0200
Subject: [PATCH 7/7] Test

---
 .../upload-document.component.spec.ts         | 228 +++++++++---------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/gnd-app/src/app/upload-document/upload-document.component.spec.ts b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
index df5e709b..0c70952a 100644
--- a/gnd-app/src/app/upload-document/upload-document.component.spec.ts
+++ b/gnd-app/src/app/upload-document/upload-document.component.spec.ts
@@ -139,117 +139,117 @@
 //   expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
 // });
 // });
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { UploadDocumentComponent } from './upload-document.component';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
-import { of } from 'rxjs';
-
-describe('UploadDocumentComponent', () => {
-  let component: UploadDocumentComponent;
-  let fixture: ComponentFixture<UploadDocumentComponent>;
-  let httpMock: HttpTestingController;
-  let debugElement: DebugElement;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
-      providers: [
-        {
-          provide: ActivatedRoute,
-          useValue: {
-            paramMap: of({
-              get: (key: string) => {
-                switch (key) {
-                  case 'fileType': return 'someFileType';
-                  default: return null;
-                }
-              }
-            })
-          }
-        }
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(UploadDocumentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    debugElement = fixture.debugElement;
-    httpMock = TestBed.inject(HttpTestingController);
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  afterEach(() => {
-    httpMock.verify();
-  });
-
-  it('should call onFileSelected and upload file', fakeAsync(() => {
-    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
-    const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
-
-    spyOn(component, 'onFileSelected').and.callThrough();
-
-    input.dispatchEvent(new Event('change'));
-    input.files = [file];
-
-    fixture.detectChanges();
-    tick();
-
-    expect(component.onFileSelected).toHaveBeenCalled();
-    expect(component.fileName).toBe('test.txt');
-
-    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
-    expect(req.request.method).toBe('POST');
-    req.flush({
-      fileName: 'test.txt',
-      result: 'file processed',
-      documentStatus: 'Compliant',
-      nerCount: 5,
-      location: 'New York',
-      personalData: 'Present',
-      financialData: 'Present',
-      contactData: 'Present',
-      medicalData: 'Absent',
-      ethnicData: 'Absent',
-      biometricData: 'Absent',
-      consentAgreement: 'Consent obtained'
-    });
-
-    fixture.detectChanges();
-    tick();
-
-    expect(component.result).toBe('file processed');
-    expect(component.documentStatus).toBe('Compliant');
-  }));
-
-  it('should display the analysis result in the analysis window', () => {
-    const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
-    const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
-
-    const dataTransfer = new DataTransfer();
-    dataTransfer.items.add(file);
-
-    input.files = dataTransfer.files;
-    input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
-
-    const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
-    req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
-
-    fixture.detectChanges();
-
-    const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
-    const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
-
-    expect(analysisHeader.textContent).toContain('Analysis Result:');
-    expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
-  });
-});
+// import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+// import { UploadDocumentComponent } from './upload-document.component';
+// import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+// import { DebugElement } from '@angular/core';
+// import { By } from '@angular/platform-browser';
+// import { NO_ERRORS_SCHEMA } from '@angular/core';
+// import { RouterTestingModule } from '@angular/router/testing';
+// import { ActivatedRoute } from '@angular/router';
+// import { of } from 'rxjs';
+
+// describe('UploadDocumentComponent', () => {
+//   let component: UploadDocumentComponent;
+//   let fixture: ComponentFixture<UploadDocumentComponent>;
+//   let httpMock: HttpTestingController;
+//   let debugElement: DebugElement;
+
+//   beforeEach(async () => {
+//     await TestBed.configureTestingModule({
+//       imports: [RouterTestingModule, HttpClientTestingModule, UploadDocumentComponent],
+//       providers: [
+//         {
+//           provide: ActivatedRoute,
+//           useValue: {
+//             paramMap: of({
+//               get: (key: string) => {
+//                 switch (key) {
+//                   case 'fileType': return 'someFileType';
+//                   default: return null;
+//                 }
+//               }
+//             })
+//           }
+//         }
+//       ],
+//       schemas: [NO_ERRORS_SCHEMA]
+//     })
+//     .compileComponents();
+
+//     fixture = TestBed.createComponent(UploadDocumentComponent);
+//     component = fixture.componentInstance;
+//     fixture.detectChanges();
+//     debugElement = fixture.debugElement;
+//     httpMock = TestBed.inject(HttpTestingController);
+//   });
+
+//   it('should create', () => {
+//     expect(component).toBeTruthy();
+//   });
+
+//   afterEach(() => {
+//     httpMock.verify();
+//   });
+
+//   it('should call onFileSelected and upload file', fakeAsync(() => {
+//     const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+//     const input = fixture.debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+//     spyOn(component, 'onFileSelected').and.callThrough();
+
+//     input.dispatchEvent(new Event('change'));
+//     input.files = [file];
+
+//     fixture.detectChanges();
+//     tick();
+
+//     expect(component.onFileSelected).toHaveBeenCalled();
+//     expect(component.fileName).toBe('test.txt');
+
+//     const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+//     expect(req.request.method).toBe('POST');
+//     req.flush({
+//       fileName: 'test.txt',
+//       result: 'file processed',
+//       documentStatus: 'Compliant',
+//       nerCount: 5,
+//       location: 'New York',
+//       personalData: 'Present',
+//       financialData: 'Present',
+//       contactData: 'Present',
+//       medicalData: 'Absent',
+//       ethnicData: 'Absent',
+//       biometricData: 'Absent',
+//       consentAgreement: 'Consent obtained'
+//     });
+
+//     fixture.detectChanges();
+//     tick();
+
+//     expect(component.result).toBe('file processed');
+//     expect(component.documentStatus).toBe('Compliant');
+//   }));
+
+//   it('should display the analysis result in the analysis window', () => {
+//     const file = new File(['file content'], 'test.txt', { type: 'text/plain' });
+//     const input = debugElement.query(By.css('input[type="file"]')).nativeElement;
+
+//     const dataTransfer = new DataTransfer();
+//     dataTransfer.items.add(file);
+
+//     input.files = dataTransfer.files;
+//     input.dispatchEvent(new Event('change', { bubbles: true, cancelable: true }));
+
+//     const req = httpMock.expectOne('http://127.0.0.1:8000/file-upload-new');
+//     req.flush({ fileName: 'test.txt', result: 'line1\nline2' });
+
+//     fixture.detectChanges();
+
+//     const analysisHeader = debugElement.query(By.css('.analysis-box-header')).nativeElement;
+//     const resultContent = debugElement.query(By.css('.result-content')).nativeElement;
+
+//     expect(analysisHeader.textContent).toContain('Analysis Result:');
+//     expect(resultContent.innerHTML).toContain('<b>line1</b><br>line2');
+//   });
+// });