-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Move report stats call to platform in dashboard #2907
Merged
Merged
Changes from 41 commits
Commits
Show all changes
54 commits
Select commit
Hold shift + click to select a range
9e33e2c
Minor
bistaastha e0851cd
Update reports.service.ts
bistaastha 510af5d
Minor
bistaastha 3ee6972
Minor
bistaastha 8b6d202
Minor
bistaastha a4c88ba
Update reports.service.spec.ts
bistaastha e1a2cfe
Update reports.service.spec.ts
bistaastha 20433c7
Update view-expense.page.ts
bistaastha 6cd2788
Update view-mileage.page.ts
bistaastha 0f6d646
Update view-per-diem.page.ts
bistaastha f0aa09b
Update reports.service.ts
bistaastha cafd8c3
feat: Move add expenses to platform (#2878)
bistaastha c2a8e74
Minor
bistaastha 94a919d
Minor
bistaastha 5eaefdf
Minor
bistaastha 436ac68
Minor
bistaastha 1943364
Update reports.service.spec.ts
bistaastha c6e9fcc
Update reports.service.ts
bistaastha 597b6f4
Minor
bistaastha bf71e82
Mt push
bistaastha 1272999
Update reports.service.spec.ts
bistaastha d51f7ad
Revert "Minor"
bistaastha ee8d684
Merge branch 'master' into FYLE-86cuqn6db-add-methods-to-get-reports
bistaastha 5ce284f
Merge branch 'master' into FYLE-86cuqn6db-add-methods-to-get-reports
bistaastha c1fe7b0
Update reports.service.ts
bistaastha 109fa15
Rename platform-stats-requesst-param.model.ts to platform-stats-reque…
bistaastha 74be123
Update reports.service.ts
bistaastha bdb940a
Update reports.service.ts
bistaastha 12fa61d
Update reports.service.ts
bistaastha b8e7994
Merge branch 'FYLE-86cuqn6db-add-methods-to-get-reports' into FYLE-86…
bistaastha 4a812b6
Minor
bistaastha 19cb290
Merge branch 'FYLE-86cuqn6db-add-methods-to-get-reports-approvers' of…
bistaastha 1705f10
Minor
bistaastha d6614f4
Minor
bistaastha 70482e5
Minor
bistaastha c7a604f
Minor
bistaastha c11842b
Minor
bistaastha f8ed65d
Minor
bistaastha ce1ea5d
Minor
bistaastha d8e2708
Update dashboard.service.spec.ts
bistaastha 210ba44
Update dashboard.service.ts
bistaastha 7023bbf
fix: fix platform spender reports test coverage (#2950)
bistaastha 1fd28ee
Minor
bistaastha a540c60
Minor
bistaastha f3f4991
Minor
bistaastha d368a85
Minor
bistaastha c6aea75
Minor
bistaastha fd01bbd
Minor
bistaastha b4aca49
Merge branch 'master' into FYLE-86cuqn6db-stats
bistaastha c6f4340
Update reports.service.spec.ts
bistaastha 5aa0259
Minor
bistaastha 35f7595
Merge branch 'FYLE-86cuqn6db-stats' of github.com:fylein/fyle-mobile-…
bistaastha eb3f340
Minor
bistaastha 52b2f57
Update report-stats.data.ts
bistaastha File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
src/app/core/models/platform/v1/platform-stats-request-param.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export interface PlatformStatsRequestParams { | ||
state: string; | ||
} |
9 changes: 9 additions & 0 deletions
9
src/app/core/models/platform/v1/report-stats-response.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
export interface ReportsStatsResponsePlatform { | ||
count: number; | ||
failed_amount: number; | ||
failed_count: number; | ||
processing_amount: number; | ||
processing_count: number; | ||
reimbursable_amount: number; | ||
total_amount: number; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,4 +3,5 @@ export interface ReportsQueryParams { | |
offset?: number; | ||
limit?: number; | ||
order?: string; | ||
id?: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
import { Stats } from './stats.model'; | ||
import { ReportsStatsResponsePlatform } from './platform/v1/report-stats-response.model'; | ||
import { StatsResponse } from './platform/v1/stats-response.model'; | ||
|
||
export interface ReportStats { | ||
draft: Stats; | ||
report: Stats; | ||
approved: Stats; | ||
paymentPending: Stats; | ||
processing: Stats; | ||
draft: ReportsStatsResponsePlatform; | ||
report: ReportsStatsResponsePlatform; | ||
approved: ReportsStatsResponsePlatform; | ||
paymentPending: ReportsStatsResponsePlatform; | ||
processing: ReportsStatsResponsePlatform; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 63 additions & 3 deletions
66
src/app/core/services/platform/v1/approver/reports.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should have processing_amount and processing_count, no?