SamSys
|
10e7400611
|
test moda completed
|
2025-11-02 19:11:04 +03:30 |
|
SamSys
|
23c99e60d5
|
ClassificationEmployee add to group or edit membrize completed
|
2025-10-26 19:10:20 +03:30 |
|
SamSys
|
490393acbc
|
ClassficationScheme > EditSalariesAndCoefficient front completed
|
2025-10-25 01:32:09 +03:30 |
|
SamSys
|
c6874b33cf
|
ClassificationSalariestab and create front completed
|
2025-10-19 23:11:39 +03:30 |
|
SamSys
|
596e21b712
|
craetejobs modal front
|
2025-10-14 04:21:50 +03:30 |
|
SamSys
|
fc3053dd17
|
Merge branch 'master' into WorskhopClassifiedPlan
|
2025-10-11 15:10:12 +03:30 |
|
|
|
7a58423eb3
|
feat: implement "GetNotCreatedWorkshop" method and update related functionality in InsuranceList
|
2025-10-09 14:30:09 +03:30 |
|
|
|
70164ae498
|
feat: add "GetNotCreatedWorkshop" method to InsuranceList functionality
|
2025-10-09 13:47:43 +03:30 |
|
SamSys
|
849369fea3
|
GroupAndJobs tab Query
|
2025-10-08 17:41:23 +03:30 |
|
SamSys
|
283f66ab32
|
Merge branch 'master' into WorskhopClassifiedPlan
|
2025-10-07 17:36:14 +03:30 |
|
SamSys
|
abf00884a4
|
Create ClassificationGroup With CreateScheme - EditScheme
|
2025-10-07 01:38:01 +03:30 |
|
|
|
21df40af3b
|
add isInvalid to leave entity - set query filter for it
|
2025-10-06 19:50:42 +03:30 |
|
SamSys
|
a3dc27f08e
|
SchemeTab, create scheme , scheme list
|
2025-10-06 13:26:36 +03:30 |
|
SamSys
|
055ce2b2a7
|
merge from master
|
2025-10-04 16:35:11 +03:30 |
|
SamSys
|
8171e06965
|
Create razorPage for classificationScheme , add isClassificationCompleted bool to workshop Table
|
2025-09-30 21:20:05 +03:30 |
|
SamSys
|
8044d64d5e
|
Classification tables Mapping
|
2025-09-18 05:16:00 +03:30 |
|
SamSys
|
1ef86d5e9c
|
Classification Tables Designed
|
2025-09-16 05:26:20 +03:30 |
|
SamSys
|
b3cf56eb1c
|
conflict Fixed
|
2025-09-16 03:01:41 +03:30 |
|
SamSys
|
20dbd0121f
|
Merge From Master
|
2025-09-16 03:01:02 +03:30 |
|
SamSys
|
c3cb3df3d3
|
change compute leaving model on checkout
|
2025-09-13 06:29:25 +03:30 |
|
SamSys
|
3b12be04b5
|
test defualt remote
|
2025-09-09 16:18:38 +03:30 |
|
SamSys
|
82d035b7e1
|
mirrorTest4
|
2025-09-08 01:20:58 +03:30 |
|
SamSys
|
e80621280c
|
mirror test
|
2025-09-08 01:09:15 +03:30 |
|
SamSys
|
1c6b0ac292
|
test miror
|
2025-09-08 01:04:02 +03:30 |
|
SamSys
|
7d3a1dad71
|
test mirror2
|
2025-09-08 00:53:59 +03:30 |
|
SamSys
|
b5fc98a47b
|
test mirror
|
2025-09-08 00:50:28 +03:30 |
|
SamSys
|
29fed23805
|
Checkout NEW Compute DailyWage Completed
|
2025-09-02 04:33:30 +03:30 |
|
SamSys
|
a26f079969
|
merge from master to manualDailyWage
|
2025-08-31 17:20:27 +03:30 |
|
SamSys
|
5053b69295
|
EmployeeMandatoryHourse bug fixed
|
2025-08-31 16:18:34 +03:30 |
|
SamSys
|
7e3f7d1dcf
|
Completed DailYWage and BaseYear report For Contract
|
2025-08-28 06:09:02 +03:30 |
|
MahanCh
|
ec2defab69
|
feat: add employee mandatory hours to checkout model and database
|
2025-08-25 10:33:43 +03:30 |
|
SamSys
|
8f76b8c082
|
Upgraded daillyWage Completed
|
2025-08-24 03:37:54 +03:30 |
|
SamSys
|
584425b3af
|
and new metod to upgrade dailyWage
|
2025-08-23 07:09:56 +03:30 |
|
SamSys
|
2f60883ea2
|
add new prop to contractTable - compute dailyWage
|
2025-08-23 04:27:04 +03:30 |
|
SamSys
|
4a3515ad65
|
manualDailyWage frontEnd Completed
|
2025-08-20 02:52:06 +03:30 |
|
SamSys
|
49b84b50a5
|
add dailywage select on create contract front
|
2025-08-18 05:33:31 +03:30 |
|
SamSys
|
b82456f172
|
chnages
|
2025-08-15 16:22:27 +03:30 |
|
SamSys
|
c04a8f86a4
|
new metod To Compute Spreation BaseYear
|
2025-08-15 15:49:35 +03:30 |
|
MahanCh
|
b77538218f
|
add conflict indicator for employee customize checkout records
|
2025-08-12 11:17:02 +03:30 |
|
MahanCh
|
4aa710b7d6
|
add search
|
2025-08-11 15:13:31 +03:30 |
|
MahanCh
|
ac4bd3453a
|
Merge branch 'master' into Main
# Conflicts:
# CompanyManagment.Application/SalaryAidApplication.cs
|
2025-08-09 14:46:36 +03:30 |
|
MahanCh
|
a9008beb24
|
Change CreateAsync For SalaryAid
|
2025-08-09 14:45:04 +03:30 |
|
MahanCh
|
8432b2660e
|
Merge branch 'Feature/Chcekout/AddHasConflict' into Main
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/FinancialStatementController.cs
|
2025-08-06 14:11:06 +03:30 |
|
MahanCh
|
ce8a0b397d
|
Merge branch 'Feature/InstitutionContract/Create-Api' into Main
|
2025-08-06 11:37:37 +03:30 |
|
MahanCh
|
c1fcaa1726
|
add transaction controller and create api
edit institutionContractController.cs and add excel download
|
2025-08-06 11:37:06 +03:30 |
|
MahanCh
|
346756c766
|
Merge branch 'Feature/PaymentInstrument/Init' into Main
|
2025-08-05 16:05:54 +03:30 |
|
MahanCh
|
20f208ac0e
|
Add IsActive to group
|
2025-08-05 16:05:17 +03:30 |
|
MahanCh
|
a71433f751
|
add AmountConflict in checkout
|
2025-08-05 13:11:12 +03:30 |
|
MahanCh
|
99a8cc181d
|
Refactor: add stats method for tabs in GetList InstitutionContract
|
2025-08-04 16:27:16 +03:30 |
|
MahanCh
|
a4bcb1ac55
|
refactor: update GetList methods to use PagedResult for paginated responses in InstitutionContract-related components
|
2025-08-04 15:36:20 +03:30 |
|