Browse Source

Format checks updated

pull/2479/head
Manushreshta B L 2 years ago
parent
commit
61db525e7c
  1. 10
      apps/api/src/app/admin/admin.service.ts
  2. 1
      apps/api/src/services/data-provider/data-provider.service.ts
  3. 39
      apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
  4. 28
      apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html

10
apps/api/src/app/admin/admin.service.ts

@ -45,10 +45,12 @@ export class AdminService {
symbol
}: UniqueAsset): Promise<SymbolProfile | never> {
try {
if(dataSource==="MANUAL")
return await this.symbolProfileService.add(
{symbol, currency:DEFAULT_CURRENCY, dataSource:"MANUAL"}
);
if (dataSource === 'MANUAL')
return await this.symbolProfileService.add({
symbol,
currency: DEFAULT_CURRENCY,
dataSource: 'MANUAL'
});
const assetProfiles = await this.dataProviderService.getAssetProfiles([
{ dataSource, symbol }

1
apps/api/src/services/data-provider/data-provider.service.ts

@ -15,6 +15,7 @@ import { UniqueAsset } from '@ghostfolio/common/interfaces';
import type { Granularity, UserWithSettings } from '@ghostfolio/common/types';
import { Inject, Injectable, Logger } from '@nestjs/common';
import { DataSource, MarketData, SymbolProfile } from '@prisma/client';
import { data } from 'cheerio/lib/api/attributes';
import { format, isValid } from 'date-fns';
import { groupBy, isEmpty, isNumber } from 'lodash';

39
apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts

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

28
apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html

@ -7,9 +7,24 @@
<h1 i18n mat-dialog-title>Add Asset Profile</h1>
<div class="flex-grow-1 py-3" mat-dialog-content>
<div class="my-2">
<mat-radio-group [(ngModel)]="selectedOption" name="radioOptions">
<div class="flex"><mat-radio-button [checked]="selectedOption==='auto'" value="auto" (click)="onRadioChange('auto')" name="auto"></mat-radio-button><label for="auto">Search</label></div>
<div class="flex"><mat-radio-button value="manual" (click)="onRadioChange('manual')" name="manual"></mat-radio-button><label for="auto">Add Manually</label></div>
<mat-radio-group name="radioOptions" [(ngModel)]="selectedOption">
<div class="flex">
<mat-radio-button
name="auto"
value="auto"
[checked]="selectedOption==='auto'"
(click)="onRadioChange('auto')"
></mat-radio-button
><label for="auto">Search</label>
</div>
<div class="flex">
<mat-radio-button
name="manual"
value="manual"
(click)="onRadioChange('manual')"
></mat-radio-button
><label for="auto">Add Manually</label>
</div>
</mat-radio-group>
</div>
@ -25,10 +40,13 @@
<div *ngIf="selectedOption === 'manual'">
<mat-form-field appearance="outline" class="w-100">
<mat-label>Symbol</mat-label>
<input matInput formControlName="addSymbol" placeholder="Enter symbol"/>
<input
formControlName="addSymbol"
matInput
placeholder="Enter symbol"
/>
</mat-form-field>
</div>
</div>
<div class="d-flex justify-content-end" mat-dialog-actions>
<button i18n mat-button type="button" (click)="onCancel()">Cancel</button>

Loading…
Cancel
Save