diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts index f3d7ebef3..1f5484466 100644 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts @@ -97,7 +97,7 @@ export class EntityAddComponent implements OnInit { initAnswers() { return this._formBuilder.group({ contact_person: ['', Validators.compose([Validators.required])], - contact_email: ['', Validators.compose([Validators.required])], + contact_email: ['', Validators.compose([Validators.required, Validators.email])], contact_mobile_no: ['', Validators.compose([Validators.required])], }); } diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts index d72fe8de7..300fb31a0 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts @@ -123,7 +123,7 @@ public pageTitle: string = "Edit Entity Master Details"; isAct = isAct == null ? 1 : isAct; return this._formBuilder.group({ contact_person: [c_person, Validators.compose([Validators.required])], - contact_email: [c_email, Validators.compose([Validators.required])], + contact_email: [c_email, Validators.compose([Validators.required, Validators.email])], contact_mobile_no: [e_phn, Validators.compose([Validators.required])], entity_child_id: [fk_id], isactive: [isAct] diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index 7326014cf..1f33e28f2 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -46,7 +46,7 @@ {{ product.entity_name }}
-
{{ product.full_name }} ({{product.short_name}})
+
{{ product.full_name }} ({{product.short_name}})
{{ product.branch_name }}
{{product.city_name}}, {{product.state_name}}
diff --git a/ng6-seed/src/app/settings/settings.module.ts b/ng6-seed/src/app/settings/settings.module.ts index 1cb445065..14ffb9cdc 100644 --- a/ng6-seed/src/app/settings/settings.module.ts +++ b/ng6-seed/src/app/settings/settings.module.ts @@ -26,7 +26,7 @@ import { RouterModule } from '@angular/router'; import { SettingsRoutes } from './settings.routing'; import { RegisterComponent } from '../session/register/register.component'; import { UserService } from './service/user.service'; -// import { MastersModule } from './masters/masters.module'; +import { MastersModule } from './masters/masters.module'; // import { EntityModule } from './entity/entity.module'; // import { AddEntityComponent } from './entity/add-entity/add-entity.component'; // import { EditEntityComponent } from './entity/edit-entity/edit-entity.component'; @@ -38,7 +38,7 @@ import { EntityModule } from './entity/entity.module'; imports: [ CommonModule, RouterModule.forChild(SettingsRoutes),MatCardModule, - // MastersModule, + MastersModule, EntityModule, MatIconModule, MatInputModule, diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 2eec5e065..ac9a52283 100644 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -34,7 +34,7 @@ const MENUITEMS : Menu[] = [ children:[ {state:'users',name:'User List'}, {state:'mastermodule',name:'Master Details'}, - // {state:'entitymodule',name:'Entity Type'} + {state:'entity',name:'Entity Details'} ] }, {