From 17840cd3da70ab56dce21b2d9058be25ddccaff0 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:16:15 -0500 Subject: [PATCH 1/9] issue #33 draft pull with new branch --- .../src/app/views/gaussianDashboard/gdashboard.component.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html new file mode 100644 index 00000000..4b3bd103 --- /dev/null +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html @@ -0,0 +1 @@ +// file for new gaussian webpage \ No newline at end of file From 80cc141871e6394bed8a2519f66af3f4fd7d41c2 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Sun, 7 Apr 2024 21:17:33 -0500 Subject: [PATCH 2/9] updates to gaussian webpage --- .../src/app/app-routing.module.ts | 4 +- .../orca_data_converter/src/app/app.module.ts | 2 + .../gdashboard.component.css | 145 ++++ .../gdashboard.component.html | 84 +- .../gdashboard.component.spec.ts | 35 + .../gaussianDashboard/gdashboard.component.ts | 807 ++++++++++++++++++ 6 files changed, 1074 insertions(+), 3 deletions(-) create mode 100644 frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.css create mode 100644 frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.spec.ts create mode 100644 frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts diff --git a/frontend/orca_data_converter/src/app/app-routing.module.ts b/frontend/orca_data_converter/src/app/app-routing.module.ts index c3ea77bd..c9ebe1a8 100644 --- a/frontend/orca_data_converter/src/app/app-routing.module.ts +++ b/frontend/orca_data_converter/src/app/app-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Dashboard1Component } from './views/dashboard1/dashboard1.component'; +import { GDashboardComponent } from './views/gaussianDashboard/gdashboard.component'; const routes: Routes = [ - { path: 'home1', component: Dashboard1Component } + { path: 'home1', component: GDashboardComponent } ]; @NgModule({ diff --git a/frontend/orca_data_converter/src/app/app.module.ts b/frontend/orca_data_converter/src/app/app.module.ts index ff6599c8..62029d1b 100644 --- a/frontend/orca_data_converter/src/app/app.module.ts +++ b/frontend/orca_data_converter/src/app/app.module.ts @@ -10,10 +10,12 @@ import { DashboardComponent } from './views/dashboard/dashboard.component'; import { MultiSelectModule } from "primeng/multiselect"; import { Dashboard1Component } from './views/dashboard1/dashboard1.component'; import { HttpClientModule } from "@angular/common/http"; +import { GDashboardComponent } from './views/gaussianDashboard/gdashboard.component'; @NgModule({ declarations: [ AppComponent, + GDashboardComponent, DashboardComponent, Dashboard1Component ], diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.css b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.css new file mode 100644 index 00000000..1a735b4e --- /dev/null +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.css @@ -0,0 +1,145 @@ +:host ::ng-deep .custom-ms + .p-multiselect-label { + width: 300px !important; + } + + input[type="file"]{ + padding: 0.5rem; + cursor: pointer; + font-size: 1rem; + } + + #whole { + font-family: 'Didot'; + font-size: 20px; + text-align: center; + padding: 80px 0; + position: relative; + } + + #customFile { + display: none; + } + + .background-image::before { + content: ""; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-image: url('https://www.shutterstock.com/image-vector/dolphin-circle-water-600nw-346914458.jpg'); + background-size: contain; + background-repeat: no-repeat; + background-position: center; + opacity: 0.35; + z-index: -1; + + } + + + .form-label { + border: 1px solid #ccc; + border-radius: 5px; + display: inline-block; + padding: 8px 15px; + cursor: pointer; + font-size: 18px; + transition-duration: 0.7s; + } + + .form-label:hover { + background-color: black; + color:white; + } + + #keyTerms-toSearch { + border: 1px solid #ccc; + border-radius: 5px; + padding: 8px 12px; + width: 210x; + box-sizing: border-box; + font-size: 18px; + } + + #linesSpecified-toSearch { + border: 1px solid #ccc; + border-radius: 5px; + padding: 8px 12px; + width: 210x; + box-sizing: border-box; + font-size: 18px; + } + + #sections-toSearch { + border: 1px solid #ccc; + border-radius: 5px; + padding: 8px 12px; + width: 210x; + box-sizing: border-box; + font-size: 18px; + } + + #useTotalLines-toSearch { + border: 1px solid #ccc; + border-radius: 5px; + padding: 8px 12px; + width: 210x; + box-sizing: border-box; + font-size: 18px; + } + + #totalLines-toSearch { + border: 1px solid #ccc; + border-radius: 5px; + padding: 8px 12px; + width: 210x; + box-sizing: border-box; + font-size: 18px; + } + + input::placeholder { + color: gray; + font-family:'Courier New', Courier, monospace; + font-style: italic; + font-size: 12px; + } + + + #fileNameInput { + border: 1px solid #ccc; + border-radius: 5px; + padding: 8px 12px; + width: 210x; + box-sizing: border-box; + font-size: 18px; + } + + #fileNameInput:focus { + border: 2px solid #555; + } + + #downloadButton { + font-family: 'Calibri'; + font-size: 18px; + color: black; + background-color: white; + border: 1px solid #ccc; + border-radius: 5px; + margin-top: 25px; + padding: 12px; + } + + #downloadButton:hover,.Submit:hover { + background-color: black; + color:white; + transform: scale(1.1); + transition: all 0.5s ease-in; + cursor: pointer; + } + + .Submit { + border: none; + border-radius: 5px; + padding: 0.5rem 1rem; + } \ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html index 4b3bd103..fee12279 100644 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html @@ -1 +1,83 @@ -// file for new gaussian webpage \ No newline at end of file +
+

