Commit Graph

1239 Commits

Author SHA1 Message Date
bc6854f8a7 Merge branch 'Feature/institution-contract/verification-modifies' into Main 2025-12-29 19:15:37 +03:30
SamSys
a33d7c019c launchsettnig 2025-12-29 15:08:53 +03:30
61062dba7b Merge branch 'master' into Main
# Conflicts:
#	.github/workflows/dotnet-developPublish.yml
2025-12-29 12:23:29 +03:30
5581e7e013 Merge branch 'Feature/program-manager/test-upload' into Main 2025-12-29 12:18:31 +03:30
d855684cd7 add: implement AutoUpdateDeployStatusCommand for automatic deployment status updates 2025-12-29 12:16:51 +03:30
9e5e8d8e5d refactor: improve code formatting and structure in ProjectController 2025-12-29 11:45:32 +03:30
0b704da21f Merge branch 'Feature/ClientEmployeePageApi' into Main
# Conflicts:
#	CompanyManagment.EFCore/Repository/EmployeeRepository .cs
2025-12-29 11:26:40 +03:30
e8059f98d5 Merge branch 'Feature/program-manager/test-upload' into Main 2025-12-29 10:27:50 +03:30
9eefdd8fd1 add: implement GetProjectDeployBoardDetails endpoint for retrieving project board details 2025-12-29 10:27:23 +03:30
219e64c0f7 add menu 2025-12-29 09:35:33 +03:30
60a1d1cd8e Merge branch 'master' into Main 2025-12-28 19:31:51 +03:30
b42217ed94 Merge branch 'Feature/Excel/instiutiton-contract' 2025-12-28 19:31:14 +03:30
8b6786c09a add route for excel download 2025-12-28 19:20:25 +03:30
45c5d20323 add excel download 2025-12-28 19:17:50 +03:30
SamSys
dc4c8e9a26 get employee List for api completed 2025-12-28 18:45:32 +03:30
0721467abf Merge branch 'Feature/program-manager/test-upload' into Main 2025-12-28 18:33:15 +03:30
ad6f872145 fix: update contract and insurance list links to use dynamic domain 2025-12-28 18:31:13 +03:30
d22805892a Merge branch 'Feature/Insurance/client-api'
# Conflicts:
#	CompanyManagment.EFCore/Repository/InsuranceListRepository.cs
2025-12-28 18:25:14 +03:30
4da496cab8 Merge branch 'Feature/contracts/api' 2025-12-28 13:08:56 +03:30
aa0eae6c83 feat: implement Excel export for institution contracts with categorized tabs 2025-12-28 13:01:40 +03:30
SamSys
0e7cb00a9f Merge branch 'Feature/ClientLeavePageApi' into Main 2025-12-27 17:00:07 +03:30
SamSys
cddaf2f709 changes 2025-12-27 16:58:36 +03:30
SamSys
337cd40a4e LeaveDuration daily and hourly on create modal completed 2025-12-27 16:51:08 +03:30
SamSys
a98300cacd GetHourlyLeaveDuration 2025-12-27 15:49:39 +03:30
SamSys
ee486eb706 mearge from clientleavePageApi 2025-12-27 14:11:16 +03:30
SamSys
daded35ab1 Merge branch 'master' into Feature/ClientLeavePageApi 2025-12-27 14:06:29 +03:30
SamSys
ba778bb519 LeaveListPrint 2025-12-27 14:06:10 +03:30
4c638cbdae add: implement DeployStatus and IsArchived properties in ProjectPhase, and create ProjectDeployBoardListQueryHandler for project deployment management 2025-12-27 13:59:37 +03:30
SamSys
54c67fe8f7 add ListPrint 2025-12-27 12:06:02 +03:30
54e5904951 add from form to verify gateway 2025-12-25 17:16:07 +03:30
SamSys
a638913172 create levave api and get rotating shift api 2025-12-25 16:16:50 +03:30
SamSys
74bd802a3d sms settings frontEnd bug fixed 2025-12-24 18:24:37 +03:30
d80a36ec35 add: create EmployeeController to manage employee selection for workshops 2025-12-24 16:31:32 +03:30
4f0e5a34a4 add: implement reactivation logic for institution contracts and retrieve previous contracts 2025-12-24 15:40:06 +03:30
SamSys
57d13b9bed Merge branch 'Feature/ClientLeavePageApi' into Main 2025-12-24 12:54:18 +03:30
SamSys
69476f3f2d add multiple get list for leaveController 2025-12-24 12:53:06 +03:30
SamSys
4bc65e500d Merge branch 'Feature/ClientLeavePageApi' of https://github.com/samsyntax24/OriginalGozareshgir into Feature/ClientLeavePageApi 2025-12-24 11:53:15 +03:30
2e274dd280 Merge branch 'Feature/ClientLeavePageApi' into Main 2025-12-24 11:18:25 +03:30
07587d162f add: implement PrintAllAsync and PrintOneAsync methods for leave printing functionality 2025-12-24 11:17:53 +03:30
be7fad2cf5 Merge remote-tracking branch 'origin/Feature/ClientLeavePageApi' into Main 2025-12-24 10:19:31 +03:30
a79f9a28fb Merge branch 'master' into Main 2025-12-23 20:40:56 +03:30
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
30b4f52896 add: refactor RollCall application to support asynchronous operations and enhance transaction handling 2025-12-23 20:16:33 +03:30
SamSys
59bbb7aae6 ini leave groupList 2025-12-23 18:15:48 +03:30
SamSys
89de3162de GetLewvList Api 2025-12-23 17:03:54 +03:30
SamSys
4ac51f24b5 marge from master 2025-12-23 15:14:15 +03:30
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
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
46d193b45e Merge branch 'Feature/program-manager/test-upload' 2025-12-22 19:51:49 +03:30