Browse Source

Add comment to activity

pull/1097/head
Thomas 3 years ago
parent
commit
88219279a5
  1. 3
      apps/api/src/app/export/export.service.ts
  2. 2
      apps/api/src/app/import/import.service.ts
  3. 4
      apps/api/src/app/order/create-order.dto.ts
  4. 4
      apps/api/src/app/order/update-order.dto.ts
  5. 2
      apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
  6. 6
      apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
  7. 2
      prisma/migrations/20220725155238_added_comment_to_order/migration.sql
  8. 1
      prisma/schema.prisma

3
apps/api/src/app/export/export.service.ts

@ -18,6 +18,7 @@ export class ExportService {
orderBy: { date: 'desc' }, orderBy: { date: 'desc' },
select: { select: {
accountId: true, accountId: true,
comment: true,
date: true, date: true,
fee: true, fee: true,
id: true, id: true,
@ -40,6 +41,7 @@ export class ExportService {
activities: activities.map( activities: activities.map(
({ ({
accountId, accountId,
comment,
date, date,
fee, fee,
id, id,
@ -50,6 +52,7 @@ export class ExportService {
}) => { }) => {
return { return {
accountId, accountId,
comment,
fee, fee,
id, id,
quantity, quantity,

2
apps/api/src/app/import/import.service.ts

@ -48,6 +48,7 @@ export class ImportService {
for (const { for (const {
accountId, accountId,
comment,
currency, currency,
dataSource, dataSource,
date, date,
@ -58,6 +59,7 @@ export class ImportService {
unitPrice unitPrice
} of activities) { } of activities) {
await this.orderService.createOrder({ await this.orderService.createOrder({
comment,
fee, fee,
quantity, quantity,
type, type,

4
apps/api/src/app/order/create-order.dto.ts

@ -27,6 +27,10 @@ export class CreateOrderDto {
@IsOptional() @IsOptional()
assetSubClass?: AssetSubClass; assetSubClass?: AssetSubClass;
@IsString()
@IsOptional()
comment?: string;
@IsString() @IsString()
currency: string; currency: string;

4
apps/api/src/app/order/update-order.dto.ts

@ -27,6 +27,10 @@ export class UpdateOrderDto {
@IsOptional() @IsOptional()
assetSubClass?: AssetSubClass; assetSubClass?: AssetSubClass;
@IsString()
@IsOptional()
comment?: string;
@IsString() @IsString()
currency: string; currency: string;

2
apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts

@ -76,6 +76,7 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
accountId: [this.data.activity?.accountId, Validators.required], accountId: [this.data.activity?.accountId, Validators.required],
assetClass: [this.data.activity?.SymbolProfile?.assetClass], assetClass: [this.data.activity?.SymbolProfile?.assetClass],
assetSubClass: [this.data.activity?.SymbolProfile?.assetSubClass], assetSubClass: [this.data.activity?.SymbolProfile?.assetSubClass],
comment: [this.data.activity?.comment],
currency: [ currency: [
this.data.activity?.SymbolProfile?.currency, this.data.activity?.SymbolProfile?.currency,
Validators.required Validators.required
@ -245,6 +246,7 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
accountId: this.activityForm.controls['accountId'].value, accountId: this.activityForm.controls['accountId'].value,
assetClass: this.activityForm.controls['assetClass'].value, assetClass: this.activityForm.controls['assetClass'].value,
assetSubClass: this.activityForm.controls['assetSubClass'].value, assetSubClass: this.activityForm.controls['assetSubClass'].value,
comment: this.activityForm.controls['comment'].value,
currency: this.activityForm.controls['currency'].value, currency: this.activityForm.controls['currency'].value,
date: this.activityForm.controls['date'].value, date: this.activityForm.controls['date'].value,
dataSource: this.activityForm.controls['dataSource'].value, dataSource: this.activityForm.controls['dataSource'].value,

6
apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html

@ -135,6 +135,12 @@
> >
</mat-form-field> </mat-form-field>
</div> </div>
<div>
<mat-form-field appearance="outline" class="w-100">
<mat-label i18n>Comment</mat-label>
<textarea formControlName="comment" matInput></textarea>
</mat-form-field>
</div>
<div <div
[ngClass]="{ 'd-none': activityForm.controls['type']?.value !== 'ITEM' }" [ngClass]="{ 'd-none': activityForm.controls['type']?.value !== 'ITEM' }"
> >

2
prisma/migrations/20220725155238_added_comment_to_order/migration.sql

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "Order" ADD COLUMN "comment" TEXT;

1
prisma/schema.prisma

@ -71,6 +71,7 @@ model Order {
Account Account? @relation(fields: [accountId, accountUserId], references: [id, userId]) Account Account? @relation(fields: [accountId, accountUserId], references: [id, userId])
accountId String? accountId String?
accountUserId String? accountUserId String?
comment String?
createdAt DateTime @default(now()) createdAt DateTime @default(now())
date DateTime date DateTime
fee Float fee Float

Loading…
Cancel
Save