Commit Graph

2535 Commits

Author SHA1 Message Date
cb3d4b711a Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 14:19:16 +03:30
779514f5c0 refactor ValidateExcel method in SalaryAidController to use ValidateExcelRequest model 2026-02-05 14:18:18 +03:30
b69d450a3a Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 13:56:23 +03:30
bc491eec18 add EditDetails endpoint to SalaryAidController for salary aid detail retrieval 2026-02-05 13:55:02 +03:30
c980c627ba Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 12:53:44 +03:30
67910d2fa5 add EditDetails method to SalaryAidController for retrieving salary aid details 2026-02-05 12:50:53 +03:30
8cf960ebd7 Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 12:01:35 +03:30
ad167ea1f4 Merge branch 'Feature/roll-call/client-api' into Main 2026-02-05 12:01:31 +03:30
9475c786d3 add endpoint to remove employee roll calls by date 2026-02-05 11:58:52 +03:30
db32b1e6ea set WorkshopId in search model for salary aid list retrieval 2026-02-05 11:50:23 +03:30
b30a8b0e4d Merge branch 'Feature/roll-call/client-api' into Main 2026-02-05 11:32:47 +03:30
0ba0043751 Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 11:32:44 +03:30
79a9d72b86 rename SalaryAidViewModels property to Items in grouped view models 2026-02-05 11:32:16 +03:30
dddc4b143a add edit functionality for employee roll call details 2026-02-05 11:29:41 +03:30
127d9f7a46 Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 11:06:24 +03:30
a8cb226d20 change list key for salary aid 2026-02-05 11:05:54 +03:30
793b10c6cc Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 10:33:39 +03:30
ffe8fa67e2 refactor salary aid controller to update Excel validation endpoint 2026-02-05 10:33:09 +03:30
a0d2023a6c add Excel validation for salary aid import and update pagination in salary aid list 2026-02-05 10:32:08 +03:30
gozareshgir
8ff6d8ecc0 Merge branch 'Main' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Main 2026-02-03 19:24:56 +03:30
gozareshgir
c466b68c9a sms report chage 2026-02-03 19:24:44 +03:30
332f58de9b Merge branch 'master' into Main 2026-02-03 17:56:21 +03:30
db0047d3d3 set time get details 2026-02-03 17:54:32 +03:30
ddeb6a7182 Merge branch 'Feature/program-manager/request-additional-time' into Main 2026-02-03 15:53:35 +03:30
77b5c8168e add project details to CreateTimeRequestDetailsResponse and handle section validation 2026-02-03 15:49:47 +03:30
d7731cd7ad Merge branch 'Feature/program-manager/request-additional-time' into Main 2026-02-03 15:25:02 +03:30
cd2c770a9f add parameter in get 2026-02-03 15:17:39 +03:30
gozareshgir
734d0ca692 Merge branch 'Main' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Main 2026-02-03 15:16:55 +03:30
gozareshgir
d07a78a637 Merge branch 'Feature/SmsRepoetApi' into Main 2026-02-03 15:16:48 +03:30
gozareshgir
1ac73f9689 change showStatus signalR 2026-02-03 15:09:50 +03:30
c28bb46aaf Merge remote-tracking branch 'origin/Main' into Main 2026-02-03 14:24:58 +03:30
gozareshgir
d2d95b4fbe fix conflict 2026-02-03 14:21:48 +03:30
gozareshgir
f067d5a7b4 merge from smsReport 2026-02-03 14:21:34 +03:30
gozareshgir
fe8e94f121 merge from master 2026-02-03 14:10:48 +03:30
gozareshgir
c493718452 InstantSms change signalR 2026-02-03 14:08:16 +03:30
dc56df5e0f Merge remote-tracking branch 'origin/Main' into Main 2026-02-03 14:03:05 +03:30
d6e60e2cab Merge branch 'Feature/loan/client-api' into Main 2026-02-03 13:46:00 +03:30
fa4c39904a chnage loan list to new type 2026-02-03 13:44:47 +03:30
gozareshgir
a14a78309e Merge branch 'Feature/SmsRepoetApi' 2026-02-02 19:46:54 +03:30
gozareshgir
4ccade4c7a change sms url 2026-02-02 19:45:51 +03:30
085d138bc5 Merge branch 'Feature/SmsRepoetApi' 2026-02-02 19:19:32 +03:30
gozareshgir
6e74447ccb Merge branch 'Main' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Main 2026-02-02 19:16:55 +03:30
gozareshgir
b65c33c43a test change 2026-02-02 19:16:47 +03:30
0b1cc34008 Merge branch 'Feature/roll-call/client-api' into Main 2026-02-02 19:09:48 +03:30
3dace574ff refactor date parsing method in RollCallCaseHistoryController 2026-02-02 19:08:25 +03:30
bf2a102a55 add Excel export functionality for roll call case history 2026-02-02 19:07:11 +03:30
88744bd4cf add endpoint to download case history as Excel file 2026-02-02 17:54:33 +03:30
0705823157 Merge branch 'Feature/roll-call/client-api' into Main 2026-02-02 17:32:41 +03:30
5942075dd6 refactor roll call case history controller and add total working hours endpoint 2026-02-02 17:31:37 +03:30
61015ae5c1 Merge remote-tracking branch 'origin/master' 2026-02-02 16:54:32 +03:30