From f5af60cbbaf01a9fcca78bedb0957a8b9189ab2f Mon Sep 17 00:00:00 2001 From: SahilK-027 Date: Fri, 3 May 2024 11:41:37 +0530 Subject: [PATCH] fix: file name --- src/app/core/mock-data/recently-used.data.ts | 2 +- .../core/models/add-edit-advance-request-form-value.model.ts | 2 +- src/app/core/models/mileage-form-value.model.ts | 2 +- src/app/core/models/per-diem-form-value.model.ts | 2 +- src/app/core/models/project-options.model.ts | 2 +- src/app/core/models/split-expense.model.ts | 2 +- .../v2/{extended-project.model.ts => project-v2.model.ts} | 0 src/app/core/services/projects.service.ts | 2 +- src/app/core/services/recently-used-items.service.ts | 2 +- src/app/core/test-data/projects.spec.data.ts | 2 +- src/app/fyle/add-edit-expense/add-edit-expense.page.ts | 2 +- src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts | 2 +- src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts | 2 +- src/app/fyle/split-expense/split-expense.page.ts | 2 +- .../fy-select-modal/fy-select-project-modal.component.ts | 2 +- .../components/fy-select-project/fy-select-project.component.ts | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename src/app/core/models/v2/{extended-project.model.ts => project-v2.model.ts} (100%) diff --git a/src/app/core/mock-data/recently-used.data.ts b/src/app/core/mock-data/recently-used.data.ts index c8a4d17f72..e2dc285f5e 100644 --- a/src/app/core/mock-data/recently-used.data.ts +++ b/src/app/core/mock-data/recently-used.data.ts @@ -1,5 +1,5 @@ import { RecentlyUsed } from '../models/v1/recently_used.model'; -import { ProjectV2 } from '../models/v2/extended-project.model'; +import { ProjectV2 } from '../models/v2/project-v2.model'; import { Currency, CurrencyName } from '../models/currency.model'; import { CostCenter } from '../models/v1/cost-center.model'; diff --git a/src/app/core/models/add-edit-advance-request-form-value.model.ts b/src/app/core/models/add-edit-advance-request-form-value.model.ts index 93648ccdd9..b753655718 100644 --- a/src/app/core/models/add-edit-advance-request-form-value.model.ts +++ b/src/app/core/models/add-edit-advance-request-form-value.model.ts @@ -1,6 +1,6 @@ import { AdvanceRequestCustomFieldValues } from './advance-request-custom-field-values.model'; import { CurrencyObj } from './currency-obj.model'; -import { ProjectV2 } from './v2/extended-project.model'; +import { ProjectV2 } from './v2/project-v2.model'; export interface AddEditAdvanceRequestFormValue { currencyObj: CurrencyObj; diff --git a/src/app/core/models/mileage-form-value.model.ts b/src/app/core/models/mileage-form-value.model.ts index 1b465bc6af..012fece259 100644 --- a/src/app/core/models/mileage-form-value.model.ts +++ b/src/app/core/models/mileage-form-value.model.ts @@ -5,7 +5,7 @@ import { PlatformMileageRates } from './platform/platform-mileage-rates.model'; import { TxnCustomProperties } from './txn-custom-properties.model'; import { CostCenter } from './v1/cost-center.model'; import { OrgCategory } from './v1/org-category.model'; -import { ProjectV2 } from './v2/extended-project.model'; +import { ProjectV2 } from './v2/project-v2.model'; import { Report } from '../models/platform/v1/report.model'; export interface MileageFormValue { diff --git a/src/app/core/models/per-diem-form-value.model.ts b/src/app/core/models/per-diem-form-value.model.ts index 705ee2d2ec..e5237df121 100644 --- a/src/app/core/models/per-diem-form-value.model.ts +++ b/src/app/core/models/per-diem-form-value.model.ts @@ -5,7 +5,7 @@ import { TxnCustomProperties } from './txn-custom-properties.model'; import { CostCenter } from './v1/cost-center.model'; import { OrgCategory } from './v1/org-category.model'; import { PerDiemRates } from './v1/per-diem-rates.model'; -import { ProjectV2 } from './v2/extended-project.model'; +import { ProjectV2 } from './v2/project-v2.model'; export interface PerDiemFormValue { currencyObj: { diff --git a/src/app/core/models/project-options.model.ts b/src/app/core/models/project-options.model.ts index 3417db5229..482061a07f 100644 --- a/src/app/core/models/project-options.model.ts +++ b/src/app/core/models/project-options.model.ts @@ -1,4 +1,4 @@ -import { ProjectV2 } from './v2/extended-project.model'; +import { ProjectV2 } from './v2/project-v2.model'; export interface ProjectOption { label: string; diff --git a/src/app/core/models/split-expense.model.ts b/src/app/core/models/split-expense.model.ts index 721706f2d2..4d4a3a624d 100644 --- a/src/app/core/models/split-expense.model.ts +++ b/src/app/core/models/split-expense.model.ts @@ -1,4 +1,4 @@ -import { ProjectV2 } from './v2/extended-project.model'; +import { ProjectV2 } from './v2/project-v2.model'; export interface SplitExpense { amount: number; diff --git a/src/app/core/models/v2/extended-project.model.ts b/src/app/core/models/v2/project-v2.model.ts similarity index 100% rename from src/app/core/models/v2/extended-project.model.ts rename to src/app/core/models/v2/project-v2.model.ts diff --git a/src/app/core/services/projects.service.ts b/src/app/core/services/projects.service.ts index e67669cda4..7b4b8d7081 100644 --- a/src/app/core/services/projects.service.ts +++ b/src/app/core/services/projects.service.ts @@ -4,7 +4,7 @@ import { ApiV2Service } from './api-v2.service'; import { map } from 'rxjs/operators'; import { Cacheable } from 'ts-cacheable'; import { Observable } from 'rxjs'; -import { ProjectV2 } from '../models/v2/extended-project.model'; +import { ProjectV2 } from '../models/v2/project-v2.model'; import { ProjectV1 } from '../models/v1/extended-project.model'; import { ProjectParams } from '../models/project-params.model'; import { intersection } from 'lodash'; diff --git a/src/app/core/services/recently-used-items.service.ts b/src/app/core/services/recently-used-items.service.ts index 03b8da5220..31521d1ac5 100644 --- a/src/app/core/services/recently-used-items.service.ts +++ b/src/app/core/services/recently-used-items.service.ts @@ -5,7 +5,7 @@ import { RecentlyUsed } from '../models/v1/recently_used.model'; import { ApiService } from './api.service'; import { ProjectsService } from 'src/app/core/services/projects.service'; import { map } from 'rxjs/operators'; -import { ProjectV2 } from '../models/v2/extended-project.model'; +import { ProjectV2 } from '../models/v2/project-v2.model'; import { ExtendedOrgUser } from '../models/extended-org-user.model'; import { OrgCategoryListItem } from '../models/v1/org-category.model'; import { Currency, CurrencyName } from '../models/currency.model'; diff --git a/src/app/core/test-data/projects.spec.data.ts b/src/app/core/test-data/projects.spec.data.ts index beddaa9b79..9237864820 100644 --- a/src/app/core/test-data/projects.spec.data.ts +++ b/src/app/core/test-data/projects.spec.data.ts @@ -1,7 +1,7 @@ import { ProjectParams } from '../models/project-params.model'; import { ProjectV1 } from '../models/v1/extended-project.model'; import { OrgCategory, OrgCategoryListItem } from '../models/v1/org-category.model'; -import { ProjectV2 } from '../models/v2/extended-project.model'; +import { ProjectV2 } from '../models/v2/project-v2.model'; export const apiResponseActiveOnly = [ { diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts index e1ddbb82f7..fd482e4429 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts @@ -83,7 +83,7 @@ import { OrgCategory, OrgCategoryListItem } from 'src/app/core/models/v1/org-cat import { RecentlyUsed } from 'src/app/core/models/v1/recently_used.model'; import { Transaction } from 'src/app/core/models/v1/transaction.model'; import { DuplicateSet } from 'src/app/core/models/v2/duplicate-sets.model'; -import { ProjectV2 } from 'src/app/core/models/v2/extended-project.model'; +import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model'; import { AccountsService } from 'src/app/core/services/accounts.service'; import { AuthService } from 'src/app/core/services/auth.service'; import { CategoriesService } from 'src/app/core/services/categories.service'; diff --git a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts index cad156aa3a..4c5f937feb 100644 --- a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts +++ b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts @@ -63,7 +63,7 @@ import { ExpenseFieldsObj } from 'src/app/core/models/v1/expense-fields-obj.mode import { OrgCategory, OrgCategoryListItem } from 'src/app/core/models/v1/org-category.model'; import { RecentlyUsed } from 'src/app/core/models/v1/recently_used.model'; import { Transaction } from 'src/app/core/models/v1/transaction.model'; -import { ProjectV2 } from 'src/app/core/models/v2/extended-project.model'; +import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model'; import { AccountsService } from 'src/app/core/services/accounts.service'; import { AuthService } from 'src/app/core/services/auth.service'; import { CategoriesService } from 'src/app/core/services/categories.service'; diff --git a/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts b/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts index ab1c3acbd3..5e8d6b7e69 100644 --- a/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts +++ b/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts @@ -62,7 +62,7 @@ import { TrackingService } from '../../core/services/tracking.service'; import { TokenService } from 'src/app/core/services/token.service'; import { RecentlyUsedItemsService } from 'src/app/core/services/recently-used-items.service'; import { RecentlyUsed } from 'src/app/core/models/v1/recently_used.model'; -import { ProjectV2 } from 'src/app/core/models/v2/extended-project.model'; +import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model'; import { CostCenter, CostCenters } from 'src/app/core/models/v1/cost-center.model'; import { ExpenseFieldsService } from 'src/app/core/services/expense-fields.service'; import { ModalPropertiesService } from 'src/app/core/services/modal-properties.service'; diff --git a/src/app/fyle/split-expense/split-expense.page.ts b/src/app/fyle/split-expense/split-expense.page.ts index f4c97b2048..c06e585050 100644 --- a/src/app/fyle/split-expense/split-expense.page.ts +++ b/src/app/fyle/split-expense/split-expense.page.ts @@ -38,7 +38,7 @@ import { SplitExpense } from 'src/app/core/models/split-expense.model'; import { CurrencyObj } from 'src/app/core/models/currency-obj.model'; import { SplitExpenseForm } from 'src/app/core/models/split-expense-form.model'; import { ToastType } from 'src/app/core/enums/toast-type.enum'; -import { ProjectV2 } from 'src/app/core/models/v2/extended-project.model'; +import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model'; import { ExpenseField } from 'src/app/core/models/v1/expense-field.model'; import { SplitExpensePolicy } from 'src/app/core/models/platform/v1/split-expense-policy.model'; import { SplitExpenseMissingFields } from 'src/app/core/models/platform/v1/split-expense-missing-fields.model'; diff --git a/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.ts b/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.ts index 3872bcea21..857130e502 100644 --- a/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.ts +++ b/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.ts @@ -6,7 +6,7 @@ import { isEqual } from 'lodash'; import { ProjectsService } from 'src/app/core/services/projects.service'; import { AuthService } from 'src/app/core/services/auth.service'; import { RecentLocalStorageItemsService } from 'src/app/core/services/recent-local-storage-items.service'; -import { ProjectV2 } from 'src/app/core/models/v2/extended-project.model'; +import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model'; import { UtilityService } from 'src/app/core/services/utility.service'; import { OrgSettingsService } from 'src/app/core/services/org-settings.service'; import { OrgUserSettingsService } from 'src/app/core/services/org-user-settings.service'; diff --git a/src/app/shared/components/fy-select-project/fy-select-project.component.ts b/src/app/shared/components/fy-select-project/fy-select-project.component.ts index d986237a3a..c9f16d19e2 100644 --- a/src/app/shared/components/fy-select-project/fy-select-project.component.ts +++ b/src/app/shared/components/fy-select-project/fy-select-project.component.ts @@ -3,7 +3,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { noop } from 'rxjs'; import { ModalController } from '@ionic/angular'; import { FyProjectSelectModalComponent } from './fy-select-modal/fy-select-project-modal.component'; -import { ProjectV2 } from 'src/app/core/models/v2/extended-project.model'; +import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model'; import { ModalPropertiesService } from 'src/app/core/services/modal-properties.service'; import { ProjectOption } from 'src/app/core/models/project-options.model';