From 9dc8444979117500d41383096a63a83c97edd474 Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Fri, 5 Oct 2018 22:04:17 -0400
Subject: [PATCH 01/10] Added Clients Component. Now the client table retrieves
 the info from api.

---
 src/app/@core/data/smart-table.service.ts     | 423 +-----------------
 .../catalog/clients/clients.component.html    |  10 +
 .../catalog/clients/clients.component.scss    |   0
 .../catalog/clients/clients.component.ts      |  70 +++
 .../pages/catalog/clients/clients.model.ts    |   6 +
 .../pages/catalog/clients/clients.service.ts  |  33 ++
 src/app/pages/pages-menu.ts                   |   4 +
 src/app/pages/pages-routing.module.ts         |   6 +-
 src/app/pages/pages.module.ts                 |   4 +
 9 files changed, 136 insertions(+), 420 deletions(-)
 create mode 100644 src/app/pages/catalog/clients/clients.component.html
 create mode 100644 src/app/pages/catalog/clients/clients.component.scss
 create mode 100644 src/app/pages/catalog/clients/clients.component.ts
 create mode 100644 src/app/pages/catalog/clients/clients.model.ts
 create mode 100644 src/app/pages/catalog/clients/clients.service.ts

diff --git a/src/app/@core/data/smart-table.service.ts b/src/app/@core/data/smart-table.service.ts
index 56f1087..1e48fef 100644
--- a/src/app/@core/data/smart-table.service.ts
+++ b/src/app/@core/data/smart-table.service.ts
@@ -4,425 +4,10 @@ import { Injectable } from '@angular/core';
 export class SmartTableService {
 
   data = [{
-    id: 1,
-    firstName: 'Mark',
-    lastName: 'Otto',
-    username: '@mdo',
-    email: 'mdo@gmail.com',
-    age: '28',
-  }, {
-    id: 2,
-    firstName: 'Jacob',
-    lastName: 'Thornton',
-    username: '@fat',
-    email: 'fat@yandex.ru',
-    age: '45',
-  }, {
-    id: 3,
-    firstName: 'Larry',
-    lastName: 'Bird',
-    username: '@twitter',
-    email: 'twitter@outlook.com',
-    age: '18',
-  }, {
-    id: 4,
-    firstName: 'John',
-    lastName: 'Snow',
-    username: '@snow',
-    email: 'snow@gmail.com',
-    age: '20',
-  }, {
-    id: 5,
-    firstName: 'Jack',
-    lastName: 'Sparrow',
-    username: '@jack',
-    email: 'jack@yandex.ru',
-    age: '30',
-  }, {
-    id: 6,
-    firstName: 'Ann',
-    lastName: 'Smith',
-    username: '@ann',
-    email: 'ann@gmail.com',
-    age: '21',
-  }, {
-    id: 7,
-    firstName: 'Barbara',
-    lastName: 'Black',
-    username: '@barbara',
-    email: 'barbara@yandex.ru',
-    age: '43',
-  }, {
-    id: 8,
-    firstName: 'Sevan',
-    lastName: 'Bagrat',
-    username: '@sevan',
-    email: 'sevan@outlook.com',
-    age: '13',
-  }, {
-    id: 9,
-    firstName: 'Ruben',
-    lastName: 'Vardan',
-    username: '@ruben',
-    email: 'ruben@gmail.com',
-    age: '22',
-  }, {
-    id: 10,
-    firstName: 'Karen',
-    lastName: 'Sevan',
-    username: '@karen',
-    email: 'karen@yandex.ru',
-    age: '33',
-  }, {
-    id: 11,
-    firstName: 'Mark',
-    lastName: 'Otto',
-    username: '@mark',
-    email: 'mark@gmail.com',
-    age: '38',
-  }, {
-    id: 12,
-    firstName: 'Jacob',
-    lastName: 'Thornton',
-    username: '@jacob',
-    email: 'jacob@yandex.ru',
-    age: '48',
-  }, {
-    id: 13,
-    firstName: 'Haik',
-    lastName: 'Hakob',
-    username: '@haik',
-    email: 'haik@outlook.com',
-    age: '48',
-  }, {
-    id: 14,
-    firstName: 'Garegin',
-    lastName: 'Jirair',
-    username: '@garegin',
-    email: 'garegin@gmail.com',
-    age: '40',
-  }, {
-    id: 15,
-    firstName: 'Krikor',
-    lastName: 'Bedros',
-    username: '@krikor',
-    email: 'krikor@yandex.ru',
-    age: '32',
-  }, {
-    'id': 16,
-    'firstName': 'Francisca',
-    'lastName': 'Brady',
-    'username': '@Gibson',
-    'email': 'franciscagibson@comtours.com',
-    'age': 11,
-  }, {
-    'id': 17,
-    'firstName': 'Tillman',
-    'lastName': 'Figueroa',
-    'username': '@Snow',
-    'email': 'tillmansnow@comtours.com',
-    'age': 34,
-  }, {
-    'id': 18,
-    'firstName': 'Jimenez',
-    'lastName': 'Morris',
-    'username': '@Bryant',
-    'email': 'jimenezbryant@comtours.com',
-    'age': 45,
-  }, {
-    'id': 19,
-    'firstName': 'Sandoval',
-    'lastName': 'Jacobson',
-    'username': '@Mcbride',
-    'email': 'sandovalmcbride@comtours.com',
-    'age': 32,
-  }, {
-    'id': 20,
-    'firstName': 'Griffin',
-    'lastName': 'Torres',
-    'username': '@Charles',
-    'email': 'griffincharles@comtours.com',
-    'age': 19,
-  }, {
-    'id': 21,
-    'firstName': 'Cora',
-    'lastName': 'Parker',
-    'username': '@Caldwell',
-    'email': 'coracaldwell@comtours.com',
-    'age': 27,
-  }, {
-    'id': 22,
-    'firstName': 'Cindy',
-    'lastName': 'Bond',
-    'username': '@Velez',
-    'email': 'cindyvelez@comtours.com',
-    'age': 24,
-  }, {
-    'id': 23,
-    'firstName': 'Frieda',
-    'lastName': 'Tyson',
-    'username': '@Craig',
-    'email': 'friedacraig@comtours.com',
-    'age': 45,
-  }, {
-    'id': 24,
-    'firstName': 'Cote',
-    'lastName': 'Holcomb',
-    'username': '@Rowe',
-    'email': 'coterowe@comtours.com',
-    'age': 20,
-  }, {
-    'id': 25,
-    'firstName': 'Trujillo',
-    'lastName': 'Mejia',
-    'username': '@Valenzuela',
-    'email': 'trujillovalenzuela@comtours.com',
-    'age': 16,
-  }, {
-    'id': 26,
-    'firstName': 'Pruitt',
-    'lastName': 'Shepard',
-    'username': '@Sloan',
-    'email': 'pruittsloan@comtours.com',
-    'age': 44,
-  }, {
-    'id': 27,
-    'firstName': 'Sutton',
-    'lastName': 'Ortega',
-    'username': '@Black',
-    'email': 'suttonblack@comtours.com',
-    'age': 42,
-  }, {
-    'id': 28,
-    'firstName': 'Marion',
-    'lastName': 'Heath',
-    'username': '@Espinoza',
-    'email': 'marionespinoza@comtours.com',
-    'age': 47,
-  }, {
-    'id': 29,
-    'firstName': 'Newman',
-    'lastName': 'Hicks',
-    'username': '@Keith',
-    'email': 'newmankeith@comtours.com',
-    'age': 15,
-  }, {
-    'id': 30,
-    'firstName': 'Boyle',
-    'lastName': 'Larson',
-    'username': '@Summers',
-    'email': 'boylesummers@comtours.com',
-    'age': 32,
-  }, {
-    'id': 31,
-    'firstName': 'Haynes',
-    'lastName': 'Vinson',
-    'username': '@Mckenzie',
-    'email': 'haynesmckenzie@comtours.com',
-    'age': 15,
-  }, {
-    'id': 32,
-    'firstName': 'Miller',
-    'lastName': 'Acosta',
-    'username': '@Young',
-    'email': 'milleryoung@comtours.com',
-    'age': 55,
-  }, {
-    'id': 33,
-    'firstName': 'Johnston',
-    'lastName': 'Brown',
-    'username': '@Knight',
-    'email': 'johnstonknight@comtours.com',
-    'age': 29,
-  }, {
-    'id': 34,
-    'firstName': 'Lena',
-    'lastName': 'Pitts',
-    'username': '@Forbes',
-    'email': 'lenaforbes@comtours.com',
-    'age': 25,
-  }, {
-    'id': 35,
-    'firstName': 'Terrie',
-    'lastName': 'Kennedy',
-    'username': '@Branch',
-    'email': 'terriebranch@comtours.com',
-    'age': 37,
-  }, {
-    'id': 36,
-    'firstName': 'Louise',
-    'lastName': 'Aguirre',
-    'username': '@Kirby',
-    'email': 'louisekirby@comtours.com',
-    'age': 44,
-  }, {
-    'id': 37,
-    'firstName': 'David',
-    'lastName': 'Patton',
-    'username': '@Sanders',
-    'email': 'davidsanders@comtours.com',
-    'age': 26,
-  }, {
-    'id': 38,
-    'firstName': 'Holden',
-    'lastName': 'Barlow',
-    'username': '@Mckinney',
-    'email': 'holdenmckinney@comtours.com',
-    'age': 11,
-  }, {
-    'id': 39,
-    'firstName': 'Baker',
-    'lastName': 'Rivera',
-    'username': '@Montoya',
-    'email': 'bakermontoya@comtours.com',
-    'age': 47,
-  }, {
-    'id': 40,
-    'firstName': 'Belinda',
-    'lastName': 'Lloyd',
-    'username': '@Calderon',
-    'email': 'belindacalderon@comtours.com',
-    'age': 21,
-  }, {
-    'id': 41,
-    'firstName': 'Pearson',
-    'lastName': 'Patrick',
-    'username': '@Clements',
-    'email': 'pearsonclements@comtours.com',
-    'age': 42,
-  }, {
-    'id': 42,
-    'firstName': 'Alyce',
-    'lastName': 'Mckee',
-    'username': '@Daugherty',
-    'email': 'alycedaugherty@comtours.com',
-    'age': 55,
-  }, {
-    'id': 43,
-    'firstName': 'Valencia',
-    'lastName': 'Spence',
-    'username': '@Olsen',
-    'email': 'valenciaolsen@comtours.com',
-    'age': 20,
-  }, {
-    'id': 44,
-    'firstName': 'Leach',
-    'lastName': 'Holcomb',
-    'username': '@Humphrey',
-    'email': 'leachhumphrey@comtours.com',
-    'age': 28,
-  }, {
-    'id': 45,
-    'firstName': 'Moss',
-    'lastName': 'Baxter',
-    'username': '@Fitzpatrick',
-    'email': 'mossfitzpatrick@comtours.com',
-    'age': 51,
-  }, {
-    'id': 46,
-    'firstName': 'Jeanne',
-    'lastName': 'Cooke',
-    'username': '@Ward',
-    'email': 'jeanneward@comtours.com',
-    'age': 59,
-  }, {
-    'id': 47,
-    'firstName': 'Wilma',
-    'lastName': 'Briggs',
-    'username': '@Kidd',
-    'email': 'wilmakidd@comtours.com',
-    'age': 53,
-  }, {
-    'id': 48,
-    'firstName': 'Beatrice',
-    'lastName': 'Perry',
-    'username': '@Gilbert',
-    'email': 'beatricegilbert@comtours.com',
-    'age': 39,
-  }, {
-    'id': 49,
-    'firstName': 'Whitaker',
-    'lastName': 'Hyde',
-    'username': '@Mcdonald',
-    'email': 'whitakermcdonald@comtours.com',
-    'age': 35,
-  }, {
-    'id': 50,
-    'firstName': 'Rebekah',
-    'lastName': 'Duran',
-    'username': '@Gross',
-    'email': 'rebekahgross@comtours.com',
-    'age': 40,
-  }, {
-    'id': 51,
-    'firstName': 'Earline',
-    'lastName': 'Mayer',
-    'username': '@Woodward',
-    'email': 'earlinewoodward@comtours.com',
-    'age': 52,
-  }, {
-    'id': 52,
-    'firstName': 'Moran',
-    'lastName': 'Baxter',
-    'username': '@Johns',
-    'email': 'moranjohns@comtours.com',
-    'age': 20,
-  }, {
-    'id': 53,
-    'firstName': 'Nanette',
-    'lastName': 'Hubbard',
-    'username': '@Cooke',
-    'email': 'nanettecooke@comtours.com',
-    'age': 55,
-  }, {
-    'id': 54,
-    'firstName': 'Dalton',
-    'lastName': 'Walker',
-    'username': '@Hendricks',
-    'email': 'daltonhendricks@comtours.com',
-    'age': 25,
-  }, {
-    'id': 55,
-    'firstName': 'Bennett',
-    'lastName': 'Blake',
-    'username': '@Pena',
-    'email': 'bennettpena@comtours.com',
-    'age': 13,
-  }, {
-    'id': 56,
-    'firstName': 'Kellie',
-    'lastName': 'Horton',
-    'username': '@Weiss',
-    'email': 'kellieweiss@comtours.com',
-    'age': 48,
-  }, {
-    'id': 57,
-    'firstName': 'Hobbs',
-    'lastName': 'Talley',
-    'username': '@Sanford',
-    'email': 'hobbssanford@comtours.com',
-    'age': 28,
-  }, {
-    'id': 58,
-    'firstName': 'Mcguire',
-    'lastName': 'Donaldson',
-    'username': '@Roman',
-    'email': 'mcguireroman@comtours.com',
-    'age': 38,
-  }, {
-    'id': 59,
-    'firstName': 'Rodriquez',
-    'lastName': 'Saunders',
-    'username': '@Harper',
-    'email': 'rodriquezharper@comtours.com',
-    'age': 20,
-  }, {
-    'id': 60,
-    'firstName': 'Lou',
-    'lastName': 'Conner',
-    'username': '@Sanchez',
-    'email': 'lousanchez@comtours.com',
-    'age': 16,
+    cedula: "25872062",
+    nombre: "Manuel",
+    apellido: "Rodriguez",
+    telefono: "04141633960"
   }];
 
   getData() {
diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
new file mode 100644
index 0000000..05cd834
--- /dev/null
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -0,0 +1,10 @@
+<nb-card>
+  <nb-card-header>
+    Smart Table
+  </nb-card-header>
+
+  <nb-card-body>
+    <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
+    </ng2-smart-table>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/catalog/clients/clients.component.scss b/src/app/pages/catalog/clients/clients.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
new file mode 100644
index 0000000..9d8958c
--- /dev/null
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -0,0 +1,70 @@
+import { Component, OnInit } from '@angular/core';
+import { LocalDataSource } from 'ng2-smart-table';
+import { Clientmodel } from './clients.model';
+import { SmartTableService } from '../../../@core/data/smart-table.service';
+import { ClientService } from './clients.service';
+
+@Component({
+  selector: 'mac-clients',
+  templateUrl: './clients.component.html',
+  styles: ['./clients.component.scss'],
+  providers: [ClientService]
+})
+export class ClientsComponent {
+
+  settings = {
+    add: {
+      addButtonContent: '<i class="nb-plus"></i>',
+      createButtonContent: '<i class="nb-checkmark"></i>',
+      cancelButtonContent: '<i class="nb-close"></i>',
+      confirmCreate: true,
+    },
+    edit: {
+      editButtonContent: '<i class="nb-edit"></i>',
+      saveButtonContent: '<i class="nb-checkmark"></i>',
+      cancelButtonContent: '<i class="nb-close"></i>',
+    },
+    delete: {
+      deleteButtonContent: '<i class="nb-trash"></i>',
+      confirmDelete: true,
+    },
+    columns: {
+      cedula: {
+        title: 'Cédula',
+        type: 'string',
+      },
+      nombre: {
+        title: 'Nombre',
+        type: 'string',
+      },
+      apellido: {
+        title: 'Apellido',
+        type: 'string',
+      },
+      telefono: {
+        title: 'Teléfono',
+        type: 'string',
+      },
+    },
+  };
+
+  source: LocalDataSource = new LocalDataSource();
+
+  constructor(private service: SmartTableService,
+              private clientService: ClientService) {
+    this.getClients()
+  }
+
+  getClients(): void{
+    this.clientService.getClients().subscribe(clients =>
+      this.source.load(clients))
+  }
+
+  onDeleteConfirm(event): void {
+    if (window.confirm('Are you sure you want to delete?')) {
+      event.confirm.resolve();
+    } else {
+      event.confirm.reject();
+    }
+  }
+}
diff --git a/src/app/pages/catalog/clients/clients.model.ts b/src/app/pages/catalog/clients/clients.model.ts
new file mode 100644
index 0000000..141849f
--- /dev/null
+++ b/src/app/pages/catalog/clients/clients.model.ts
@@ -0,0 +1,6 @@
+export class Clientmodel {
+    cedula: number;
+    nombre: string;
+    apellido: string;
+    telefono: string
+}
\ No newline at end of file
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
new file mode 100644
index 0000000..e4bdd73
--- /dev/null
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -0,0 +1,33 @@
+
+import { of, Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { Clientmodel } from './clients.model';
+import { catchError, tap } from 'rxjs/operators'
+import { HttpHeaders, HttpClient } from '@angular/common/http'
+
+const httpOptions = {
+    headers: new HttpHeaders({'Content-Type': 'application/json'})
+}
+@Injectable()
+export class ClientService {
+    API_URL:string = "https://mactaquilla.herokuapp.com/taquilla-api"
+
+    constructor(
+        private http: HttpClient
+    ){}
+    
+    getClients():Observable<Clientmodel[]>{
+        let apiURL =  `${this.API_URL}/cliente/`
+        return this.http.get<Clientmodel[]>(apiURL).pipe(
+            tap(clients => console.log("Fetched clients")),
+            catchError(this.handleError('getClients', []))
+        )
+    }
+
+    private handleError<T>(operation = 'operation', result?: T){
+        return (error: any):Observable<T> =>{
+            console.log(error);
+            return of(result as T)
+        }
+    }
+}
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 34bd495..7f41816 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -48,6 +48,10 @@ export const MENU_ITEMS: NbMenuItem[] = [
         title: 'Tabs',
         link: '/pages/ui-features/tabs',
       },
+      {
+        title: 'Clients',
+        link: '/pages/clients'
+      }
     ],
   },
   {
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index d714eca..c20591a 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
 import { PagesComponent } from './pages.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { NotFoundComponent } from './miscellaneous/not-found/not-found.component';
+import { ClientsComponent } from './catalog/clients/clients.component';
 
 const routes: Routes = [{
   path: '',
@@ -12,6 +13,9 @@ const routes: Routes = [{
     path: 'dashboard',
     component: DashboardComponent,
   }, {
+    path: 'clients',
+    component: ClientsComponent
+  },{
     path: 'ui-features',
     loadChildren: './ui-features/ui-features.module#UiFeaturesModule',
   }, {
@@ -35,7 +39,7 @@ const routes: Routes = [{
   }, {
     path: 'miscellaneous',
     loadChildren: './miscellaneous/miscellaneous.module#MiscellaneousModule',
-  }, {
+  },{
     path: '',
     redirectTo: 'dashboard',
     pathMatch: 'full',
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index adcae4a..ea66507 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -5,9 +5,12 @@ import { DashboardModule } from './dashboard/dashboard.module';
 import { PagesRoutingModule } from './pages-routing.module';
 import { ThemeModule } from '../@theme/theme.module';
 import { MiscellaneousModule } from './miscellaneous/miscellaneous.module';
+import { ClientsComponent } from './catalog/clients/clients.component';
+import { Ng2SmartTableModule } from 'ng2-smart-table'
 
 const PAGES_COMPONENTS = [
   PagesComponent,
+  ClientsComponent
 ];
 
 @NgModule({
@@ -16,6 +19,7 @@ const PAGES_COMPONENTS = [
     ThemeModule,
     DashboardModule,
     MiscellaneousModule,
+    Ng2SmartTableModule
   ],
   declarations: [
     ...PAGES_COMPONENTS,

From d8a22f4444bda1a2509d6dcb08235043c4dde33a Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Fri, 5 Oct 2018 22:49:52 -0400
Subject: [PATCH 02/10] Added add clients.

---
 .../catalog/clients/clients.component.html    |  3 ++-
 .../catalog/clients/clients.component.ts      |  9 +++++++++
 .../pages/catalog/clients/clients.service.ts  | 19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
index 05cd834..411078a 100644
--- a/src/app/pages/catalog/clients/clients.component.html
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -4,7 +4,8 @@
   </nb-card-header>
 
   <nb-card-body>
-    <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
+    <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)"
+    (createConfirm)="createClient($event)">
     </ng2-smart-table>
   </nb-card-body>
 </nb-card>
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index 9d8958c..4c4eeae 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -67,4 +67,13 @@ export class ClientsComponent {
       event.confirm.reject();
     }
   }
+
+  createClient(event): void{
+    this.clientService.addClient(event.newData as Clientmodel).subscribe(client =>{
+        if (client) {
+          event.confirm.resolve(event.newData)
+        }
+      }
+    )
+  }
 }
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index e4bdd73..cab3383 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -24,9 +24,24 @@ export class ClientService {
         )
     }
 
+    addClient(client: Clientmodel):Observable<Clientemodel>{
+        let apiURL =  `${this.API_URL}/cliente/`
+        return this.http.post<Clientmodel>(apiURL, client, httpOptions).pipe(
+            tap((client: Clientmodel) => console.log("Client added")),
+            catchError(this.handleError<Clientmodel>('addclient'))
+        )
+    }
+
     private handleError<T>(operation = 'operation', result?: T){
-        return (error: any):Observable<T> =>{
-            console.log(error);
+        return (error_object: any):Observable<T> =>{
+            console.log(error_object.error);
+            let error_message = "Your request return the following errors:\n"
+            for ( var key in error_object.error){
+                if (error_object.error.hasOwnProperty(key)){
+                    error_message += key + ": " + error_object.error[key] + "\n"
+                }
+            }
+            alert(error_message)
             return of(result as T)
         }
     }

From caeb90574e07afe2caf5b0b017d5cfdc711d7bec Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Fri, 5 Oct 2018 23:05:56 -0400
Subject: [PATCH 03/10] Added edit clients. But there's some problem with the
 edit endpoint.

---
 src/app/pages/catalog/clients/clients.component.html |  2 +-
 src/app/pages/catalog/clients/clients.component.ts   | 12 ++++++++++++
 src/app/pages/catalog/clients/clients.service.ts     | 12 ++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
index 411078a..8a45d27 100644
--- a/src/app/pages/catalog/clients/clients.component.html
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -5,7 +5,7 @@
 
   <nb-card-body>
     <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)"
-    (createConfirm)="createClient($event)">
+    (createConfirm)="createClient($event)" (editConfirm)="editClient($event)">
     </ng2-smart-table>
   </nb-card-body>
 </nb-card>
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index 4c4eeae..735b1ed 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -23,6 +23,7 @@ export class ClientsComponent {
       editButtonContent: '<i class="nb-edit"></i>',
       saveButtonContent: '<i class="nb-checkmark"></i>',
       cancelButtonContent: '<i class="nb-close"></i>',
+      confirmSave: true
     },
     delete: {
       deleteButtonContent: '<i class="nb-trash"></i>',
@@ -32,6 +33,7 @@ export class ClientsComponent {
       cedula: {
         title: 'Cédula',
         type: 'string',
+        editable: false
       },
       nombre: {
         title: 'Nombre',
@@ -68,6 +70,16 @@ export class ClientsComponent {
     }
   }
 
+  editClient(event):void {
+    console.log("alo")
+    this.clientService.updateClient(event.newData as Clientmodel).subscribe(client =>{
+        if (client){
+          event.confirm.resolve(event.newData)
+        }
+      }
+    )
+  }
+
   createClient(event): void{
     this.clientService.addClient(event.newData as Clientmodel).subscribe(client =>{
         if (client) {
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index cab3383..c44eda8 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -24,11 +24,19 @@ export class ClientService {
         )
     }
 
-    addClient(client: Clientmodel):Observable<Clientemodel>{
+    addClient(client: Clientmodel):Observable<Clientmodel>{
         let apiURL =  `${this.API_URL}/cliente/`
         return this.http.post<Clientmodel>(apiURL, client, httpOptions).pipe(
             tap((client: Clientmodel) => console.log("Client added")),
-            catchError(this.handleError<Clientmodel>('addclient'))
+            catchError(this.handleError<Clientmodel>('addClient'))
+        )
+    }
+
+    updateClient(client: Clientmodel):Observable<any>{
+        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit/`
+        return this.http.put(apiURL, client, httpOptions).pipe(
+            tap(_ => console.log(`update client ${client.cedula}`)),
+            catchError(this.handleError<any>('updateClient'))
         )
     }
 

From f1d4a75df443ea74f1b6d6254400a393f540a4e1 Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Sat, 6 Oct 2018 10:07:06 -0400
Subject: [PATCH 04/10] Added delete client.

---
 src/app/pages/catalog/clients/clients.component.ts |  5 +++--
 src/app/pages/catalog/clients/clients.service.ts   | 10 +++++++++-
 src/app/pages/pages-routing.module.ts              |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index 735b1ed..3a40501 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -64,14 +64,15 @@ export class ClientsComponent {
 
   onDeleteConfirm(event): void {
     if (window.confirm('Are you sure you want to delete?')) {
-      event.confirm.resolve();
+      this.clientService.deleteClient(event.data as Clientmodel).subscribe(client =>{
+        this.getClients()
+      })
     } else {
       event.confirm.reject();
     }
   }
 
   editClient(event):void {
-    console.log("alo")
     this.clientService.updateClient(event.newData as Clientmodel).subscribe(client =>{
         if (client){
           event.confirm.resolve(event.newData)
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index c44eda8..1811db2 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -33,13 +33,21 @@ export class ClientService {
     }
 
     updateClient(client: Clientmodel):Observable<any>{
-        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit/`
+        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit`
         return this.http.put(apiURL, client, httpOptions).pipe(
             tap(_ => console.log(`update client ${client.cedula}`)),
             catchError(this.handleError<any>('updateClient'))
         )
     }
 
+    deleteClient(client: Clientmodel):Observable<Clientmodel>{
+        let apiURL = `${this.API_URL}/cliente/${client.cedula}/delete`
+        return this.http.delete<Clientmodel>(apiURL, httpOptions).pipe(
+            tap(_ => console.log(`delete client ${client.cedula}`)),
+            catchError(this.handleError<Clientmodel>('deleteClient'))
+        )
+    }
+
     private handleError<T>(operation = 'operation', result?: T){
         return (error_object: any):Observable<T> =>{
             console.log(error_object.error);
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index c20591a..4deb75b 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -14,7 +14,7 @@ const routes: Routes = [{
     component: DashboardComponent,
   }, {
     path: 'clients',
-    component: ClientsComponent
+    component: ClientsComponent,
   },{
     path: 'ui-features',
     loadChildren: './ui-features/ui-features.module#UiFeaturesModule',

From 6c3fc6870f8eda0f12c247ce25873d5144473232 Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Tue, 30 Oct 2018 18:13:10 -0400
Subject: [PATCH 05/10] Added modal form to add clients Now the form to add
 clients have all validation fields. Added toaster notification to
 pages.modules

---
 .../catalog/clients/clients.component.html    | 91 ++++++++++++++++++-
 .../catalog/clients/clients.component.scss    | 29 ++++++
 .../catalog/clients/clients.component.ts      | 70 ++++++++++----
 .../pages/catalog/clients/clients.model.ts    |  2 +-
 .../pages/catalog/clients/clients.service.ts  | 18 +---
 src/app/pages/pages-menu.ts                   | 13 ++-
 src/app/pages/pages.module.ts                 |  6 +-
 7 files changed, 188 insertions(+), 41 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
index 8a45d27..7cd4148 100644
--- a/src/app/pages/catalog/clients/clients.component.html
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -4,8 +4,95 @@
   </nb-card-header>
 
   <nb-card-body>
-    <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)"
-    (createConfirm)="createClient($event)" (editConfirm)="editClient($event)">
+    <toaster-container [toasterconfig]="config"></toaster-container>
+    <ng2-smart-table [settings]="settings" [source]="source" (delete)="onDeleteConfirm($event)"
+    (create)="createClientModal(addclient)" (edit)="editClient($event)">
     </ng2-smart-table>
   </nb-card-body>
 </nb-card>
+
+<!-- Add client modal -->
+<ng-template #addclient let-modal let-d="dismiss">
+  <div class="modal-header">
+    <h4 class="modal-title">Add client</h4>
+    <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+    <!-- Form client -->
+  <form #addclientForm="ngForm" (ngSubmit)="createClient()">
+    <div class="modal-body">
+      <div class="form-group">
+        <label>Id</label>
+        <input type="text" class="form-control" id="cedula"
+        [(ngModel)]="clientemodel.cedula" name="cedula" maxlength="10" 
+        pattern="^[V|E|J|P][0-9]{5,9}$" #cedula="ngModel" required>
+      </div>
+
+      <div *ngIf="cedula.invalid && (cedula.dirty || cedula.touched)"
+    class="alert alert-danger">
+
+        <div *ngIf="cedula.errors.required">
+          Id is required.
+        </div>
+        <div *ngIf="cedula.errors.pattern">
+          Id must have the format: [V|E|J|P]XXXXXX
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Name</label>
+        <input type="text" class="form-control" id="name"
+        [(ngModel)]="clientemodel.nombre" name="name" maxlength="50"
+        pattern="[a-zA-Z]*" #name="ngModel" required>
+      </div>
+
+      <div *ngIf="name.invalid && (name.dirty || name.touched)"
+      class="alert alert-danger">
+        <div *ngIf="name.errors.required">
+          Name is required.
+        </div>
+        <div *ngIf="name.errors.pattern">
+          Name cannot have numbers or specials characters
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Last name</label>
+        <input type="text" class="form-control" id="last_name"
+        [(ngModel)]="clientemodel.apellido" name="last_name" maxlength="50"
+        pattern="[a-zA-Z]*" #last_name="ngModel" required>
+      </div>
+
+      <div *ngIf="last_name.invalid && (last_name.dirty || last_name.touched)"
+      class="alert alert-danger">
+        <div *ngIf="last_name.errors.required">
+          Last name is required.
+        </div>
+        <div *ngIf="last_name.errors.pattern">
+          Last name cannot have numbers or specials characters
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Phone</label>
+        <input type="text" class="form-control" id="phone"
+        [(ngModel)]="clientemodel.telefono" name="phone" maxlength="15"
+        pattern="^[(]?\d{3}[)]?\s?-?\s?\d{3}\s?-?\s?\d{4}$" #phone="ngModel" required>
+      </div>
+        <div *ngIf="phone.invalid && (phone.dirty || phone.touched)"
+        class="alert alert-danger">
+          <div *ngIf="phone.errors.required">
+            Phone is required.
+          </div>
+          <div *ngIf="phone.errors.pattern">
+            Phone format must be xxx-xxxxxxx, xxx-xxx-xxxx or xxxxxxxxxx
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+          <button type="button"  type="submit" class="btn btn-success btn-demo" 
+          [disabled]="!addclientForm.form.valid">Add client</button>
+      </div>
+    </form>
+</ng-template>
diff --git a/src/app/pages/catalog/clients/clients.component.scss b/src/app/pages/catalog/clients/clients.component.scss
index e69de29..33a91ed 100644
--- a/src/app/pages/catalog/clients/clients.component.scss
+++ b/src/app/pages/catalog/clients/clients.component.scss
@@ -0,0 +1,29 @@
+@import '../../../@theme/styles/themes';
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/bootstrap/breakpoints';
+
+@include nb-install-component() {
+
+  nb-card-footer {
+    padding-bottom: 0.25rem;
+
+    button {
+      @include nb-ltr(margin, 0 1rem 1rem 0);
+      @include nb-rtl(margin, 0 0 1rem 1rem);
+    }
+  }
+
+  /* stylelint-disable */
+  toaster-container /deep/ {
+    #toast-container .toast-close-button {
+      right: 0;
+    }
+  }
+  /* stylelint-enable */
+
+  @include media-breakpoint-down(xs) {
+    .dropdown-toggle {
+      font-size: 0.75rem;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index 3a40501..ce2e7f3 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -3,6 +3,10 @@ import { LocalDataSource } from 'ng2-smart-table';
 import { Clientmodel } from './clients.model';
 import { SmartTableService } from '../../../@core/data/smart-table.service';
 import { ClientService } from './clients.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { error } from '@angular/compiler/src/util';
+import { ToasterService, ToasterConfig, Toast, BodyOutputType } from 'angular2-toaster';
+import 'style-loader!angular2-toaster/toaster.css';
 
 @Component({
   selector: 'mac-clients',
@@ -13,47 +17,55 @@ import { ClientService } from './clients.service';
 export class ClientsComponent {
 
   settings = {
+    mode: 'external',
+    actions: {
+      position: 'right'
+    },
     add: {
-      addButtonContent: '<i class="nb-plus"></i>',
-      createButtonContent: '<i class="nb-checkmark"></i>',
-      cancelButtonContent: '<i class="nb-close"></i>',
-      confirmCreate: true,
+      addButtonContent: '<i class="nb-plus"></i>'
     },
     edit: {
-      editButtonContent: '<i class="nb-edit"></i>',
-      saveButtonContent: '<i class="nb-checkmark"></i>',
-      cancelButtonContent: '<i class="nb-close"></i>',
-      confirmSave: true
+      editButtonContent: '<i class="nb-edit"></i>'
     },
     delete: {
-      deleteButtonContent: '<i class="nb-trash"></i>',
-      confirmDelete: true,
+      deleteButtonContent: '<i class="nb-trash"></i>'
     },
     columns: {
       cedula: {
-        title: 'Cédula',
+        title: 'id',
         type: 'string',
         editable: false
       },
       nombre: {
-        title: 'Nombre',
+        title: 'Name',
         type: 'string',
       },
       apellido: {
-        title: 'Apellido',
+        title: 'Last name',
         type: 'string',
       },
       telefono: {
-        title: 'Teléfono',
+        title: 'Phone',
         type: 'string',
       },
     },
   };
 
   source: LocalDataSource = new LocalDataSource();
+  clientemodel = new Clientmodel();
+  activeModal: any;
+  config:ToasterConfig = new ToasterConfig({
+    positionClass: 'toast-top-full-width',
+    timeout: 30000,
+    tapToDismiss: true,
+    showCloseButton: true
+  });
+
 
   constructor(private service: SmartTableService,
-              private clientService: ClientService) {
+              private clientService: ClientService,
+              private modalService: NgbModal,
+              private toasterService: ToasterService) {
     this.getClients()
   }
 
@@ -81,12 +93,32 @@ export class ClientsComponent {
     )
   }
 
-  createClient(event): void{
-    this.clientService.addClient(event.newData as Clientmodel).subscribe(client =>{
-        if (client) {
-          event.confirm.resolve(event.newData)
+  createClientModal(content): void{
+    this.activeModal =  this.modalService.open(content, { size: 'lg'})
+  }
+
+  createClient(): void{
+    this.clientService.addClient(this.clientemodel).subscribe(client =>{
+        if(client){
+          if(!client.error){
+            this.activeModal.dismiss()
+            this.getClients() 
+          }else{ 
+            this.toasterService.pop('warning', 'Your request has the following errors:\n',
+            this.getErrorMessage(client.error))
+          }
         }
       }
     )
   }
+
+  getErrorMessage(object): string{
+    let error_message = ""
+    for ( var key in object){
+        if (object.hasOwnProperty(key)){
+            error_message += object[key] + "\n"
+        }
+    }
+    return error_message
+  }
 }
diff --git a/src/app/pages/catalog/clients/clients.model.ts b/src/app/pages/catalog/clients/clients.model.ts
index 141849f..576f680 100644
--- a/src/app/pages/catalog/clients/clients.model.ts
+++ b/src/app/pages/catalog/clients/clients.model.ts
@@ -1,5 +1,5 @@
 export class Clientmodel {
-    cedula: number;
+    cedula: string;
     nombre: string;
     apellido: string;
     telefono: string
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index 1811db2..eec7ff7 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -24,11 +24,11 @@ export class ClientService {
         )
     }
 
-    addClient(client: Clientmodel):Observable<Clientmodel>{
+    addClient(client: Clientmodel):Observable<any>{
         let apiURL =  `${this.API_URL}/cliente/`
         return this.http.post<Clientmodel>(apiURL, client, httpOptions).pipe(
             tap((client: Clientmodel) => console.log("Client added")),
-            catchError(this.handleError<Clientmodel>('addClient'))
+            catchError(this.handleError<any>('addClient'))
         )
     }
 
@@ -40,25 +40,17 @@ export class ClientService {
         )
     }
 
-    deleteClient(client: Clientmodel):Observable<Clientmodel>{
+    deleteClient(client: Clientmodel):Observable<any>{
         let apiURL = `${this.API_URL}/cliente/${client.cedula}/delete`
         return this.http.delete<Clientmodel>(apiURL, httpOptions).pipe(
             tap(_ => console.log(`delete client ${client.cedula}`)),
-            catchError(this.handleError<Clientmodel>('deleteClient'))
+            catchError(this.handleError<any>('deleteClient'))
         )
     }
 
     private handleError<T>(operation = 'operation', result?: T){
         return (error_object: any):Observable<T> =>{
-            console.log(error_object.error);
-            let error_message = "Your request return the following errors:\n"
-            for ( var key in error_object.error){
-                if (error_object.error.hasOwnProperty(key)){
-                    error_message += key + ": " + error_object.error[key] + "\n"
-                }
-            }
-            alert(error_message)
-            return of(result as T)
+            return of(error_object)
         }
     }
 }
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 7f41816..7d38bbd 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -11,6 +11,15 @@ export const MENU_ITEMS: NbMenuItem[] = [
     title: 'FEATURES',
     group: true,
   },
+  {
+    title: 'Catalog',
+    children: [
+      {
+        title: 'Clients',
+        link: '/pages/clients'
+      }
+    ]
+  },
   {
     title: 'UI Features',
     icon: 'nb-keypad',
@@ -47,10 +56,6 @@ export const MENU_ITEMS: NbMenuItem[] = [
       {
         title: 'Tabs',
         link: '/pages/ui-features/tabs',
-      },
-      {
-        title: 'Clients',
-        link: '/pages/clients'
       }
     ],
   },
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index ea66507..ea548eb 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -6,7 +6,8 @@ import { PagesRoutingModule } from './pages-routing.module';
 import { ThemeModule } from '../@theme/theme.module';
 import { MiscellaneousModule } from './miscellaneous/miscellaneous.module';
 import { ClientsComponent } from './catalog/clients/clients.component';
-import { Ng2SmartTableModule } from 'ng2-smart-table'
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { ToasterModule } from 'angular2-toaster';
 
 const PAGES_COMPONENTS = [
   PagesComponent,
@@ -19,7 +20,8 @@ const PAGES_COMPONENTS = [
     ThemeModule,
     DashboardModule,
     MiscellaneousModule,
-    Ng2SmartTableModule
+    Ng2SmartTableModule,
+    ToasterModule.forRoot()
   ],
   declarations: [
     ...PAGES_COMPONENTS,

From f6b110b15038f82867b1358bf0cea771c7a4ef7d Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Tue, 30 Oct 2018 19:48:03 -0400
Subject: [PATCH 06/10] Added edit and delete client modals.

---
 .../catalog/clients/clients.component.html    | 68 +++++++++++++------
 .../catalog/clients/clients.component.ts      | 65 +++++++++++++-----
 .../pages/catalog/clients/clients.service.ts  |  4 +-
 3 files changed, 96 insertions(+), 41 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
index 7cd4148..f4798d6 100644
--- a/src/app/pages/catalog/clients/clients.component.html
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -5,38 +5,43 @@
 
   <nb-card-body>
     <toaster-container [toasterconfig]="config"></toaster-container>
-    <ng2-smart-table [settings]="settings" [source]="source" (delete)="onDeleteConfirm($event)"
-    (create)="createClientModal(addclient)" (edit)="editClient($event)">
+    <ng2-smart-table [settings]="settings" [source]="source" 
+    (delete)="deleteClientModal(confirmdeleteclient, $event)"
+    (create)="createClientModal(client)" 
+    (edit)="editClientModal(client, $event)">
     </ng2-smart-table>
   </nb-card-body>
 </nb-card>
 
-<!-- Add client modal -->
-<ng-template #addclient let-modal let-d="dismiss">
+<!-- Client modal. Create and edit -->
+<ng-template #client let-modal let-d="dismiss">
   <div class="modal-header">
-    <h4 class="modal-title">Add client</h4>
+    <h4 class="modal-title" *ngIf="!edit">Add client</h4>
+    <h4 class="modal-title" *ngIf="edit">Edit client</h4>
     <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-    <!-- Form client -->
-  <form #addclientForm="ngForm" (ngSubmit)="createClient()">
+  <!-- Form for add and edit client -->
+  <form #clientForm="ngForm" (ngSubmit)="!edit ? createClient() : editClient()">
     <div class="modal-body">
-      <div class="form-group">
-        <label>Id</label>
-        <input type="text" class="form-control" id="cedula"
-        [(ngModel)]="clientemodel.cedula" name="cedula" maxlength="10" 
-        pattern="^[V|E|J|P][0-9]{5,9}$" #cedula="ngModel" required>
-      </div>
+      <div *ngIf="!edit">
+        <div class="form-group">
+          <label>Id</label>
+          <input type="text" class="form-control" id="cedula"
+          [(ngModel)]="clientemodel.cedula" name="cedula" maxlength="10" 
+          pattern="^[V|E|J|P]\-[0-9]{5,8}$" #cedula="ngModel" required>
+        </div>
 
-      <div *ngIf="cedula.invalid && (cedula.dirty || cedula.touched)"
-    class="alert alert-danger">
+        <div *ngIf="cedula.invalid && !edit && (cedula.dirty || cedula.touched)"
+      class="alert alert-danger">
 
-        <div *ngIf="cedula.errors.required">
-          Id is required.
-        </div>
-        <div *ngIf="cedula.errors.pattern">
-          Id must have the format: [V|E|J|P]XXXXXX
+          <div *ngIf="cedula.errors.required">
+            Id is required.
+          </div>
+          <div *ngIf="cedula.errors.pattern">
+            Id must have the format: [V|E|J|P]-XXXXXX
+          </div>
         </div>
       </div>
 
@@ -91,8 +96,27 @@ <h4 class="modal-title">Add client</h4>
         </div>
       </div>
       <div class="modal-footer">
-          <button type="button"  type="submit" class="btn btn-success btn-demo" 
-          [disabled]="!addclientForm.form.valid">Add client</button>
+        <button type="button"  type="submit" class="btn btn-success btn-demo" 
+          [disabled]="!clientForm.form.valid">
+            <span *ngIf="!edit">Add client</span>
+            <span *ngIf="edit">Edit client</span>
+        </button>
       </div>
     </form>
 </ng-template>
+
+<!-- Confirm delete client modal -->
+<ng-template #confirmdeleteclient let-modal let-d="dismiss">
+  <div class="modal-header">
+    Delete client
+    <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    Are you sure you want to delete {{clientemodel.nombre}} client?
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-danger" (click)="onDeleteConfirm(clientemodel)">delete</button>
+  </div>
+</ng-template>
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index ce2e7f3..4660c7a 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -3,7 +3,7 @@ import { LocalDataSource } from 'ng2-smart-table';
 import { Clientmodel } from './clients.model';
 import { SmartTableService } from '../../../@core/data/smart-table.service';
 import { ClientService } from './clients.service';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbModal, NgbModalOptions } from '@ng-bootstrap/ng-bootstrap';
 import { error } from '@angular/compiler/src/util';
 import { ToasterService, ToasterConfig, Toast, BodyOutputType } from 'angular2-toaster';
 import 'style-loader!angular2-toaster/toaster.css';
@@ -52,7 +52,7 @@ export class ClientsComponent {
   };
 
   source: LocalDataSource = new LocalDataSource();
-  clientemodel = new Clientmodel();
+  clientemodel: Clientmodel = new Clientmodel();
   activeModal: any;
   config:ToasterConfig = new ToasterConfig({
     positionClass: 'toast-top-full-width',
@@ -60,6 +60,7 @@ export class ClientsComponent {
     tapToDismiss: true,
     showCloseButton: true
   });
+  edit: boolean = false;
 
 
   constructor(private service: SmartTableService,
@@ -74,20 +75,24 @@ export class ClientsComponent {
       this.source.load(clients))
   }
 
-  onDeleteConfirm(event): void {
-    if (window.confirm('Are you sure you want to delete?')) {
-      this.clientService.deleteClient(event.data as Clientmodel).subscribe(client =>{
+  onDeleteConfirm(client: Clientmodel): void {
+    this.clientService.deleteClient(client).subscribe(client =>{
+      if (client){
+        this.activeModal.dismiss()
         this.getClients()
-      })
-    } else {
-      event.confirm.reject();
-    }
+      }else{
+        this.showErrorMessage(client.error)
+      }
+    })
   }
 
-  editClient(event):void {
-    this.clientService.updateClient(event.newData as Clientmodel).subscribe(client =>{
-        if (client){
-          event.confirm.resolve(event.newData)
+  editClient():void {
+    this.clientService.updateClient(this.clientemodel).subscribe(client =>{
+        if (!client.error){
+          this.activeModal.dismiss()
+          this.getClients() 
+        }else{
+          this.showErrorMessage(client.error)
         }
       }
     )
@@ -97,6 +102,32 @@ export class ClientsComponent {
     this.activeModal =  this.modalService.open(content, { size: 'lg'})
   }
 
+  editClientModal(content, event): void{
+    this.edit = true
+    this.clientemodel = event.data
+    const modal_options : NgbModalOptions = {
+      size: 'lg',
+      beforeDismiss: () => {
+        this.clientemodel = new Clientmodel();
+        this.edit = false
+        return true
+      }
+    }
+    this.activeModal = this.modalService.open(content, modal_options)
+  }
+
+  deleteClientModal(content, event): void{
+    this.clientemodel = event.data
+    const modal_options : NgbModalOptions = {
+      size: 'lg',
+      beforeDismiss: () => {
+        this.clientemodel = new Clientmodel();
+        return true
+      }
+    }
+    this.activeModal = this.modalService.open(content, modal_options)
+  }
+
   createClient(): void{
     this.clientService.addClient(this.clientemodel).subscribe(client =>{
         if(client){
@@ -104,21 +135,21 @@ export class ClientsComponent {
             this.activeModal.dismiss()
             this.getClients() 
           }else{ 
-            this.toasterService.pop('warning', 'Your request has the following errors:\n',
-            this.getErrorMessage(client.error))
+            this.showErrorMessage(client.error)
           }
         }
       }
     )
   }
 
-  getErrorMessage(object): string{
+  showErrorMessage(object): void{
     let error_message = ""
     for ( var key in object){
         if (object.hasOwnProperty(key)){
             error_message += object[key] + "\n"
         }
     }
-    return error_message
+    this.toasterService.pop('warning', 'Your request has the following errors:\n',
+    error_message)
   }
 }
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index eec7ff7..c0f5419 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -33,7 +33,7 @@ export class ClientService {
     }
 
     updateClient(client: Clientmodel):Observable<any>{
-        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit`
+        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit/`
         return this.http.put(apiURL, client, httpOptions).pipe(
             tap(_ => console.log(`update client ${client.cedula}`)),
             catchError(this.handleError<any>('updateClient'))
@@ -41,7 +41,7 @@ export class ClientService {
     }
 
     deleteClient(client: Clientmodel):Observable<any>{
-        let apiURL = `${this.API_URL}/cliente/${client.cedula}/delete`
+        let apiURL = `${this.API_URL}/cliente/${client.cedula}/delete/`
         return this.http.delete<Clientmodel>(apiURL, httpOptions).pipe(
             tap(_ => console.log(`delete client ${client.cedula}`)),
             catchError(this.handleError<any>('deleteClient'))

From e781517af2b8456f1e04e0fea17430fb45e70acd Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Tue, 30 Oct 2018 20:10:14 -0400
Subject: [PATCH 07/10] Added client documentation

---
 .../catalog/clients/clients.component.ts      | 64 +++++++++++++++++++
 .../pages/catalog/clients/clients.model.ts    |  4 ++
 .../pages/catalog/clients/clients.service.ts  | 62 +++++++++++++++++-
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index 4660c7a..d4a5579 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -8,14 +8,22 @@ import { error } from '@angular/compiler/src/util';
 import { ToasterService, ToasterConfig, Toast, BodyOutputType } from 'angular2-toaster';
 import 'style-loader!angular2-toaster/toaster.css';
 
+/**
+ * Component for crud of clients
+ *
+ * @export
+ * @class ClientsComponent
+ */
 @Component({
   selector: 'mac-clients',
   templateUrl: './clients.component.html',
   styles: ['./clients.component.scss'],
   providers: [ClientService]
 })
+
 export class ClientsComponent {
 
+  // smart-table settings
   settings = {
     mode: 'external',
     actions: {
@@ -63,6 +71,14 @@ export class ClientsComponent {
   edit: boolean = false;
 
 
+  /**
+   *Creates an instance of ClientsComponent.
+   * @param {SmartTableService} service
+   * @param {ClientService} clientService
+   * @param {NgbModal} modalService
+   * @param {ToasterService} toasterService
+   * @memberof ClientsComponent
+   */
   constructor(private service: SmartTableService,
               private clientService: ClientService,
               private modalService: NgbModal,
@@ -70,11 +86,22 @@ export class ClientsComponent {
     this.getClients()
   }
 
+  /**
+   * Get clients and show their info on smart-table
+   *
+   * @memberof ClientsComponent
+   */
   getClients(): void{
     this.clientService.getClients().subscribe(clients =>
       this.source.load(clients))
   }
 
+  /**
+   * Confirm method for delete client
+   *
+   * @param {Clientmodel} client to be deleted
+   * @memberof ClientsComponent
+   */
   onDeleteConfirm(client: Clientmodel): void {
     this.clientService.deleteClient(client).subscribe(client =>{
       if (client){
@@ -86,6 +113,11 @@ export class ClientsComponent {
     })
   }
 
+  /**
+   * Method that makes the update for a client info
+   *
+   * @memberof ClientsComponent
+   */
   editClient():void {
     this.clientService.updateClient(this.clientemodel).subscribe(client =>{
         if (!client.error){
@@ -98,10 +130,23 @@ export class ClientsComponent {
     )
   }
 
+  /**
+   * Activate create client modal
+   *
+   * @param {*} content Template to be render
+   * @memberof ClientsComponent
+   */
   createClientModal(content): void{
     this.activeModal =  this.modalService.open(content, { size: 'lg'})
   }
 
+  /**
+   * Activate edit client modal
+   *
+   * @param {*} content Template to be render
+   * @param {*} event with client info
+   * @memberof ClientsComponent
+   */
   editClientModal(content, event): void{
     this.edit = true
     this.clientemodel = event.data
@@ -116,6 +161,13 @@ export class ClientsComponent {
     this.activeModal = this.modalService.open(content, modal_options)
   }
 
+  /**
+   * Delete client modal
+   *
+   * @param {*} content to be render
+   * @param {*} event with client info
+   * @memberof ClientsComponent
+   */
   deleteClientModal(content, event): void{
     this.clientemodel = event.data
     const modal_options : NgbModalOptions = {
@@ -128,6 +180,11 @@ export class ClientsComponent {
     this.activeModal = this.modalService.open(content, modal_options)
   }
 
+  /**
+   * Add client to DB
+   *
+   * @memberof ClientsComponent
+   */
   createClient(): void{
     this.clientService.addClient(this.clientemodel).subscribe(client =>{
         if(client){
@@ -142,6 +199,13 @@ export class ClientsComponent {
     )
   }
 
+  /**
+   * Method to show notifications
+   * when some error occurs
+   *
+   * @param {*} object with error info
+   * @memberof ClientsComponent
+   */
   showErrorMessage(object): void{
     let error_message = ""
     for ( var key in object){
diff --git a/src/app/pages/catalog/clients/clients.model.ts b/src/app/pages/catalog/clients/clients.model.ts
index 576f680..b70d411 100644
--- a/src/app/pages/catalog/clients/clients.model.ts
+++ b/src/app/pages/catalog/clients/clients.model.ts
@@ -1,3 +1,7 @@
+/**
+ * @export
+ * @class Clientmodel
+ */
 export class Clientmodel {
     cedula: string;
     nombre: string;
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index c0f5419..eeb96af 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -8,22 +8,52 @@ import { HttpHeaders, HttpClient } from '@angular/common/http'
 const httpOptions = {
     headers: new HttpHeaders({'Content-Type': 'application/json'})
 }
+
+
+/**
+ * Service with methods to add, edit or
+ * delete clients.
+ *
+ * @export
+ * @class ClientService
+ */
 @Injectable()
 export class ClientService {
+
     API_URL:string = "https://mactaquilla.herokuapp.com/taquilla-api"
 
+    /**
+     *Creates an instance of ClientService.
+     * @param {HttpClient} http
+     * @memberof ClientService
+     */
     constructor(
         private http: HttpClient
     ){}
     
-    getClients():Observable<Clientmodel[]>{
+    /**
+     * Method to get all clients
+     *
+     * @returns {Observable<Clientmodel[]>} Return list of clients 
+     * if everything is ok or error if not 
+     * @memberof ClientService
+     */
+    getClients():Observable<any>{
         let apiURL =  `${this.API_URL}/cliente/`
         return this.http.get<Clientmodel[]>(apiURL).pipe(
             tap(clients => console.log("Fetched clients")),
-            catchError(this.handleError('getClients', []))
+            catchError(this.handleError('getClients'))
         )
     }
 
+    /**
+     * Method to add client
+     *
+     * @param {Clientmodel} client to be added
+     * @returns {Observable<any>} Return client if everything is ok
+     * or error if not
+     * @memberof ClientService
+     */
     addClient(client: Clientmodel):Observable<any>{
         let apiURL =  `${this.API_URL}/cliente/`
         return this.http.post<Clientmodel>(apiURL, client, httpOptions).pipe(
@@ -32,6 +62,14 @@ export class ClientService {
         )
     }
 
+    /**
+     * Method to edit client
+     *
+     * @param {Clientmodel} client to be edited
+     * @returns {Observable<any>} return client if everythings is ok
+     * or error if not
+     * @memberof ClientService
+     */
     updateClient(client: Clientmodel):Observable<any>{
         let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit/`
         return this.http.put(apiURL, client, httpOptions).pipe(
@@ -40,6 +78,14 @@ export class ClientService {
         )
     }
 
+    /**
+     * Method to delete client
+     *
+     * @param {Clientmodel} client to be deleted
+     * @returns {Observable<any>} return null if everythings is ok
+     * or error if not
+     * @memberof ClientService
+     */
     deleteClient(client: Clientmodel):Observable<any>{
         let apiURL = `${this.API_URL}/cliente/${client.cedula}/delete/`
         return this.http.delete<Clientmodel>(apiURL, httpOptions).pipe(
@@ -48,7 +94,17 @@ export class ClientService {
         )
     }
 
-    private handleError<T>(operation = 'operation', result?: T){
+    
+    /**
+     * Method to handle errors
+     *
+     * @private
+     * @template T
+     * @param {string} [operation='operation'] operation that generates the error
+     * @returns Observable with error info
+     * @memberof ClientService
+     */
+    private handleError<T>(operation = 'operation'){
         return (error_object: any):Observable<T> =>{
             return of(error_object)
         }

From a1be5ff85dca18ff07da06e16e2f602610ea9d1f Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Wed, 31 Oct 2018 10:23:28 -0400
Subject: [PATCH 08/10] Edited edit and delete endpoints for clients. Fixed bug
 when a client was deleted and his modal doesnt dismiss.

---
 src/app/pages/catalog/clients/clients.component.ts | 2 +-
 src/app/pages/catalog/clients/clients.service.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index d4a5579..cbe5a24 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -104,7 +104,7 @@ export class ClientsComponent {
    */
   onDeleteConfirm(client: Clientmodel): void {
     this.clientService.deleteClient(client).subscribe(client =>{
-      if (client){
+      if (client == null){
         this.activeModal.dismiss()
         this.getClients()
       }else{
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index eeb96af..44c6a89 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -71,7 +71,7 @@ export class ClientService {
      * @memberof ClientService
      */
     updateClient(client: Clientmodel):Observable<any>{
-        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/edit/`
+        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/`
         return this.http.put(apiURL, client, httpOptions).pipe(
             tap(_ => console.log(`update client ${client.cedula}`)),
             catchError(this.handleError<any>('updateClient'))
@@ -87,7 +87,7 @@ export class ClientService {
      * @memberof ClientService
      */
     deleteClient(client: Clientmodel):Observable<any>{
-        let apiURL = `${this.API_URL}/cliente/${client.cedula}/delete/`
+        let apiURL = `${this.API_URL}/cliente/${client.cedula}/`
         return this.http.delete<Clientmodel>(apiURL, httpOptions).pipe(
             tap(_ => console.log(`delete client ${client.cedula}`)),
             catchError(this.handleError<any>('deleteClient'))

From 423dde86e331f479a259dd0c9794e49a8eb0c9c5 Mon Sep 17 00:00:00 2001
From: manuelinho96 <mr.1311223@gmail.com>
Date: Sat, 3 Nov 2018 18:08:00 -0400
Subject: [PATCH 09/10] Translate UI to spanish Bug fix when a client is being
 edited

---
 .../catalog/clients/clients.component.html    | 40 +++++++++----------
 .../catalog/clients/clients.component.ts      | 13 +++---
 src/app/pages/pages-menu.ts                   |  2 +-
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
index f4798d6..46caeaf 100644
--- a/src/app/pages/catalog/clients/clients.component.html
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -1,6 +1,6 @@
 <nb-card>
   <nb-card-header>
-    Smart Table
+    Clientes CRUD
   </nb-card-header>
 
   <nb-card-body>
@@ -16,8 +16,8 @@
 <!-- Client modal. Create and edit -->
 <ng-template #client let-modal let-d="dismiss">
   <div class="modal-header">
-    <h4 class="modal-title" *ngIf="!edit">Add client</h4>
-    <h4 class="modal-title" *ngIf="edit">Edit client</h4>
+    <h4 class="modal-title" *ngIf="!edit">Añadir cliente</h4>
+    <h4 class="modal-title" *ngIf="edit">Editar cliente</h4>
     <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
       <span aria-hidden="true">&times;</span>
     </button>
@@ -27,7 +27,7 @@ <h4 class="modal-title" *ngIf="edit">Edit client</h4>
     <div class="modal-body">
       <div *ngIf="!edit">
         <div class="form-group">
-          <label>Id</label>
+          <label>Cédula</label>
           <input type="text" class="form-control" id="cedula"
           [(ngModel)]="clientemodel.cedula" name="cedula" maxlength="10" 
           pattern="^[V|E|J|P]\-[0-9]{5,8}$" #cedula="ngModel" required>
@@ -37,16 +37,16 @@ <h4 class="modal-title" *ngIf="edit">Edit client</h4>
       class="alert alert-danger">
 
           <div *ngIf="cedula.errors.required">
-            Id is required.
+            La Cédula es obligatoria
           </div>
           <div *ngIf="cedula.errors.pattern">
-            Id must have the format: [V|E|J|P]-XXXXXX
+            La cédula debe tener el siguiente formato: [V|E|J|P]-XXXXXX
           </div>
         </div>
       </div>
 
       <div class="form-group">
-        <label>Name</label>
+        <label>Nombre</label>
         <input type="text" class="form-control" id="name"
         [(ngModel)]="clientemodel.nombre" name="name" maxlength="50"
         pattern="[a-zA-Z]*" #name="ngModel" required>
@@ -55,15 +55,15 @@ <h4 class="modal-title" *ngIf="edit">Edit client</h4>
       <div *ngIf="name.invalid && (name.dirty || name.touched)"
       class="alert alert-danger">
         <div *ngIf="name.errors.required">
-          Name is required.
+         El nombre es obligatorio
         </div>
         <div *ngIf="name.errors.pattern">
-          Name cannot have numbers or specials characters
+          El nombre no puede tener caracteres especiales
         </div>
       </div>
 
       <div class="form-group">
-        <label>Last name</label>
+        <label>Apellido</label>
         <input type="text" class="form-control" id="last_name"
         [(ngModel)]="clientemodel.apellido" name="last_name" maxlength="50"
         pattern="[a-zA-Z]*" #last_name="ngModel" required>
@@ -72,15 +72,15 @@ <h4 class="modal-title" *ngIf="edit">Edit client</h4>
       <div *ngIf="last_name.invalid && (last_name.dirty || last_name.touched)"
       class="alert alert-danger">
         <div *ngIf="last_name.errors.required">
-          Last name is required.
+          El apellido es obligatorio
         </div>
         <div *ngIf="last_name.errors.pattern">
-          Last name cannot have numbers or specials characters
+          El apellido no puede tener caracteres especiales
         </div>
       </div>
 
       <div class="form-group">
-        <label>Phone</label>
+        <label>Teléfono</label>
         <input type="text" class="form-control" id="phone"
         [(ngModel)]="clientemodel.telefono" name="phone" maxlength="15"
         pattern="^[(]?\d{3}[)]?\s?-?\s?\d{3}\s?-?\s?\d{4}$" #phone="ngModel" required>
@@ -88,18 +88,18 @@ <h4 class="modal-title" *ngIf="edit">Edit client</h4>
         <div *ngIf="phone.invalid && (phone.dirty || phone.touched)"
         class="alert alert-danger">
           <div *ngIf="phone.errors.required">
-            Phone is required.
+            El teléfono es obligatorio
           </div>
           <div *ngIf="phone.errors.pattern">
-            Phone format must be xxx-xxxxxxx, xxx-xxx-xxxx or xxxxxxxxxx
+            El formato del teléfono debe ser xxx-xxxxxxx, xxx-xxx-xxxx o xxxxxxxxxx
           </div>
         </div>
       </div>
       <div class="modal-footer">
         <button type="button"  type="submit" class="btn btn-success btn-demo" 
           [disabled]="!clientForm.form.valid">
-            <span *ngIf="!edit">Add client</span>
-            <span *ngIf="edit">Edit client</span>
+            <span *ngIf="!edit">Añadir cliente</span>
+            <span *ngIf="edit">Editar cliente</span>
         </button>
       </div>
     </form>
@@ -108,15 +108,15 @@ <h4 class="modal-title" *ngIf="edit">Edit client</h4>
 <!-- Confirm delete client modal -->
 <ng-template #confirmdeleteclient let-modal let-d="dismiss">
   <div class="modal-header">
-    Delete client
+    Eliminar cliente
     <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="modal-body">
-    Are you sure you want to delete {{clientemodel.nombre}} client?
+    Estas que seguro que deseas eliminar al cliente {{clientemodel.nombre}}?
   </div>
   <div class="modal-footer">
-    <button class="btn btn-danger" (click)="onDeleteConfirm(clientemodel)">delete</button>
+    <button class="btn btn-danger" (click)="onDeleteConfirm(clientemodel)">Eliminar</button>
   </div>
 </ng-template>
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index cbe5a24..2e5226a 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -27,6 +27,7 @@ export class ClientsComponent {
   settings = {
     mode: 'external',
     actions: {
+      columnTitle: 'Acciones',
       position: 'right'
     },
     add: {
@@ -40,20 +41,20 @@ export class ClientsComponent {
     },
     columns: {
       cedula: {
-        title: 'id',
+        title: 'Cédula',
         type: 'string',
         editable: false
       },
       nombre: {
-        title: 'Name',
+        title: 'Nombre',
         type: 'string',
       },
       apellido: {
-        title: 'Last name',
+        title: 'Apellido',
         type: 'string',
       },
       telefono: {
-        title: 'Phone',
+        title: 'Teléfono',
         type: 'string',
       },
     },
@@ -149,7 +150,7 @@ export class ClientsComponent {
    */
   editClientModal(content, event): void{
     this.edit = true
-    this.clientemodel = event.data
+    Object.assign(this.clientemodel, event.data)
     const modal_options : NgbModalOptions = {
       size: 'lg',
       beforeDismiss: () => {
@@ -213,7 +214,7 @@ export class ClientsComponent {
             error_message += object[key] + "\n"
         }
     }
-    this.toasterService.pop('warning', 'Your request has the following errors:\n',
+    this.toasterService.pop('warning', 'Tu solicitud presentó los siguientes errores:\n',
     error_message)
   }
 }
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 7d38bbd..5c2cca0 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -15,7 +15,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
     title: 'Catalog',
     children: [
       {
-        title: 'Clients',
+        title: 'Clientes',
         link: '/pages/clients'
       }
     ]

From e2d65dc1fbc34cac92b1add9a644d79b7b8aa8a0 Mon Sep 17 00:00:00 2001
From: manuelitod <mr.1311223@gmail.com>
Date: Sun, 6 Jan 2019 10:36:51 -0400
Subject: [PATCH 10/10] Translated client model to english

---
 src/app/pages/catalog/clients/clients.component.html | 10 +++++-----
 src/app/pages/catalog/clients/clients.component.ts   |  8 ++++----
 src/app/pages/catalog/clients/clients.model.ts       |  8 ++++----
 src/app/pages/catalog/clients/clients.service.ts     | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/app/pages/catalog/clients/clients.component.html b/src/app/pages/catalog/clients/clients.component.html
index 46caeaf..ba59aa0 100644
--- a/src/app/pages/catalog/clients/clients.component.html
+++ b/src/app/pages/catalog/clients/clients.component.html
@@ -29,7 +29,7 @@ <h4 class="modal-title" *ngIf="edit">Editar cliente</h4>
         <div class="form-group">
           <label>Cédula</label>
           <input type="text" class="form-control" id="cedula"
-          [(ngModel)]="clientemodel.cedula" name="cedula" maxlength="10" 
+          [(ngModel)]="clientemodel.id_document" name="cedula" maxlength="10" 
           pattern="^[V|E|J|P]\-[0-9]{5,8}$" #cedula="ngModel" required>
         </div>
 
@@ -48,7 +48,7 @@ <h4 class="modal-title" *ngIf="edit">Editar cliente</h4>
       <div class="form-group">
         <label>Nombre</label>
         <input type="text" class="form-control" id="name"
-        [(ngModel)]="clientemodel.nombre" name="name" maxlength="50"
+        [(ngModel)]="clientemodel.first_name" name="name" maxlength="50"
         pattern="[a-zA-Z]*" #name="ngModel" required>
       </div>
 
@@ -65,7 +65,7 @@ <h4 class="modal-title" *ngIf="edit">Editar cliente</h4>
       <div class="form-group">
         <label>Apellido</label>
         <input type="text" class="form-control" id="last_name"
-        [(ngModel)]="clientemodel.apellido" name="last_name" maxlength="50"
+        [(ngModel)]="clientemodel.last_name" name="last_name" maxlength="50"
         pattern="[a-zA-Z]*" #last_name="ngModel" required>
       </div>
 
@@ -82,7 +82,7 @@ <h4 class="modal-title" *ngIf="edit">Editar cliente</h4>
       <div class="form-group">
         <label>Teléfono</label>
         <input type="text" class="form-control" id="phone"
-        [(ngModel)]="clientemodel.telefono" name="phone" maxlength="15"
+        [(ngModel)]="clientemodel.phone_number" name="phone" maxlength="15"
         pattern="^[(]?\d{3}[)]?\s?-?\s?\d{3}\s?-?\s?\d{4}$" #phone="ngModel" required>
       </div>
         <div *ngIf="phone.invalid && (phone.dirty || phone.touched)"
@@ -114,7 +114,7 @@ <h4 class="modal-title" *ngIf="edit">Editar cliente</h4>
     </button>
   </div>
   <div class="modal-body">
-    Estas que seguro que deseas eliminar al cliente {{clientemodel.nombre}}?
+    Estas que seguro que deseas eliminar al cliente {{clientemodel.first_name}}?
   </div>
   <div class="modal-footer">
     <button class="btn btn-danger" (click)="onDeleteConfirm(clientemodel)">Eliminar</button>
diff --git a/src/app/pages/catalog/clients/clients.component.ts b/src/app/pages/catalog/clients/clients.component.ts
index 2e5226a..7d56aea 100644
--- a/src/app/pages/catalog/clients/clients.component.ts
+++ b/src/app/pages/catalog/clients/clients.component.ts
@@ -40,20 +40,20 @@ export class ClientsComponent {
       deleteButtonContent: '<i class="nb-trash"></i>'
     },
     columns: {
-      cedula: {
+      id_document: {
         title: 'Cédula',
         type: 'string',
         editable: false
       },
-      nombre: {
+      first_name: {
         title: 'Nombre',
         type: 'string',
       },
-      apellido: {
+      last_name: {
         title: 'Apellido',
         type: 'string',
       },
-      telefono: {
+      phone_number: {
         title: 'Teléfono',
         type: 'string',
       },
diff --git a/src/app/pages/catalog/clients/clients.model.ts b/src/app/pages/catalog/clients/clients.model.ts
index b70d411..589d21c 100644
--- a/src/app/pages/catalog/clients/clients.model.ts
+++ b/src/app/pages/catalog/clients/clients.model.ts
@@ -3,8 +3,8 @@
  * @class Clientmodel
  */
 export class Clientmodel {
-    cedula: string;
-    nombre: string;
-    apellido: string;
-    telefono: string
+    id_document: string;
+    first_name: string;
+    last_name: string;
+    phone_number: string
 }
\ No newline at end of file
diff --git a/src/app/pages/catalog/clients/clients.service.ts b/src/app/pages/catalog/clients/clients.service.ts
index 44c6a89..3b75d83 100644
--- a/src/app/pages/catalog/clients/clients.service.ts
+++ b/src/app/pages/catalog/clients/clients.service.ts
@@ -39,7 +39,7 @@ export class ClientService {
      * @memberof ClientService
      */
     getClients():Observable<any>{
-        let apiURL =  `${this.API_URL}/cliente/`
+        let apiURL =  `${this.API_URL}/client/`
         return this.http.get<Clientmodel[]>(apiURL).pipe(
             tap(clients => console.log("Fetched clients")),
             catchError(this.handleError('getClients'))
@@ -55,7 +55,7 @@ export class ClientService {
      * @memberof ClientService
      */
     addClient(client: Clientmodel):Observable<any>{
-        let apiURL =  `${this.API_URL}/cliente/`
+        let apiURL =  `${this.API_URL}/client/`
         return this.http.post<Clientmodel>(apiURL, client, httpOptions).pipe(
             tap((client: Clientmodel) => console.log("Client added")),
             catchError(this.handleError<any>('addClient'))
@@ -71,9 +71,9 @@ export class ClientService {
      * @memberof ClientService
      */
     updateClient(client: Clientmodel):Observable<any>{
-        let apiURL =  `${this.API_URL}/cliente/${client.cedula}/`
+        let apiURL =  `${this.API_URL}/client/${client.id_document}/`
         return this.http.put(apiURL, client, httpOptions).pipe(
-            tap(_ => console.log(`update client ${client.cedula}`)),
+            tap(_ => console.log(`update client ${client.id_document}`)),
             catchError(this.handleError<any>('updateClient'))
         )
     }
@@ -87,9 +87,9 @@ export class ClientService {
      * @memberof ClientService
      */
     deleteClient(client: Clientmodel):Observable<any>{
-        let apiURL = `${this.API_URL}/cliente/${client.cedula}/`
+        let apiURL = `${this.API_URL}/client/${client.id_document}/`
         return this.http.delete<Clientmodel>(apiURL, httpOptions).pipe(
-            tap(_ => console.log(`delete client ${client.cedula}`)),
+            tap(_ => console.log(`delete client ${client.id_document}`)),
             catchError(this.handleError<any>('deleteClient'))
         )
     }