From 2a607f988e2ba726f5e7144fb1c253b001277f38 Mon Sep 17 00:00:00 2001 From: tibing Date: Tue, 5 Jul 2016 12:30:03 +0300 Subject: [PATCH 1/3] feat(inputs\rating): add rating component --- .../inputs/components/ratinginputs/index.ts | 1 + .../ratinginputs/ratinginputs.component.ts | 20 +++++++++++++++++++ .../components/ratinginputs/ratinginputs.html | 9 +++++++++ .../components/inputs/inputs.component.ts | 4 +++- .../pages/forms/components/inputs/inputs.html | 4 ++++ src/app/theme/sass/_form.scss | 8 ++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/app/pages/forms/components/inputs/components/ratinginputs/index.ts create mode 100644 src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts create mode 100644 src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.html diff --git a/src/app/pages/forms/components/inputs/components/ratinginputs/index.ts b/src/app/pages/forms/components/inputs/components/ratinginputs/index.ts new file mode 100644 index 00000000..9a62ed6f --- /dev/null +++ b/src/app/pages/forms/components/inputs/components/ratinginputs/index.ts @@ -0,0 +1 @@ +export * from './ratinginputs.component'; diff --git a/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts b/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts new file mode 100644 index 00000000..0e4b2e2d --- /dev/null +++ b/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts @@ -0,0 +1,20 @@ +import { RatingComponent } from 'ng2-bootstrap/ng2-bootstrap'; +import { Component } from '@angular/core'; + +@Component({ + selector: 'rating-inputs', + directives: [RatingComponent], + template: require('./ratinginputs.html') +}) + +export class Rating { + private _rate1:number = 3; + private _rate2:number = 4; + + private _max1:number = 5; + private _max2:number = 10; + + constructor() { + } + +} diff --git a/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.html b/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.html new file mode 100644 index 00000000..d8b7cf5a --- /dev/null +++ b/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.html @@ -0,0 +1,9 @@ +
+ + Rate: {{_rate1}} +
+ +
+ + Rate: {{_rate2}} +
diff --git a/src/app/pages/forms/components/inputs/inputs.component.ts b/src/app/pages/forms/components/inputs/inputs.component.ts index 34f59dbe..e2914188 100644 --- a/src/app/pages/forms/components/inputs/inputs.component.ts +++ b/src/app/pages/forms/components/inputs/inputs.component.ts @@ -6,11 +6,13 @@ import {StandardInputs} from './components/standardInputs'; import {ValidationInputs} from './components/validationInputs'; import {GroupInputs} from './components/groupInputs'; import {CheckboxInputs} from './components/checkboxInputs'; +import {Rating} from './components/ratinginputs'; + @Component({ selector: 'inputs', encapsulation: ViewEncapsulation.None, - directives: [BaCard, StandardInputs, ValidationInputs, GroupInputs, CheckboxInputs], + directives: [BaCard, StandardInputs, ValidationInputs, GroupInputs, CheckboxInputs, Rating], template: require('./inputs.html'), }) export class Inputs { diff --git a/src/app/pages/forms/components/inputs/inputs.html b/src/app/pages/forms/components/inputs/inputs.html index d9db5970..96155321 100644 --- a/src/app/pages/forms/components/inputs/inputs.html +++ b/src/app/pages/forms/components/inputs/inputs.html @@ -19,6 +19,10 @@ + + + + diff --git a/src/app/theme/sass/_form.scss b/src/app/theme/sass/_form.scss index 2a7b0d8c..29b60ada 100644 --- a/src/app/theme/sass/_form.scss +++ b/src/app/theme/sass/_form.scss @@ -582,3 +582,11 @@ label.custom-input-danger { .sub-little-text { font-size: 12px; } + +.rating { + font-size: 20px; +} + +rating-inputs span { + vertical-align: middle; +} From 1b2073ffd10e6c76d7bce9c128a179056540e85b Mon Sep 17 00:00:00 2001 From: David Francis Date: Thu, 7 Jul 2016 22:01:59 -0400 Subject: [PATCH 2/3] Add forms module to package.json --- package.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index af3cca1b..d3995422 100644 --- a/package.json +++ b/package.json @@ -6,15 +6,16 @@ "homepage": "http://akveo.github.io/ng2-admin/", "license": "MIT", "dependencies": { - "@angular/common": "2.0.0-rc.3", - "@angular/compiler": "2.0.0-rc.3", - "@angular/core": "2.0.0-rc.3", - "@angular/http": "2.0.0-rc.3", - "@angular/platform-browser": "2.0.0-rc.3", - "@angular/platform-browser-dynamic": "2.0.0-rc.3", - "@angular/platform-server": "2.0.0-rc.3", + "@angular/common": "2.0.0-rc.4", + "@angular/compiler": "2.0.0-rc.4", + "@angular/core": "2.0.0-rc.4", + "@angular/http": "2.0.0-rc.4", + "@angular/platform-browser": "2.0.0-rc.4", + "@angular/platform-browser-dynamic": "2.0.0-rc.4", + "@angular/platform-server": "2.0.0-rc.4", "@angular/router": "3.0.0-alpha.8", "@angular/router-deprecated": "2.0.0-rc.2", + "@angular/forms":"0.2.0", "amcharts3": "github:amcharts/amcharts3", "ammap3": "github:amcharts/ammap3", "animate.css": "^3.5.1", From 598175841657a3f1ca5969ecfc31d461f233c89a Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Fri, 8 Jul 2016 10:39:25 +0300 Subject: [PATCH 3/3] refactor(treeview): get rid of strange ts compilation error --- src/app/theme/components/baCard/baCard.component.ts | 3 +-- src/app/theme/components/baCard/index.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/theme/components/baCard/baCard.component.ts b/src/app/theme/components/baCard/baCard.component.ts index 8c700c08..f49807b0 100644 --- a/src/app/theme/components/baCard/baCard.component.ts +++ b/src/app/theme/components/baCard/baCard.component.ts @@ -1,5 +1,4 @@ -import {Component, ViewEncapsulation, Input} from '@angular/core'; - +import {Component, ViewEncapsulation, ViewChild, Input} from '@angular/core'; import {BaCardBlur} from './baCardBlur.directive'; @Component({ diff --git a/src/app/theme/components/baCard/index.ts b/src/app/theme/components/baCard/index.ts index b04caf13..8a8fa6c2 100644 --- a/src/app/theme/components/baCard/index.ts +++ b/src/app/theme/components/baCard/index.ts @@ -1,2 +1 @@ -export * from './baCard.component.ts'; -export * from './baCardBlur.directive'; +export * from './baCard.component';