Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

entity details changes update: kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-10-05 18:53:25 +05:30
parent 6156834e9c
commit bd0372b005
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts
View File

@ -97,7 +97,7 @@ export class EntityAddComponent implements OnInit {
initAnswers() { initAnswers() {
return this._formBuilder.group({ return this._formBuilder.group({
contact_person: ['', Validators.compose([Validators.required])], 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])], contact_mobile_no: ['', Validators.compose([Validators.required])],
}); });
} }

2
ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts
View File

@ -123,7 +123,7 @@ public pageTitle: string = "Edit Entity Master Details";
isAct = isAct == null ? 1 : isAct; isAct = isAct == null ? 1 : isAct;
return this._formBuilder.group({ return this._formBuilder.group({
contact_person: [c_person, Validators.compose([Validators.required])], 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])], contact_mobile_no: [e_phn, Validators.compose([Validators.required])],
entity_child_id: [fk_id], entity_child_id: [fk_id],
isactive: [isAct] isactive: [isAct]

2
ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
View File

@ -46,7 +46,7 @@
{{ product.entity_name }} {{ product.entity_name }}
</div> </div>
<div fxFlex="0 1 auto" class="ml-xs" fxFlex="30%"> <div fxFlex="0 1 auto" class="ml-xs" fxFlex="30%">
<div>{{ product.full_name }} ({{product.short_name}})</div> <div><b>{{ product.full_name }} ({{product.short_name}})</b></div>
<div> {{ product.branch_name }} </div> <div> {{ product.branch_name }} </div>
<div> {{product.city_name}}, {{product.state_name}} </div> <div> {{product.city_name}}, {{product.state_name}} </div>
</div> </div>

4
ng6-seed/src/app/settings/settings.module.ts
View File

@ -26,7 +26,7 @@ import { RouterModule } from '@angular/router';
import { SettingsRoutes } from './settings.routing'; import { SettingsRoutes } from './settings.routing';
import { RegisterComponent } from '../session/register/register.component'; import { RegisterComponent } from '../session/register/register.component';
import { UserService } from './service/user.service'; 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 { EntityModule } from './entity/entity.module';
// import { AddEntityComponent } from './entity/add-entity/add-entity.component'; // import { AddEntityComponent } from './entity/add-entity/add-entity.component';
// import { EditEntityComponent } from './entity/edit-entity/edit-entity.component'; // import { EditEntityComponent } from './entity/edit-entity/edit-entity.component';
@ -38,7 +38,7 @@ import { EntityModule } from './entity/entity.module';
imports: [ imports: [
CommonModule, CommonModule,
RouterModule.forChild(SettingsRoutes),MatCardModule, RouterModule.forChild(SettingsRoutes),MatCardModule,
// MastersModule, MastersModule,
EntityModule, EntityModule,
MatIconModule, MatIconModule,
MatInputModule, MatInputModule,

2
ng6-seed/src/app/shared/menu-items/menu-items.ts
View File

@ -34,7 +34,7 @@ const MENUITEMS : Menu[] = [
children:[ children:[
{state:'users',name:'User List'}, {state:'users',name:'User List'},
{state:'mastermodule',name:'Master Details'}, {state:'mastermodule',name:'Master Details'},
// {state:'entitymodule',name:'Entity Type'} {state:'entity',name:'Entity Details'}
] ]
}, },
{ {