-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from sdtabilit/feature/SLTS-59-new-watch-list
Feature/slts 59 new watch list
- Loading branch information
Showing
19 changed files
with
223 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
2 changes: 2 additions & 0 deletions
2
ScadaLTS-UI/src/app/appBody/dashboard/dashboard.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| DASHBOARD | ||
|
|
33 changes: 33 additions & 0 deletions
33
ScadaLTS-UI/src/app/appBody/dashboard/dashboard.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // /* tslint:disable:no-unused-variable */ | ||
| // | ||
| // import { TestBed, async } from '@angular/core/testing'; | ||
| // import { AppComponent } from './app.component'; | ||
| // | ||
| // describe('AppComponent', () => { | ||
| // beforeEach(() => { | ||
| // TestBed.configureTestingModule({ | ||
| // declarations: [ | ||
| // AppComponent | ||
| // ], | ||
| // }); | ||
| // }); | ||
| // | ||
| // it('should create the app', async(() => { | ||
| // let fixture = TestBed.createComponent(AppComponent); | ||
| // let app = fixture.debugElement.componentInstance; | ||
| // expect(app).toBeTruthy(); | ||
| // })); | ||
| // | ||
| // it(`should have as title 'app works!'`, async(() => { | ||
| // let fixture = TestBed.createComponent(AppComponent); | ||
| // let app = fixture.debugElement.componentInstance; | ||
| // expect(app.title).toEqual('app works!'); | ||
| // })); | ||
| // | ||
| // it('should render title in a h1 tag', async(() => { | ||
| // let fixture = TestBed.createComponent(AppComponent); | ||
| // fixture.detectChanges(); | ||
| // let compiled = fixture.debugElement.nativeElement; | ||
| // expect(compiled.querySelector('h1').textContent).toContain('app works!'); | ||
| // })); | ||
| // }); |
10 changes: 10 additions & 0 deletions
10
ScadaLTS-UI/src/app/appBody/dashboard/dashboard.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'dashboard', | ||
| templateUrl: './dashboard.component.html', | ||
| styleUrls: ['./dashboard.component.css'] | ||
| }) | ||
| export class DashboardComponent { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import { BrowserModule } from '@angular/platform-browser'; | ||
| import { NgModule } from '@angular/core'; | ||
| import { FormsModule } from '@angular/forms'; | ||
| import { HttpModule } from '@angular/http'; | ||
| import { MaterialModule } from '@angular/material'; | ||
| import { DashboardComponent } from './dashboard.component'; | ||
|
|
||
| @NgModule({ | ||
| declarations: [ | ||
| DashboardComponent | ||
| ], | ||
| imports: [ | ||
| BrowserModule, | ||
| FormsModule, | ||
| HttpModule, | ||
| MaterialModule.forRoot() | ||
| ], | ||
| providers: [], | ||
| bootstrap: [DashboardComponent] | ||
| }) | ||
| export class AppModule { } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from './dashboard.component'; | ||
| export * from './dashboard.module'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from './watchlist.component'; | ||
| export * from './watchlist.module'; |
5 changes: 5 additions & 0 deletions
5
ScadaLTS-UI/src/app/appBody/watchlist/watchlist.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| input { | ||
| border: 1px solid #333; | ||
| width: 98%; | ||
| height: 50px; | ||
| } |
15 changes: 15 additions & 0 deletions
15
ScadaLTS-UI/src/app/appBody/watchlist/watchlist.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <div class="search"> | ||
|
|
||
| <div class="searchInput"> | ||
| <input type="text" placeholder="search"/> | ||
| </div> | ||
|
|
||
| <div class="listItem"> | ||
| <ul class="listGroup" *ngIf="items.length"> | ||
| <li class="listGroupItem" *ngFor="let item of items"></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
|
|
33 changes: 33 additions & 0 deletions
33
ScadaLTS-UI/src/app/appBody/watchlist/watchlist.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // /* tslint:disable:no-unused-variable */ | ||
| // | ||
| // import { TestBed, async } from '@angular/core/testing'; | ||
| // import { AppComponent } from './app.component'; | ||
| // | ||
| // describe('AppComponent', () => { | ||
| // beforeEach(() => { | ||
| // TestBed.configureTestingModule({ | ||
| // declarations: [ | ||
| // AppComponent | ||
| // ], | ||
| // }); | ||
| // }); | ||
| // | ||
| // it('should create the app', async(() => { | ||
| // let fixture = TestBed.createComponent(AppComponent); | ||
| // let app = fixture.debugElement.componentInstance; | ||
| // expect(app).toBeTruthy(); | ||
| // })); | ||
| // | ||
| // it(`should have as title 'app works!'`, async(() => { | ||
| // let fixture = TestBed.createComponent(AppComponent); | ||
| // let app = fixture.debugElement.componentInstance; | ||
| // expect(app.title).toEqual('app works!'); | ||
| // })); | ||
| // | ||
| // it('should render title in a h1 tag', async(() => { | ||
| // let fixture = TestBed.createComponent(AppComponent); | ||
| // fixture.detectChanges(); | ||
| // let compiled = fixture.debugElement.nativeElement; | ||
| // expect(compiled.querySelector('h1').textContent).toContain('app works!'); | ||
| // })); | ||
| // }); |
10 changes: 10 additions & 0 deletions
10
ScadaLTS-UI/src/app/appBody/watchlist/watchlist.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'watchlist', | ||
| templateUrl: './watchlist.component.html', | ||
| styleUrls: ['./watchlist.component.css'] | ||
| }) | ||
| export class WatchlistComponent { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import { BrowserModule } from '@angular/platform-browser'; | ||
| import { NgModule } from '@angular/core'; | ||
| import { FormsModule } from '@angular/forms'; | ||
| import { HttpModule } from '@angular/http'; | ||
| import { MaterialModule } from '@angular/material'; | ||
| import { WatchlistComponent } from './watchlist.component'; | ||
|
|
||
| @NgModule({ | ||
| declarations: [ | ||
| WatchlistComponent | ||
| ], | ||
| imports: [ | ||
| BrowserModule, | ||
| FormsModule, | ||
| HttpModule, | ||
| MaterialModule.forRoot() | ||
| ], | ||
| providers: [], | ||
| bootstrap: [WatchlistComponent] | ||
| }) | ||
| export class AppModule { } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.