Commit Graph

2397 Commits

Author SHA1 Message Date
gozareshgir
8db161f960 fix 2026-01-21 20:00:19 +03:30
gozareshgir
3bb16c02b4 merge from AdminCheckoutApi 2026-01-21 19:57:48 +03:30
gozareshgir
7a79343b2f GetContractsToCreateCheckout Completed 2026-01-21 19:20:15 +03:30
gozareshgir
dfc392f07a Merge branch 'AdminCheckoutApi' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into AdminCheckoutApi 2026-01-21 12:57:41 +03:30
a68b879e95 comment the unfinished rollcall 2026-01-20 19:58:49 +03:30
161f3a92a7 Merge remote-tracking branch 'origin/AdminCheckoutApi' into AdminCheckoutApi
# Conflicts:
#	CompanyManagment.EFCore/Repository/CheckoutRepository.cs
2026-01-20 19:46:23 +03:30
5a1ec104a1 add salary aid and loan for checkout print 2026-01-20 19:44:40 +03:30
gozareshgir
7fc5ac7ccd change 2026-01-20 18:48:00 +03:30
gozareshgir
5b6f967fca workshopSelectList api and employeeSelectlist 2026-01-20 18:17:32 +03:30
gozareshgir
3317bde6d6 checkout group and one print 2026-01-20 14:16:00 +03:30
gozareshgir
5cd30e5910 Checkout Print Api init 2026-01-19 19:12:48 +03:30
gozareshgir
d51e4c462a changes 2026-01-19 13:42:37 +03:30
gozareshgir
4463fdc177 Rotating Shift api completed 2026-01-19 13:41:36 +03:30
gozareshgir
2ce63d1e0f Merge branch 'master' into AdminCheckoutApi 2026-01-19 12:57:57 +03:30
gozareshgir
21302803b6 insurance WorkingDays bug Fixed 2026-01-19 12:32:51 +03:30
gozareshgir
38603b2249 rotatingshift init 2026-01-18 18:54:33 +03:30
gozareshgir
037723ef70 chenage 2026-01-18 18:08:23 +03:30
gozareshgir
7bb507c841 merge from adminCheckoutApi 2026-01-18 18:07:10 +03:30
gozareshgir
bf03247f81 checkout list completed 2026-01-18 15:59:17 +03:30
cb2c6b9ad1 Merge branch 'Feature/roll-call/client-api' into Main 2026-01-18 14:25:01 +03:30
355ec72140 comment excel data 2026-01-18 14:17:23 +03:30
21b3467517 Merge branch 'Fix/program-manager/fix-some-bugs' into Main 2026-01-18 13:20:30 +03:30
e9d0efc52f Merge branch 'Feature/roll-call/client-api' into Main
# Conflicts:
#	CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs
#	CompanyManagment.EFCore/Repository/RollCallRepository.cs
2026-01-18 13:18:27 +03:30
301a8f06f4 Merge branch 'Feature/Checkout/client-api' into Main 2026-01-18 13:15:37 +03:30
63a3027a17 add client checkout list controller 2026-01-18 12:51:58 +03:30
gozareshgir
12af5dcb56 get checkout list init 2026-01-14 16:39:05 +03:30
gozareshgir
8ec13ffae1 Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir 2026-01-14 14:40:50 +03:30
gozareshgir
5508d4e88f Checkout Compute Minuts Base 2026-01-14 14:39:51 +03:30
43abb74c61 Merge branch 'Feature/program-manager/chat'
# Conflicts:
#	ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs
2026-01-14 10:57:07 +03:30
73e6681baa add message type to search query 2026-01-14 10:46:44 +03:30
90fa0ac8f8 change excel download api controller 2026-01-14 10:20:58 +03:30
90b2fd2eab add order for skills in set time 2026-01-14 10:13:57 +03:30
eb8352e8fc add rollcall download excel controller. 2026-01-14 09:37:55 +03:30
4c7599b568 add print to rollcall case history 2026-01-13 18:50:18 +03:30
d179c90c48 change paginated to list 2026-01-13 18:31:10 +03:30
gozareshgir
ae2427473b Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 17:54:43 +03:30
gozareshgir
2fc124bf6d Get Sms Details 2026-01-13 17:35:29 +03:30
gozareshgir
068d34b4b4 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 17:08:58 +03:30
gozareshgir
1d88ca0fbb changes 2026-01-13 17:05:07 +03:30
gozareshgir
e2911dfc2a addnew dto 2026-01-13 17:00:59 +03:30
gozareshgir
377f95561c Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 16:43:29 +03:30
gozareshgir
cfb96d1277 Chenge Post Methods to fromBody 2026-01-13 16:42:50 +03:30
gozareshgir
b5c5be2cb6 change smsResult grouping 2026-01-13 16:26:04 +03:30
8850328fd4 add GetEditDetails controller method 2026-01-13 16:08:13 +03:30
b7172630e2 set orders for projects 2026-01-13 15:49:51 +03:30
gozareshgir
b66dc81688 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 15:35:29 +03:30
gozareshgir
f5c8888137 IsDev mode chak for instant sms 2026-01-13 15:33:08 +03:30
gozareshgir
20ff66da2f Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 15:18:05 +03:30
gozareshgir
4d7923936e InstantSms Send Completed 2026-01-13 15:16:33 +03:30
0604514190 Merge branch 'refs/heads/master' into Fix/program-manager/fix-some-bugs 2026-01-13 14:51:25 +03:30