Commit Graph

212 Commits

Author SHA1 Message Date
SamSys
0eb9ecc373 client checkou warning message FrontEnd 2025-11-01 13:21:41 +03:30
45002b88c4 fix: update absence terminology to 'عدم حضور' across multiple files 2025-10-22 11:18:55 +03:30
78458f24e5 feat: add entry and exit time differences to roll call reports 2025-10-20 15:43:59 +03:30
9095ed28e1 fix invalid bug 2025-10-07 17:20:48 +03:30
7b3d1f527c feat: integrate "IsInvalid" filter and dropdown functionality in leave management 2025-10-07 12:51:18 +03:30
dbbee73e2a add is invalid to list - NOT FINISHED 2025-10-06 20:07:32 +03:30
21df40af3b add isInvalid to leave entity - set query filter for it 2025-10-06 19:50:42 +03:30
MahanCh
df39072944 feat: add employee mandatory hours to print layouts and view models 2025-08-26 13:52:21 +03:30
SamSys
3aa5668696 CustomizeCheckout enable or disable on client menu bug fixed 2025-08-21 16:44:51 +03:30
MahanCh
b92aaaffa0 fix: enable and manage customize checkout options in client menu 2025-08-18 11:55:34 +03:30
MahanCh
366ad25a3a add conflict indication for salary aids in checkout process 2025-08-12 12:44:48 +03:30
MahanCh
463e4bc080 Merge branch 'refs/heads/master' into Feature/Chcekout/AddHasConflict 2025-08-12 12:43:12 +03:30
MahanCh
b77538218f add conflict indicator for employee customize checkout records 2025-08-12 11:17:02 +03:30
MahanCh
e877aca832 Merge branch 'Main' into Feature/Chcekout/AddHasConflict 2025-08-12 09:56:50 +03:30
MahanCh
25903856b2 add has conflict in List for checkout 2025-08-10 11:02:16 +03:30
MahanCh
d1b7e0c3e1 changes 2025-08-09 15:15:38 +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
290e1639e8 Merge branch 'master' into Main 2025-08-09 14:10:33 +03:30
MahanCh
3650b46b8e fix 404 Error on sending data for checkout exists in SalaryAid 2025-08-09 14:10:12 +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
6d6ce93f74 some changes 2025-08-05 14:25:32 +03:30
MahanCh
a71433f751 add AmountConflict in checkout 2025-08-05 13:11:12 +03:30
MahanCh
8da9f09663 add debt alert for users who don't have permissions 2025-07-31 14:09:16 +03:30
MahanCh
5ae31b9cea add "debt" section for mobile 2025-07-28 16:17:53 +03:30
MahanCh
e87733f5cb Add Client Menu changes and add "debt" section in header 2025-07-28 14:20:36 +03:30
MahanCh
e8fd8bdace change the menu for new items 2025-07-28 11:39:53 +03:30
MahanCh
313579cdee add fake api - disable employeeReport in Menu 2025-07-27 13:16:21 +03:30
MahanCh
2bdfdb366e fix create employee by client 2025-07-15 15:39:32 +03:30
MahanCh
2714732750 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-07-08 13:51:59 +03:30
MahanCh
2a78a9dc1a change employee upload picture change name style 2025-07-08 13:51:52 +03:30
MahanCh
0d66a79d49 fix some bugs 2025-07-03 15:39:24 +03:30
MahanCh
73732cfe67 fix: create employee upload picture create bug 2025-07-01 16:24:53 +03:30
MahanCh
80c0ec28d5 finishOffDayOfWeek for CWS 2025-06-29 14:01:47 +03:30
MahanCh
b133aa67d2 merge fom master 2025-06-29 13:25:23 +03:30
MahanCh
4415cb8128 change checkout styles 2025-06-25 16:07:02 +03:30
MahanCh
fcfe7c7e58 delete friday work 2025-06-24 10:45:41 +03:30
SamSys
fcad12d3ef ClientCreateEmployee change merged 2025-06-22 15:11:51 +03:30
8afdf13863 change string and extract number 2025-06-22 13:21:15 +03:30
53d44700b8 fix employeeIds bug 2025-06-22 12:35:30 +03:30
a6c25ec8e8 complete front but backend still not finished 2025-06-19 13:51:05 +03:30
7b2eefa954 create employee without auth for client p1 - not finished 2025-06-18 15:31:13 +03:30
fb1db062f3 complete method for weeklyDayOfweek... 2025-06-15 19:44:09 +03:30
SamSys
d70abb60d7 guid for application download link 2025-06-08 16:17:08 +03:30
87b0d248a3 Convert checkoutPrintOne to CheckoutPrintAll for best performance 2025-06-03 19:38:18 +03:30
7c1fe65cf2 add sync employee status with left work method on rollcall employee upload picture 2025-06-02 16:29:03 +03:30
SamSys
d8c0471878 Client CameraAccounts new permission added 2025-05-31 17:40:42 +03:30
SamSys
0811482370 add selected workshops on editRole subAccount 2025-05-31 00:34:36 +03:30
394d65db31 changes 2025-05-30 23:23:53 +03:30
59deae29c2 add workshopIds to role get details 2025-05-30 23:14:38 +03:30