|
|
f76a12d45c
|
Merge branch 'Feature/InstitutionContract/upgrade' into Main
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
|
2025-10-28 13:18:41 +03:30 |
|
|
|
2d5efb62be
|
Merge remote-tracking branch 'origin/Main' into Main
|
2025-10-28 13:17:55 +03:30 |
|
|
|
ef3338c648
|
Merge branch 'Feature/InstitutionContract/print-api' into Main
|
2025-10-28 13:16:04 +03:30 |
|
|
|
595b2c8a2d
|
feat: update verification date and time properties in institution contract model
|
2025-10-28 13:15:46 +03:30 |
|
|
|
fcf2b38457
|
feat: add previous ID handling and price difference validation to institution contract amendment workshops
|
2025-10-28 13:13:55 +03:30 |
|
SamSys
|
82bb932cfc
|
useWebSockets added
|
2025-10-28 13:05:20 +03:30 |
|
SamSys
|
82c2b641fe
|
maarge from InsuranceEmployeeSharecheckout
|
2025-10-27 17:20:38 +03:30 |
|
SamSys
|
3d013cfa60
|
compute insuranceEmployeeShare on checkout
|
2025-10-27 16:41:02 +03:30 |
|
|
|
7b71bd36b1
|
feat: add verification status and amendment tracking to institution contract models
|
2025-10-27 15:22:45 +03:30 |
|
|
|
bdc142d577
|
Merge branch 'Feature/roll-call/admin-report-api' into Main
|
2025-10-27 13:26:57 +03:30 |
|
|
|
5d55118c3c
|
feat: add endpoint to retrieve distinct workshops for roll call reporting
|
2025-10-27 13:25:20 +03:30 |
|
|
|
62900a22a1
|
feat: add amendment verification details retrieval methods and update related classes
|
2025-10-27 11:30:56 +03:30 |
|
|
|
f7b9389f55
|
refactor: comment out unused amendment verification methods in institutionContractController
|
2025-10-26 18:09:00 +03:30 |
|
|
|
1c2ff03c90
|
Merge branch 'Feature/InstitutionContract/upgrade' into Main
|
2025-10-26 18:03:46 +03:30 |
|
|
|
280db87408
|
Merge branch 'Feature/InstitutionContract/print-api'
|
2025-10-26 14:00:18 +03:30 |
|
|
|
e6977b29fc
|
feat: add methods for creating institution contract amendment changes and enhance personnel count handling
|
2025-10-26 14:00:03 +03:30 |
|
|
|
6e902011ca
|
feat: enhance institution contract verification process and update SMS service methods
|
2025-10-26 12:21:14 +03:30 |
|
|
|
7cce903f6e
|
Merge branch 'Feature/InstitutionContract/print-api' into Feature/InstitutionContract/upgrade
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.Application/InstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
|
2025-10-26 12:03:39 +03:30 |
|
|
|
4d6077c93d
|
Merge branch 'refs/heads/master' into Feature/InstitutionContract/upgrade
|
2025-10-26 11:50:48 +03:30 |
|
|
|
83c1985ad9
|
Merge branch 'Feature/roll-call/admin-report-api' into Main
|
2025-10-26 11:24:07 +03:30 |
|
|
|
c5a1e5c274
|
feat: implement RollCallController and enhance workshop roll call reporting functionality
|
2025-10-26 11:23:51 +03:30 |
|
|
|
4c6de6a76f
|
refactor: improve sorting logic in Fine, Loan, and Reward repositories
|
2025-10-25 17:25:08 +03:30 |
|
|
|
e0c247d07b
|
feat: add RollCallController with current day roll call API endpoint
|
2025-10-25 16:18:22 +03:30 |
|
|
|
1a3558df52
|
Merge branch 'refs/heads/Main' into Feature/roll-call/current-day-api
|
2025-10-25 16:18:02 +03:30 |
|
|
|
c36e81e263
|
feat: update InstitutionContractRepository to enhance workshop change tracking and improve data handling
|
2025-10-25 15:23:48 +03:30 |
|
|
|
25c7b67eb5
|
feat: extend SMS service to include contracting party and institution contract IDs in verification link and code methods
|
2025-10-25 14:18:04 +03:30 |
|
|
|
19b390b17d
|
refactor: update employee sorting logic by color for improved clarity
|
2025-10-25 12:08:27 +03:30 |
|
|
|
d3cd7e5b3c
|
Merge branch 'master' into Main
|
2025-10-23 16:50:03 +03:30 |
|
|
|
6b6b0767e3
|
Merge branch 'master' into Feature/InstitutionContract/print-api
|
2025-10-23 16:44:36 +03:30 |
|
|
|
3d86ba401f
|
fix: update IsOldContract logic to handle null and empty workshop groups
|
2025-10-23 16:44:19 +03:30 |
|
|
|
818d88d859
|
feat: update InstitutionContractAmendmentChange to include roll call options and current workshop ID
|
2025-10-23 16:32:45 +03:30 |
|
|
|
6a6e2e532a
|
feat: add print API for institution contracts and include verifier details
|
2025-10-23 14:13:55 +03:30 |
|
|
|
1a70569a36
|
feat: implement amendment completion functionality with payment details
|
2025-10-23 11:44:12 +03:30 |
|
|
|
8d24339f04
|
Merge branch 'master' into Feature/InstitutionContract/upgrade
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
|
2025-10-23 09:29:05 +03:30 |
|
|
|
ca6638d6a3
|
feat: enhance workshop query with additional filtering options and improved mapping
|
2025-10-22 19:26:10 +03:30 |
|
|
|
608fb824dc
|
refactor: remove unnecessary console logging in workshop selection
|
2025-10-22 17:23:17 +03:30 |
|
|
|
4686151bbb
|
Merge branch 'Main'
# Conflicts:
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
|
2025-10-22 17:04:59 +03:30 |
|
|
|
d7fae42e4f
|
Merge remote-tracking branch 'origin/master'
|
2025-10-22 17:01:12 +03:30 |
|
|
|
2cfe480733
|
fix: correct workshop ID reference in employee count calculation
|
2025-10-22 17:00:33 +03:30 |
|
syntax24
|
c574ce534d
|
Insurance Exept include = 0, Employee 1496
|
2025-10-22 16:55:11 +03:30 |
|
|
|
174edbf87d
|
Merge branch 'Feature/InstitutionContract/add-old-edit-api' into Main
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
|
2025-10-22 15:29:43 +03:30 |
|
|
|
a827470831
|
feat: add API for editing old institution contracts with new properties
|
2025-10-22 15:19:17 +03:30 |
|
|
|
bea858d4e7
|
feat: add AmendmentComplete method and request class to InstitutionContractApplication
|
2025-10-22 13:33:30 +03:30 |
|
|
|
c9b61c3fc6
|
fix: validate Georgian date conversion in financial statement application
|
2025-10-22 12:07:26 +03:30 |
|
|
|
45002b88c4
|
fix: update absence terminology to 'عدم حضور' across multiple files
|
2025-10-22 11:18:55 +03:30 |
|
|
|
0bacb24aa2
|
Merge branch 'Feature/InstitutionContract/upgrade' into Main
|
2025-10-21 21:58:25 +03:30 |
|
|
|
7fd8851f71
|
refactor: optimize employee count calculation in InstitutionContractRepository
|
2025-10-21 21:57:04 +03:30 |
|
|
|
bc6ae854f8
|
Merge branch 'Feature/InstitutionContract/upgrade' into Main
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
|
2025-10-21 15:07:16 +03:30 |
|
|
|
68f1f81b53
|
feat: add BSON representation for Id property in InstitutionContractAmendmentTemp
|
2025-10-21 15:05:48 +03:30 |
|
|
|
d4c2ab939e
|
fix: correct workshop ID reference in employee count calculation
|
2025-10-21 14:55:23 +03:30 |
|
