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

1218 Commits

Author SHA1 Message Date
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
SamSys
54c67fe8f7 add ListPrint 2025-12-27 12:06:02 +03:30
mahan
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
mahan
d80a36ec35 add: create EmployeeController to manage employee selection for workshops 2025-12-24 16:31:32 +03:30
mahan
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
mahan
2e274dd280 Merge branch 'Feature/ClientLeavePageApi' into Main 2025-12-24 11:18:25 +03:30
mahan
07587d162f add: implement PrintAllAsync and PrintOneAsync methods for leave printing functionality 2025-12-24 11:17:53 +03:30
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
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
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
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
6a446d5972 add: implement AutoStopOverTimeTaskSections command and related functionality 2025-12-22 19:13:34 +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
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
mahan
12fab5a9a5 add {id:guid} convention for controllers 2025-12-20 20:57:34 +03:30
mahan
b4526a4338 Merge branch 'Feature/institution-contract/verify-mannually' 2025-12-20 20:09:13 +03:30
mahan
18da3221d7 Merge branch 'Feature/institution-contract/print' into Main 
# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
 2025-12-20 19:21:16 +03:30
SamSys
5bdfbc572b add next deploy and contractingParty add to workshop on AndroidApk page 2025-12-20 18:42:53 +03:30
mahan
186cb95c70 refactor: remove unused discount-related classes and update workshop ID handling 2025-12-20 18:37:44 +03:30
mahan
b1f9bc98ba Merge branch 'Feature/institution-contract/verify-mannually' into Main 
# Conflicts:
#	Company.Domain/InstitutionContractAgg/InstitutionContract.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
 2025-12-20 18:33:39 +03:30
mahan
4385a65cbc feat: add manual verification endpoint for institution contracts 2025-12-20 18:27:59 +03:30
mahan
722f8dae7c feat: implement manual verification for institution contracts and add signing type handling 2025-12-20 18:27:17 +03:30
SamSys
07113353c4 add uploadFrontEnd btn to AndroidApk page 2025-12-20 16:01:07 +03:30
mahan
93ee88ba46 Merge branch 'Feature/contracts/api' into Main 2025-12-20 15:52:32 +03:30
mahan
4b39994de6 feat: add API endpoint for printing multiple contracts 2025-12-20 15:50:34 +03:30