diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f9f0165..8919f61 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,21 +1,27 @@ import { BrowserModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { HttpClientModule } from '@angular/common/http'; import { TreeModule } from 'primeng/tree'; +import { DropdownModule } from 'primeng/dropdown'; import { MainComponent } from './main/main.component'; import { MainCenterComponent } from './main/main-center/main-center.component'; import { TreeComponent } from './main/tree/tree.component'; import { DropdownComponent } from './main/dropdown/dropdown.component'; +import { FormsModule } from '@angular/forms'; @NgModule({ declarations: [AppComponent, TreeComponent, MainComponent, MainCenterComponent, DropdownComponent], imports: [ BrowserModule, AppRoutingModule, + FormsModule, + BrowserAnimationsModule, TreeModule, + DropdownModule, HttpClientModule ], providers: [], diff --git a/src/app/main/dropdown/dropdown.component.html b/src/app/main/dropdown/dropdown.component.html index f46e699..a18b36a 100644 --- a/src/app/main/dropdown/dropdown.component.html +++ b/src/app/main/dropdown/dropdown.component.html @@ -1,13 +1,4 @@ -

Please select a model:

- - -

-
- - - - -

No information is available for selected model

-
\ No newline at end of file +
+

End Item:

+ +
\ No newline at end of file diff --git a/src/app/main/dropdown/dropdown.component.ts b/src/app/main/dropdown/dropdown.component.ts index 04dbe4d..35db625 100644 --- a/src/app/main/dropdown/dropdown.component.ts +++ b/src/app/main/dropdown/dropdown.component.ts @@ -1,23 +1,29 @@ import { Component, OnInit } from '@angular/core'; -import { XAService } from 'src/app/services/XAService.service'; +import { EndItemService } from 'src/app/services/enditem.service'; +import { SelectItem } from 'primeng/api'; @Component({ selector: 'app-dropdown', templateUrl: './dropdown.component.html', styleUrls: ['./dropdown.component.css'] }) -export class DropdownComponent implements OnInit { - constructor(private xaService: XAService) { } +export class DropdownComponent { - xaList = [{ name: null, value: null }, { name: 'UConn', value: 1 }, { name: 'Test', value: 2 }]; + constructor( + private endItemService: EndItemService + ) {} - selectedXA = ''; + // TODO replace with backend. + xaList: SelectItem[] = [ + { label: 'None selected', value: null }, + { label: 'UConn', value: 'Uconn' }, + { label: 'Test', value: 'Test' } + ]; - selectOptionHandler(event: any) { - this.selectedXA = event.target.value; - this.xaService.changeXA(this.selectedXA); - } + selectedEndItem = ''; - ngOnInit() { + onChange(event: any) { + this.endItemService.setEndItem(this.selectedEndItem); } + } diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html index a8ac724..9f15d2c 100644 --- a/src/app/main/main.component.html +++ b/src/app/main/main.component.html @@ -1,6 +1,7 @@ - -

-
+
+ +
+
\ No newline at end of file diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index 8334f84..daeb522 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { EndItemService } from '../services/enditem.service'; @Component({ selector: 'app-main', @@ -6,7 +7,10 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./main.component.css'] }) export class MainComponent implements OnInit { - constructor() { } + + constructor( + private endItemService: EndItemService + ) { } ngOnInit() { } diff --git a/src/app/main/tree/tree.component.html b/src/app/main/tree/tree.component.html index e752daa..1246370 100644 --- a/src/app/main/tree/tree.component.html +++ b/src/app/main/tree/tree.component.html @@ -1,13 +1,7 @@ - - - -
-
{{ node.label }}
-
-
-
-
- - -

No XA selected

-
\ No newline at end of file + + +
+
{{ node.label }}
+
+
+
\ No newline at end of file diff --git a/src/app/main/tree/tree.component.ts b/src/app/main/tree/tree.component.ts index e84b413..5419316 100644 --- a/src/app/main/tree/tree.component.ts +++ b/src/app/main/tree/tree.component.ts @@ -3,7 +3,7 @@ import { TreeNode } from 'primeng/api'; import { Subscription } from 'rxjs'; import { NodeService } from 'src/app/services/node.service'; import { TreeService } from 'src/app/services/tree.service'; -import { XAService } from 'src/app/services/XAService.service'; +import { EndItemService } from 'src/app/services/enditem.service'; @Component({ selector: 'app-tree', @@ -13,19 +13,18 @@ import { XAService } from 'src/app/services/XAService.service'; export class TreeComponent implements OnInit, OnDestroy { private dropdownSubscription: Subscription; - currentXA: string; + + selectedEndItem: string; filesTree: TreeNode[]; constructor( private treeService: TreeService, private nodeService: NodeService, - private xaService: XAService + private endItemService: EndItemService ) { } ngOnInit() { - this.dropdownSubscription = this.xaService.xa$.subscribe(async (xa) => { - this.currentXA = xa; - }); + this.dropdownSubscription = this.endItemService.endItem$.subscribe(xa => this.selectedEndItem = xa); this.nodeService.getFiles().then(files => (this.filesTree = files)); } diff --git a/src/app/services/XAService.service.ts b/src/app/services/XAService.service.ts deleted file mode 100644 index 990841c..0000000 --- a/src/app/services/XAService.service.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { BehaviorSubject } from 'rxjs'; -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class XAService { - - private selectedXA = new BehaviorSubject(null); - xa$ = this.selectedXA.asObservable(); - - changeXA(newXA: string) { - this.selectedXA.next(newXA); - } -} diff --git a/src/app/services/enditem.service.ts b/src/app/services/enditem.service.ts new file mode 100644 index 0000000..bead0cf --- /dev/null +++ b/src/app/services/enditem.service.ts @@ -0,0 +1,16 @@ +import { BehaviorSubject } from 'rxjs'; +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class EndItemService { + + private selectedEndItem = new BehaviorSubject(null); + endItem$ = this.selectedEndItem.asObservable(); + + setEndItem(endItem: string) { + this.selectedEndItem.next(endItem); + } + +}