fix validation rules, sort bug

Author: tibbus

src/app/formView/formView.component.html

@@ -40,6 +40,9 @@
 				<div [hidden]="cast.actor || !submited" class="alert alert-danger">
 					Actor is required !
 				</div>
+				<div [hidden]="!(cast.actor && cast.actor.length > 30)" class="alert alert-danger">
+					Actor is name is too long !
+				</div>
 			</div>
 
 			<div class="right salary">
@@ -48,6 +51,12 @@
 				<div [hidden]="cast.salary || !submited" class="alert alert-danger">
 					Salary is required !
 				</div>
+				<div [hidden]="isNumber(cast.salary) || !submited" class="alert alert-danger">
+					Salary should be a Number !
+				</div>
+				<div [hidden]="!(cast.salary > 1000000000)" class="alert alert-danger">
+					Salary is too high !
+				</div>
 			</div>
 
 			<div class="btn btn-default minus" (click)="clickRemoveCast(i)">

src/app/formView/formView.component.ts

@@ -49,8 +49,24 @@ export class FormViewComponent {
         // this should not be required if Angular2 validation works properly
         this.movie.casts.forEach(cast => {
             if (!cast.actor || !cast.salary) {
-                isValid = false; 
-            } 
+                isValid = false;
+            }
+
+            if (cast.actor && cast.actor.length > 30) {
+                isValid = false;
+            }
+
+            if (cast.salary > 1000000000) {
+                isValid = false;
+            }
+
+            if (cast.salary > 1000000000) {
+                isValid = false;
+            }
+
+            if (!this.isNumber(cast.salary)) {
+                isValid = false;
+            }
         });
 
         if (isValid) {
@@ -72,4 +88,8 @@ export class FormViewComponent {
     changeSetSalary($event, i) {
         this.movie.casts[i].salary = $event.target.value;
     }
+
+    isNumber(value) {
+        return !isNaN(parseFloat(value)) && isFinite(value);
+    }
 }

src/app/listView/listView.component.ts

@@ -32,6 +32,6 @@ export class ListViewComponent {
         }
 
         // refresh movies
-        this.setMovies();
+        this.movieService.updateMovies();
     }
 }

src/app/services/movie.service.ts

@@ -12,13 +12,17 @@ export class MovieService {
 
         this.mapTotal();
 
-        this.movies$.next(this.movies);
+        this.updateMovies();
     }
 
     public getMovies() {
         return this.movies$;
     }
 
+    public updateMovies() {
+        this.movies$.next(this.movies);
+    }
+
     public getCategories() {
         return {
             "action": ["comedy", "crime", "thriller"],
@@ -39,7 +43,7 @@ export class MovieService {
     public sortMoviesAsc() {
         this.movies = this.movies.map(movie => {
             movie.casts.sort((a, b) => {
-                return a.salary > b.salary;
+                return parseFloat(a.salary) > parseFloat(b.salary);
             });
 
             return movie;
@@ -49,7 +53,7 @@ export class MovieService {
     public sortMoviesDesc() {
         this.movies = this.movies.map(movie => {
             movie.casts.sort((a, b) => {
-                return a.salary < b.salary;
+                return parseFloat(a.salary) < parseFloat(b.salary);
             });
 
             return movie;