admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,971 Commits 109 Branches 0 Tags
be7fad2cf5ecaf08ddf4e79d663a0b498b9203a2
Commit Graph

1971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahan
be7fad2cf5 Merge remote-tracking branch 'origin/Feature/ClientLeavePageApi' into Main 2025-12-24 10:19:31 +03:30
mahan
a79f9a28fb Merge branch 'master' into Main 2025-12-23 20:40:56 +03:30
mahan
0d4b5774b6 Merge remote-tracking branch 'origin/Main' into Main 
# Conflicts:
#	CompanyManagment.Application/InstitutionContractApplication.cs
#	CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs
 2025-12-23 20:18:37 +03:30
mahan
30b4f52896 add: refactor RollCall application to support asynchronous operations and enhance transaction handling 2025-12-23 20:16:33 +03:30
mahan
134466547e add: enhance InstitutionContractRepository to include employer workshops and left work details 2025-12-23 18:54:10 +03:30
mahan
a191968c15 add: include Installments in InstitutionContractRepository query 2025-12-23 18:16:50 +03:30
mahan
d740c36dc6 add: update ProjectBoardDetailResponse to use TotalTimeMinute and SpentTimeMinute 2025-12-23 17:33:09 +03:30
SamSys
89de3162de GetLewvList Api 2025-12-23 17:03:54 +03:30
SamSys
76408c48cf IsAmendment SetPendingWorkflow ... 2025-12-23 15:31:12 +03:30
SamSys
4ac51f24b5 marge from master 2025-12-23 15:14:15 +03:30
SamSys
132c8ac5a4 init 2025-12-23 15:10:17 +03:30
SamSys
f00fde4084 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-12-23 13:47:25 +03:30
SamSys
e8b3700cdf GetList PlanPercentage CountAsync 2025-12-23 13:46:59 +03:30
mahan
0ca35e3295 Merge remote-tracking branch 'origin/master' 2025-12-23 11:51:47 +03:30
mahan
ed121e9ade fix: correct typo in CountPerson property reference in PlanPercentageRepository 2025-12-23 11:34:15 +03:30
mahan
548aefb8e1 Merge branch 'ServiceAmountManagmentApi' into Main 
# Conflicts:
#	CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs
 2025-12-23 11:33:32 +03:30
mahan
223c2bde21 refactor: clean up whitespace and improve query filtering in PlanPercentageRepository 2025-12-23 11:32:46 +03:30
mahan
a1736fa3cc refactor: clean up InstitutionContractApplication and remove unused properties from InstitutionContractPrintViewModel 2025-12-23 11:20:10 +03:30
mahan
62f6817640 Merge remote-tracking branch 'origin/Main' into Main 
# Conflicts:
#	Company.Domain/InstitutionContractAgg/InstitutionContract.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	CompanyManagment.Application/InstitutionContractApplication.cs
#	ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
 2025-12-23 11:13:46 +03:30
mahan
f17b566957 fix: update TotalCount calculation in PagedResult to use correct count from plans 2025-12-23 10:59:00 +03:30
mahan
1a91743916 add: update CalculateDiscount method to include contractStart parameter 2025-12-23 10:50:11 +03:30
SamSys
dd68473150 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-12-23 04:18:08 +03:30
SamSys
72e3859d2c next ui upload from wbe completed 2025-12-23 04:17:52 +03:30
mahan
46d193b45e Merge branch 'Feature/program-manager/test-upload' 2025-12-22 19:51:49 +03:30
mahan
1bfe41418b add: enhance ProjectBoardDetailResponse to include RemainingTime and user time details 2025-12-22 19:51:21 +03:30
mahan
6a446d5972 add: implement AutoStopOverTimeTaskSections command and related functionality 2025-12-22 19:13:34 +03:30
Mahan Chamani
acec101c4c Update deployment password in workflow file 2025-12-22 18:24:02 +03:30
SamSys
27edcc5f7b changed 2025-12-22 17:48:04 +03:30
SamSys
7d92321d1c Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-12-22 17:46:31 +03:30
SamSys
19f78a230c change 2025-12-22 17:46:02 +03:30
mahan
0e91e6f287 Merge remote-tracking branch 'origin/master' 2025-12-22 17:44:20 +03:30
mahan
9df56ee19b Merge branch 'Feature/institution-contract/verify-mannually' 2025-12-22 17:44:04 +03:30
mahan
8750604d96 feat: add financial transaction handling during institution contract verification 2025-12-22 17:43:32 +03:30
mahan
f27ce460fd feat: integrate RollCallService repository into InstitutionContractApplication and WorkshopApplication 2025-12-22 17:33:37 +03:30
SamSys
934019c6c6 InsuranceNotCreated tab backend changed 2025-12-22 16:34:42 +03:30
SamSys
21b69edf93 merg from ServiceAmountsmanagment 2025-12-22 14:22:38 +03:30
SamSys
82bf10c2d5 ServiceAmount GetList 2025-12-22 14:21:01 +03:30
SamSys
68b42c98d6 changes 2025-12-22 13:24:53 +03:30
SamSys
f13688ccb2 changes 2025-12-22 13:24:44 +03:30
SamSys
bb9074df34 merge from ServiceAmountsManagment 2025-12-22 13:24:03 +03:30
SamSys
19a72ac78d load data and create service percentage 2025-12-22 12:35:51 +03:30
SamSys
9cb42b7cef background job changed 2025-12-22 11:16:50 +03:30
mahan
1a6248f15d Merge branch 'Feature/Insurance/client-api' into Main 2025-12-21 11:03:49 +03:30
mahan
8e5d4c312e fix: correct spelling of 'Month' and enhance insurance client list retrieval with additional properties 2025-12-21 11:03:23 +03:30
mahan
12fab5a9a5 add {id:guid} convention for controllers 2025-12-20 20:57:34 +03:30
mahan
20dd8f64f4 add: include OneMonthWithoutTax and OneMonthTax properties in InstitutionContractPrintViewModel 2025-12-20 20:28:08 +03:30
mahan
b827493306 refactor: remove unused discount-related classes from IInstitutionContractApplicationpnpm 2025-12-20 20:12:31 +03:30
mahan
04c65eae93 Merge branch 'Feature/institution-contract/print' 
# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
 2025-12-20 20:10:30 +03:30
mahan
b4526a4338 Merge branch 'Feature/institution-contract/verify-mannually' 2025-12-20 20:09:13 +03:30
mahan
2d879ce80a fix: update workshop identification logic in InstitutionContractApplication 2025-12-20 20:06:28 +03:30