+ Convert Gaussian files to Word documents +

+

Upload your Gaussian data file

+ +
+ +
+ + +
+ +
+

Enter the terms you wish to search for (txt only):

+
+
+ +
+
+
+ + + +
+

Enter how you want the lines specified:

+
+
+ +
+
+
+ +
+

Number of sections?

+
+
+ +
+
+
+ +
+

Use total lines?

+
+
+ +
+
+
+ +
+

Total number of lines for output doc?

+
+
+ +
+
+
+
+ +
+
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.spec.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.spec.ts new file mode 100644 index 00000000..843565d2 --- /dev/null +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.spec.ts @@ -0,0 +1,35 @@ +import { TestBed } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { AppComponent } from '../../app.component'; + +describe('AppComponent', () => { + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + RouterTestingModule + ], + declarations: [ + AppComponent + ], + }).compileComponents(); + }); + + it('should create the app', () => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.componentInstance; + expect(app).toBeTruthy(); + }); + + it(`should have as title 'example'`, () => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.componentInstance; + expect(app.title).toEqual('example'); + }); + + it('should render title', () => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.nativeElement as HTMLElement; + expect(compiled.querySelector('.content span')?.textContent).toContain('example app is running!'); + }); +}); diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts new file mode 100644 index 00000000..1037efa9 --- /dev/null +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts @@ -0,0 +1,807 @@ +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import {SelectItem} from 'primeng/api'; + +interface Brand { + name: string; + search_terms: string; + sections: number; + specifyLines: string; + use_total_lines: boolean; + lines: number; +} + +interface BrandsGroup { + groupName: string; + brands: Brand[]; +} + +@Component({ + selector: 'app-gdashboard', + templateUrl: './gdashboard.component.html', + styleUrls: ['./gdashboard.component.css'] +}) + +export class GDashboardComponent implements OnInit{ + + brandGroups: BrandsGroup[] = []; + selectedBrands: Brand[] = []; + public fileName: string; + selectedFile: File | null = null; + + constructor(private readonly http: HttpClient) { } + + onFileSelected(event: any) { + this.selectedFile = event.target.files[0]; + } + + ngOnInit() { + this.brandGroups = [ + { + groupName: "Cartesian Coordinates (Angstroem)", + brands: [ + { + name: "Row 1", + search_terms: "cartesian coordinates (angstroem)", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "cartesian coordinates (angstroem)", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "cartesian coordinates (angstroem)", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "cartesian coordinates (angstroem)", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 5", + search_terms: "cartesian coordinates (angstroem)", + sections: 5, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 6", + search_terms: "cartesian coordinates (angstroem)", + sections: 6, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 7", + search_terms: "cartesian coordinates (angstroem)", + sections: 7, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Cartesian Coordinates (A.U.)", + brands: [ + { + name: "Row 1", + search_terms: "cartesian coordinates (a.u.)", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "cartesian coordinates (a.u.)", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "cartesian coordinates (a.u.)", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "cartesian coordinates (a.u.)", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 5", + search_terms: "cartesian coordinates (a.u.)", + sections: 5, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 6", + search_terms: "cartesian coordinates (a.u.)", + sections: 6, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 7", + search_terms: "cartesian coordinates (a.u.)", + sections: 7, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + + ] + }, + { + groupName: "Internal Coordinates (Angstroem)", + brands: [ + { + name: "Row 1", + search_terms: "internal coordinates (angstroem)", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "internal coordinates (angstroem)", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "internal coordinates (angstroem)", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "internal coordinates (angstroem)", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 5", + search_terms: "internal coordinates (angstroem)", + sections: 5, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 6", + search_terms: "internal coordinates (angstroem)", + sections: 6, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 7", + search_terms: "internal coordinates (angstroem)", + sections: 7, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Internal Coordinates (A.U.)", + brands: [ + { + name: "Row 1", + search_terms: "internal coordinates (a.u.)", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "internal coordinates (a.u.)", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "internal coordinates (a.u.)", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "internal coordinates (a.u.)", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 5", + search_terms: "internal coordinates (a.u.)", + sections: 5, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 6", + search_terms: "internal coordinates (a.u.)", + sections: 6, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 7", + search_terms: "internal coordinates (a.u.)", + sections: 7, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Basis Set Information", + brands: [ + { + name: "Row 1", + search_terms: "basis set information", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "basis set information", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "basis set information", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "basis set information", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Orbital Energies", + brands: [ + { + name: "Row 1", + search_terms: "orbital energies", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "orbital energies", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Mulliken Atomic Charges", + brands: [ + { + name: "Row 1", + search_terms: "mulliken atomic charges", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "mulliken atomic charges", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Mulliken Reduced Orbital Charges", + brands: [ + { + name: "Row 1", + search_terms: "mulliken reduced orbital charges", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "mulliken reduced orbital charges", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Loewdin Atomic Charges", + brands: [ + { + name: "Row 1", + search_terms: "loewdin atomic charges", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "loewdin atomic charges", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Timings", + brands: [ + { + name: "Row 1", + search_terms: "timings", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "timings", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "timings", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "timings", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 5", + search_terms: "timings", + sections: 5, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 6", + search_terms: "timings", + sections: 6, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 7", + search_terms: "timings", + sections: 7, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 8", + search_terms: "timings", + sections: 8, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Vibrational Frequencies", + brands: [ + { + name: "Row 1", + search_terms: "vibrational frequencies", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "vibrational frequencies", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "vibrational frequencies", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Normal Modes", + brands: [ + { + name: "Row 1", + search_terms: "normal modes", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "normal modes", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "normal modes", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "IR Spectrum", + brands: [ + { + name: "Row 1", + search_terms: "ir spectrum", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "ir spectrum", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "ir spectrum", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Thermochemistry at 298.15K", + brands: [ + { + name: "Row 1", + search_terms: "thermochemsitry at 298.15k", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "thermochemistry at 298.15k", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "thermochemistry at 298.15k", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Inner Energy", + brands: [ + { + name: "Row 1", + search_terms: "inner energy", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "inner energy", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "inner energy", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Enthalpy", + brands: [ + { + name: "Row 1", + search_terms: "enthalpy", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "enthalpy", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "enthalpy", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Entropy", + brands: [ + { + name: "Row 1", + search_terms: "entropy", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "entropy", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "entropy", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Gibbs Free Energy", + brands: [ + { + name: "Row 1", + search_terms: "gibbs free energy", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "gibbs free energy", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "gibbs free energy", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + { + groupName: "Cartesian Gradient", + brands: [ + { + name: "Row 1", + search_terms: "cartesian gradient", + sections: 1, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 2", + search_terms: "cartesian gradient", + sections: 2, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 3", + search_terms: "cartesian gradient", + sections: 3, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 4", + search_terms: "cartesian gradient", + sections: 4, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 5", + search_terms: "cartesian gradient", + sections: 5, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + }, + { + name: "Row 6", + search_terms: "cartesian gradient", + sections: 6, + specifyLines: "WHOLE", + use_total_lines: false, + lines: 0 + } + ] + }, + ]; + } + + checkEmpty(){ + var inputValueFile = (document.getElementById("customFile")).files?.length; + var inputValueFileName = (document.getElementById("fileNameInput")).value; + if (inputValueFileName === ""){ + alert("One or more inputs are empty.") + return 0; + } + + if (inputValueFile === 0) { + alert("One or more inputs are empty."); + return 0; + } + + else{ + return 1; + } +} + + runBackend(){ + this.checkEmpty(); + this.http.post('https://github.com/oss-slu/orca_converter/blob/main/Backend/Backend/API.py', null).subscribe(); + console.log(this.fileName); + console.log(this.selectedBrands); + return this.selectedBrands, this.fileName; + } + + onUpload() { + if (!this.selectedFile) { + console.error('No file selected'); + return; + } + + const formData = new FormData(); + formData.append('file', this.selectedFile); + + this.http.post('http://localhost:5000/upload', formData).subscribe( + (response) => { + console.log('File uploaded successfully:', response); + }, + (error) => { + console.error('Error uploading file:', error); + } + ); + } +} \ No newline at end of file From dbe99ca6dffd6c2d667a27187f4cdc8af6033302 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Sun, 7 Apr 2024 22:03:54 -0500 Subject: [PATCH 3/9] code according to guassian but blank screen --- frontend/orca_data_converter/src/app/app.component.html | 4 ++-- frontend/orca_data_converter/src/app/app.component.ts | 4 ++-- frontend/orca_data_converter/src/app/app.module.ts | 2 +- .../src/app/views/gaussianDashboard/gdashboard.component.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/orca_data_converter/src/app/app.component.html b/frontend/orca_data_converter/src/app/app.component.html index 323a539c..69aaa6be 100644 --- a/frontend/orca_data_converter/src/app/app.component.html +++ b/frontend/orca_data_converter/src/app/app.component.html @@ -1,6 +1,6 @@ -
+
- +
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/app.component.ts b/frontend/orca_data_converter/src/app/app.component.ts index 63d4171f..36c08e7f 100644 --- a/frontend/orca_data_converter/src/app/app.component.ts +++ b/frontend/orca_data_converter/src/app/app.component.ts @@ -8,11 +8,11 @@ import {firstValueFrom} from 'rxjs'; styleUrls: ['./app.component.css'] }) export class AppComponent implements OnInit { - dashboard:any; + gaussianDashboard:any; constructor(private http: HttpClient) { - this.dashboard = window.location.pathname + this.gaussianDashboard = window.location.pathname } async ngOnInit(): Promise { diff --git a/frontend/orca_data_converter/src/app/app.module.ts b/frontend/orca_data_converter/src/app/app.module.ts index 62029d1b..5fcb9198 100644 --- a/frontend/orca_data_converter/src/app/app.module.ts +++ b/frontend/orca_data_converter/src/app/app.module.ts @@ -6,11 +6,11 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; +import { GDashboardComponent } from './views/gaussianDashboard/gdashboard.component'; import { DashboardComponent } from './views/dashboard/dashboard.component'; import { MultiSelectModule } from "primeng/multiselect"; import { Dashboard1Component } from './views/dashboard1/dashboard1.component'; import { HttpClientModule } from "@angular/common/http"; -import { GDashboardComponent } from './views/gaussianDashboard/gdashboard.component'; @NgModule({ declarations: [ diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html index fee12279..38a213f9 100644 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html @@ -7,7 +7,7 @@

Upload your Gaussian data file

- +
From e517375476fa85c60eff4c7292286b5b5ccfe2e1 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:37:16 -0500 Subject: [PATCH 4/9] completition of issue #33 --- frontend/orca_data_converter/src/app/app-routing.module.ts | 4 ++-- frontend/orca_data_converter/src/app/app.component.html | 4 ++-- frontend/orca_data_converter/src/app/app.component.ts | 4 ++-- .../src/app/views/gaussianDashboard/gdashboard.component.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/orca_data_converter/src/app/app-routing.module.ts b/frontend/orca_data_converter/src/app/app-routing.module.ts index c9ebe1a8..5f1ddf02 100644 --- a/frontend/orca_data_converter/src/app/app-routing.module.ts +++ b/frontend/orca_data_converter/src/app/app-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { GDashboardComponent } from './views/gaussianDashboard/gdashboard.component'; +import { DashboardComponent } from './views/dashboard/dashboard.component'; const routes: Routes = [ - { path: 'home1', component: GDashboardComponent } + { path: 'home1', component: DashboardComponent } ]; @NgModule({ diff --git a/frontend/orca_data_converter/src/app/app.component.html b/frontend/orca_data_converter/src/app/app.component.html index 69aaa6be..323a539c 100644 --- a/frontend/orca_data_converter/src/app/app.component.html +++ b/frontend/orca_data_converter/src/app/app.component.html @@ -1,6 +1,6 @@ -
+
- +
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/app.component.ts b/frontend/orca_data_converter/src/app/app.component.ts index 36c08e7f..63d4171f 100644 --- a/frontend/orca_data_converter/src/app/app.component.ts +++ b/frontend/orca_data_converter/src/app/app.component.ts @@ -8,11 +8,11 @@ import {firstValueFrom} from 'rxjs'; styleUrls: ['./app.component.css'] }) export class AppComponent implements OnInit { - gaussianDashboard:any; + dashboard:any; constructor(private http: HttpClient) { - this.gaussianDashboard = window.location.pathname + this.dashboard = window.location.pathname } async ngOnInit(): Promise { diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts index 1037efa9..25c86c5d 100644 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts @@ -17,7 +17,7 @@ interface BrandsGroup { } @Component({ - selector: 'app-gdashboard', + selector: 'app-gaussianDashboard', templateUrl: './gdashboard.component.html', styleUrls: ['./gdashboard.component.css'] }) From 72032c0ac1465dd44ad9b940140eb510a8b1549b Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:36:19 -0500 Subject: [PATCH 5/9] changing dashboard to dashboard1 in app-routhing.module --- frontend/orca_data_converter/src/app/app-routing.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/orca_data_converter/src/app/app-routing.module.ts b/frontend/orca_data_converter/src/app/app-routing.module.ts index 5f1ddf02..c3ea77bd 100644 --- a/frontend/orca_data_converter/src/app/app-routing.module.ts +++ b/frontend/orca_data_converter/src/app/app-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DashboardComponent } from './views/dashboard/dashboard.component'; +import { Dashboard1Component } from './views/dashboard1/dashboard1.component'; const routes: Routes = [ - { path: 'home1', component: DashboardComponent } + { path: 'home1', component: Dashboard1Component } ]; @NgModule({ From fac0def78fcb4023604ddc0c1b37452f783154a1 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:46:38 -0500 Subject: [PATCH 6/9] renamed to GaussianDashboardComponent and gaussianDashboard --- frontend/orca_data_converter/src/app/app.module.ts | 4 ++-- ...hboard.component.css => gaussianDashboard.component.css} | 0 ...oard.component.html => gaussianDashboard.component.html} | 0 ...omponent.spec.ts => gaussianDashboard.component.spec.ts} | 0 ...ashboard.component.ts => gaussianDashboard.component.ts} | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) rename frontend/orca_data_converter/src/app/views/gaussianDashboard/{gdashboard.component.css => gaussianDashboard.component.css} (100%) rename frontend/orca_data_converter/src/app/views/gaussianDashboard/{gdashboard.component.html => gaussianDashboard.component.html} (100%) rename frontend/orca_data_converter/src/app/views/gaussianDashboard/{gdashboard.component.spec.ts => gaussianDashboard.component.spec.ts} (100%) rename frontend/orca_data_converter/src/app/views/gaussianDashboard/{gdashboard.component.ts => gaussianDashboard.component.ts} (99%) diff --git a/frontend/orca_data_converter/src/app/app.module.ts b/frontend/orca_data_converter/src/app/app.module.ts index 5fcb9198..68bbf87e 100644 --- a/frontend/orca_data_converter/src/app/app.module.ts +++ b/frontend/orca_data_converter/src/app/app.module.ts @@ -6,7 +6,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { GDashboardComponent } from './views/gaussianDashboard/gdashboard.component'; +import { GaussianDashboardComponent } from './views/gaussianDashboard/gaussianDashboard.component'; import { DashboardComponent } from './views/dashboard/dashboard.component'; import { MultiSelectModule } from "primeng/multiselect"; import { Dashboard1Component } from './views/dashboard1/dashboard1.component'; @@ -15,7 +15,7 @@ import { HttpClientModule } from "@angular/common/http"; @NgModule({ declarations: [ AppComponent, - GDashboardComponent, + GaussianDashboardComponent, DashboardComponent, Dashboard1Component ], diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.css b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.css similarity index 100% rename from frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.css rename to frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.css diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.html similarity index 100% rename from frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.html rename to frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.html diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.spec.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.spec.ts similarity index 100% rename from frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.spec.ts rename to frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.spec.ts diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts similarity index 99% rename from frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts rename to frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts index 25c86c5d..3b9f5dca 100644 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gdashboard.component.ts +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts @@ -18,11 +18,11 @@ interface BrandsGroup { @Component({ selector: 'app-gaussianDashboard', - templateUrl: './gdashboard.component.html', - styleUrls: ['./gdashboard.component.css'] + templateUrl: './gaussianDashboard.component.html', + styleUrls: ['./gaussianDashboard.component.css'] }) -export class GDashboardComponent implements OnInit{ +export class GaussianDashboardComponent implements OnInit{ brandGroups: BrandsGroup[] = []; selectedBrands: Brand[] = []; From 63a8706786e7298a13c88681f451bbb8040127b8 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:24:16 -0500 Subject: [PATCH 7/9] README additions --- frontend/orca_data_converter/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/orca_data_converter/README.md b/frontend/orca_data_converter/README.md index 0359b03a..aaf4aee4 100644 --- a/frontend/orca_data_converter/README.md +++ b/frontend/orca_data_converter/README.md @@ -25,3 +25,10 @@ Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To u ## Further help To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page. + +## Client's Request for Gaussian Webpage + +The ORCA and Gaussian websites should be very similar or perhaps even merged if possible. +The types of data needed are going to be very similar, the only difference will be the formatting of the text in the output files. +The suggestion would be to try and duplicate the orca website with the gaussian website. +It might be easier to select the output file type (ORCA or Gaussian) on the same page, and then use the same code to do the text extraction. From 126e0066fb6d3ef0251c0b552e7bc1f33c413128 Mon Sep 17 00:00:00 2001 From: mkalal6 <137332780+mkalal6@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:40:48 -0500 Subject: [PATCH 8/9] reusability code --- .../views/dashboard/dashboard.component.ts | 2 +- .../dashboardView.component.css} | 0 .../gaussianDashboard.component.css | 145 ------------------ .../gaussianDashboard.component.ts | 2 +- 4 files changed, 2 insertions(+), 147 deletions(-) rename frontend/orca_data_converter/src/app/views/{dashboard/dashboard.component.css => dashboardView/dashboardView.component.css} (100%) delete mode 100644 frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.css diff --git a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts b/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts index fe539392..7688dce7 100644 --- a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts +++ b/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts @@ -19,7 +19,7 @@ interface BrandsGroup { @Component({ selector: 'app-dashboard', templateUrl: './dashboard.component.html', - styleUrls: ['./dashboard.component.css'] + styleUrls: ['./dashboardView.component.css'] }) export class DashboardComponent implements OnInit{ diff --git a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.css b/frontend/orca_data_converter/src/app/views/dashboardView/dashboardView.component.css similarity index 100% rename from frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.css rename to frontend/orca_data_converter/src/app/views/dashboardView/dashboardView.component.css diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.css b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.css deleted file mode 100644 index 1a735b4e..00000000 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.css +++ /dev/null @@ -1,145 +0,0 @@ -:host ::ng-deep .custom-ms - .p-multiselect-label { - width: 300px !important; - } - - input[type="file"]{ - padding: 0.5rem; - cursor: pointer; - font-size: 1rem; - } - - #whole { - font-family: 'Didot'; - font-size: 20px; - text-align: center; - padding: 80px 0; - position: relative; - } - - #customFile { - display: none; - } - - .background-image::before { - content: ""; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-image: url('https://www.shutterstock.com/image-vector/dolphin-circle-water-600nw-346914458.jpg'); - background-size: contain; - background-repeat: no-repeat; - background-position: center; - opacity: 0.35; - z-index: -1; - - } - - - .form-label { - border: 1px solid #ccc; - border-radius: 5px; - display: inline-block; - padding: 8px 15px; - cursor: pointer; - font-size: 18px; - transition-duration: 0.7s; - } - - .form-label:hover { - background-color: black; - color:white; - } - - #keyTerms-toSearch { - border: 1px solid #ccc; - border-radius: 5px; - padding: 8px 12px; - width: 210x; - box-sizing: border-box; - font-size: 18px; - } - - #linesSpecified-toSearch { - border: 1px solid #ccc; - border-radius: 5px; - padding: 8px 12px; - width: 210x; - box-sizing: border-box; - font-size: 18px; - } - - #sections-toSearch { - border: 1px solid #ccc; - border-radius: 5px; - padding: 8px 12px; - width: 210x; - box-sizing: border-box; - font-size: 18px; - } - - #useTotalLines-toSearch { - border: 1px solid #ccc; - border-radius: 5px; - padding: 8px 12px; - width: 210x; - box-sizing: border-box; - font-size: 18px; - } - - #totalLines-toSearch { - border: 1px solid #ccc; - border-radius: 5px; - padding: 8px 12px; - width: 210x; - box-sizing: border-box; - font-size: 18px; - } - - input::placeholder { - color: gray; - font-family:'Courier New', Courier, monospace; - font-style: italic; - font-size: 12px; - } - - - #fileNameInput { - border: 1px solid #ccc; - border-radius: 5px; - padding: 8px 12px; - width: 210x; - box-sizing: border-box; - font-size: 18px; - } - - #fileNameInput:focus { - border: 2px solid #555; - } - - #downloadButton { - font-family: 'Calibri'; - font-size: 18px; - color: black; - background-color: white; - border: 1px solid #ccc; - border-radius: 5px; - margin-top: 25px; - padding: 12px; - } - - #downloadButton:hover,.Submit:hover { - background-color: black; - color:white; - transform: scale(1.1); - transition: all 0.5s ease-in; - cursor: pointer; - } - - .Submit { - border: none; - border-radius: 5px; - padding: 0.5rem 1rem; - } \ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts index 3b9f5dca..c3b8d946 100644 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts @@ -19,7 +19,7 @@ interface BrandsGroup { @Component({ selector: 'app-gaussianDashboard', templateUrl: './gaussianDashboard.component.html', - styleUrls: ['./gaussianDashboard.component.css'] + styleUrls: ['./dashboardView.component.css'] }) export class GaussianDashboardComponent implements OnInit{ From c05e3a6427bd99bd3abc6cf4504814fe5210c168 Mon Sep 17 00:00:00 2001 From: SiriChandanaGarimella <156231102+SiriChandanaGarimella@users.noreply.github.com> Date: Mon, 8 Apr 2024 18:33:39 -0500 Subject: [PATCH 9/9] routing and code reusability changes --- .../src/app/app-routing.module.ts | 7 +- .../src/app/app.component.html | 5 -- .../src/app/app.component.ts | 7 +- .../views/dashboard/dashboard.component.html | 83 ------------------- .../views/dashboard/dashboard.component.ts | 6 +- .../dashboardView.component.html | 52 ++++++++++++ .../gaussianDashboard.component.html | 83 ------------------- .../gaussianDashboard.component.ts | 6 +- 8 files changed, 69 insertions(+), 180 deletions(-) delete mode 100644 frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.html create mode 100644 frontend/orca_data_converter/src/app/views/dashboardView/dashboardView.component.html delete mode 100644 frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.html diff --git a/frontend/orca_data_converter/src/app/app-routing.module.ts b/frontend/orca_data_converter/src/app/app-routing.module.ts index c3ea77bd..cfbde021 100644 --- a/frontend/orca_data_converter/src/app/app-routing.module.ts +++ b/frontend/orca_data_converter/src/app/app-routing.module.ts @@ -1,9 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Dashboard1Component } from './views/dashboard1/dashboard1.component'; +import { DashboardComponent } from './views/dashboard/dashboard.component'; +import { GaussianDashboardComponent } from './views/gaussianDashboard/gaussianDashboard.component'; const routes: Routes = [ - { path: 'home1', component: Dashboard1Component } + { path: 'orca', component: DashboardComponent }, + { path: 'gaussian', component: GaussianDashboardComponent }, + { path: '', redirectTo: 'orca', pathMatch: 'full' } ]; @NgModule({ diff --git a/frontend/orca_data_converter/src/app/app.component.html b/frontend/orca_data_converter/src/app/app.component.html index 323a539c..90c6b646 100644 --- a/frontend/orca_data_converter/src/app/app.component.html +++ b/frontend/orca_data_converter/src/app/app.component.html @@ -1,6 +1 @@ -
-
- -
-
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/app.component.ts b/frontend/orca_data_converter/src/app/app.component.ts index 63d4171f..2c3855b2 100644 --- a/frontend/orca_data_converter/src/app/app.component.ts +++ b/frontend/orca_data_converter/src/app/app.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import {HttpClient} from '@angular/common/http'; import {firstValueFrom} from 'rxjs'; +import { Router } from '@angular/router'; @Component({ selector: 'app-root', @@ -8,11 +9,11 @@ import {firstValueFrom} from 'rxjs'; styleUrls: ['./app.component.css'] }) export class AppComponent implements OnInit { - dashboard:any; + dashboard:string; - constructor(private http: HttpClient) { - this.dashboard = window.location.pathname + constructor(private http: HttpClient, private router: Router) { + this.dashboard = this.router.url; } async ngOnInit(): Promise { diff --git a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.html b/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.html deleted file mode 100644 index d6b9c914..00000000 --- a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.html +++ /dev/null @@ -1,83 +0,0 @@ -
-

- Convert ORCA files to Word documents -

-

Upload your ORCA data file

- -
- -
- - -
- -
-

Enter the terms you wish to search for (txt only):

-
-
- -
-
-
- - - -
-

Enter how you want the lines specified:

-
-
- -
-
-
- -
-

Number of sections?

-
-
- -
-
-
- -
-

Use total lines?

-
-
- -
-
-
- -
-

Total number of lines for output doc?

-
-
- -
-
-
-
- -
-
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts b/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts index 7688dce7..e29503f6 100644 --- a/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts +++ b/frontend/orca_data_converter/src/app/views/dashboard/dashboard.component.ts @@ -18,12 +18,14 @@ interface BrandsGroup { @Component({ selector: 'app-dashboard', - templateUrl: './dashboard.component.html', - styleUrls: ['./dashboardView.component.css'] + templateUrl: '../dashboardView/dashboardView.component.html', + styleUrls: ['../dashboardView/dashboardView.component.css'] }) export class DashboardComponent implements OnInit{ + fileType = 'ORCA'; + fileExtension = '.txt'; brandGroups: BrandsGroup[] = []; selectedBrands: Brand[] = []; public fileName: string; diff --git a/frontend/orca_data_converter/src/app/views/dashboardView/dashboardView.component.html b/frontend/orca_data_converter/src/app/views/dashboardView/dashboardView.component.html new file mode 100644 index 00000000..a956ef85 --- /dev/null +++ b/frontend/orca_data_converter/src/app/views/dashboardView/dashboardView.component.html @@ -0,0 +1,52 @@ +
+

Convert {{ fileType }} files to Word documents

+

Upload your {{ fileType }} data file

+
+
+ + +
+
+

Enter the terms you wish to search for (txt only):

+
+
+ +
+
+
+
+

Enter how you want the lines specified:

+
+
+ +
+
+
+
+

Number of sections?

+
+
+ +
+
+
+
+

Use total lines?

+
+
+ +
+
+
+
+

Total number of lines for output doc?

+
+
+ +
+
+
+
+ +
+
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.html b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.html deleted file mode 100644 index 38a213f9..00000000 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.html +++ /dev/null @@ -1,83 +0,0 @@ -
-

- Convert Gaussian files to Word documents -

-

Upload your Gaussian data file

- -
- -
- - -
- -
-

Enter the terms you wish to search for (txt only):

-
-
- -
-
-
- - - -
-

Enter how you want the lines specified:

-
-
- -
-
-
- -
-

Number of sections?

-
-
- -
-
-
- -
-

Use total lines?

-
-
- -
-
-
- -
-

Total number of lines for output doc?

-
-
- -
-
-
-
- -
-
\ No newline at end of file diff --git a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts index c3b8d946..5e2c6e0f 100644 --- a/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts +++ b/frontend/orca_data_converter/src/app/views/gaussianDashboard/gaussianDashboard.component.ts @@ -18,12 +18,14 @@ interface BrandsGroup { @Component({ selector: 'app-gaussianDashboard', - templateUrl: './gaussianDashboard.component.html', - styleUrls: ['./dashboardView.component.css'] + templateUrl: '../dashboardView/dashboardView.component.html', + styleUrls: ['../dashboardView/dashboardView.component.css'] }) export class GaussianDashboardComponent implements OnInit{ + fileType = 'Gaussian'; + fileExtension = '.log'; brandGroups: BrandsGroup[] = []; selectedBrands: Brand[] = []; public fileName: string;