Skip to content
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.

Sign up for GitHub

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

[HRIS-425] - [Improvements] Additional Function for Export: Cut-off Filter for DTR #328

Merged
merged 3 commits into from
Nov 18, 2024
Merged

[HRIS-425] - [Improvements] Additional Function for Export: Cut-off Filter for DTR #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
969fe4c
fixed checking errors
Miguel21Monacillo Oct 31, 2024
648d632
Merge branch 'develop' of https://github.com/framgia/sph-hris into hr…
Miguel21Monacillo Nov 12, 2024
a5f9414
removed the unused values
Miguel21Monacillo Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/Schema/Queries/TimeSheetQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public TimeSheetQuery(TimeSheetService timeSheetService)
}

[AdminUser]
public async Task<List<TimeEntryDTO>> GetTimeEntries(String? date, String? status)
public async Task<List<TimeEntryDTO>> GetTimeEntries(String? startDate, String? endDate, String? status)
{
return await _timeSheetService.GetAll(date, status);
return await _timeSheetService.GetAll(startDate, endDate, status);
}

[AdminUser]
Expand Down
14 changes: 6 additions & 8 deletions api/Services/TimeSheetService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static TimeEntryDTO ToTimeEntryDTO(TimeEntry timeEntry, List<Leave> leave
}
}

public async Task<List<TimeEntryDTO>> GetAll(String? date = null, String? status = null)
public async Task<List<TimeEntryDTO>> GetAll(String? startDate = null, String? endDate = null, String? status = null)
{
var domain = _httpService.getDomainURL();
using (HrisContext context = _contextFactory.CreateDbContext())
Expand All @@ -159,16 +159,14 @@ public async Task<List<TimeEntryDTO>> GetAll(String? date = null, String? status
.Select(entry => ToTimeEntryDTO(entry, leaves, domain, null, null))
.ToListAsync();

if (date != null)
if (!string.IsNullOrEmpty(startDate) && !string.IsNullOrEmpty(endDate))
{
var filterDate = from entry in entries
where DateOnly.Parse(date).CompareTo(entry.Date) == 0
select entry;

entries = filterDate.ToList();

var start = DateOnly.Parse(startDate);
var end = DateOnly.Parse(endDate);
entries = entries.Where(entry => entry.Date >= start && entry.Date <= end).ToList();
}


if (status != null)
{
var filterStatus = from entry in entries
Expand Down
121 changes: 120 additions & 1 deletion client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"apexcharts": "^3.36.3",
"classnames": "^2.3.2",
"cookies-next": "^2.1.1",
"date-fns": "^4.1.0",
"emoji-mart": "^5.5.2",
"framer-motion": "^10.0.1",
"graphql": "^16.6.0",
Expand All @@ -34,10 +35,11 @@
"next-auth": "^4.18.8",
"nextjs-progressbar": "^0.0.16",
"rc-tooltip": "^5.2.2",
"react": "18.2.0",
"react": "^18.2.0",
"react-apexcharts": "^1.4.0",
"react-confirm-alert": "^3.0.6",
"react-csv": "^2.2.2",
"react-date-range": "^2.0.1",
"react-dom": "18.2.0",
"react-feather": "^2.0.10",
"react-file-icon": "^1.3.0",
Expand All @@ -58,6 +60,7 @@
"@types/node": "18.11.3",
"@types/react": "18.0.21",
"@types/react-csv": "^1.1.10",
"@types/react-date-range": "^1.4.9",
"@types/react-dom": "18.0.6",
"@types/react-file-icon": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^5.47.1",
Expand Down
Loading
Loading