Skip to content

Commit

Permalink
feat: Move tasks, My Expenses, add expenses to report popup and creat…
Browse files Browse the repository at this point in the history
…e report to platform (#2952)
  • Loading branch information
bistaastha committed May 14, 2024
1 parent 53c7020 commit 9b4dd6a
Show file tree
Hide file tree
Showing 26 changed files with 705 additions and 983 deletions.
12 changes: 0 additions & 12 deletions src/app/core/mock-data/modal-controller.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { filterOptions1 } from './filter.data';
import { selectedFilters1, selectedFilters4, taskSelectedFiltersData } from './selected-filters.data';
import { FilterOptionType } from 'src/app/shared/components/fy-filters/filter-option-type.enum';
import { CreateNewReportComponent as createReportV2 } from 'src/app/shared/components/create-new-report-v2/create-new-report.component';
import { CreateNewReportComponent } from 'src/app/shared/components/create-new-report/create-new-report.component';
import { Mode } from '@ionic/core';
import { fyModalProperties } from './model-properties.data';
import { AddTxnToReportDialogComponent as v2 } from 'src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component';
Expand All @@ -21,8 +20,6 @@ import { advanceRequestFileUrlData2, fileObject4 } from './file-object.data';
import { ViewCommentComponent } from 'src/app/shared/components/comments-history/view-comment/view-comment.component';
import { FyPopoverComponent } from 'src/app/shared/components/fy-popover/fy-popover.component';
import { VirtualSelectModalComponent } from 'src/app/shared/components/virtual-select/virtual-select-modal/virtual-select-modal.component';

import { apiExpenseRes } from './expense.data';
import { apiExpenses1 } from './platform/v1/expense.data';

export const modalControllerParams = {
Expand Down Expand Up @@ -57,15 +54,6 @@ export const modalControllerParams2 = {
cssClass: 'dialog-popover',
};

export const newReportModalParams = {
component: CreateNewReportComponent,
componentProps: {
selectedExpensesToReport: apiExpenseRes,
},
mode: <Mode>'ios',
...fyModalProperties,
};

export const newReportModalParams2 = {
component: createReportV2,
componentProps: {
Expand Down
6 changes: 6 additions & 0 deletions src/app/core/mock-data/option.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export const optionData1: Option[] = deepFreeze([
created_at: new Date('2023-07-11T06:19:28.260142+00:00'),
currency: 'USD',
employee: {
org_name: 'Staging Loaded',
level: null,
mobile: '123456098',
ach_account: {
added: true,
verified: null,
Expand Down Expand Up @@ -77,6 +80,9 @@ export const optionData1: Option[] = deepFreeze([
created_at: new Date('2023-07-11T06:19:28.260142+00:00'),
currency: 'USD',
employee: {
org_name: 'Staging Loaded',
level: null,
mobile: '123456098',
ach_account: {
added: true,
verified: null,
Expand Down
Loading

0 comments on commit 9b4dd6a

Please sign in to comment.