1814 Commits

Author SHA1 Message Date
195a88c1e4 renamed status of expse list - name to displayName 2025-07-24 12:43:09 +05:30
f4f8a61445 added utils fun that has code convert into bootstrap color like priamery. 2025-07-24 12:43:08 +05:30
7b2a4ea834 initiated forn edit and created with one component 2025-07-24 12:41:56 +05:30
de689b0af8 completed full updation for expnse feature 2025-07-24 12:35:12 +05:30
289a732600 progress in expense update 2025-07-24 02:55:39 +05:30
5e93798d01 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-23 18:03:52 +05:30
209e1341de Merge pull request 'Feature#791_ViewExpense : View Expense Detailas from calling expense details api' (#286) from Feature#791_ViewExpense into Feature_Expense
Reviewed-on: #286
merged
2025-07-23 12:11:18 +00:00
ab737a80d4 view expense with document (image), not yet PDF 2025-07-23 17:36:54 +05:30
f30430c254 updated global modal for size customize 2025-07-23 17:27:47 +05:30
f6e18e0482 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-23 14:17:34 +05:30
fa9736b620 changed added expense button 2025-07-23 14:15:16 +05:30
a23ca8a412 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-23 14:07:09 +05:30
00b3a3420e renamed status of expse list - name to displayName 2025-07-23 11:59:02 +05:30
6c276a3c8d added utils fun that has code convert into bootstrap color like priamery. 2025-07-23 11:44:59 +05:30
5209b78df7 color, displayName - of Expense status columns names added insinde hidden column 2025-07-23 10:48:18 +05:30
5f6a00f9f2 initiated forn edit and created with one component 2025-07-22 18:53:17 +05:30
9bbd2dd014 Merge pull request 'Feature#794_ActionExpense : Partially Implemented Expense Action' (#279) from Feature#794_ActionExpense into Feature_Expense
Reviewed-on: #279
Merged
2025-07-22 12:07:15 +00:00
280715d62f Added taking action on expense, like Review, Approve ... 2025-07-22 17:20:08 +05:30
2ab2a1d8bd made new hook for make action on give employee 2025-07-22 14:39:49 +05:30
dbdb7a1299 Merge pull request 'Feature#791_ViewExpense : Partially implemented Expense Details modal with full view' (#276) from Feature#791_ViewExpense into Feature_Expense
Reviewed-on: #276
merged
2025-07-22 08:42:00 +00:00
a4f3a6f0ed partially implemented Expense Details modal with full view 2025-07-22 14:08:52 +05:30
e5f528547c Merge pull request 'Feature_Create&DisplayList' (#271) from Feature_Create&DisplayList into Feature_Expense
Reviewed-on: #271
2025-07-22 06:02:58 +00:00
5c4a5c0620 created and display expenses list 2025-07-22 06:02:58 +00:00
364d67647f making a expense page layout 2025-07-22 06:02:58 +00:00
8b0c62ff70 created list view interface 2025-07-22 06:02:58 +00:00
2a3a4b91fe Merge pull request 'Feature-#784 : api integrated for get list of expense-status in master' (#269) from Feature-#784 into Feature_Expense
Reviewed-on: #269
Merged
2025-07-21 05:17:00 +00:00
e49145914f api integrated for get list of expense-status in master 2025-07-21 10:44:26 +05:30
e379f0e348 refactored code for optimze 2025-07-21 10:43:09 +05:30
43e173d0ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-21 09:47:09 +05:30
7024413710 Merge pull request 'added Payment Mode master with API integration and table config for get list' (#268) from Feature-#782-GetPaymentMode into Feature_Expense
Reviewed-on: #268
Merged
2025-07-19 18:09:46 +00:00
4427d71980 added Payment Mode master with API integration and table config for get list 2025-07-19 23:37:09 +05:30
295e63ec7f Merge pull request 'Add Expense Type Master: API Integration, Table Display, and Hook Support : Get List' (#267) from Feature-#781-GetExpenseType into Feature_Expense
Reviewed-on: #267
Merged
2025-07-19 17:49:50 +00:00
037359cdfc add Expense Type master with API integration and table config 2025-07-19 23:03:43 +05:30
c58d4d684b Merge pull request 'FixedInfra Planning issue' (#266) from taskPlanningIssue into main
Reviewed-on: #266
Merged
2025-07-19 05:49:31 +00:00
f0e007fe89 FixedInfra Planning issue 2025-07-19 11:18:21 +05:30
56540f7521 changed project selection routing 2025-07-18 19:20:31 +05:30
632119cfb9 removed unused code 2025-07-18 18:38:35 +05:30
b84275a7a3 fixed: employee fetching inside assign task 2025-07-18 17:09:49 +05:30
07373f6180 Merge pull request 'Integrated React-query in Gallery for handling api calling' (#264) from query-Gallary into react-query-v2
Reviewed-on: #264
merged
2025-07-18 09:58:51 +00:00
89085d5069 prevent IntersectionObserver error on unobserve with null ref 2025-07-18 15:01:44 +05:30
425c32750c integrated query in gallary 2025-07-18 14:56:40 +05:30
cd23e43a82 removed unused code 2025-07-18 11:57:07 +05:30
0ad8c72aa9 fixed singlar 2025-07-18 11:32:32 +05:30
d176221c13 Corrected regex to accurately detect / and dashboard 2025-07-18 11:19:29 +05:30
1c68e3a3d5 fixed signalr issue due to occured integrated query 2025-07-18 10:54:44 +05:30
0c95882e7f changed employeeAttendance record modal 2025-07-18 00:09:45 +05:30
92568039eb sync data within regularize request and appove or reject between 2025-07-18 00:01:16 +05:30
07885d3ed4 intergrated react-query 2025-07-17 20:41:57 +05:30
6e5e206bc8 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-17 17:30:16 +05:30
23998d8735 Merge pull request 'Issues_July_3W' (#262) from Issues_July_3W into main
Reviewed-on: #262
2025-07-17 11:50:24 +00:00