diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss index ce799dd58..3b58d3c81 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss @@ -5,7 +5,7 @@ margin-top: -5px; display: block; } -:host /deep/ { +:host { mat-sidenav { max-width: 400px; max-height: 500px; diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss index c3a4529d4..fa93a7e63 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss @@ -5,7 +5,7 @@ margin-top: -5px; display: block; } -:host /deep/ { +:host { // mat-sidenav { // max-width: 400px; // max-height: 500px; diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 802277039..c6e5c4532 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -164,7 +164,7 @@ Designation is Required - + @@ -174,7 +174,8 @@ - + + Select diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index 1f65cd0ec..5c01337d7 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -74,6 +74,7 @@ export class RegisterComponent implements OnInit { configdata: any; shortname: any; vendorlist: any; + vendor: boolean; constructor( private router: Router, public fb: FormBuilder,public cb: FormBuilder, public AWS: AwsService, private cd: ChangeDetectorRef ,private elementRef: ElementRef,public users:UserService,notifier:NotifierService,private dialog: MatDialog) { @@ -331,6 +332,13 @@ console.log("cog",userData,this.usersData) this.visible = false; // alert(this.visible); } + if(e.role_id=='28' ||e.role_id=='29') + { + this.vendor=true; + } + else{ + this.vendor=false; + } // if(e.value){ @@ -396,7 +404,7 @@ getBranch(flag?){ if(this.types[0].entity_type_id == '2' && this.regForm.value.lenVenName.short_name == 'MWISE') { //this.regForm.addControl('user_config',this.addUserConfigControls()) this.regForm.addControl('designation',new FormControl('',Validators.required)) - this.regForm.addControl('smc_agency_id',new FormControl('',Validators.required)) + this.regForm.addControl('smc_agency_id',new FormControl('')) this.getvendor() this.users.getEntityPreferences(this.regForm.value.lenVenName.entity_id).subscribe(res=>{ if(res['dataStatus']) { diff --git a/ng6-seed/src/assets/styles/scss/components/_messages.scss b/ng6-seed/src/assets/styles/scss/components/_messages.scss index 2767914d0..56cad7b4a 100755 --- a/ng6-seed/src/assets/styles/scss/components/_messages.scss +++ b/ng6-seed/src/assets/styles/scss/components/_messages.scss @@ -2,7 +2,7 @@ @import "../mixins/bi-app/bi-app-ltr"; @import "../app.variables"; @import "../mixins"; -:host /deep/ { +:host { [appAccordionToggle] { cursor: pointer; } @@ -86,7 +86,7 @@ } } -.app-dark :host /deep/ { +.app-dark :host { .messages-list { .mat-list-item { background: mat-color($dark-background, card); @@ -95,7 +95,7 @@ } } -[dir="rtl"] :host /deep/ { +[dir="rtl"] :host { .messages-nav { mat-icon { margin-right: 0;