|
@ -31,20 +31,19 @@ export class CreateAssetProfileDialog implements OnInit, OnDestroy { |
|
|
public readonly adminService: AdminService, |
|
|
public readonly adminService: AdminService, |
|
|
public readonly changeDetectorRef: ChangeDetectorRef, |
|
|
public readonly changeDetectorRef: ChangeDetectorRef, |
|
|
public readonly dialogRef: MatDialogRef<CreateAssetProfileDialog>, |
|
|
public readonly dialogRef: MatDialogRef<CreateAssetProfileDialog>, |
|
|
public readonly formBuilder: FormBuilder, |
|
|
public readonly formBuilder: FormBuilder |
|
|
|
|
|
|
|
|
) {} |
|
|
) {} |
|
|
|
|
|
|
|
|
public ngOnInit() { |
|
|
public ngOnInit() { |
|
|
|
|
|
this.createAssetProfileForm = this.formBuilder.group( |
|
|
|
|
|
{ |
|
|
this.createAssetProfileForm = this.formBuilder.group({ |
|
|
searchSymbol: new FormControl(null, [Validators.required]), |
|
|
searchSymbol: new FormControl(null, [Validators.required]), |
|
|
addSymbol: new FormControl(null, [Validators.required]) |
|
|
addSymbol: new FormControl(null, [Validators.required]) |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
validators: atLeastOneValid |
|
|
validators: atLeastOneValid, |
|
|
} |
|
|
}); |
|
|
); |
|
|
|
|
|
|
|
|
this.selectedOption = 'auto'; |
|
|
this.selectedOption = 'auto'; |
|
|
} |
|
|
} |
|
@ -58,18 +57,19 @@ export class CreateAssetProfileDialog implements OnInit, OnDestroy { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public onSubmit() { |
|
|
public onSubmit() { |
|
|
console.log(this.createAssetProfileForm.controls['addSymbol'].value) |
|
|
console.log(this.createAssetProfileForm.controls['addSymbol'].value); |
|
|
this.selectedOption==='auto'? |
|
|
this.selectedOption === 'auto' |
|
|
this.dialogRef.close({ |
|
|
? this.dialogRef.close({ |
|
|
dataSource: |
|
|
dataSource: |
|
|
this.createAssetProfileForm.controls['searchSymbol'].value.dataSource, |
|
|
this.createAssetProfileForm.controls['searchSymbol'].value |
|
|
symbol: this.createAssetProfileForm.controls['searchSymbol'].value.symbol |
|
|
.dataSource, |
|
|
}) |
|
|
symbol: |
|
|
: |
|
|
this.createAssetProfileForm.controls['searchSymbol'].value.symbol |
|
|
this.dialogRef.close({ |
|
|
}) |
|
|
dataSource:"MANUAL", |
|
|
: this.dialogRef.close({ |
|
|
symbol: this.createAssetProfileForm.controls['addSymbol'].value |
|
|
dataSource: 'MANUAL', |
|
|
}) |
|
|
symbol: this.createAssetProfileForm.controls['addSymbol'].value |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public ngOnDestroy() {} |
|
|
public ngOnDestroy() {} |
|
@ -79,11 +79,16 @@ const atLeastOneValid = (control: AbstractControl): ValidationErrors | null => { |
|
|
const searchSymbolControl = control.get('searchSymbol'); |
|
|
const searchSymbolControl = control.get('searchSymbol'); |
|
|
const addSymbolControl = control.get('addSymbol'); |
|
|
const addSymbolControl = control.get('addSymbol'); |
|
|
|
|
|
|
|
|
if(searchSymbolControl.valid && addSymbolControl.valid){ |
|
|
if (searchSymbolControl.valid && addSymbolControl.valid) { |
|
|
return { atLeastOneValid: true }; |
|
|
return { atLeastOneValid: true }; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if ((!searchSymbolControl || !addSymbolControl) || (searchSymbolControl.valid || addSymbolControl.valid)) { |
|
|
if ( |
|
|
|
|
|
!searchSymbolControl || |
|
|
|
|
|
!addSymbolControl || |
|
|
|
|
|
searchSymbolControl.valid || |
|
|
|
|
|
addSymbolControl.valid |
|
|
|
|
|
) { |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|