Compare commits

..

1474 Commits

Author SHA1 Message Date
bc114b6ae0 Merge remote-tracking branch 'origin/Subscription_Plan' into Purchase_Invoice_Management 2025-12-16 11:06:57 +05:30
92a09bfcf0 Handle Date range in Expense Widget on dashboard
Link Project to detail page in Attendance Report Widget
2025-12-15 11:45:43 +05:30
4f9fa1b7c2 Add link to he project from Attendance details widget 2025-12-15 11:08:27 +05:30
34d5ce9ef9 missing request demo links 2025-12-14 17:22:21 +05:30
476fb49e07 adjust sidebar logo size and position from left border 2025-12-14 17:03:12 +05:30
7143af1e1e format DPR page 2025-12-14 16:49:06 +05:30
a477090cb8 Add missing images 2025-12-14 16:07:46 +05:30
f1a5f72db7 modified landing page hero images 2025-12-14 13:27:50 +05:30
e8886577d8 Correction in weidget. 2025-12-13 16:36:47 +05:30
e10a6ff14c Change the design of subscription page. 2025-12-13 14:51:17 +05:30
a309d13247 Correction in teams, projectinfra and daily task for dropdown. 2025-12-13 11:51:16 +05:30
fa694d8361 Correction in Attendance page. 2025-12-13 11:37:53 +05:30
a9bbd75d6c Correction in name of Project by status to Attendance by Project 2025-12-13 11:26:50 +05:30
3ff80ee032 Sorting in Subscription page. 2025-12-13 11:20:16 +05:30
e695807e77 Adding 2025-12-13 11:18:45 +05:30
630c11985d Correction in Subscription page. 2025-12-13 11:18:11 +05:30
d68cb9e664 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Subscription_Plan 2025-12-13 09:59:35 +05:30
caeece0660 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-13 09:57:19 +05:30
44f3d8783d Adding additional fields in landing subscription cards. 2025-12-13 09:54:02 +05:30
3a8c1745f4 Removing dropdown logic all the places wehre dropdown is added. 2025-12-12 19:07:55 +05:30
deba5dfa01 Adding View functionality in Add challan. 2025-12-12 18:11:38 +05:30
bb743d2bb0 Adding Submit functionality in tenant. 2025-12-12 17:27:37 +05:30
6f9eeadc22 fixed project list paginantion 2025-12-12 16:22:55 +05:30
6099dd2ea5 fixed logo label on side bar 2025-12-12 15:25:21 +05:30
7b1b360c78 added missing view_all_employee permissions 2025-12-12 10:31:36 +05:30
cdaf642eba added zoom in - out using mouse wheel 2025-12-11 16:01:11 +05:30
b31195c5a1 Adding sorting in Project display. 2025-12-11 11:04:29 +05:30
9daeffd90e Adding formatcurrecny at hover effect at Expense Breakdown. 2025-12-11 10:54:24 +05:30
ab34ea63fa Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-11 10:39:36 +05:30
17ef307ff2 Adding MyJobs at the place of all jobs in service Jobs. 2025-12-11 10:39:32 +05:30
ae9ef7938d fixed : Project created permission for service 2025-12-11 10:37:39 +05:30
e755faecdc fixed: added array guards in mergedServices to stop iterable error 2025-12-11 10:25:45 +05:30
23660379c9 fixed 'ProjectwiseTeamCount' path inside dashboard 2025-12-11 09:51:01 +05:30
2bf5e9a13f Merge branch 'Encrypted_Reponse' into Purchase_Invoice_Management 2025-12-11 09:40:09 +05:30
3413806670 Merge branch 'Encrypted_Reponse' into Purchase_Invoice_Management 2025-12-11 09:39:51 +05:30
8033fdb7e7 selected default current selected service - create task 2025-12-10 16:52:52 +05:30
b62fc82a9c Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-10 16:33:04 +05:30
4253ed71eb modified ui base on suggestion 2025-12-10 16:32:59 +05:30
01fc302011 Merge pull request 'Adding_Chips_DailyTask :- Adding Chips in Daily task report.' (#538) from Adding_Chips_DailyTask into Purchase_Invoice_Management
Reviewed-on: #538
merged
2025-12-10 11:01:16 +00:00
d56aefde02 Adding sizing in manageemployee. 2025-12-10 11:01:16 +00:00
c71fe3a45e Adding dates chips in document. 2025-12-10 11:01:16 +00:00
0f43c877c4 Adding Date picker chips in Expense and 2025-12-10 11:01:16 +00:00
153ffcdc3e Adding w-100 at doument filter panel. 2025-12-10 11:01:16 +00:00
e31e4cfc31 Adding Filter chips at Tenant. 2025-12-10 11:01:16 +00:00
8216bf1f2d Correction in Infra Project Card view. 2025-12-10 11:01:16 +00:00
6b9d7c56bc Adding filter chips in daily Progress Report. 2025-12-10 11:01:16 +00:00
07ba95e533 removed console warning 2025-12-10 12:40:30 +05:30
c1ae9ee55e changed footer 2025-12-10 12:26:43 +05:30
117d82769a Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into dpr-report 2025-12-10 12:16:11 +05:30
35f1aa8c13 hide attendance project wise overview project having selected 2025-12-10 12:12:12 +05:30
cd1ae64753 added attandace poject wise overview 2025-12-10 12:09:53 +05:30
363a9c5feb Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-10 10:32:00 +05:30
69148331f5 added partially proejctwise attendace 2025-12-10 10:31:54 +05:30
1bbc338b9b Merge pull request 'Adding Dashboard a Jobs Weidget.' (#537) from Jobs_Weidget into Purchase_Invoice_Management
Reviewed-on: #537
merged
2025-12-10 05:00:21 +00:00
bc0540a0b7 Adding Dashboard a Jobs Weidget. 2025-12-10 10:27:07 +05:30
65158b9368 added encryption 2025-12-09 16:37:13 +05:30
4a47b1d0fa removed console and added none option for groupping for Expense list 2025-12-09 14:26:18 +05:30
0643d3d0e1 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-09 12:40:03 +05:30
3a1aac8834 Updation at Projects Completion Status when nothing is zero nothing is show. 2025-12-08 18:13:17 +05:30
8e49d4dc8b added new class for pageView heigt 2025-12-08 16:24:03 +05:30
e10bb10c20 display properly each document 2025-12-08 14:10:00 +05:30
cd9c6d2365 removed color for collection action butttons 2025-12-08 11:43:58 +05:30
0a82297396 fixed updated or archived - service jobs msg 2025-12-08 11:37:14 +05:30
07ab3314f3 Removing Console.log at ViewBranchdetails. 2025-12-08 10:31:54 +05:30
e6a6c8c9e8 Updation in ViewBranchdetails. 2025-12-08 10:03:09 +05:30
3d90eebd44 Increasing the size of plannedwork. 2025-12-06 17:14:07 +05:30
d5582400b0 Changes in EditActivity Modal. 2025-12-06 17:10:36 +05:30
8b3ca8d57a Merge pull request 'Adding_dropdown :- Adding custome dropdown across all the modal.' (#533) from Adding_dropdown into Purchase_Invoice_Management
Reviewed-on: #533
merged
2025-12-06 11:30:46 +00:00
7eb2274584 Resolving Error in EditActivitymodal. 2025-12-06 16:57:14 +05:30
5a8a8c4676 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 16:54:54 +05:30
d9c3964983 Merge pull request 'Add Pending Actions toggle near search box in Expense.' (#530) from Adding_Toggle_Button into Purchase_Invoice_Management
Reviewed-on: #530
merged
2025-12-06 11:18:15 +00:00
50e33b7b39 Add Pending Actions toggle near search box in Expense. 2025-12-06 11:18:15 +00:00
d6a8040977 Merge pull request 'Attendance in Employee Profile Should Display Project-Wise' (#531) from Kartik_Enhancement_918 into Purchase_Invoice_Management
Reviewed-on: #531
Merged
2025-12-06 11:14:50 +00:00
95813c5869 Planned Work now accepts values with up to 2 decimal places. 2025-12-06 11:14:50 +00:00
88dc11793c Attendance in Employee Profile Should Display Project-Wise 2025-12-06 11:14:50 +00:00
ca3cc590d2 Merge pull request 'Branch_Detail_View :- Adding details view in jobs.' (#532) from Branch_Detail_View into Purchase_Invoice_Management
Reviewed-on: #532
merged
2025-12-06 11:13:10 +00:00
1e151a8b10 Adding Cursor pointer for view branch in jobs. 2025-12-06 11:13:10 +00:00
946e0b2883 Showing details view in Branches. 2025-12-06 11:13:10 +00:00
baa17ab0cf fixed visile dropdown issue inside master page 2025-12-06 16:42:10 +05:30
7de27cc335 Correction in Master Page. 2025-12-06 16:35:02 +05:30
3c3468f8f9 Correction in EmpProfile. 2025-12-06 16:00:07 +05:30
c4a46cbe80 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 15:08:54 +05:30
c83e7eb75f Adding dropdown in Edit Task. 2025-12-06 15:07:18 +05:30
72b533226a Adding dropdown across all places. 2025-12-06 14:49:23 +05:30
48ff718da4 Correction in directory managecontact. 2025-12-06 13:00:35 +05:30
654e34ebfa Adding Dropdown in all places. 2025-12-06 12:58:43 +05:30
c7e72946ea added mission hook 2025-12-06 11:58:09 +05:30
19c8975e8f added margin bottom for selectField 2025-12-06 11:30:32 +05:30
1f64cf65f9 Merge branch 'Adding_dropdown' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 11:12:35 +05:30
29cebedfad fixed selectfield ui 2025-12-06 11:12:25 +05:30
a1680c709a Adding dropdown in Daily task. 2025-12-06 10:22:24 +05:30
0e75a3e1c9 Adding Dropdown in Employee. 2025-12-06 10:11:58 +05:30
cdf9bbbe48 added padding to better space 2025-12-06 09:48:15 +05:30
94fbeef5d1 added skeleton 2025-12-05 19:32:23 +05:30
88053d1286 added optional chain for handle error 2025-12-05 18:55:23 +05:30
96bcdffdca added optional chain for n=menu 2025-12-05 18:45:19 +05:30
23a7a56e32 added collection overview widget 2025-12-05 18:24:23 +05:30
dbf4f5e9c8 Adding New dropdown in across all modules. 2025-12-05 17:57:08 +05:30
7df9d47f07 Adding dropdown in directory. 2025-12-05 15:40:38 +05:30
8f6d877548 removed scrolling inside job - status logs 2025-12-05 12:05:55 +05:30
7930876b7d Merge pull request 'Adding time line in Jobs Status.' (#527) from Implementing_TimeLine into Purchase_Invoice_Management
Reviewed-on: #52
merged
2025-12-05 06:23:55 +00:00
b8f2607b45 Adding Workdone label. 2025-12-05 06:23:55 +00:00
47752e5e35 Adding time line in Jobs Status. 2025-12-05 06:23:55 +00:00
25bb7d1f58 allow view pdf file 2025-12-05 11:38:54 +05:30
427d728efc Merge pull request 'Adding Tabs in attendancepage just like View Jobs.' (#529) from Attendance_Tabs into Purchase_Invoice_Management
Reviewed-on: #529
Merged
2025-12-05 04:49:16 +00:00
65043732d3 Adding Tabs in attendancepage just like View Jobs. 2025-12-05 04:49:16 +00:00
6a0feacb1b Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-04 17:38:32 +05:30
949126d790 Adding height in ServiceProjectTeamlist. 2025-12-04 15:20:08 +05:30
f9d66d73b0 changed sequnce of project nave 2025-12-04 13:44:23 +05:30
0dbfc1f87a hide time 2025-12-04 13:09:29 +05:30
49c07606aa Adding Acknowledge number and date in View Purchase. 2025-12-04 11:32:58 +05:30
865928c1cb correct right path 2025-12-03 16:58:42 +05:30
06882e557e fixed- added right path 2025-12-03 16:54:48 +05:30
581447ecb6 addd field inside view Purchase - 2025-12-03 16:44:21 +05:30
2392a96eb8 added new column proform amount 2025-12-03 16:02:36 +05:30
8a3228c0c1 added pagination inside infra list 2025-12-03 15:27:12 +05:30
d615f6ca8a added required start tick on field base proforma and base amount 2025-12-03 14:53:14 +05:30
48f8d4aedb Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-03 13:55:43 +05:30
258bd82b54 handle proforma to base , Tax, amount condition 2025-12-03 13:55:39 +05:30
ef38ac4cdb added page-min-h in directorycontectlist. 2025-12-03 12:34:21 +05:30
8dfc8e4336 Merge pull request 'Adding ImageGallery Chips.' (#517) from Image_Gallery_FilterChips into Purchase_Invoice_Management
Reviewed-on: #517
merged
2025-12-03 06:55:13 +00:00
25b334a83c restriction before choosing project for gallery filter api calling an removed unused code 2025-12-03 06:55:13 +00:00
a8c10a0a9a UI updation in Collection. 2025-12-03 06:55:13 +00:00
4a66dad07a UI updation in Organization. 2025-12-03 06:55:13 +00:00
21c2a5cf7d Adding ImageGallery Chips. 2025-12-03 06:55:13 +00:00
83bd99549a Merge pull request 'Finance_Export_Functionality :- Implementing Export Functionality in Finance Module.' (#522) from Finance_Export_Functionality into Purchase_Invoice_Management
Reviewed-on: #522
Merged
2025-12-03 06:45:30 +00:00
8fc49ab4a7 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-03 12:14:41 +05:30
7fc058565b changed component, follow standard naming 2025-12-03 12:12:19 +05:30
d9947daf83 changed component, follow standard naming 2025-12-03 12:09:35 +05:30
36f5edf4f5 UI updation in all popups. 2025-12-03 11:42:44 +05:30
9cd1d932b1 added preview image inside challan, remove restric of payment date 2025-12-03 11:33:23 +05:30
214a416deb UI updation in Create and Update Service and Infra projects. 2025-12-03 11:30:41 +05:30
3e3ff189c9 changed class to className 2025-12-03 10:10:36 +05:30
06ac8099ed Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-03 09:55:57 +05:30
917e7f3ccc Adding api for Finance for Export. 2025-12-03 09:53:41 +05:30
927b1840b4 Merge pull request 'Correction in HoverPopup at Jobs View panel.' (#525) from Jobs_Side_Panel into Purchase_Invoice_Management
Reviewed-on: #525
Merged
2025-12-03 04:18:02 +00:00
8dbdd230af Adding HoverPopup effect. 2025-12-03 04:18:02 +00:00
57bbcd4b45 Correction in HoverPopup. 2025-12-03 04:18:02 +00:00
c3720df294 removed invalid border for tittle 2025-12-02 17:32:27 +05:30
a747880a77 fixed value of sume value 2025-12-02 17:27:55 +05:30
3bfe108dab removed all required condition 2025-12-02 17:23:03 +05:30
aa2e732ff4 added merged payment and delete 2025-12-02 10:58:38 +05:30
76d99d6a14 merged purchase_payment 2025-12-02 09:49:56 +05:30
444ffa9696 Merge pull request 'At the time of Update in Purchase Automatically hit the sumit without click.' (#526) from Purchase_Invoice_Update into Purchase_Invoice_Management
Reviewed-on: #526
merged
2025-12-02 04:13:53 +00:00
03fb5f7bc3 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-01 15:16:51 +05:30
4b0ac5b6db Correction in Purchase List table-responsive. 2025-12-01 15:15:05 +05:30
311c74587a Adding Delete and Restore functionality in Purchase Invoice 2025-12-01 15:03:13 +05:30
ef3312523f added payment 2025-12-01 12:32:46 +05:30
35b3384dac At the time of Update in Purchase Automatically hit the sumit without click. 2025-12-01 11:39:34 +05:30
194b032870 fixed attachment issue. using added documentId 2025-12-01 10:26:54 +05:30
0482bfe191 Merge pull request 'Adding Upload functionlaiy in ManagePurchase.' (#524) from Multiple_File_Uploader into Purchase_Invoice_Management
Reviewed-on: #524
Merged
2025-12-01 04:13:29 +00:00
6fa2cc4ef0 fixed attachment remove and update operation 2025-11-29 13:27:07 +05:30
cb9d263730 Adding activetab to 0 2025-11-29 09:36:13 +05:30
f0d21b14a2 added attachement in invoice 2025-11-28 20:49:47 +05:30
9ce47a9232 Adding Upload functionlaiy in ManagePurchase. 2025-11-28 18:01:42 +05:30
5818b84760 chaange sequence of dashbord widgets 2025-11-28 12:36:23 +05:30
f9a0098adb Merge pull request 'Services_Bugs :- UI changes of Purchase Modal.' (#523) from Services_Bugs into Purchase_Invoice_Management
Reviewed-on: #523
Merged
2025-11-28 06:42:44 +00:00
00d5df5ebb Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Services_Bugs 2025-11-28 11:58:14 +05:30
40b11d209c UI updation at Purchase Invoice. 2025-11-28 11:49:26 +05:30
cb00bd4f35 centered spinner inside purchase list 2025-11-28 11:37:53 +05:30
aec6930e11 fixed challan attachmenet 2025-11-28 11:35:59 +05:30
44e1e16d19 fixed challan list attchament icon 2025-11-28 11:24:41 +05:30
76826f8cee Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-28 11:20:49 +05:30
09428b1ff1 change JobComment btn label - 'send' to 'Submit' 2025-11-28 11:20:45 +05:30
e5bfc6be44 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-28 11:10:16 +05:30
d987bd2a51 Alignment in Add Chalan and adding Page-min-h at list. 2025-11-28 11:09:45 +05:30
bd1a97716c Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-28 11:02:38 +05:30
e0789cda3a fixed project, supplier and Organization filed fullfied whenevr open for update 2025-11-28 11:02:17 +05:30
73f5b46a40 Adding Query key in useUpdatePurchaseInvoice. 2025-11-28 10:36:02 +05:30
9234253c97 fixed perfoma amt and delivery charge validation 2025-11-28 10:26:26 +05:30
2b4f086318 added add challan btn 2025-11-28 09:54:42 +05:30
1c41c00d72 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-27 21:25:26 +05:30
b8d3e58428 added challan 2025-11-27 21:25:23 +05:30
9eae0b2cd1 Correction in App routes. 2025-11-27 18:01:07 +05:30
a791007561 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-11-27 17:57:56 +05:30
af95009c1f Adding Export functionality in Expense. 2025-11-27 17:49:38 +05:30
a31d5d5015 Adding Export functionality in Payment Request. 2025-11-27 17:41:49 +05:30
b5fb48104c Adding Export functionality in Recurring Expense. 2025-11-27 17:23:13 +05:30
1b3e090211 added updation invoice 2025-11-27 16:52:33 +05:30
339a5ff257 UI alignment in Purchase Invoice popup and changes in Jobs Arcieve and Archieve button. 2025-11-27 15:56:19 +05:30
528255c2bd added view deatils of purchases 2025-11-27 12:42:40 +05:30
359a787bdb Merge branch 'Issues_Nov_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-11-27 10:40:45 +05:30
7e4a8157bf Change the UI for Employee and Directory and adding export functionality. 2025-11-27 10:40:10 +05:30
3072354ed2 Adding Export Functionality in Advance Payment and adding spinner on it. 2025-11-27 10:16:25 +05:30
909022b034 added purchase list 2025-11-26 20:25:59 +05:30
271787812b added get api for purchases 2025-11-26 19:15:50 +05:30
0eb3cc61a3 removed unused code 2025-11-26 18:56:36 +05:30
ea0e38f100 removed console 2025-11-26 18:41:23 +05:30
d27546073f Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 18:37:08 +05:30
a1a8dd4447 added zoom in and size bar collaspeing 2025-11-26 18:37:05 +05:30
80717f0458 Showing message on the center of the page in Branches. 2025-11-26 18:02:26 +05:30
4dbfe2bd48 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 17:53:21 +05:30
c2c8dabdd4 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 17:52:34 +05:30
54ca807436 removed double class name 2025-11-26 17:52:22 +05:30
6e57108f8e Merge pull request 'UI alignment in Finance forms.' (#515) from Finance_Form_Layout into Project_Branch_Management
Reviewed-on: #515
merged
2025-11-26 12:21:31 +00:00
219161f15e UI alignment in Finance forms. 2025-11-26 12:21:31 +00:00
f8963ef476 Merge pull request 'At Assigned Employee when selecting a Job role it change according to master now show correct data.' (#520) from Assigned_Employee_Job_Role into main
Reviewed-on: #520
merged
2025-11-26 12:20:28 +00:00
86039552c8 Merge pull request 'Weidget_Dashoard_Jobs :- Creating Weiget for Jobs.' (#521) from Weidget_Dashoard_Jobs into Project_Branch_Management
Reviewed-on: #521
merged
2025-11-26 12:19:44 +00:00
e8ebbe4d76 Hide the Weidget. 2025-11-26 12:19:44 +00:00
3d7a404d1f Changing Name of tabs. 2025-11-26 12:19:44 +00:00
e041e0fe8a Adding Permission in Attendance Weiget at dasboard and Project Profile. 2025-11-26 12:19:44 +00:00
082df5fad3 Changes in Daily progress report filter panel and Daily task list view. 2025-11-26 12:19:44 +00:00
cfcf80b6c2 Changes in ServiceJobs. 2025-11-26 12:19:44 +00:00
7617146512 Adding Min Height in Attendance Weiget. 2025-11-26 12:19:44 +00:00
711dfb8f00 Correction in Project Statistics. 2025-11-26 12:19:44 +00:00
cf430881dc Creating new weidget for dashboard for Service jobs. 2025-11-26 12:19:44 +00:00
7b1ad80d78 Increase the gap for Advance Payment rows. 2025-11-26 16:56:01 +05:30
833cb98dd3 Change the Name of AdvancePayment Component. 2025-11-26 16:51:01 +05:30
80f5dbd639 reset after invoice created 2025-11-26 15:50:46 +05:30
998284f398 added organization api and successfuly created invoice 2025-11-26 15:16:58 +05:30
e8f6298f93 Clicking on Contact Name in Notes Should Redirect to That Contact’s Detail Page in Directory (Web) 2025-11-26 12:35:21 +05:30
82c1dc4b8e created purchase form 2025-11-26 12:29:40 +05:30
da13e40fd5 Service title and group text appear too bold in Masters → Services 2025-11-26 11:12:53 +05:30
9c02a4a925 Increase the size of date picker in OrganizationInfo at tenant and Page is not Refresh at Create form. 2025-11-26 10:49:57 +05:30
c975e54331 Logs Tab Action Redirects Back to Page 1 Automatically 2025-11-26 10:33:04 +05:30
2109a5f1f1 “Create Job” Popup Should Close Automatically After Job Creation. 2025-11-26 10:12:58 +05:30
b8df8a2bde initially setup purchaseform 2025-11-25 20:01:11 +05:30
9ad3b8726c At Assigned Employee when selecting a Job role it change according to master now show correct data. 2025-11-25 18:09:32 +05:30
5d773b0680 Merge branch 'SideBarCollapsed' into Purchase_Invoice_Management 2025-11-25 15:24:19 +05:30
d4582c101a Merge pull request 'Project_Branch_Management : New Feature Service Project - Branch Management' (#519) from Project_Branch_Management into main
Reviewed-on: #519
merged
2025-11-25 09:42:47 +00:00
c6af020c85 changed fs-6 and body-font-size 2025-11-25 15:09:25 +05:30
822ff1a7e4 UI Alignment in Service Card view. 2025-11-25 11:20:19 +05:30
92d17167b1 added zoom in-out 2025-11-25 10:11:43 +05:30
b348117f05 added Total employee present figure 2025-11-25 09:50:39 +05:30
f13005a031 fixed side issue collapsing 2025-11-24 19:48:03 +05:30
8ec62827d5 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-24 17:58:26 +05:30
965fce1587 Merge pull request 'Service_Project_ListView :- Creating List view for service Project.' (#518) from Service_Project_ListView into Project_Branch_Management
Reviewed-on: #518
Merged
2025-11-24 11:16:57 +00:00
bb37fd7044 set align for Service Project List card 2025-11-24 11:16:57 +00:00
03d60bf66d Adding search functionality in Projectpage. 2025-11-24 11:16:57 +00:00
071e5956a7 Changes. 2025-11-24 11:16:57 +00:00
c669eb90c3 Correction in List view alignment. 2025-11-24 11:16:57 +00:00
4d2e37f52e Adding Message for Card and list view in Services and Infra 2025-11-24 11:16:57 +00:00
6dde240926 Creating a list view for Services. 2025-11-24 11:16:57 +00:00
482b5a1680 Adding lIst view. 2025-11-24 11:16:57 +00:00
098090cf69 Merge pull request 'Status Dropdown Should Auto-Close After Job Status Update' (#516) from Kartik_Bug#1773 into Project_Branch_Management
Reviewed-on: #516
mergd
2025-11-24 11:05:51 +00:00
1157643916 added report data by project and date wise 2025-11-24 16:08:45 +05:30
5747d4ec71 Status Dropdown Should Auto-Close After Job Status Update 2025-11-24 10:35:03 +05:30
37212e489e splitted code and added server data 2025-11-22 16:38:39 +05:30
b2c0388412 dpr report wireframe 2025-11-22 13:14:57 +05:30
48f314eac4 added signalR for project Branch 2025-11-21 15:28:31 +05:30
18e739f3ab fixed collection header ui 2025-11-21 14:51:31 +05:30
a5329f1a2a added new selectproject field inside ManageRecurring 2025-11-21 14:25:32 +05:30
8b4a9d2d1c added new project filed inside ManagePaymentRequest 2025-11-21 14:08:52 +05:30
4506f740eb Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 13:13:50 +05:30
f001dff5b0 Creating new icon for Un-archive 2025-11-21 13:09:14 +05:30
33d94f6f06 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 12:58:52 +05:30
0ac1141579 changed filed for project and employee now not need project for select employee 2025-11-21 12:58:47 +05:30
4d8af5da91 added pre-fill updating 2025-11-21 12:57:54 +05:30
fead3a37a6 Adding Pending in Loading in Job list. 2025-11-21 12:31:10 +05:30
98e9a8b625 When we in Archive tab then canvas will be open now it work correctly. 2025-11-21 12:21:22 +05:30
2781da8906 Change the logic according to archieve show by status. 2025-11-21 12:04:36 +05:30
d13c48dd39 Change the Ui for Archieve jobs. 2025-11-21 11:47:55 +05:30
ee4ef18594 Implementing Restore Functionality in Jobs. 2025-11-21 11:39:36 +05:30
742337a3d0 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 11:12:03 +05:30
5abab06b0c removed console error 2025-11-21 11:11:44 +05:30
17a9f4a9b1 Implementing Project change 2025-11-21 11:10:55 +05:30
de088fcfc2 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 09:46:32 +05:30
8e12eb6797 Adding Switch button on Jobs. 2025-11-21 09:45:28 +05:30
14c1da7888 added restore 2025-11-20 22:01:25 +05:30
753d8c4a2c Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-20 17:09:09 +05:30
766d19744c added suggestion for branch Type inside service Projects 2025-11-20 17:09:04 +05:30
caaadc4c08 Implementing Validation when we status will be done or closed then Archieve button will be shown. 2025-11-20 16:38:25 +05:30
1531fbe6f2 Implementing Archieve functionality in Jobs. 2025-11-20 16:16:20 +05:30
9f5a167613 added copy button for localtion url 2025-11-20 14:49:54 +05:30
fa923d4c3a added popup for branch view 2025-11-20 14:39:54 +05:30
bd43475d12 Merge pull request 'Advance_Payment_List :- Implementing advance Payment new API.' (#514) from Advance_Payment_List into Project_Branch_Management
Reviewed-on: #514
merged
2025-11-20 09:08:07 +00:00
521d46bdee Merge pull request 'Adding Billed To field in Manage Collection.' (#513) from Collection_Service_Project into Project_Branch_Management
Reviewed-on: #513
merged
2025-11-20 07:23:25 +00:00
604bb68dc2 Adding Billed To field in Manage Collection. 2025-11-20 07:23:25 +00:00
047e563505 added mutiple contact person inside branch 2025-11-20 12:49:56 +05:30
e4f053ee65 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-20 12:41:39 +05:30
7105a3640f Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-20 12:36:40 +05:30
d167c57ab0 Implementing the Update api for branches. 2025-11-20 12:34:45 +05:30
d3c006279c Increasing the size of Service details page. 2025-11-20 10:29:42 +05:30
195a0c83bb Correction in api for details. 2025-11-20 10:00:06 +05:30
8f86b05d35 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-20 09:51:29 +05:30
dd716187da Implementing edit api for branches. 2025-11-20 09:51:23 +05:30
5b86a2f64f removed console error 2025-11-20 09:50:49 +05:30
e99d49b83e added view comments 2025-11-20 09:26:02 +05:30
0210e17170 added branch details 2025-11-19 22:58:41 +05:30
e7fddd41c2 added branch for projects 2025-11-19 21:28:01 +05:30
7e4dffff34 Implementing Get api. 2025-11-19 18:47:30 +05:30
e7a68aeab7 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-19 18:32:03 +05:30
8a5d6158c2 Implementing Creating API. 2025-11-19 18:31:17 +05:30
50269aead2 added selectFiled for branch 2025-11-19 18:28:54 +05:30
0ede07b0d5 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-19 16:36:37 +05:30
df24b18a27 At the time of hit in cancel form will be closed. 2025-11-19 16:36:32 +05:30
f5d89f2bab Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-19 16:36:01 +05:30
15978b2ac7 fixed useClient implmention 2025-11-19 16:35:53 +05:30
2dbf5dc109 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-19 16:31:12 +05:30
7cc8cc99c2 Creating a list view and modal for Branches. 2025-11-19 16:30:51 +05:30
c04ee8dab5 configure branch related api inside service repo. and made hooks for branch 2025-11-19 16:28:37 +05:30
c52f85ee4a added Advance payment flag inside paymentRequest list and view details 2025-11-19 15:44:54 +05:30
c718269dfd added spinner in service profile page 2025-11-19 15:35:39 +05:30
268bd2875f Changing the position of Status in Collection list view. 2025-11-19 14:26:12 +05:30
7773b7a43b Adding Status and UI implementation in Collection. 2025-11-19 12:59:57 +05:30
25003d912e add green color class for onfieldwork.com 2025-11-19 12:35:13 +05:30
a3be63b74f Implementing api for Advance payment all data. 2025-11-19 12:22:38 +05:30
54420c70d9 change landing page logo to marco from ON 2025-11-19 12:15:08 +05:30
4b5f8756b3 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-19 11:27:51 +05:30
10e54637d5 Adding list view in Advance payment list. 2025-11-19 10:47:11 +05:30
3fe533c8e3 addd serach poject field both projects 2025-11-19 10:42:12 +05:30
5b91c13b85 adding list view in advance payment list. 2025-11-19 09:46:41 +05:30
ed87e3f11b removed conole error 2025-11-18 18:28:38 +05:30
e276836653 added prevent to take action after close ticket 2025-11-18 18:13:49 +05:30
523d6baea6 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-18 17:56:21 +05:30
9e47f10440 updated padding of multi- select tag 2025-11-18 17:56:17 +05:30
54d89e1429 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Advance_Payment_List 2025-11-18 17:38:30 +05:30
018f132501 Adding Navigate functionality in ServiceprjectTeams. 2025-11-18 17:31:51 +05:30
f3eed11540 Merge pull request 'Service_Management_CardView :- Creating a card for Services project.' (#512) from Service_Management_CardView into Service_Project_Managment
Reviewed-on: #512
merged
2025-11-18 11:56:35 +00:00
836b34c237 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Management_CardView 2025-11-18 17:24:04 +05:30
bf92ffcb3e added job status during update job 2025-11-18 17:22:52 +05:30
dd380f6820 Edit button add in About project for Services. 2025-11-18 17:20:53 +05:30
f997c2f2cc Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Management_CardView 2025-11-18 17:01:22 +05:30
1c5d62f5ed Correction in HoverPopup when it we select single the all will be open. 2025-11-18 16:57:48 +05:30
37dbbf53f3 fixed table align 2025-11-18 16:56:11 +05:30
2cb9b41f98 Increasing the size of datepicker at TaskReport filter panel. 2025-11-18 16:38:57 +05:30
e6e27beb6f Creating Card for ServiceProject. 2025-11-18 16:35:05 +05:30
9822ae91ec Adding AdvancePayment a list view. 2025-11-18 15:56:16 +05:30
3753d01f7d prevent to change status once job status is done 2025-11-18 14:25:13 +05:30
c8a599fc8f Adding Extra fields in Service Project Card. 2025-11-18 12:47:39 +05:30
1c2674d435 Filteration using status in Services and Infra. 2025-11-18 12:24:41 +05:30
31d340c645 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Management_CardView 2025-11-18 12:15:25 +05:30
61e210c305 Filtering according to Dropdown filter. 2025-11-18 12:14:35 +05:30
dd41600045 modify Job view Ui 2025-11-18 11:58:57 +05:30
72052a4708 Creating a ServiceCard view. 2025-11-18 11:50:29 +05:30
4dfc0fa7ca Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-18 11:08:44 +05:30
3cfac9a2bb fixed - useProject (infra) params 2025-11-18 11:08:33 +05:30
b14353dd4f Adding Organization form at Create Service. 2025-11-18 10:10:44 +05:30
8de1230f79 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 20:26:33 +05:30
9b65e0a320 added update job 2025-11-17 20:26:28 +05:30
70ed617b9b Adding Payment_processed at the place of payment_Processed. 2025-11-17 19:21:40 +05:30
d4bb7373f2 Adding Plus icon in Create Services. 2025-11-17 19:12:34 +05:30
f4f14127b7 Merge pull request 'We are creating filter chips in the Payment Request filter panel.' (#508) from Katik_Task#1746 into Service_Project_Managment
Reviewed-on: #508
2025-11-17 13:12:58 +00:00
c8bbf6b8a8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Katik_Task#1746 2025-11-17 18:40:18 +05:30
36be17daa7 Merge pull request 'Hide “Advance Payment” Mode When Creating Expense After Payment Processed (Mobile & Web)' (#509) from Kartik_Bug#1735 into Service_Project_Managment
Reviewed-on: #509
2025-11-17 13:06:01 +00:00
d6b2ed9f84 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:35:49 +05:30
088e5e0368 UI Implementation at Job List 2025-11-17 18:35:42 +05:30
977e5c77a7 Merge pull request 'Invoice list should display according to the selected date range in Collection module.' (#510) from Kartik_Bug#1505 into Service_Project_Managment
Reviewed-on: #510
2025-11-17 13:03:50 +00:00
2b1d3e5890 Merge branch 'Service_Project_Managment' into Kartik_Bug#1505 2025-11-17 13:03:42 +00:00
a61e621ce2 Merge pull request 'Kartik_Bug#1737 :- UI Implementation in Expense Weidget.' (#507) from Kartik_Bug#1737 into Service_Project_Managment
Reviewed-on: #507
2025-11-17 13:01:33 +00:00
0bd1cea703 1) Handle blank space in menu bar
2) Breadcrum  "Home" link to "Dashboard" on pages where it was missing
2025-11-17 18:30:13 +05:30
d6ef713370 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:28:20 +05:30
da391368a6 setup job data for update 2025-11-17 18:28:15 +05:30
6860ba3dff Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:25:48 +05:30
849567f999 UI changes in View Jobs. 2025-11-17 18:25:42 +05:30
507bc68da9 Added the server timeout for signalR 2025-11-17 18:12:35 +05:30
767475c7e5 Adding Create Service Project and Create Infra project project at ManageProject. 2025-11-17 17:53:01 +05:30
5f649cd917 Added Job Id in Jobs. 2025-11-17 17:50:41 +05:30
ea6686560d added missing job id 2025-11-17 17:46:13 +05:30
1358cd749a fixed error during came merged 2025-11-17 17:09:35 +05:30
d95ba4c800 added changes status fun 2025-11-17 17:06:05 +05:30
78eafd2e5a Showing ProjectName at the breadcrum in Services Project. 2025-11-17 16:15:36 +05:30
6598ec9f73 Adding placeholder and adding in TagInput a background color. 2025-11-17 15:44:03 +05:30
679ae95b8c Removing project selection at Job Creation. 2025-11-17 15:21:31 +05:30
4f03cbb305 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 13:34:09 +05:30
d342550b0f added refresh Manage Job form whenever closing after editing and creating job 2025-11-17 13:34:04 +05:30
4f7ad519cf Change label in Advance Payment in Total balance to currenct balance and hide project selection dropdown in PR and Advance. 2025-11-17 13:11:22 +05:30
c311324bad Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 12:45:01 +05:30
937531afb6 updated PmsEmployeeInputTag for getting all exiten employee for update 2025-11-17 12:44:56 +05:30
b68f8306fd added confirmation modal inside serviceproject employee list 2025-11-17 12:44:01 +05:30
7470a6836f UI alignment at View Managejob Ticket in jobs. 2025-11-17 12:33:19 +05:30
12184091cd UI alignment at view Jobs. 2025-11-17 11:29:44 +05:30
8761c128e6 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 10:57:51 +05:30
8eb34addcd added serviceproject list 2025-11-17 10:57:48 +05:30
b568188a3e Adding TDS Calculation in ViewExpense. 2025-11-17 10:31:41 +05:30
a21bec943d Added GST number in Organization. 2025-11-17 10:05:02 +05:30
3d1d8264ad Merge pull request 'Service_Project_Management_Bugs :- Changes for Jobs' (#511) from Service_Project_Management_Bugs into Service_Project_Managment
Reviewed-on: #511
Merged
2025-11-17 04:16:04 +00:00
d831d08aaf Adding validation in Contact number and adding trim functioanlity. 2025-11-17 04:16:04 +00:00
8553b6bee7 At New Project popup show the Active selected all the time when popup open. 2025-11-17 04:16:04 +00:00
e47262123d Added columns in jobs list and implementing functionality for daysleft. 2025-11-17 04:16:04 +00:00
852ebd7dd0 Correction in UI in ProjectPage. 2025-11-17 04:16:04 +00:00
fc1235caef added allocation and deallocation of service Project team 2025-11-17 00:42:50 +05:30
7e646ca3e8 add new EmployeeSearch for multiple 2025-11-14 20:07:28 +05:30
92bcfb73c6 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 16:47:40 +05:30
770123119c Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 16:39:57 +05:30
7190a3c190 added offcanavs for create and update 2025-11-14 16:39:46 +05:30
b399977946 Invoice list should display according to the selected date range in Collection module. 2025-11-14 15:39:40 +05:30
314dd67118 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 15:12:23 +05:30
74e3b11174 Adding some space in Payment Request list. 2025-11-14 15:12:07 +05:30
dab3c5fe52 fixed attachement error 2025-11-14 14:58:50 +05:30
d1bcc9981c Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 13:04:29 +05:30
86819dde03 added comment, attchment 2025-11-14 13:04:15 +05:30
64d96d46d0 Correction in UI in Dashboard weidget. 2025-11-14 12:58:47 +05:30
05f45a66d8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#1737 2025-11-14 11:59:06 +05:30
0b38196847 Hide “Advance Payment” Mode When Creating Expense After Payment Processed (Mobile & Web) 2025-11-14 11:52:12 +05:30
74e645a41e Increase the size of datepicker at gallery filter panel and remove unwanted PaidBy field in ViewPayment Request. 2025-11-14 11:23:10 +05:30
598601c515 We are creating filter chips in the Payment Request filter panel. 2025-11-14 10:22:27 +05:30
297e0712bc integrated job details api and optimized form 2025-11-14 02:51:29 +05:30
9b7988d6d8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-13 19:50:41 +05:30
844a6f59d1 added fetch api of jobs 2025-11-13 19:50:19 +05:30
c1be1dafc8 Changes in Payment Request List view adding Due Date, Created at and Payee. 2025-11-13 17:45:05 +05:30
14ed888fe8 UI implementation has been done in Expense 2025-11-13 17:22:54 +05:30
b13034a995 Expense widget - Layout change 2025-11-13 15:14:07 +05:30
c4b589460a Correction in EmpReportingManger. 2025-11-13 12:33:50 +05:30
32b7c53b6c Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-13 12:31:47 +05:30
c0378e1d7d revert body background color change. It was turned white after making changes for Landing Page. Ideallly it had to be gray 2025-11-13 12:31:43 +05:30
8453a09426 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-13 11:34:34 +05:30
60421d1028 Adding Navigate functionality in ManageReporting. 2025-11-13 11:34:05 +05:30
2746e9d2bb added Job tab 2025-11-13 11:00:51 +05:30
651779adea Merge branch 'Organization_Hierarchy' into Service_Project_Managment 2025-11-13 10:20:48 +05:30
910565e003 Merge branch 'Organization_Hierarchy' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Hierarchy 2025-11-13 10:07:48 +05:30
a40f96fe72 removed unneeded border and replace toggle for activtive - inactie 2025-11-13 10:07:40 +05:30
cd467efcb3 Correction in EmpReporting Manger. 2025-11-13 10:05:41 +05:30
559d6cdaac Adding Employee details at mange Reporting popup. 2025-11-13 09:54:54 +05:30
3500adc1eb Change the icon in Employee List manage Reporting button. 2025-11-13 09:45:41 +05:30
d7f00898a0 added delete service project 2025-11-12 19:38:04 +05:30
1bba9ab68a added created, fetch and edit operration 2025-11-12 18:12:37 +05:30
5c1b14bd38 added create service project and separated service project and orgnaization project 2025-11-12 14:18:43 +05:30
6019114853 Corrected the spelling mistake in landing page file 2025-11-12 12:41:21 +05:30
fa944f5abe Removing unwanted placeholder. 2025-11-12 12:14:09 +05:30
4351fafed7 Adding Card in Profile related to Reporting Manger. 2025-11-11 18:59:58 +05:30
15e67da7f6 modify hero images for landing page 2025-11-11 18:47:00 +05:30
94413b9beb Implementing ManageReporting at Employee. 2025-11-11 18:00:34 +05:30
8900ed6fc4 Merge branch 'landing-page-consmatic-changes-migration' into migrate_main 2025-11-11 17:34:50 +05:30
04a3141f65 remove swiper from login main and added bootstrap corausal 2025-11-11 17:34:25 +05:30
264ed4a74d added pluse minus sign 2025-11-11 16:50:17 +05:30
1067ac02b3 arrange images for login screen swiper module 2025-11-11 16:05:09 +05:30
96abc8d42c Additing validation at payment Request schema. 2025-11-11 14:40:31 +05:30
ba0036b1fa Adding Badge. 2025-11-11 14:14:02 +05:30
c52fb2c999 Adding TDS percentage calculation at View Payment Request. 2025-11-11 14:11:35 +05:30
867ee92151 Adding popup in employees for ManageReporting. 2025-11-11 11:11:13 +05:30
1195cae2d7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Hierarchy 2025-11-11 09:45:48 +05:30
4eecaf0509 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 18:54:01 +05:30
d82f405e08 changed Expense view u 2025-11-10 18:53:47 +05:30
a37c6b32cb Changing label in Create Payment Request. 2025-11-10 18:31:13 +05:30
9e18dda02f Adding End Date at the view Recurring Expense. 2025-11-10 17:08:23 +05:30
b016f4a523 UI updation at recurring expense. 2025-11-10 17:04:28 +05:30
081b042308 corrected signal key 2025-11-10 16:27:26 +05:30
ca4d57cdc0 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 16:10:45 +05:30
ec9bcd1ea5 added validation for Tax , base amount, and added signal for PR and Recurring 2025-11-10 16:10:18 +05:30
00e74b645c Ui alignment in Recurring Expense and Payment Request page. 2025-11-10 16:00:28 +05:30
26675d61c3 UI correction at Collection form. 2025-11-10 15:36:17 +05:30
78faab1b1e Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 12:58:34 +05:30
6982bb9d77 added heading for PR and Expense Modal 2025-11-10 12:58:30 +05:30
2e49a61aab Changing Date in Expense list grouping. 2025-11-10 12:44:13 +05:30
3723f05a38 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 12:40:33 +05:30
bc6a935e95 modify view of PR 2025-11-10 12:40:29 +05:30
717d215d8e handle UI to look sliker and add missing images 2025-11-10 12:30:16 +05:30
6531eb7576 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 11:50:00 +05:30
c52cbb1435 Adding End Date in Recurring Expense Popup and adding i icon on it. 2025-11-10 11:49:56 +05:30
b86bf204a9 add landing page 2025-11-10 11:36:32 +05:30
30615e4bba login page swaper added 2025-11-10 11:28:51 +05:30
dad9551e52 add images
(cherry picked from commit 34b0fa3d43d45e67098ce768f30a00fca0a72925)
2025-11-10 11:24:58 +05:30
449de6edba added new attribute - disabled 2025-11-10 10:15:13 +05:30
34b0fa3d43 add images 2025-11-10 10:06:09 +05:30
c14dc3d765 prevent calling unnecessary call during logout and fixed currency displaying in update form 2025-11-08 21:32:35 +05:30
e7fcfdb154 added Advance Payment 2025-11-08 16:07:09 +05:30
b35c39ca36 removed unsused 2025-11-08 15:42:00 +05:30
2b5858a885 removed unused code 2025-11-08 15:38:51 +05:30
04806c6d53 fixed error - building image 2025-11-08 15:34:59 +05:30
0dac797e21 upadated recurringList after create 2025-11-08 15:22:24 +05:30
5a7c6a29ba added recurring payment 2025-11-08 15:20:53 +05:30
40cb641428 added Create Expense action - inSequence of PaymentRequest 2025-11-08 14:29:17 +05:30
587fb420fd migrated PR from upgrade_Expense 2025-11-08 12:53:24 +05:30
2f70b83548 added route and initially setup of payment-request 2025-11-08 09:24:45 +05:30
1058b223b0 removed console and debugger 2025-11-08 09:13:11 +05:30
6f228ed5f1 added currency,rename of ExpenseType to expenseCategory - hooks,( expenseCategoryIds = fileter object) 2025-11-08 09:10:35 +05:30
6a97dcf5f6 added initially expense 2025-11-07 18:15:45 +05:30
dcbb4a3997 fixed DatePicker size issue 2025-11-07 16:47:51 +05:30
7b2bb4d59a Merge branch 'Issues_Oct_4W_V1' into migrate_main 2025-11-07 15:17:58 +05:30
f6ea489a0e removed unwanted code 2025-11-07 15:15:24 +05:30
3259a1ba81 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Payment_Getway_Management 2025-11-07 14:56:27 +05:30
57850acd63 Merge pull request 'Progress Bar Misalignment in Project Widgets on Dashboard' (#497) from Kartik_Bug_V1#1539 into Issues_Oct_4W_V1
Reviewed-on: #497
Merged
2025-11-07 09:22:44 +00:00
3204602b25 Progress Bar Misalignment in Project Widgets on Dashboard 2025-11-07 09:22:44 +00:00
034859e88b Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Oct_4W_V1 2025-11-07 14:51:05 +05:30
a656907695 migrated suscripton onfield to main sub-branch 2025-11-07 14:47:09 +05:30
5f2a567600 Document Filter should close automatically when navigating to another menu from Project Profile page 2025-11-07 12:51:28 +05:30
9ef1e39041 Changes in Directory card and Notes view at the UI. 2025-11-07 12:34:57 +05:30
c3d1b46861 Increasing some gap in document view button and uploaded by and approved at. 2025-11-07 11:43:22 +05:30
2596739fc5 Giving some extra gap in document view form. 2025-11-07 11:36:27 +05:30
c216ea1162 some minor label changes 2025-11-03 12:32:34 +05:30
c7fe28a4ed change application title from all places from PMS to OnFieldWork 2025-11-03 12:07:07 +05:30
7b1ed97452 UI changes in Expense Weidget and Attendance weidget. 2025-10-31 16:42:07 +05:30
72eb64177f Correction in Attendance Overview. 2025-10-31 15:50:33 +05:30
466b09df88 Correction in Tenant Schema at onboarding date. 2025-10-31 15:39:27 +05:30
8522f0ca82 Correction in Date format in Attendance logs, and adding spinnerloade at attendance tab. 2025-10-31 15:37:26 +05:30
166c0794ed Image filter is not auto close when we move to next tab. 2025-10-31 15:15:36 +05:30
1c64fac499 Adding Spinners in all files. 2025-10-31 15:06:11 +05:30
4a08394015 Merge pull request 'Adding Spinner in Dashbard.' (#496) from Kartik_Bug_V1#1543 into Issues_Oct_4W_V1
Reviewed-on: #496
Merged
2025-10-31 05:28:48 +00:00
86f931929a Adding Spinner in Dashbard. 2025-10-31 10:57:56 +05:30
9fbe3cf6a5 Merge pull request 'Alignment Correction for Organization & Employee Filters in Attendance → Regularization Tab' (#495) from Kartik_Bug_V1#1569 into Issues_Oct_4W_V1
Reviewed-on: #495
merged
2025-10-31 05:21:20 +00:00
f7c55b4e67 Changes in Attendance tabs. 2025-10-31 05:21:20 +00:00
6a78eddd2b Changes in UI of Attendance Tabs 2025-10-31 05:21:20 +00:00
8fb2091dbd Changes in Expense Component UI. 2025-10-30 16:30:29 +05:30
565ce3f757 UI changes in View popup at attendance logs 2025-10-30 12:16:25 +05:30
c7976a5a0a Changes in Expense List at heading Expense Type to Expense Category. 2025-10-30 12:06:57 +05:30
31a8329254 added initial setp for aing subscription 2025-10-30 09:48:35 +05:30
46ad5429cf intergrated self subscription 2025-10-29 18:59:05 +05:30
e5b4e8325f integrated self subsciption 2025-10-29 18:58:48 +05:30
e95a78e1a3 added payment getway using raz razorpay 2025-10-29 10:58:28 +05:30
a2f105dd41 Merge pull request 'Expense_Weidget_main' (#489) from Expense_Weidget_main into main
Reviewed-on: #489
merged
2025-10-25 10:18:16 +00:00
aa1fc00611 initially setup paymentgatway 2025-10-25 15:37:38 +05:30
247bda1be4 format figure in at dashboard 2025-10-25 12:16:22 +05:30
fc2d115f40 fixed move figure out f card - using type= compact 2025-10-25 12:12:36 +05:30
7f848eeb38 fixed figure moved out of card 2025-10-25 11:40:34 +05:30
b38eb1bc4b handle view documents inside expense 2025-10-25 11:37:23 +05:30
9cd9e0fbbe added document files properly handling inside 2025-10-25 11:20:57 +05:30
4238157fd4 prevent error occurering due to zoom in -out 2025-10-25 11:02:57 +05:30
d7caf47498 added zoom functionality inside prevw documents 2025-10-25 10:45:52 +05:30
b4f1c48293 removed debugger 2025-10-25 10:27:21 +05:30
a070d23304 added skeleton for dashboard card figures cards 2025-10-25 10:26:41 +05:30
32f16092db changed ui for org 2025-10-24 17:29:38 +05:30
1372f9870a updated - add org. ui 2025-10-24 16:01:35 +05:30
d130ede851 changed button size of resetbutton inside preview-document component 2025-10-24 13:19:09 +05:30
9355efa4af fixed search position of master search bar 2025-10-24 13:12:41 +05:30
c438b51ef1 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-24 13:04:39 +05:30
5b3f002772 Merge branch 'Collection_Management' 2025-10-24 12:33:58 +05:30
0d9037dbdc Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Collection_Management 2025-10-24 12:32:42 +05:30
55d455bb10 Merge pull request 'Collection_Management' (#487) from Collection_Management into main
Reviewed-on: #487
Merged
2025-10-24 06:41:58 +00:00
767e218987 changed useCollection file extension syntax js to jsx 2025-10-24 06:41:58 +00:00
e0eec8ff69 added ratoted image inside preview documents 2025-10-24 06:41:58 +00:00
c38efe9934 added mismatch permission 2025-10-24 06:41:58 +00:00
9e5555ff9d added properly permissions 2025-10-24 06:41:58 +00:00
8a18c0860e added collection permission 2025-10-24 06:41:58 +00:00
e5b01e9e0f added xl, and doc file allow to upload and getSubscription plan api properly 2025-10-24 06:41:58 +00:00
b7268f9294 removed console 2025-10-24 06:41:58 +00:00
43ecdadfa9 added paymentadjustment head crud operation 2025-10-24 06:41:58 +00:00
005261abab adjust history table whenever select comment tab 2025-10-24 06:41:58 +00:00
9527427f47 added provideAll is flag inside basic projctname api 2025-10-24 06:41:58 +00:00
10fc88c022 added mark as completd api operation 2025-10-24 06:41:58 +00:00
3b0097f46b integrated editcollection and vew douments 2025-10-24 06:41:58 +00:00
ecd726bbb1 integrated comment api added comment and payments history inside view collection 2025-10-24 06:41:58 +00:00
d14fb130c6 updated payhistory after add payment 2025-10-24 06:41:58 +00:00
b6ef3e0d22 added skeleton for payment history at add payment form 2025-10-24 06:41:58 +00:00
b3f489fe9f rmoved console 2025-10-24 06:41:58 +00:00
edae70f8af integrated collection details api 2025-10-24 06:41:58 +00:00
4563e328a5 changed useCollection file extension syntax js to jsx 2025-10-24 12:01:24 +05:30
8f0ca4a9ca added ratoted image inside preview documents 2025-10-17 12:26:57 +05:30
dec959c495 added mismatch permission 2025-10-17 11:55:55 +05:30
cb7e044b27 added properly permissions 2025-10-17 11:19:44 +05:30
4c059afb72 added collection permission 2025-10-17 10:18:11 +05:30
97525e3cb2 Correction in Expense compoent at name column. 2025-10-16 12:51:03 +05:30
2a0f7794b5 Changes in filter panel. 2025-10-16 10:17:12 +05:30
798ea24088 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-16 10:03:02 +05:30
8460460caf Merge pull request 'Excessive space between Organization dropdown and Search bar in Attendance menu.' (#484) from Kartik_Bug#1499 into Issues_Oct_main_2W
Reviewed-on: #484
Merged
2025-10-15 12:37:16 +00:00
c8273070ac Changes in Attendance and Expenselist. 2025-10-15 12:37:16 +00:00
dc4e48ad3b Changes in Employee list at pagination and at mobile view then scrollbar is shown. 2025-10-15 12:37:16 +00:00
20b508bebc Changes in Regularization tab. 2025-10-15 12:37:16 +00:00
05c01d1d34 Changes in Attendance page. 2025-10-15 12:37:16 +00:00
073897156e Excessive space between Organization dropdown and Search bar in Attendance menu. 2025-10-15 12:37:16 +00:00
3a2fcf71ee Merge pull request 'Export to PDF button not functioning' (#479) from Kartik_Bug#1434 into Issues_Oct_main_2W
Reviewed-on: #479
Merged
2025-10-15 12:33:55 +00:00
f0c6aea55d Create a seprate file for export functionality in employee. 2025-10-15 12:33:55 +00:00
278a5651fe Changes in excel import. 2025-10-15 12:33:55 +00:00
6fc3e674e5 Export to PDF button not functioning 2025-10-15 12:33:55 +00:00
9f4d82eb06 Merge pull request '“No images match the selected filters.” message should be displayed at the center of the page.' (#481) from Kartik_Bug#1497 into Issues_Oct_main_2W
Reviewed-on: #481
Merged
2025-10-15 12:26:25 +00:00
4ba0c823c0 “No images match the selected filters.” message should be displayed at the center of the page. 2025-10-15 12:26:25 +00:00
acf6a28191 Merge pull request 'Attendance "No record" message improvement' (#480) from Kartik_Bug#1437 into Issues_Oct_main_2W
Reviewed-on: #480
merged
2025-10-15 12:24:37 +00:00
98c90f2a9b Attendance "No record" message improvement 2025-10-15 12:24:37 +00:00
6e89fbd680 added xl, and doc file allow to upload and getSubscription plan api properly 2025-10-15 17:31:58 +05:30
cc2a82e3f0 Removing error in Contact Filter panel. 2025-10-15 16:56:18 +05:30
b23518f796 Changes in expense filter panel. 2025-10-15 15:58:59 +05:30
9648d1a98b removed console 2025-10-15 15:55:46 +05:30
aa947b791b added paymentadjustment head crud operation 2025-10-15 15:42:30 +05:30
bd6332fa61 Changes in Filter panel. 2025-10-15 14:10:03 +05:30
51cca64dd5 adjust history table whenever select comment tab 2025-10-15 12:55:07 +05:30
57d65a5fe7 Adding Chips in Document, Directory and Expense Page. 2025-10-15 12:46:47 +05:30
ca88928850 added provideAll is flag inside basic projctname api 2025-10-15 12:45:11 +05:30
962286a4da added mark as completd api operation 2025-10-15 12:35:07 +05:30
0b02531909 Adding Table-respnsive in projectNav. 2025-10-15 11:33:09 +05:30
dec15278fa Changes in Emp Attendance and DateRange picker. 2025-10-15 11:00:18 +05:30
76df08e921 integrated editcollection and vew douments 2025-10-14 20:17:48 +05:30
0052fed1e6 integrated comment api added comment and payments history inside view collection 2025-10-14 18:20:36 +05:30
da56c59ac9 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-14 17:40:42 +05:30
d9392c244e Changes in UI of Weigets and show selected project on 2 heading. 2025-10-14 17:29:20 +05:30
a7f1ba97c3 Creating new weidgets in Dashboard in main. 2025-10-14 17:14:06 +05:30
b80af5467c Changes in Infrastructure. 2025-10-14 15:07:07 +05:30
e2035e1fd8 updated payhistory after add payment 2025-10-14 14:28:49 +05:30
7176a86913 Merge pull request 'integrated collection details api' (#485) from collection_dev into Collection_Management
Reviewed-on: #485
Merged
2025-10-14 08:54:29 +00:00
a26e4d1dc2 added skeleton for payment history at add payment form 2025-10-14 08:54:29 +00:00
f91c7d6da1 rmoved console 2025-10-14 08:54:29 +00:00
272645f0b4 integrated collection details api 2025-10-14 08:54:29 +00:00
301684a12b Merge pull request 'collection_dev' (#482) from collection_dev into Collection_Management
Reviewed-on: #482
merged
2025-10-14 04:55:41 +00:00
9288ac1fbc successfuuly fetch data and create collection 2025-10-14 10:24:45 +05:30
376a2a397f intergrated get list and create collection 2025-10-14 00:21:19 +05:30
58c2fbdf1b initiallly setup 2025-10-13 17:15:59 +05:30
9592108472 Removing extra margin-top on Project-details. 2025-10-13 16:35:28 +05:30
3b032b7b07 Merge pull request 'Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams' (#475) from Kartik_Bug#1455 into Issues_Oct_main_2W
Reviewed-on: #475
merged
2025-10-13 09:33:09 +00:00
b8891d403f Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams 2025-10-13 09:33:09 +00:00
01568db61c Merge pull request '“NA” Should Be Displayed When Employee Has No Email Instead of “–”' (#476) from Kartik_Bug#1451 into Issues_Oct_main_2W
Reviewed-on: #476
Merged
2025-10-13 09:32:51 +00:00
80a974e3be “NA” Should Be Displayed When Employee Has No Email Instead of “–” 2025-10-13 09:32:51 +00:00
f3e05a11d6 Merge pull request 'Adding Project and Service field in View Organization popup.' (#477) from Kartik_Task#1477 into Issues_Oct_main_2W
Reviewed-on: #477
Merged
2025-10-13 09:32:32 +00:00
222e6495a8 Adding Project and Service field in View Organization popup. 2025-10-13 09:32:32 +00:00
18a3b8a85b Merge pull request 'Filter Sidebar Should Auto-Close When Navigating to Another Page' (#478) from Kartik_Bug#1450 into Issues_Oct_main_2W
Reviewed-on: #478
merged
2025-10-13 09:32:17 +00:00
d75296ffe8 Filter Sidebar Should Auto-Close When Navigating to Another Page 2025-10-13 14:51:47 +05:30
6649cab6a2 Added cursor-not-allowed when user can delete the organization. 2025-10-13 14:16:11 +05:30
eab23389ed Correction in Projects Completion Status in this weidget data cannot be shown. 2025-10-13 12:51:42 +05:30
12b632f087 added new api for list of org 2025-10-11 18:06:51 +05:30
6ee4fb6d04 Updated TeamEmployeeList to fetch employees using useOrganizationEmployees during search. 2025-10-11 17:48:25 +05:30
67bb685d4b added new api for orgaization dropdown 2025-10-11 16:55:22 +05:30
8fd4e7f3f1 added space between first and last name 2025-10-11 16:30:27 +05:30
aca2decb00 clear fully cache after remove session 2025-10-11 16:26:04 +05:30
f7f4b68997 changed reimburse data during transaction to current date 2025-10-11 15:09:04 +05:30
f839613066 Merge pull request 'Fix: Ensure orgData can be cleared when opening Organization Modal' (#474) from HotChanges_11_10_25 into main
Reviewed-on: #474
Merged
2025-10-11 08:42:26 +00:00
b58bd33774 added requested b and requested at column inside rgularization 2025-10-11 14:08:27 +05:30
136bc94c5b removed dbugger and add new classes 2025-10-11 13:12:23 +05:30
281a956ac8 fixed directory header layout 2025-10-11 12:43:37 +05:30
31882c3d12 REMOVED UNNEEDED CARD CLASS 2025-10-11 11:13:38 +05:30
a64635cd37 Fix: Ensure orgData can be cleared when opening Organization Modal 2025-10-11 10:29:40 +05:30
9b8c8c34ab Merge pull request 'HotChanges_10_10_25' (#472) from HotChanges_10_10_25 into main
Reviewed-on: #472
Merged
2025-10-10 14:50:04 +00:00
704ba79289 prevent to select future date 2025-10-10 20:17:06 +05:30
3440467107 wapped header content into separated div 2025-10-10 18:25:19 +05:30
f4edcfd2f3 changed prod url 2025-10-10 18:18:20 +05:30
62e5c6899a profile icon should display always at end 2025-10-10 18:17:24 +05:30
00a23b3de9 changed class for table responsive 2025-10-10 18:11:43 +05:30
79161a8ede prevent to pick future date 2025-10-10 18:09:35 +05:30
860779d096 fixed service list show in Dialy Task 2025-10-10 18:08:21 +05:30
a2067e150d fixed service list show 2025-10-10 17:51:12 +05:30
edce5ef614 added newhook that return only organization employee for employee list (Active or Inactive) 2025-10-10 16:48:22 +05:30
dd944b3414 datepicker should not take future date 2025-10-10 16:46:34 +05:30
13d3572cf6 fixed datepicke ui 2025-10-10 16:45:43 +05:30
0dd7c19457 added navigation hook to replace path 2025-10-10 15:37:59 +05:30
3cc4f0b416 mismatch service api fixed 2025-10-10 14:15:30 +05:30
f8095ac9bf upgraded progress 2025-10-10 10:55:51 +05:30
6280abf95e added marging between fltes input box 2025-10-09 17:32:39 +05:30
1200937097 Merge pull request 'HotChanges_09_10_25 : Added Daily Task Filter' (#467) from HotChanges_09_10_25 into main
Reviewed-on: #467
Merged
2025-10-09 12:00:21 +00:00
5d1ccb9572 changed buttons size 2025-10-09 17:25:03 +05:30
91ffc5a0e0 added filter for DailyTask Report 2025-10-09 17:23:04 +05:30
1c4804fed2 added for serviceI dropdown list 2025-10-09 16:48:15 +05:30
0e5e716df2 removed debuggger 2025-10-09 16:20:43 +05:30
aecaee7116 addded project when project goin to update state 2025-10-09 15:38:59 +05:30
97dca1a10b removed unused code 2025-10-07 14:53:48 +05:30
c35eacca5a addded filter added inside api 2025-10-07 14:02:25 +05:30
5e27ed36fa Merge pull request 'HotChanges_06-10-25 : Image Gallery and Attendanc CheckIn check-Out' (#459) from HotChanges_06-10-25 into main
Reviewed-on: #459
Merged
2025-10-07 07:12:49 +00:00
8bcfcc5718 fixed attendance - check In -out and persisted date range from Redux store for attendance logs 2025-10-07 07:12:49 +00:00
ad1bef4f7b added gallery and gallery filter 2025-10-07 07:12:49 +00:00
9886fac03e employee attendance display sorted by date, 2025-10-06 17:20:36 +05:30
a28a7fb444 checked-Out Time should be greather than or equal to checked In time 2025-10-06 16:07:31 +05:30
470421b730 added two date and service-name column inside ProjectAssignedOrgslist and fixed inactive fn in project team 2025-10-06 10:58:07 +05:30
7505b790a7 added trim fn to avoid extra spacing 2025-10-06 10:06:31 +05:30
8fd13247c7 Merge pull request 'HotChanges_04_10_25' (#450) from HotChanges_04_10_25 into main
Reviewed-on: #450
Merged
2025-10-05 04:28:55 +00:00
0fec257354 make removeSession flexible to clear local, session, or both 2025-10-05 00:21:19 +05:30
638c033705 fixed employee name show whenever update expense - for paid by 2025-10-05 00:14:39 +05:30
7872e21477 changed date utils and added search employee inside manage expense 2025-10-04 19:50:26 +05:30
6928bbd309 Changes in ProjectRepository api for getProjectInfraByProject 2025-10-04 17:50:54 +05:30
3693af3d00 added missing projects at ManageContact (Edit&Crate) 2025-10-04 16:36:11 +05:30
d5df200ede Merge pull request 'Organization_Management : Organization Hierarchy' (#443) from Organization_Management into main
Reviewed-on: #443
Merged
2025-09-30 09:07:30 +00:00
9c6450496e added closed fun after create project and changed label name 2025-09-30 14:22:01 +05:30
cfd3986479 fixed small changed like heading, font change 2025-09-30 11:59:16 +05:30
764b145ad9 empty select activity, planne work fields after successfully created task 2025-09-29 18:31:56 +05:30
20c7cf7f37 added right path for organization info show 2025-09-29 18:00:48 +05:30
6d74940c0c added optional chain at view org details 2025-09-29 17:55:56 +05:30
02dcd8611f user could not create subtask completed equal to approve task and fixd error imported subTask component 2025-09-29 17:29:11 +05:30
02600308e8 rmoved unused and console 2025-09-29 16:53:24 +05:30
d1c72291a3 update date utility for localtoUtc fn 2025-09-29 15:20:54 +05:30
fdbd81c5e7 removed console 2025-09-29 15:13:36 +05:30
28d5ef653d added optional chain for manage project to prevent run time error 2025-09-29 15:10:49 +05:30
550b142d74 fixed run time date error 2025-09-29 15:03:52 +05:30
68335f0695 added temp. placeholder for image gallary 2025-09-29 14:38:23 +05:30
4ea20981fc Merge pull request 'Changes in Directory edit' (#407) from Kartik_Bug#1180 into Organization_Management
Reviewed-on: #407
Merged
2025-09-29 09:00:27 +00:00
965e1e4808 Correction in Edit Bucket in Directory. 2025-09-29 09:00:27 +00:00
1c376fe91f Changes in Directory edit 2025-09-29 09:00:27 +00:00
61835cb189 added clear filter 2025-09-29 12:55:31 +05:30
375c482b61 renamed Inactive to Includes Inactive 2025-09-29 12:04:33 +05:30
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
22514b1fa0 Merge pull request 'ProjectUpdationForOrganizaion : added Two fields inside Project create and update form - Promoter and PMC and added Remember me' (#442) from ProjectUpdationForOrganizaion into Organization_Management
Reviewed-on: #442
Merged
2025-09-28 18:44:30 +00:00
61b209a082 addded remember me functionality 2025-09-29 00:13:52 +05:30
198e31290c updated project files 2025-09-28 22:15:07 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
2489095b0b Merge pull request 'Date picker in Document Filter shows pre-filled date instead of blank' (#422) from Kartik_Bug#1250 into Organization_Management
Reviewed-on: #422
Merged
2025-09-27 09:41:15 +00:00
eb8d269662 Date picker in Document Filter shows pre-filled date instead of blank 2025-09-27 09:41:15 +00:00
bbd8ed12f6 Merge pull request 'Date field not cleared in Tenant filter after clicking Clear button' (#432) from Kartik_Bug#1306 into Organization_Management
Reviewed-on: #432
Merged
2025-09-27 09:40:05 +00:00
1e7b4ba21e Date field not cleared in Tenant filter after clicking Clear button 2025-09-27 09:40:05 +00:00
4de3987a37 Merge pull request 'Add extra spacing in Infra Work details.' (#434) from Kartik_Bug#1359 into Organization_Management
Reviewed-on: #434
Merged
2025-09-27 09:38:34 +00:00
7455d8a221 Add extra spacing in Infra Work details. 2025-09-27 09:38:34 +00:00
3f4b7d08d4 Merge pull request 'Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task' (#435) from Kartik_Task#1361 into Organization_Management
Reviewed-on: #435
Merged
2025-09-27 09:37:36 +00:00
7ac3268514 Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task 2025-09-27 09:37:36 +00:00
f8740472de Merge pull request 'Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab)' (#436) from Kartik_Task#1374 into Organization_Management
Reviewed-on: #436
Merged
2025-09-27 09:36:27 +00:00
be72ca9a58 Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab) 2025-09-27 09:36:27 +00:00
c71c00c0f7 Merge pull request 'Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure)' (#438) from Kartik_Bug#1372 into Organization_Management
Reviewed-on: #438
Merged
2025-09-27 09:35:27 +00:00
112e0ff798 Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure) 2025-09-27 09:35:27 +00:00
96eb030457 Merge pull request 'Tenant Creation – Error banner for plan selection/currency should not be shown' (#439) from Kartik_Bug#1370 into Organization_Management
Reviewed-on: #439
Merged
2025-09-27 09:34:48 +00:00
a873ace109 Tenant Creation – Error banner for plan selection/currency should not be shown 2025-09-27 09:34:48 +00:00
fb164bd2f2 Merge pull request 'Switch Tenant & Goto workspace option label should be “Switch Workspace' (#440) from Kartik_Bug#1366 into Organization_Management
Reviewed-on: #440
Merged
2025-09-27 09:34:07 +00:00
0d6708619f Switch Tenant & Goto workspace option label should be “Switch Workspace 2025-09-27 09:34:07 +00:00
edba191a2e Merge pull request 'Tenant Creation – Logo removed when navigating back from second page' (#441) from Kartik_Bug#1369 into Organization_Management
Reviewed-on: #441
Merged
2025-09-27 09:33:46 +00:00
ddfe09b570 Tenant Creation – Logo removed when navigating back from second page 2025-09-27 09:33:46 +00:00
acb899dd2e Merge pull request 'Change the label in Assign Organization.' (#433) from Kartik_Bug#1353 into Organization_Management
Reviewed-on: #433
Merged
2025-09-27 09:31:52 +00:00
ae66cb3705 Change the label in Assign Organization. 2025-09-27 09:31:52 +00:00
d52fa00de0 Merge pull request 'Team Assign ToProject : With other Organization employees' (#437) from TeamAssignToProject into Organization_Management
Reviewed-on: #437
Merged
2025-09-27 09:29:59 +00:00
ca8a41bb63 added style classes for footer 2025-09-27 09:29:59 +00:00
265c74f079 added filter and sorted employee list - Team 2025-09-27 09:29:59 +00:00
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
3233043cf2 initial setup for assign emp to project 2025-09-27 09:29:59 +00:00
3fddb686d3 change get employee at assign task to employee 2025-09-27 14:58:39 +05:30
4fd6e5cc1a Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-27 10:33:40 +05:30
1fb8eb9ef1 Create Task popup will open at all the time while submitting. 2025-09-26 16:21:37 +05:30
1a3890e837 Removing Create and Activity from MasterModal.jsx file. 2025-09-26 15:34:08 +05:30
2dbf08e330 Removing create and Edit activity component. 2025-09-26 15:02:03 +05:30
b044b88c49 Adding border in Group and Activities popup and Removing mandatory field in Tenant. 2025-09-26 14:56:19 +05:30
db815ba038 Rmoving Refresh icon and Label in Tenant. 2025-09-26 11:51:55 +05:30
53fa013c39 split projectList component 2025-09-26 11:47:03 +05:30
22a1ad45e7 Change the name of Switch Tenant to Workspace 2025-09-26 11:37:31 +05:30
91dcd7c132 The images on the Forgot page and Request Demo page should be centered after the update. 2025-09-26 10:53:31 +05:30
7d18edfa9b added tenant selection path within otp sign in way 2025-09-26 10:01:09 +05:30
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +05:30
69c225ac72 Adding Services dropdown in Organization Creation dropdown. 2025-09-25 16:09:36 +05:30
182280e91d Merge pull request 'Correction of Delete Employee Popup Texts' (#424) from Kartik_Bug#1261 into Organization_Management
Reviewed-on: #424
Mereged
2025-09-25 09:21:54 +00:00
38bd8d36c0 Correction of Delete Employee Popup Texts 2025-09-25 09:21:54 +00:00
a4bccc9bf6 Merge pull request 'Verify mandatory indicator (*) for Reference field while creating a Tenant' (#427) from Kartik_Bug#1295 into Organization_Management
Reviewed-on: #427
Merged
2025-09-25 09:20:48 +00:00
0e6dd93260 Verify mandatory indicator (*) for Reference field while creating a Tenant 2025-09-25 09:20:48 +00:00
245219ad71 Merge pull request 'Inconsistent search bar height in Tenant module' (#429) from Kartik_Bug#1300 into Organization_Management
Reviewed-on: #429
Merged
2025-09-25 09:19:07 +00:00
978a497f28 Inconsistent search bar height in Tenant module 2025-09-25 09:19:07 +00:00
451d0a785f Merge pull request 'Change all create button UI.' (#430) from Kartik_Task#1345 into Organization_Management
Reviewed-on: #430
Merged
2025-09-25 09:17:56 +00:00
84f9cb2e29 Change all create button UI. 2025-09-25 09:17:56 +00:00
9d9ca28bad Merge pull request 'Incorrect button sequence in Tenant Edit form' (#428) from Kartik_Bug#1301 into Organization_Management
Reviewed-on: #428
Merged
2025-09-25 09:17:16 +00:00
1d218056ac Incorrect button sequence in Tenant Edit form 2025-09-25 09:17:16 +00:00
58837cef0c Merge pull request 'Adding Activity-Group in Create Task popup.' (#431) from Kartik_Task_InfraMask#1266 into Organization_Management
Reviewed-on: #431
merged
2025-09-25 09:00:46 +00:00
1cd3bf6c7f updated assigned services poject whenver assigned new service 2025-09-25 09:00:46 +00:00
d2b10495bd Added Services Column in Edit activity modal 2025-09-25 09:00:46 +00:00
ae9c4833b3 Added Activity Group, and implemented sorting for Service, Activity Group, and Activities. 2025-09-25 09:00:46 +00:00
e69efe61cb Adding Activity-Group in Create Task popup. 2025-09-25 09:00:46 +00:00
92b1531b75 daily task planning filtering according to service 2025-09-25 14:11:04 +05:30
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
49eaf857ad In Choose Orgainzation popup Find Organization and Search box show in one line. 2025-09-25 11:46:12 +05:30
ccdfc193c6 Change the position of setting and Organization in Project nav. 2025-09-25 09:52:13 +05:30
817b31379e Switch Tenant button move to top in User Profile. 2025-09-24 17:33:55 +05:30
b36120f73d Merge pull request 'In ExpensePanel add new Toggle button.' (#421) from Kartik_Task#1303 into Organization_Management
Reviewed-on: #421
2025-09-24 11:14:01 +00:00
e2ae2e5fbd change labels as per guidance 2025-09-24 16:43:36 +05:30
521e6690cb uncommit important stuff 2025-09-24 15:09:34 +05:30
1f4a7e5e9c forgot uncomment important stuff- tenant 2025-09-24 15:08:42 +05:30
1d3fcff859 Merge pull request 'Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default' (#423) from Kartik_Bug#1292 into Organization_Management
Reviewed-on: #423
Merged
2025-09-24 07:20:45 +00:00
1286184e1f Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default 2025-09-24 07:20:45 +00:00
4e315aafcf added small ui changed like table b-padding, button size and fixd delete activity and group 2025-09-24 12:49:00 +05:30
52e12426af Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-23 17:49:01 +05:30
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
d87dae4799 In ExpensePanel add new Toggle button. 2025-09-23 16:35:48 +05:30
4683eff749 In the ProjectList view, when we select 'View Details', the project is automatically set to 'marcosecure' instead of the selected project. 2025-09-23 11:06:16 +05:30
772a3e2829 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-22 18:44:13 +05:30
ca7b0cda13 initially setup of service management 2025-09-22 18:44:05 +05:30
a380a7ab29 Changes in Choose Organization1 popup increase the space. 2025-09-22 16:25:02 +05:30
c609387924 Changes in Organization popup 2025-09-22 16:00:24 +05:30
69cc3b9383 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-22 13:13:22 +05:30
6ebbc853bc optimized logout fun and intergrated inside Tenant selection page 2025-09-22 13:13:13 +05:30
71dd35adc2 Changes in Services Dropdown. 2025-09-22 12:40:00 +05:30
533b40d1bf Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-22 10:31:06 +05:30
42a80bbd68 removed unused code 2025-09-22 10:30:57 +05:30
397020ccb4 Merge pull request 'Creating a Services in Master Compoenents.' (#408) from Master_Services into Organization_Management
Reviewed-on: #408
2025-09-22 05:00:06 +00:00
71932ea6dc Merge pull request 'Integrate the API for Work Area and fetch data filtered by serviceId.' (#419) from Kartik_Task_Infra#1265 into Organization_Management
Reviewed-on: #419
2025-09-22 04:07:58 +00:00
693cabf63d Merge pull request 'Calling api for Attendance component for Organization.' (#420) from Kartik_Task_Att#1236 into Organization_Management
Reviewed-on: #420
2025-09-22 04:07:09 +00:00
4afe43d116 handle one tenant have , directly move to dashboard once logged 2025-09-22 00:09:34 +05:30
b9b3788dda configured tenant level login 2025-09-21 18:59:34 +05:30
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +05:30
aee510f527 revert pramod changed - (tenant login mistake 2025-09-21 16:58:29 +05:30
7e6020e3db Merge branch 'organization_management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-21 16:42:26 +05:30
cf78d17cf5 Merge pull request 'Add an Organization column in the Attendance grid across all tabs.' (#414) from Kartik_Task_OrgCol_att#1238 into Organization_Management
Reviewed-on: #414
2025-09-21 11:11:21 +00:00
72dbdb0fe0 Changes in Attendance 2025-09-21 16:40:23 +05:30
afcd1934f9 Integrate the API for Work Area and fetch data filtered by serviceId. 2025-09-21 15:10:31 +05:30
Pramod
3e5afe0bc6 revertlogin initial steup in organization_management brnach 2025-09-21 10:13:12 +05:30
Pramod
070fa93fca initially setup login 2025-09-21 10:06:38 +05:30
53a9cbc30b Merge pull request 'Changes in the Teams Services dropdown will reflect the Services data.' (#418) from Kartik_Task_TeamGrid#1259 into Organization_Management
Reviewed-on: #418
2025-09-20 15:01:16 +00:00
70acf57266 Remove message from Services dropdwon. 2025-09-20 20:05:25 +05:30
b2d7349fc9 Adding search funcionality in Teams for Organization and Services. 2025-09-20 19:37:47 +05:30
a0f7e5c57b Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task_TeamGrid#1259 2025-09-20 19:32:41 +05:30
fa7dc2860c Changes in the Teams Services dropdown will reflect the Services data. 2025-09-20 19:30:47 +05:30
a1a935b0d5 Merge pull request 'changed Uii for org. or project assigned' (#417) from organization_level_login into Organization_Management
Reviewed-on: #417
2025-09-20 13:27:30 +00:00
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30
9711144236 Adding a new Grid in Teams Grid. 2025-09-20 15:40:17 +05:30
1a88f5fec5 chenages msg 2025-09-20 14:02:57 +05:30
ce73cfad21 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-20 13:59:24 +05:30
7dafd4a45f fetched assigned organozation to project 2025-09-20 13:59:20 +05:30
2e3e3aa6ca Merge pull request 'Adding Filter Icon in Attendance tab and add functionality in all Attendance component.' (#416) from Kartik_Task_AttFilter#1235 into Organization_Management
Reviewed-on: #416
2025-09-20 06:45:11 +00:00
158c934a9f Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-20 12:14:40 +05:30
f6d864d42e assign to project and Tenant flow is integrated with api 2025-09-20 12:14:34 +05:30
90b96864be Changes in Attendance filter 2025-09-20 12:13:49 +05:30
5a048f7066 Merge pull request 'Adding Dropdown and API call in Daily Progress Report.' (#413) from Kartik_Task_DailyProgress#1232 into Organization_Management
Reviewed-on: #413
2025-09-20 06:22:43 +00:00
731d2dbed7 Changes in Infrastructure. 2025-09-20 11:51:32 +05:30
25de45b31b Merge pull request 'Adding Dropdown in Daily Task Planning and call api.' (#412) from Kartik_Task_DailyTask#1231 into Organization_Management
Reviewed-on: #412
2025-09-20 06:09:58 +00:00
58b5da1793 Changes in Daily Task planning 2025-09-20 11:39:14 +05:30
0746e5c349 Merge pull request 'Adding Dropdown in Create Task Popup.' (#411) from Kartik_Task#1230 into Organization_Management
Reviewed-on: #411
2025-09-20 06:03:55 +00:00
83143dff0a Merge pull request 'Adding Services Dropdown in Infrastructure.' (#410) from Kartik_Task#1229 into Organization_Management
Reviewed-on: #410
2025-09-20 06:00:05 +00:00
994f22e8c0 Changes in Infrastructure service dropdown. 2025-09-20 11:29:29 +05:30
84a5be52f8 Merge pull request 'Adding Dropdown and Organization Column in Teams' (#409) from Kartik_Task#1227 into Organization_Management
Reviewed-on: #409
2025-09-20 05:52:30 +00:00
b39df5f665 Changes in Teams dropdown. 2025-09-20 11:21:56 +05:30
9bdcc74486 Adding Filter Icon in Attendance tab and add functionality in all Attendance component. 2025-09-20 10:28:18 +05:30
005fdb3490 added assigned org to project 2025-09-19 23:46:06 +05:30
9223f7a176 Adding Card in Daily Progress Report. 2025-09-19 20:03:36 +05:30
27b62c858d Change the position of Datepicker and Dropdown box. 2025-09-19 19:50:50 +05:30
00d6774e06 Change the position of Services in Create Task popup in Infrastructure. 2025-09-19 19:26:46 +05:30
1ef82ad0b2 Only 1 project or no project is assigned then dropdown will be hide. 2025-09-19 19:20:01 +05:30
1da587d010 Adding condition if single or no project assigned then dropdown is not shown 2025-09-19 19:13:02 +05:30
164b82e1c7 Add an Organization column in the Attendance grid across all tabs. 2025-09-19 17:00:02 +05:30
e9d8b6daea Adding Dropdown and API call in Daily Progress Report. 2025-09-19 16:43:44 +05:30
9b37288901 Adding Dropdown in Daily Task Planning and call api. 2025-09-19 16:32:34 +05:30
54e609883d Adding Dropdown in Create Task Popup. 2025-09-19 16:13:09 +05:30
7d17422681 Calling Api for Services dropdown. 2025-09-19 16:02:36 +05:30
d67121c150 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1227 2025-09-19 15:55:25 +05:30
e154bac64a Calling api for services dropdwon. 2025-09-19 15:54:29 +05:30
ea350db98b Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1229 2025-09-19 15:27:16 +05:30
133024bc5c setup assigned org to project and integrated projectservice 2025-09-19 15:25:58 +05:30
ea219b7176 Adding Services Dropdown in Infrastructure. 2025-09-19 15:03:25 +05:30
af5519fd60 Adding Dropdown and Organization Column in Teams 2025-09-19 14:53:40 +05:30
08194dd8ef Creating a Services in Master Compoenents. 2025-09-19 14:18:56 +05:30
1452e77bc5 initially setup service provider form 2025-09-18 19:23:24 +05:30
7fa2ca9227 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-18 15:25:02 +05:30
0d9ef7f248 integrated fetch organization list api and display with search filter 2025-09-18 15:23:48 +05:30
9a3488c92b convert inline style css class into class name 2025-09-18 15:23:48 +05:30
1b144aab8a organization created successfully 2025-09-18 15:23:48 +05:30
2e65007f26 fixed Modal provider component and setup organization creation 2025-09-18 15:23:48 +05:30
3c4c25b449 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:23:23 +05:30
979293ad90 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:21:23 +05:30
99eaf92e3f initially setup 2025-09-18 15:18:51 +05:30
28b0541894 organization created successfully 2025-09-18 15:18:04 +05:30
a48fc1d989 fixed Modal provider component and setup organization creation 2025-09-18 15:18:04 +05:30
78a0ecebf1 resolved conflict during came rebase 2025-09-18 15:18:04 +05:30
8eb8e27f89 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:18:04 +05:30
012a89b3ea setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:18:04 +05:30
18698a67e3 removed unused files 2025-09-18 15:18:04 +05:30
701d1adc0b initially setup 2025-09-18 15:18:03 +05:30
b2c68824dd fixed refresh existen permission 2025-09-18 12:57:37 +05:30
b3b7297bc3 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web 2025-09-18 12:40:06 +05:30
9311f41f56 fixed high level changes 2025-09-18 12:38:39 +05:30
9ba2ecfb1f Merge pull request 'Intefrating_API_Dashboard Changes in UI of Dashboard and Login form password field.' (#406) from Intefrating_API_Dashboard into main
Reviewed-on: #406
2025-09-18 07:05:38 +00:00
a27b8571b5 cosmatic changes 2025-09-18 12:35:04 +05:30
fd36298543 Changes in UI of Landing Page subscription and add skeleton 2025-09-18 12:07:46 +05:30
09bb58e50e fixed project level permission bug 2025-09-18 11:30:38 +05:30
01a5766074 organization created successfully 2025-09-18 10:01:39 +05:30
0348f6da8e fixed Modal provider component and setup organization creation 2025-09-17 19:45:42 +05:30
1c0e8655c4 Changes in Login-form hide/unhide button add secondary. 2025-09-17 17:09:56 +05:30
6211f52e3a Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Intefrating_API_Dashboard 2025-09-17 16:51:56 +05:30
df9107f0d8 Changes in UI of Subscription-plan. 2025-09-17 16:49:52 +05:30
eea7252b96 Changes in UI of Dashboard getplans. 2025-09-17 16:10:49 +05:30
442ecff926 Merge pull request 'Refactor_Directory And Project Level Permsssion' (#404) from Refactor_Directory into main
Reviewed-on: #404
Merged
2025-09-17 10:24:45 +00:00
0abd77dab7 Merge pull request 'Calling API for Dashboard paln show.' (#405) from Intefrating_API_Dashboard into Refactor_Directory
Reviewed-on: #405
Merged
2025-09-17 10:23:13 +00:00
4b0ea3a0db Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-17 15:50:49 +05:30
d3218eb77a handle project set null at employee details page 2025-09-17 15:50:44 +05:30
4ad87af7f4 Add FAQ Answers on landing page 2025-09-17 15:22:25 +05:30
7b15309dbf Calling API for Dashboard paln show. 2025-09-17 14:38:57 +05:30
834ce62e67 Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-17 14:26:35 +05:30
889b477dd0 removed subMenu of Project setting 2025-09-17 14:24:45 +05:30
19f8189fc3 resolved conflict during came rebase 2025-09-17 14:19:02 +05:30
970c195ca5 refactore SelectMult Tag for label display is required or optional 2025-09-17 14:15:29 +05:30
d944d3a389 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-17 14:15:29 +05:30
e0c7eee1fd removed unused files 2025-09-17 14:14:56 +05:30
6baa2896c2 initially setup 2025-09-17 14:14:56 +05:30
a835e75f66 fixed view project 2025-09-17 13:15:00 +05:30
cc7ef47055 fixed validation msg set bottom of select box 2025-09-17 12:54:40 +05:30
95fbac4760 fixed prevent removed existen permission whenever add new one 2025-09-17 12:41:00 +05:30
a86c815ca2 Asthetic Changes
- Margin on all sides for grid
- Margin for card content
2025-09-16 18:33:48 +05:30
daa1a29e8a added option chain for handle error 2025-09-16 18:11:47 +05:30
794429821b Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-16 17:57:11 +05:30
7d94c17c71 modified ui of header directory 2025-09-16 17:57:06 +05:30
fb6a8255c9 Changes in DocumentManager popup change the sequence. 2025-09-16 17:08:36 +05:30
7ef10e3e5b Merge pull request 'Handled Global and Project level permissions' (#403) from hotchanges_projectPermission into Refactor_Directory
Reviewed-on: #403
Merged
2025-09-16 10:43:30 +00:00
0a489be675 added proper global and project level permission 2025-09-16 16:08:47 +05:30
c014d6c929 handle delete bucket 2025-09-16 12:07:42 +05:30
2c378745fa changed label class of directory filter 2025-09-16 10:59:25 +05:30
080d2307ca removed unused code 2025-09-16 10:49:44 +05:30
d2288ea967 Merge pull request 'Issues_Sep_1W_V2' (#402) from Issues_Sep_1W_V2 into Refactor_Directory
Reviewed-on: #402
Merged
2025-09-16 05:11:27 +00:00
42086d7f3a Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Sep_1W_V2 2025-09-16 10:40:27 +05:30
020020056e Changes in Activities DateRangePicket. 2025-09-15 18:19:11 +05:30
9b3ffdb33d changed input of search input text- search at Contact 2025-09-15 17:32:31 +05:30
d70c8e5995 Merge pull request 'Filter dropdown in Assign Task popup does not close on outside click' (#396) from Kartik_Bug#1123 into Issues_Sep_1W_V2
Reviewed-on: #396
Merged
2025-09-15 11:52:15 +00:00
e6e90c7d4e Filter dropdown in Assign Task popup does not close on outside click 2025-09-15 11:52:15 +00:00
19241cc556 Merge pull request 'Remove Extra Line Below "No Contact Found" Message in Directory' (#400) from Kartik_Bug#1115 into Refactor_Directory
Reviewed-on: #400
Merged
2025-09-15 11:51:46 +00:00
7c2744058d Remove Extra Line Below "No Contact Found" Message in Directory 2025-09-15 11:51:46 +00:00
a963176c95 Merge pull request 'Message should be inside card' (#399) from Kartik_Bug#1080 into Refactor_Directory
Reviewed-on: #399
Merged
2025-09-15 11:48:52 +00:00
6bc8c65c81 Message should be inside card 2025-09-15 11:48:52 +00:00
45bd5a7f66 Merge pull request 'Directory - Contacts Exported to Excel does not format properly' (#397) from Kartik_Bug#1064 into Refactor_Directory
Reviewed-on: #397
Merged
2025-09-15 11:47:56 +00:00
e179a267aa Directory - Contacts Exported to Excel does not format properly 2025-09-15 11:47:56 +00:00
9c51378963 Merge pull request 'Employee Profile Page Not Updating without refresh page ,After Edit' (#398) from Kartik_Bug#909 into Issues_Sep_1W_V2
Reviewed-on: #398
Merged
2025-09-15 11:37:17 +00:00
4927680fe3 fixed going wrong request for Expense payload - Transaction 2025-09-15 17:00:36 +05:30
9af7a5ceb2 Employee Profile Page Not Updating without refresh page ,After Edit 2025-09-15 15:19:40 +05:30
94eb283b2d added permission for managr task 2025-09-13 19:01:08 +05:30
0e3a634205 fixed permission add and remove updation 2025-09-13 18:16:56 +05:30
2ef56e7f83 added correct msg for contact person 2025-09-13 16:10:17 +05:30
d80fa27906 Merge pull request 'Remove Required Indicator from Tags Field in Document Upload' (#392) from Kartik_Bug#1104 into Issues_Sep_1W_V2
Reviewed-on: #392
Merged
2025-09-13 10:13:18 +00:00
70110192f4 Remove Required Indicator from Tags Field in Document Upload 2025-09-13 10:13:18 +00:00
548597ed4f Merge pull request 'Display Only "Re-activate" Button for Inactive Employees in Action Column' (#394) from Kartik_Bug#1113 into Issues_Sep_1W_V2
Reviewed-on: #394
Merged
2025-09-13 10:11:25 +00:00
75ca3d1504 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-09-13 10:11:25 +00:00
f20ff7eb73 Merge pull request 'Created bucket card is visible in middle of Manage Buckets popup & after refresh page it displayed at left corner.' (#393) from Kartik_Bug#976 into Issues_Sep_1W_V2
Reviewed-on: #393
Merged
2025-09-13 10:10:32 +00:00
ce59869827 Created bucket card is visible in middle of Manage Buckets popup & after refresh page it displayed at left corner. 2025-09-13 10:10:32 +00:00
d77e3c5f03 Merge pull request 'Standardize All Buttons in Expenses Module to Match Website-Wide Button Style' (#391) from Kartik_Bug#830 into Issues_Sep_1W_V2
Reviewed-on: #391
Merged
2025-09-13 10:06:14 +00:00
2f2ddb0576 Standardize All Buttons in Expenses Module to Match Website-Wide Button Style 2025-09-13 10:06:14 +00:00
2e14fc862d Merge pull request 'Forgot Password – Reset link not sent, error shown for all valid emails' (#389) from Kartik_Bug#962 into Issues_Sep_1W_V2
Reviewed-on: #389
Merged
2025-09-13 10:05:34 +00:00
84500f6913 Forgot Password – Reset link not sent, error shown for all valid emails 2025-09-13 10:05:34 +00:00
2790f50275 Merge pull request 'Password Field UI Not Proper – White Background Not Covering Full Field' (#386) from Kartik_Bug#1015 into Issues_Sep_1W_V2
Reviewed-on: #386
Merged
2025-09-13 10:04:39 +00:00
8c48b83581 Password Field UI Not Proper – White Background Not Covering Full Field 2025-09-13 10:04:39 +00:00
f992dbeaf1 Merge pull request 'Username and Password Fields Should Auto-Trim Spaces on Login' (#385) from Kartik_Bug#1016 into Issues_Sep_1W_V2
Reviewed-on: #385
Merged
2025-09-13 10:03:31 +00:00
d1098e64a7 Username and Password Fields Should Auto-Trim Spaces on Login 2025-09-13 10:03:31 +00:00
212e969258 Merge pull request 'New Password Field on Reset Password Page Should Be Empty' (#384) from Kartik_Bug#1071 into Issues_Sep_1W_V2
Reviewed-on: #384
Merged
2025-09-13 10:02:45 +00:00
9de1613bd9 New Password Field on Reset Password Page Should Be Empty 2025-09-13 10:02:45 +00:00
9676d45710 When the clear button hit api for full response. 2025-09-12 17:16:34 +05:30
7e5b6952f5 Apply functionality for Both Notes and Contact filter 2025-09-12 17:09:48 +05:30
0484de498c Changes in UI of Directory Notes Tabs and all the popups. 2025-09-12 16:11:31 +05:30
a7ccaa2812 changed position of text- Active and In-Active 2025-09-12 13:08:07 +05:30
5fb7e89cb2 changed sequence of contact form buttons 2025-09-12 12:58:01 +05:30
2027bd3d17 all images path changed 2025-09-12 12:37:31 +05:30
ee9698f665 changed images path for landing page 2025-09-12 12:29:54 +05:30
25ec5a354c changed path of logo 2025-09-12 12:21:40 +05:30
8335c42935 added direct bucket permission 2025-09-12 12:04:24 +05:30
3963002a2d Merge branch 'landing_page_1' into Refactor_Directory
# Conflicts:
#	src/pages/Home/LandingPage.css
2025-09-11 18:14:31 +05:30
717264c9f9 fixed update and creation for contacts 2025-09-11 17:34:56 +05:30
1a04dd51fc Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-11 16:25:49 +05:30
c83de16466 added missed outed confirm modal inside employee for suspend emp 2025-09-11 11:09:46 +05:30
b51b3db9ec added missing assset 2025-09-11 10:51:46 +05:30
79553cab4e Merge pull request 'Added new page - Landing Page' (#390) from landing_page_1 into Refactor_Directory
Reviewed-on: #390
Merged
2025-09-11 05:01:19 +00:00
7a74084841 rearrange images in folder 2025-09-11 05:01:19 +00:00
7638f8bdaa Add blog content 2025-09-11 05:01:19 +00:00
78f304a490 add blog container 2025-09-11 05:01:19 +00:00
0b38436dfe handle animations 2025-09-11 05:01:19 +00:00
15581f3f26 landing page modifications 2025-09-11 05:01:19 +00:00
8dc064340b removed unused component 2025-09-10 21:01:28 +05:30
285b853026 removed alreday declare component 2025-09-10 20:39:48 +05:30
81e5456e1d Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-10 20:36:54 +05:30
4741025dcb set Directory page for project 2025-09-10 20:35:48 +05:30
aec6bd64ff Merge pull request 'Added Document Managment feature' (#388) from Document_Manag into main
Reviewed-on: #388
Merged
2025-09-10 14:34:35 +00:00
eea36a2722 handle delete master modal 2025-09-10 20:01:06 +05:30
1a7e77c814 structured code 2025-09-10 19:09:55 +05:30
b1a2250c48 imported missing routes during merged 2025-09-10 19:03:29 +05:30
f20c3a64f6 added proper modal size for Master Modal - Application Role 2025-09-10 19:00:07 +05:30
ebab03dc9f updated method for update contact category 2025-09-10 18:52:09 +05:30
d6de8cbfc1 completely refactored directory module 2025-09-10 18:13:36 +05:30
44cc6c6e81 rearrange images in folder 2025-09-10 13:44:50 +05:30
6604a4db13 Add blog content 2025-09-10 12:49:30 +05:30
b66106c301 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-10 12:46:38 +05:30
691fd9208f fixed alignment address value at emplt about 2025-09-10 12:28:07 +05:30
45b21d3e73 restric open modal when came at admisitrator page 2025-09-10 11:33:44 +05:30
3db6cc2100 added modal, that was missing during merged 2025-09-10 11:29:01 +05:30
b934527cf5 added manually changed 2025-09-10 10:41:26 +05:30
bac62e1fa7 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
# Conflicts:
#	src/components/Employee/EmpOverview.jsx
2025-09-10 10:38:13 +05:30
5ec5218dd6 Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
#	src/pages/Activities/DailyTask.jsx
#	src/pages/master/MasterPage.jsx
2025-09-10 10:37:38 +05:30
47d0e332f1 add blog container 2025-09-10 10:35:36 +05:30
b02893fd98 Merge pull request 'Meaningful Message Required When No Reports Found in Selected Date Range' (#379) from Kartik_Bug#1045 into Issues_Sep_1W
Reviewed-on: #379
Merged
2025-09-10 04:45:29 +00:00
c9ccd46385 Meaningful Message Required When No Reports Found in Selected Date Range 2025-09-10 04:45:29 +00:00
aa45731d8c Merge pull request 'Invalid Date Displayed Instead of "NA" in Employee List' (#380) from Kartik_Bug#1039 into Issues_Sep_1W
Reviewed-on: #380
Merged
2025-09-10 04:43:23 +00:00
614d61e6e9 Invalid Date Displayed Instead of "NA" in Employee List 2025-09-10 04:43:23 +00:00
0e35194a82 Merge pull request 'Master Page - Grid alignment' (#381) from Kartik_Bug#1081 into Issues_Sep_1W
Reviewed-on: #381
Merged
2025-09-10 04:42:46 +00:00
20077a137f Master Page - Grid alignment 2025-09-10 04:42:46 +00:00
1ff1bc9269 Merge pull request 'Address field label is breaking into multiple lines in Employee Profile tab' (#382) from Kartik_Bug#1096 into Issues_Sep_1W
Reviewed-on: #382
Merged
2025-09-10 04:42:12 +00:00
b50b6bc454 Address field label is breaking into multiple lines in Employee Profile tab 2025-09-10 04:42:12 +00:00
d87defbf9a Merge pull request 'Contact Number Field Accepts More Than 10 Digits in Create/Update Contact' (#378) from Kartik_Bug#1090 into Issues_Sep_1W
Reviewed-on: #378
Merged
2025-09-10 04:41:43 +00:00
e454917763 refactored notes list 2025-09-10 02:41:59 +05:30
b113675cc2 contact Active and InActive refactored 2025-09-10 00:07:34 +05:30
025b13ea64 reafctor contact list with filter 2025-09-09 20:04:48 +05:30
755eb94ae3 added padding and marging at project feature permission card 2025-09-09 15:41:27 +05:30
1138bdf009 display properly version list 2025-09-09 15:06:25 +05:30
2642532b60 handle animations 2025-09-09 15:02:59 +05:30
67d399e3d3 set proerly alignment for label and value 2025-09-09 14:44:38 +05:30
fdc377cc3a employee joing date display regular local format 2025-09-09 14:30:08 +05:30
1bd951636a added proper msg showing whenver user did opertion for delete and restore 2025-09-09 14:27:26 +05:30
13a517f998 show msg once restored document 2025-09-09 14:13:39 +05:30
d5b3c25b45 added flag for pick future date or not 2025-09-09 13:31:30 +05:30
f8466e5f4a changed text font of SelectMulti tag value scondaru to semibold 2025-09-09 13:17:47 +05:30
6998714fea Contact Number Field Accepts More Than 10 Digits in Create/Update Contact 2025-09-09 12:51:19 +05:30
98546afc1a Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-09 12:49:35 +05:30
49b89f74ff added view, upload,update and delete permissions 2025-09-09 12:49:21 +05:30
7a5fc509fb Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-09 12:38:14 +05:30
8d44606b0b Changes In Popup of Document. 2025-09-09 12:38:11 +05:30
b91487712d initially contactfilter added 2025-09-09 12:09:03 +05:30
6ca6ec31f7 landing page modifications 2025-09-09 12:06:10 +05:30
849709ad05 Merge pull request 'Toggle Button Functionality for Deleted Notes Not Working Correctly' (#375) from Kartik_Bug#1056 into Document_Manag
Reviewed-on: #375
2025-09-09 05:33:50 +00:00
1abed1de3a managebucket component is split 2025-09-09 01:49:31 +05:30
1b98c60120 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-08 16:04:16 +05:30
4295e7d8d6 UI Changes in Document Details popup. 2025-09-08 16:04:13 +05:30
f72b7c62c8 add RootRedirect for "/" path to handle login and dashboard routing 2025-09-08 15:55:50 +05:30
01a3f5809a login Opt will be expire in % min 2025-09-08 15:17:43 +05:30
bb7e488bb0 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-08 15:06:29 +05:30
da8d63ce62 changed msg whenenver emp not found- "No team members assigned yet" 2025-09-08 15:06:24 +05:30
ef0eff98f8 Remove unwanted icon 2025-09-08 14:55:33 +05:30
2a833196f8 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-08 14:54:20 +05:30
97a4a4593e Changes In Popup of Document Manager popup. 2025-09-08 14:54:15 +05:30
a112886897 Merge pull request 'Date Picker in Employee Attendance & Activity Tab Should Default to Last 7 Days' (#374) from Kartik_Bug#1052 into Issues_Sep_1W
Reviewed-on: #374
2025-09-08 09:11:24 +00:00
db38c5fefa Merge branch 'Issues_Sep_1W' into Kartik_Bug#1052 2025-09-08 09:11:06 +00:00
c6f16249fd Merge pull request 'Filter icon should not be displayed when no records are found in Daily Progress Report' (#373) from Kartik_Bug#1042 into Issues_Sep_1W
Reviewed-on: #373
2025-09-08 09:09:36 +00:00
63a5f7b902 normalize projectId from localStorage to avoid "null" string 2025-09-08 14:22:23 +05:30
ace507232a changed dashboard route "/" to "/dashboard" 2025-09-08 12:48:19 +05:30
f9876c6d52 spell correction 2025-09-08 12:40:14 +05:30
6d86362e9e Merge branch 'Landing_pages' into Document_Manag
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
#	src/pages/employee/EmployeeList.jsx
#	src/router/AppRoutes.jsx
2025-09-08 12:34:18 +05:30
698c1b7b16 add new images
replase class= with className=
2025-09-08 12:32:16 +05:30
e216ac16ef Merge pull request 'Change the UI of all components and add stars for all mandatory fields.' (#370) from UI_Changes_PMS into Document_Manag
Reviewed-on: #370
2025-09-08 06:30:57 +00:00
0194c4427a Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:57:30 +05:30
ea022d37c8 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:50:58 +05:30
957f790fce initially created ManageBucket 2025-09-08 11:40:03 +05:30
6a472b39ef initialli refactoring directory 2025-09-08 10:14:18 +05:30
768f810465 All symbols will be same in all components. 2025-09-05 17:17:15 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
5c59ac3115 Create Employee Change the date box into DatePicker. 2025-09-05 13:07:58 +05:30
7e81649841 Toggle Button Functionality for Deleted Notes Not Working Correctly 2025-09-05 12:45:28 +05:30
c568dc9108 Date Picker in Employee Attendance & Activity Tab Should Default to Last 7 Days 2025-09-05 12:33:43 +05:30
dcb2f59f5b Filter icon should not be displayed when no records are found in Daily Progress Report 2025-09-05 12:26:57 +05:30
e39355c6fd Changes in UI for Masters component. 2025-09-05 12:00:26 +05:30
f9fe987a94 changed useproject hook name 2025-09-05 11:58:36 +05:30
87221965de Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-05 11:52:50 +05:30
6caad7850d clear and structured code 2025-09-05 11:45:04 +05:30
8f8cbf27ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-05 11:44:27 +05:30
0db0edec1a Masters Popup all heading show in Center align. 2025-09-05 11:19:35 +05:30
42b6802419 Merge pull request 'Issues_Aug_2W' (#371) from Issues_Aug_2W into main
Reviewed-on: #371
Merged
2025-09-05 05:45:32 +00:00
cabb1b01c9 don't changed project when move to one page to another page 2025-09-05 11:14:02 +05:30
f56fd23cbf In Create Project popup change the noraml date selection to DatePicker. 2025-09-05 11:12:31 +05:30
6dfdaf3316 changed name useSelectedproject to useSelectedProject 2025-09-05 11:06:38 +05:30
4369705a2d Merge branch 'Issues_Aug_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_2W 2025-09-05 10:53:35 +05:30
34654aae0a : rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject 2025-09-05 10:53:05 +05:30
2b5fc9aaac added project level feature 2025-09-04 18:06:58 +05:30
1eaf4a080c fixed confirm modal close button 2025-09-04 14:18:57 +05:30
fe3d356c2e Ui changed for document version list 2025-09-04 14:16:15 +05:30
f3913c2824 Change the UI of all components and add stars for all mandatory fields. 2025-09-03 17:19:29 +05:30
e66ce11cd5 changes tage reponse and changed confirm modal format 2025-09-03 16:40:20 +05:30
a8239d5c31 document version list display 10 version at per page 2025-09-03 15:49:12 +05:30
97a32b8f42 display suggestion for tags when create or update documen form 2025-09-03 15:45:50 +05:30
a52cf0bc39 allow to delete document category and type and edit type 2025-09-03 15:16:37 +05:30
e007c0e8da allow to add and update document category inside master 2025-09-03 12:56:39 +05:30
e2de5eba40 added document permissions 2025-09-03 11:52:49 +05:30
fd14328562 enable activating or deactivating existing documents 2025-09-03 11:18:12 +05:30
e8459d3671 convert fileSize to KB before sending request 2025-09-03 11:16:40 +05:30
528d3b756c InActiving documents 2025-09-02 20:28:23 +05:30
11be36b67a login user can be verify documents 2025-09-02 20:00:18 +05:30
ef00f83c44 document can inside open in browser 2025-09-02 19:34:42 +05:30
809f2ef726 dynamicallu show Document Id it required ? or not base document Type 2025-09-02 16:43:04 +05:30
a95e365087 removed static page size of Expense list 2025-09-02 16:42:06 +05:30
2ee9c8ecbd prevent to stay outside if have logged 2025-09-02 16:40:51 +05:30
7eb22bb785 added pagination 2025-09-02 16:40:04 +05:30
cd32f743ce changed segment button radio 2025-09-02 16:39:44 +05:30
acd642c935 display document details and document meta data and added skeleton 2025-09-02 16:39:06 +05:30
06503ac4d3 completd updation of documents 2025-09-01 22:06:13 +05:30
ee1887de8f fixed reduant api calling 2025-09-01 18:51:23 +05:30
2f24d4a7ff initially setup update document 2025-09-01 18:15:30 +05:30
f96a363a57 Merge pull request 'Notes in Project Directory showing global notes instead of project-specific contact notes.' (#358) from Kartik_Bug#974 into Issues_Aug_2W
Reviewed-on: #358
2025-09-01 09:29:07 +00:00
e81a97cd52 Notes in Project Directory showing global notes instead of project-specific contact notes. 2025-09-01 09:29:07 +00:00
f97c75dde7 Merge pull request 'When the employee is in an inactive state, the Edit button will be disabled.' (#359) from Kartik_Bug#972 into Issues_Aug_2W
Reviewed-on: #359
Merged
2025-09-01 09:27:54 +00:00
d25c51db58 When the employee is in an inactive state, the Edit button will be disabled. 2025-09-01 09:27:54 +00:00
29c5d38bef Merge pull request 'Employee Module – Unnecessary space between contact icons and contact number' (#360) from Kartik_Bug#956 into Issues_Aug_2W
Reviewed-on: #360
Merged
2025-09-01 09:26:21 +00:00
b62cbd1a75 Employee Module – Unnecessary space between contact icons and contact number 2025-09-01 09:26:21 +00:00
b1f6306f23 Merge pull request 'Office Number, Domain Name, and Tax ID fields should be nullable but are mandatory.' (#361) from Kartik_Bug#978 into Issues_Aug_2W
Reviewed-on: #361
Merged
2025-09-01 09:25:20 +00:00
3c9dd1595a Office Number, Domain Name, and Tax ID fields should be nullable but are mandatory. 2025-09-01 09:25:20 +00:00
d9456db01e Merge pull request 'Cancel button not closing All fields popup in masters' (#362) from Kartik_Bug#979 into Issues_Aug_2W
Reviewed-on: #362
Merged
2025-09-01 09:23:29 +00:00
79e23fef24 The bottom border of the Master dropdown is not visible. 2025-09-01 09:23:29 +00:00
f569ed635c Cancel button not closing All fields popup in masters 2025-09-01 09:23:29 +00:00
dca4691032 Merge pull request 'The calendar icon should display correctly when we increase the zoom.' (#363) from Kartik_Bug#973 into Issues_Aug_2W
Reviewed-on: #363
Merged
2025-09-01 09:22:42 +00:00
fa878642b6 The calendar icon should display correctly when we increase the zoom. 2025-09-01 09:22:42 +00:00
a1c3af9073 Merge pull request 'Attendance Record Popup Shows Wrong Date Format' (#364) from Kartik_Bug#1024 into Issues_Aug_2W
Reviewed-on: #364
Merged
2025-09-01 09:19:03 +00:00
f433e55a96 Changes in date format in Attendance logs and attendance. 2025-09-01 09:19:03 +00:00
833a54e57a Attendance Record Popup Shows Wrong Date Format 2025-09-01 09:19:03 +00:00
8bce930028 Merge pull request 'Expense Module – Default date range filter hides all records on page load' (#365) from Kartik_Bug#955 into Issues_Aug_2W
Reviewed-on: #365
Merged
2025-09-01 09:11:17 +00:00
047d0241bd Expense Module – Default date range filter hides all records on page load 2025-09-01 09:11:17 +00:00
e71debe932 Merge pull request 'The Tenant filter does not close when navigating to another component.' (#366) from Kartik_Bug#1028 into Issues_Aug_2W
Reviewed-on: #366
Merged
2025-09-01 09:10:38 +00:00
1a77cc809a The Tenant filter does not close when navigating to another component. 2025-09-01 09:10:38 +00:00
73c6ccc0d6 Merge pull request 'Filter Applied Without Clicking on "Apply" Button in Daily Progress Report' (#367) from Kartik_Bug#1037 into Issues_Aug_2W
Reviewed-on: #367
Merged
2025-09-01 08:56:20 +00:00
fc5f47536f Filter Applied Without Clicking on "Apply" Button in Daily Progress Report 2025-09-01 08:56:20 +00:00
aaa97532a4 Merge pull request 'Pagination Displayed Even When Records Are greater Than 20' (#368) from Kartik_Bug#1041 into Issues_Aug_2W
Reviewed-on: #368
Merged
2025-09-01 06:46:37 +00:00
f847e5f07f Remove hardcoded 20 and add ITEMS_PER_PAGE 2025-09-01 12:11:55 +05:30
8c465db8d4 Pagination Displayed Even When Records Are greater Than 20 2025-09-01 10:49:40 +05:30
518928e439 adedd fillter sidepanel and handle filter object on api level 2025-08-30 17:31:36 +05:30
cec16ded3e added skeleton for document list 2025-08-29 20:52:36 +05:30
b70d03af8a Search , Refresh featured added and initial setup for filter 2025-08-29 20:34:37 +05:30
daf7f11310 Upload new document api integrated and use can upload document at employee 2025-08-29 16:05:54 +05:30
b93eaf6b95 initial setuo new document 2025-08-28 20:22:17 +05:30
d42790628c successfully master fetched of documentType and documentCategor 2025-08-28 15:19:15 +05:30
1c9df57c74 Merge pull request 'MasterModalRefactor : Changed Master Modal' (#357) from MasterModalRefactor into Document_Manag
Reviewed-on: #357
Merged
2025-08-28 06:48:43 +00:00
d4804e4c3f updated Master modal 2025-08-28 06:48:43 +00:00
386b61d978 fixed overridding of backgound color of app 2025-08-28 12:01:47 +05:30
14fba75d19 setup routes 2025-08-28 11:31:01 +05:30
65b90bc9ac initial setup document page 2025-08-28 11:17:54 +05:30
9dddba4e30 Merge pull request 'Tenant_Manag : Feature #901 : Tenant Management' (#334) from Tenant_Manag into main
Reviewed-on: #334
Merged
2025-08-26 10:05:29 +00:00
d52c4e6ec0 rename of menu item nane 2025-08-26 14:53:06 +05:30
7268971275 after form submit or failed form will be reset 2025-08-26 12:26:40 +05:30
1ad9b782a4 added lodering status when making request for demo 2025-08-26 12:24:56 +05:30
5dfaa6d44c render properly after login 2025-08-26 12:07:56 +05:30
4b988109f9 set image path at deployed state 2025-08-26 11:59:45 +05:30
83c2f7fb0c set legal-info page css 2025-08-26 11:41:07 +05:30
ead8901d1e set logo position according screen size 2025-08-26 11:19:46 +05:30
8b2529013f fixed layout of registration page 2025-08-26 09:51:57 +05:30
bbd137a334 fixed login , forgot page 2025-08-25 20:31:53 +05:30
8b11bd952d Merge branch 'Landing_pages' of https://git.marcoaiot.com/admin/marco.pms.web into Landing_pages 2025-08-25 20:20:21 +05:30
d729054065 added public route page 2025-08-25 20:15:51 +05:30
585199a2a1 fixed layout properly of login , reset, forgot, login-with-otp and forgot -pages 2025-08-25 20:15:51 +05:30
ac0d17ca6d implement landing page UI 2025-08-25 20:15:26 +05:30
61fb797db4 change label 2025-08-25 20:14:48 +05:30
86187eaf8a changes in otp page. 2025-08-25 20:13:56 +05:30
67bf293bef add landing page 2025-08-25 20:13:56 +05:30
25945366d6 change the design of login page, otp page and request for demo page. 2025-08-25 20:13:33 +05:30
176801c014 fixed frquency range to 0 to 3 2025-08-25 14:54:22 +05:30
275d984ecc fixed cancel button on edit tenant form 2025-08-25 12:57:47 +05:30
ed1e0cd428 updated bill ans plan page 2025-08-25 12:46:48 +05:30
207c2820bf update Ui 2025-08-25 11:58:50 +05:30
fe87ebc859 added valiadtion for Team Size whenever going to upgrade or purchase plan 2025-08-25 11:30:42 +05:30
84837bbe45 removed bg color 2025-08-25 11:26:58 +05:30
3e2d601739 removed unused and added child id 2025-08-24 16:11:20 +05:30
2377a1b869 removed unused code 2025-08-24 16:10:25 +05:30
e1ecaf7a31 added default range set or not flag 2025-08-24 16:09:51 +05:30
33c8b690ef added dynamically master menu 2025-08-24 14:56:50 +05:30
75c81ecc0c added regular date formate and prevent to call api without param. 2025-08-24 14:26:32 +05:30
3fa6e19114 removed console 2025-08-24 13:11:00 +05:30
1aa6016a01 changed appmenu url 2025-08-23 17:55:39 +05:30
b00fc04a82 Merge pull request 'AppMenu : Dynamic Menus' (#356) from AppMenu into Tenant_Manag
Reviewed-on: #356
Merged
2025-08-23 11:57:43 +00:00
d1ff7321e9 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-23 17:25:50 +05:30
fc4715cdd8 Merge branch 'AppMenu' of https://git.marcoaiot.com/admin/marco.pms.web into AppMenu 2025-08-23 17:08:12 +05:30
50ec338d8a handle run time error 2025-08-23 17:06:38 +05:30
f00e3a1a24 initial setup sidebar menus from backend 2025-08-23 17:06:38 +05:30
18390e9368 Merge pull request 'Issues_Aug_1W' (#355) from Issues_Aug_1W into main
Reviewed-on: #355
merged
2025-08-23 11:09:24 +00:00
380effd2f0 changed project source 2025-08-23 14:58:22 +05:30
a01e2deee7 Changes in Regularizationaction. 2025-08-23 13:19:41 +05:30
57eb2ab405 Changes in projectId for attendance, employee.
Dropdown of project has been hide in expense.
2025-08-23 12:55:35 +05:30
a76cbe8615 handle error msg 2025-08-23 11:21:02 +05:30
006a68f2fe added new loader 2025-08-23 10:33:26 +05:30
49cf94546a changed position of autorenew input field 2025-08-23 10:23:05 +05:30
0cc65fdcfa Merge pull request 'Display Only "Re-activate" Button for Inactive Employees in Action Column' (#348) from Kartik_Bug#944 into Issues_Aug_1W
Reviewed-on: #348
Merged
2025-08-23 04:37:20 +00:00
f1bc6bd57d Updation in Employee Suspend and Reactivate employee. 2025-08-23 04:37:20 +00:00
00b73b3d34 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-08-23 04:37:20 +00:00
d542c26a17 Merge pull request 'Filter Popup from Expense Module Persists When Switching to Attendance Module' (#349) from Kartik_Bug#906 into Issues_Aug_1W
Reviewed-on: #349
Merged
2025-08-23 04:36:58 +00:00
6cbab5949c Filter Popup from Expense Module Persists When Switching to Attendance Module 2025-08-23 04:36:58 +00:00
6fe6d0ea40 Merge pull request 'Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning' (#350) from Kartik_Bug#920 into Issues_Aug_1W
Reviewed-on: #350
Merged
2025-08-23 04:36:31 +00:00
9f9bfbe922 Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning 2025-08-23 04:36:31 +00:00
52b0b9b2da Merge pull request 'Implementing a search functionality within the Attendance component to enable search across all tabs.' (#351) from Kartik_Enhancement#948 into Issues_Aug_1W
Reviewed-on: #351
Merged
2025-08-23 04:35:39 +00:00
9272783388 Implementing a search functionality within the Attendance component to enable search across all tabs. 2025-08-23 04:35:39 +00:00
fd5bd1966d Merge pull request 'Missing Employee Search Box in Assign Task Popup' (#352) from Kartik_Bug#915 into Issues_Aug_1W
Reviewed-on: #352
merged
2025-08-23 04:35:07 +00:00
b2f5213f7d restric to enter aph, symbol character 2025-08-22 15:48:43 +05:30
4ab33fd5fd added self Tenant Profile 2025-08-22 15:16:51 +05:30
735e766215 removed max user label from subscription card 2025-08-22 11:56:53 +05:30
1bf7ccbaad Missing Employee Search Box in Assign Task Popup 2025-08-20 16:28:15 +05:30
4a98c3d5e8 se default freq. 3 2025-08-19 13:39:03 +05:30
7808a39aa0 prevent to view list of tenant if haven't permission. 2025-08-19 12:06:52 +05:30
b645aec55f sorting plans history using date 2025-08-19 11:50:05 +05:30
56e4c86c7f handle empty field showing 2025-08-19 11:19:12 +05:30
5a90088a28 added tenant releated permission id's 2025-08-19 10:48:46 +05:30
e7a0d41278 restrict firstName and lastName fields to accept only alphabets 2025-08-19 10:11:47 +05:30
00904ffa86 update contact number field to support valid and also international format 2025-08-19 09:54:58 +05:30
19d7e35d8a corrected spelling mistake in "Quarterly" plan type (Bills & Plan History 2025-08-18 23:38:07 +05:30
0a82e0af42 handle run time error 2025-08-18 23:27:52 +05:30
0df19cb78e initial setup sidebar menus from backend 2025-08-18 18:21:16 +05:30
4349f19c30 Merge pull request 'Border line missing in multiple fields on Add New Employee form' (#344) from Kartik_Bug#932 into Issues_Aug_1W
Reviewed-on: #344
2025-08-18 11:08:37 +00:00
3bdd7218bb Merge pull request 'IN Create New Expense popup change the label TransactionId to Transaction ID.' (#343) from Kartik_Bug#895 into Issues_Aug_1W
Reviewed-on: #343
2025-08-18 11:07:29 +00:00
4a7fb67cd4 Merge pull request 'Inconsistent Filter Icon in Daily Progress Report section.' (#342) from Kartik_Bug#919 into Issues_Aug_1W
Reviewed-on: #342
2025-08-18 11:06:43 +00:00
30092e51bf Merge pull request 'Username & Password field should auto-trim spaces in Login page.' (#341) from Kartik_Bug#929 into Issues_Aug_1W
Reviewed-on: #341
2025-08-18 11:05:29 +00:00
db5c8fbe48 Merge pull request 'In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up' (#340) from Kartik_Bug#886 into Issues_Aug_1W
Reviewed-on: #340
2025-08-18 11:03:53 +00:00
8c5c802f72 Merge pull request 'In AttendanceLog When we select a date range picker then api is not call after updation now its working properly.' (#346) from Kartik_Bug#907 into Issues_Aug_1W
Reviewed-on: #346
2025-08-18 11:02:25 +00:00
b45a4eb553 In AttendanceLog When we select a date range picker then api is not call after updation now its working properly. 2025-08-18 16:11:02 +05:30
2208cc66b1 Border line missing in multiple fields on Add New Employee form 2025-08-18 13:27:14 +05:30
6d504bf16b IN Create New Expense popup change the label TransactionId to Transaction ID. 2025-08-18 12:38:24 +05:30
f25289f7fa adde permission keys 2025-08-18 12:15:08 +05:30
9720206150 Inconsistent Filter Icon in Daily Progress Report section. 2025-08-18 12:07:05 +05:30
438ee4417f Username & Password field should auto-trim spaces in Login page. 2025-08-18 11:46:38 +05:30
2b5df10137 In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up 2025-08-18 11:29:38 +05:30
7283140a3a Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W 2025-08-18 10:23:03 +05:30
d8f5485bec missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324
#324
2025-08-18 10:22:32 +05:30
967d176a09 change table header Official Designation to Designation 2025-08-18 10:22:32 +05:30
b97ac8e680 Special Characters Shoulsd not Allowed in Name Fields 2025-08-18 10:22:32 +05:30
745938a11f Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-18 10:22:32 +05:30
0bd8ed1035 UI Enhancement Request – Highlight Key Employee Profile Information 2025-08-18 10:22:31 +05:30
0722f52619 Deleted Employee Still Visible Until Manual Refresh. 2025-08-18 10:22:31 +05:30
ab7de32744 Removing extra space in list view. 2025-08-18 10:21:47 +05:30
9b0d19f961 Contact list grid columns not displayed when no contact is available 2025-08-18 10:21:46 +05:30
e62663af69 Change the icons on AttendanceChart.jsx 2025-08-18 10:20:08 +05:30
a602bebc5e implement landing page UI 2025-08-16 17:09:20 +05:30
1e9db47144 missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324
#324
2025-08-16 13:34:54 +05:30
dd0c7e95bf change table header Official Designation to Designation 2025-08-16 12:59:07 +05:30
ee2c973d01 change label 2025-08-16 12:57:47 +05:30
a862500fd7 Merge pull request 'Special Characters Shoulsd not Allowed in Name Fields' (#339) from Kartik_Bug#910 into Issues_Aug_1W
Reviewed-on: #339
2025-08-16 07:09:45 +00:00
d5f6dbbfae Merge pull request 'Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page' (#337) from Kartik_Bug#908 into Issues_Aug_1W
Reviewed-on: #337
2025-08-16 07:04:16 +00:00
3fdbae5cf5 Merge pull request 'UI Enhancement Request – Highlight Key Employee Profile Information' (#336) from Kartik_Bug#891 into Issues_Aug_1W
Reviewed-on: #336
2025-08-16 07:00:37 +00:00
1305ac855d Merge branch 'Kartik_Bug#798' into Issues_Aug_1W
# Conflicts:
#	src/hooks/useEmployees.js
2025-08-16 12:27:21 +05:30
9366a131e6 handle subscription tab according to tenant existent 2025-08-16 12:23:10 +05:30
30e9f49eb1 corrected Congratulation import path in TenantForm.jsx to match file name 2025-08-16 10:22:43 +05:30
340919c6fb corrected Profile import path in TenantDetails.jsx to match case-sensitive file name 2025-08-16 10:17:29 +05:30
a537da6eff Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-16 10:12:47 +05:30
241217e7cc changed folder name for Tenant 2025-08-16 10:11:19 +05:30
4af5ba8a6d added upgraded subscription functionality 2025-08-16 09:43:11 +05:30
6e300389e3 added table for history plans 2025-08-14 18:34:06 +05:30
0acd733710 handle upgrad plan 2025-08-14 17:45:01 +05:30
b9bd4e7e18 removed extra validation errors 2025-08-14 17:40:29 +05:30
051fc3903d Special Characters Shoulsd not Allowed in Name Fields 2025-08-14 13:42:10 +05:30
841ffdf133 Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-14 12:46:14 +05:30
cbfce2e4e2 UI Enhancement Request – Highlight Key Employee Profile Information 2025-08-14 11:10:25 +05:30
9669e725a4 Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W 2025-08-14 10:14:04 +05:30
8df47c1530 In Masters cancel button now cancel or close the form as excepted. 2025-08-14 10:13:17 +05:30
ef06c69a3b When the data is not loaded then the filter show "No Filter found" message. 2025-08-14 10:13:16 +05:30
5940f86815 Show Single "No Bucket Found" Message and Improve Popup Design 2025-08-14 10:13:16 +05:30
cae6d52a33 Removing extra space in list view. 2025-08-14 10:13:16 +05:30
ad9295a6b3 Contact list grid columns not displayed when no contact is available 2025-08-14 10:13:16 +05:30
af69f3f97b Font size and button styling mismatch in Contact Profile (Web Directory) 2025-08-14 10:13:16 +05:30
31f152db65 added updated functionality 2025-08-13 17:09:18 +05:30
1772a2fcd1 Merge pull request 'profile_page : Modify Employee Profile Page' (#335) from profile_page into main
Reviewed-on: #335
merged
2025-08-13 04:44:31 +00:00
af544861d2 Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-13 10:13:25 +05:30
f387a56d7b optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-13 10:13:15 +05:30
8e12528e3a Add api to fetch employee project allocation 2025-08-13 10:03:44 +05:30
874f123d4c Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-12 17:48:47 +05:30
926594c0a5 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 17:48:36 +05:30
fb2dcf073c Add api to fetch employee project allocation 2025-08-12 17:44:04 +05:30
f946c38aae Created new layout for employee profile page 2025-08-12 17:39:09 +05:30
c211f407e8 Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-12 16:27:58 +05:30
8117e60bff optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:27:26 +05:30
80ede060cb fixed column size base dvice size 2025-08-12 16:27:26 +05:30
e39a69ab8b handle error due to data loading 2025-08-12 16:27:25 +05:30
fa3ff291c8 display employee tasks in emp profile 2025-08-12 16:27:25 +05:30
beefe6396c - Add date format hook
- add Ui for Activities
2025-08-12 16:27:25 +05:30
210d16c765 Handle null variable 2025-08-12 16:24:59 +05:30
cb23a5b051 Add api to fetch employee project allocation 2025-08-12 16:24:59 +05:30
f52b68dc46 ui improvements - dashbord attendance report toggle icons change 2025-08-12 16:24:59 +05:30
ab013c29f0 change favicon 2025-08-12 16:24:59 +05:30
c350574171 - Add project list on emplyee profile
- Add image as per gender
2025-08-12 16:24:59 +05:30
90d8b82c69 - Remove consoe log
- Handle projects dropdown hidden on profile page
2025-08-12 16:24:59 +05:30
1c0a6d8a89 Created new layout for employee profile page 2025-08-12 16:24:59 +05:30
16f70067e7 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:22:34 +05:30
bda0fe636e Merge pull request 'In Masters cancel button now cancel or close the form as excepted.' (#327) from Kartik_Bug#869 into Issues_Aug_1W
Reviewed-on: #327
Merged
2025-08-12 09:43:53 +00:00
426c9c07e2 In Masters cancel button now cancel or close the form as excepted. 2025-08-12 09:43:53 +00:00
85b8abbea3 Merge pull request 'When the data is not loaded then the filter show "No Filter found" message.' (#329) from Kartik_Bug#889 into Issues_Aug_1W
Reviewed-on: #329
Merged
2025-08-12 09:42:32 +00:00
9551152eeb When the data is not loaded then the filter show "No Filter found" message. 2025-08-12 09:42:32 +00:00
9ee309bf48 Merge pull request 'Show Single "No Bucket Found" Message and Improve Popup Design' (#330) from Kartik_Bug#884 into Issues_Aug_1W
Reviewed-on: #330
Merged
2025-08-12 09:41:28 +00:00
3d2c057428 Show Single "No Bucket Found" Message and Improve Popup Design 2025-08-12 09:41:28 +00:00
2943d9d67a Merge pull request 'Contact list grid columns not displayed when no contact is available' (#331) from Kartik_Bug#888 into Issues_Aug_1W
Reviewed-on: #331
Merged
2025-08-12 09:40:27 +00:00
e9eb378b74 Removing extra space in list view. 2025-08-12 09:40:27 +00:00
310281db0c Contact list grid columns not displayed when no contact is available 2025-08-12 09:40:27 +00:00
b9c486fd4e Merge pull request 'Font size and button styling mismatch in Contact Profile (Web Directory)' (#332) from Kartik_Bug#887 into Issues_Aug_1W
Reviewed-on: #332
Merged
2025-08-12 09:36:20 +00:00
ffa622b203 Font size and button styling mismatch in Contact Profile (Web Directory) 2025-08-12 09:36:20 +00:00
6096e52684 Merge pull request 'Change the icons on AttendanceChart.jsx' (#333) from Kartik_Bug#862 into Issues_Aug_1W
Reviewed-on: #333
Merged
2025-08-12 09:30:04 +00:00
f581b0e311 resolved filter issues 2025-08-12 14:53:48 +05:30
c231f12439 Change the icons on AttendanceChart.jsx 2025-08-12 12:26:17 +05:30
56b5633c51 handle error if features missing 2025-08-12 12:13:04 +05:30
e466fd27be prevent to display description if data not have 2025-08-12 11:13:16 +05:30
d25cc3531e added Tenant Profile 2025-08-11 20:24:04 +05:30
2d7adbac14 initial setup for tenant profile 2025-08-09 17:36:14 +05:30
25f5ff27b1 added skeleton and refresh button 2025-08-09 13:01:32 +05:30
4bff065153 added pagination and partially added filter 2025-08-09 10:30:06 +05:30
fb3b55c694 added spinkit loader and integrated inside projectDeatils and InfraPlanning 2025-08-08 14:11:22 +05:30
412c2118c9 Merge branch 'Tenant_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-08 11:27:20 +05:30
4ff01d0e60 success fully created tenant with subscription 2025-08-08 11:26:17 +05:30
fbc53e9ea1 integrated tenant creation and addsubscription 2025-08-08 11:26:16 +05:30
34b429c28c tenant and subscript form full setup 2025-08-08 11:25:18 +05:30
1dc038c965 tenant creating layout setup properly 2025-08-08 11:21:46 +05:30
12cbf576e1 create new tenant app 2025-08-08 11:21:46 +05:30
5e28f9e372 initially setup tenant manag. setup wizard-form and properly manage data. handle two sperate form with on wizard 2025-08-08 11:21:46 +05:30
f093b5f532 fixed column size base dvice size 2025-08-08 10:40:09 +05:30
edf1bb9601 handle error due to data loading 2025-08-08 10:39:00 +05:30
f9e9e2b326 Merge pull request 'Expense_Manangement_Feature' (#328) from Expense_Manangement_Feature into main
Reviewed-on: #328
2025-08-07 12:31:37 +00:00
6113bc66c6 Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:57:55 +05:30
acfa254718 correct date picker 2025-08-07 17:57:46 +05:30
6a3f9e57d9 added proper date 2025-08-07 17:57:22 +05:30
952dfefddc resolved taking incorrect date range 2025-08-07 17:57:22 +05:30
7333869c2c Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:47:57 +05:30
4167fd0a4d added margin for reimburment sectin 2025-08-07 17:47:45 +05:30
11ef1932b4 view expense if have any one permission of - viewself, upload, viewALl 2025-08-07 17:47:45 +05:30
bbe9c829f3 correct date picker 2025-08-07 17:47:44 +05:30
1a77c26d6b added proper date 2025-08-07 17:47:44 +05:30
597baede57 resolved taking incorrect date range 2025-08-07 17:47:44 +05:30
27bbdae433 added margin for reimburment sectin 2025-08-07 17:38:01 +05:30
248254ba3b view expense if have any one permission of - viewself, upload, viewALl 2025-08-07 17:36:25 +05:30
cb38f9bf98 Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:18:41 +05:30
4e059e13c7 correct date picker 2025-08-07 17:18:15 +05:30
afd147c7e3 handle expense view permission 2025-08-07 17:18:15 +05:30
da12099ba1 added proper date 2025-08-07 17:18:15 +05:30
7d7549e902 resolved taking incorrect date range 2025-08-07 17:18:15 +05:30
5188db2c8f handle condition if project haven't selected 2025-08-07 17:18:15 +05:30
69f3516656 handler run time error 2025-08-07 17:18:15 +05:30
eb17ec208c mis out remove expense id from action function 2025-08-07 17:18:14 +05:30
a0762c3f0f correct date picker 2025-08-07 16:55:52 +05:30
11b1cf22b5 handle expense view permission 2025-08-07 16:09:47 +05:30
f3e60bf8bc added proper date 2025-08-07 15:50:33 +05:30
6963e8ca8c resolved taking incorrect date range 2025-08-07 15:24:13 +05:30
466f362221 handle condition if project haven't selected 2025-08-07 14:39:55 +05:30
bd5c2206dd handler run time error 2025-08-07 14:27:19 +05:30
eab4dd94e9 display employee tasks in emp profile 2025-08-07 12:57:22 +05:30
ed5ff3be4b success fully created tenant with subscription 2025-08-07 11:26:23 +05:30
04580a3f28 integrated tenant creation and addsubscription 2025-08-07 01:10:59 +05:30
6f2ddacfd1 tenant and subscript form full setup 2025-08-06 19:42:40 +05:30
6883d87bdc - Add date format hook
- add Ui for Activities
2025-08-06 18:32:43 +05:30
b85b812981 Handle null variable 2025-08-06 17:07:22 +05:30
eb735f443d Add api to fetch employee project allocation 2025-08-06 17:01:40 +05:30
9112f9f673 mis out remove expense id from action function 2025-08-06 16:56:45 +05:30
199d7ab8ff Merge pull request 'Highlight Separator Line Between Expense Details and History Section adding border-2 for the thikness of the line.' (#326) from Expense_Bugs into Expense_Manangement_Feature
Reviewed-on: #326
merged
2025-08-06 09:41:42 +00:00
0e8691f6d0 ui improvements - dashbord attendance report toggle icons change 2025-08-06 15:03:46 +05:30
bc3b543015 Resloved the delay in expense action. 2025-08-06 14:39:36 +05:30
e4058a9cb4 Insufficient Bottom Spacing in All Dropdown in Expenses Filter 2025-08-06 12:42:34 +05:30
381019dcaa Missing Bottom Border in Masters Dropdown Menu. 2025-08-06 12:38:03 +05:30
495f38db99 change favicon 2025-08-06 12:33:32 +05:30
a208bb9a17 Highlight Separator Line Between Expense Details and History Section adding border-2 for the thikness of the line. 2025-08-06 11:58:40 +05:30
bae7cb4890 - Add project list on emplyee profile
- Add image as per gender
2025-08-06 11:55:12 +05:30
195af8317a set padding horizontically for Emp table 2025-08-06 11:33:19 +05:30
e249c1f64d sorted group by options 2025-08-06 11:32:47 +05:30
db65526f6f added GST number filed 2025-08-06 11:14:48 +05:30
3d7a8a1c94 attachement display horizontically 2025-08-06 10:22:47 +05:30
a87d3fb20a changed column paidby to submitted by 2025-08-06 01:16:13 +05:30
1d2cb7b1f7 added expense path in side bar menu 2025-08-06 00:38:29 +05:30
0c8c954b9c created skeleton css file 2025-08-06 00:17:13 +05:30
627a3eb6e5 added rigth side bar tiggle in context 2025-08-06 00:13:35 +05:30
4d32d1de16 copy expense feature from Refactore_Expense 2025-08-06 00:04:26 +05:30
1bafecf0ff created new custome pagination component 2025-08-06 00:03:11 +05:30
f430e4dc46 created expense masters pages 2025-08-06 00:02:36 +05:30
317f99e2a4 added new endpoint for employee list that return basic info of employee 2025-08-06 00:01:25 +05:30
71376c7706 handle modals of expense 2025-08-06 00:00:43 +05:30
ba4cf6ad86 set up right side bar for filter globally 2025-08-05 23:59:27 +05:30
d580ca0a15 added expense releated master - Expense Type, status and paymentModa 2025-08-05 23:58:31 +05:30
b9a75efd5c created Expense route 2025-08-05 23:57:30 +05:30
549f11818b added Expense key 2025-08-05 23:57:09 +05:30
a8d5b74157 created app utils 2025-08-05 23:56:52 +05:30
eac8bd685c handle properly refresh token calls 2025-08-05 23:56:07 +05:30
8a77a609c6 added Expense releated permissions id 2025-08-05 23:55:05 +05:30
cb009c77a4 customize date picker, flexible can set max and min date and also handle react-hook-form 2025-08-05 23:54:22 +05:30
c85d21ad0c set data format - dd-mm-yy 2025-08-05 23:53:06 +05:30
c1d3b831cc tenant creating layout setup properly 2025-08-05 19:10:29 +05:30
dd81d873f1 - Remove consoe log
- Handle projects dropdown hidden on profile page
2025-08-05 19:00:59 +05:30
e76284598e Created new layout for employee profile page 2025-08-05 18:31:59 +05:30
918a5ee9be create new tenant app 2025-08-05 14:23:30 +05:30
4d66ebeb50 changes in otp page. 2025-08-05 11:48:10 +05:30
d48b4c4ef3 initially setup tenant manag. setup wizard-form and properly manage data. handle two sperate form with on wizard 2025-08-05 02:13:38 +05:30
38332c0a0d add landing page 2025-08-04 19:08:24 +05:30
7ad65ece78 Merge pull request 'change the design of login page, otp page and request for demo page.' (#323) from Kartik_Task857 into Landing_pages
Reviewed-on: #323
2025-08-04 11:57:07 +00:00
34cf3a0913 change the design of login page, otp page and request for demo page. 2025-08-04 14:37:34 +05:30
5a209ae24e Merge pull request 'HofixedIssues_July_4W' (#322) from HofixedIssues_July_4W into main
Reviewed-on: #322
Merged
2025-08-02 16:17:38 +00:00
99418e4870 prevent to open windo altert when geolocation not allow 2025-08-02 19:04:14 +05:30
aece14d013 added callBack hook 2025-08-02 17:22:49 +05:30
03fb762f24 prevent to select checkout before check in time 2025-08-02 17:12:22 +05:30
543b1bf94b revert changes fo July_4W 2025-08-02 17:01:17 +05:30
01ce4c92b6 revert changed from July_4W 2025-08-02 16:43:57 +05:30
74f532799a Merge pull request 'Issues_July_4W' (#316) from Issues_July_4W into main
Reviewed-on: #316
THis branch is deployed on prodution
2025-07-31 05:53:28 +00:00
b0e359e428 Change in Team and InfraStructure component when select a project. 2025-07-30 17:32:49 +05:30
43ed77cfc6 Deleted Employee Still Visible Until Manual Refresh. 2025-07-30 16:56:27 +05:30
b410ec71cc All Projects is shown on Unknown Projects Place. 2025-07-30 16:36:30 +05:30
c3835a3856 Some changes in Header and aboutproject component. 2025-07-30 15:34:04 +05:30
811392448d Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313) from Kartik_Task_#832_ProjectSelection into Issues_July_4W
Reviewed-on: #313
merged
2025-07-30 09:26:35 +00:00
5399fa1f17 When a project is selected, the last selected project will be displayed. 2025-07-30 14:39:43 +05:30
4512c11a60 Merge pull request 'Modify Application role popup to look better' (#309) from Kartik_Bug#793 into Issues_July_4W
Reviewed-on: #309
Merged
2025-07-30 09:04:05 +00:00
14be5aadda UI Changes in Aboutproject.jsx. 2025-07-30 09:04:05 +00:00
fa3ccd28fa Responsive grid changes in Create Role and EditRole. 2025-07-30 09:04:05 +00:00
4d4037ed71 Changes in Application Role popup. 2025-07-30 09:04:05 +00:00
91fabf929c Modify Application role popup to look better 2025-07-30 09:04:05 +00:00
95bfacf5f1 Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306) from Kartik_Bug#797 into Issues_July_4W
Reviewed-on: #306
Merged
2025-07-30 07:54:06 +00:00
76e290fe79 Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. 2025-07-30 07:54:06 +00:00
a1682c8a62 Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307) from Kartik_Enhancement#807 into Issues_July_4W
Reviewed-on: #307
Merged
2025-07-29 13:44:47 +00:00
ac8815d674 In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids. 2025-07-29 13:44:47 +00:00
697c9acfa6 Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308) from Kartik_Bug#717 into Issues_July_4W
Reviewed-on: #308
Merged
2025-07-29 13:33:08 +00:00
a763ec4412 Date Format Not Consistent – Should Always Display DD‑MM‑YYYY 2025-07-29 13:33:08 +00:00
cc05dbad20 In Contact profile popup Include Delete functionality add. 2025-07-29 16:23:19 +05:30
528d02a703 Changes in Directory card view design. 2025-07-28 13:21:20 +05:30
66f2d4bff6 In Project List page change Filter icon. 2025-07-28 13:10:55 +05:30
ffb1bd742a Merge pull request 'Project List Dropdown will be remove in Projects.' (#302) from Kartik_ProjectList#628 into Issues_July_4W
Reviewed-on: #302
Merged
2025-07-28 06:02:02 +00:00
f28a1a9d4e Project List Dropdown will be remove in Projects. 2025-07-28 06:02:02 +00:00
8b2aef8a52 All the changes of Search functionality in Attendance page. 2025-07-28 11:21:37 +05:30
254aaf1977 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 16:55:11 +05:30
bb224ea3e7 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 16:50:24 +05:30
536f4d4e3a Directory Implementation in Contact profile popup. 2025-07-26 16:50:24 +05:30
d7986e4af4 Changes in during a merge 2025-07-26 16:50:24 +05:30
527e052786 changes 2025-07-26 16:43:51 +05:30
52ef65cce0 Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 2025-07-26 16:43:28 +05:30
32434da93f Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:42:26 +05:30
276a2ca9f4 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:39:42 +05:30
aa43dd4540 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 16:39:16 +05:30
a001875a56 UI changes in Employee Profile and Project Profile. 2025-07-26 16:39:16 +05:30
f565e83413 Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 16:38:38 +05:30
55625246ce Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 16:38:38 +05:30
9f1b8f7090 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-26 16:38:38 +05:30
c35b7954fc When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-26 16:38:38 +05:30
3848130cde Chnages in Header.js wihile user is assigned to single project. 2025-07-26 16:38:38 +05:30
74c2906527 Removing Console.log. 2025-07-26 16:38:38 +05:30
7535028b44 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-26 16:38:37 +05:30
3925926084 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 16:37:52 +05:30
3709346d42 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 16:35:43 +05:30
eec208db89 Merge pull request 'Change all filter icon in Directory ,imageGallery and Project List.' (#301) from Kartik_Filter_Changes#800 into Issues_July_4W
Reviewed-on: #301
merged
2025-07-26 09:37:03 +00:00
0357596ea3 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 09:37:03 +00:00
53628f0bf0 Merge pull request 'Directory Implementation in Contact profile popup.' (#300) from Kartik_Directory_Changes#805 into Issues_July_4W
Reviewed-on: #300
Merged
2025-07-26 09:24:29 +00:00
3be282d99d Directory Implementation in Contact profile popup. 2025-07-26 14:50:55 +05:30
699c349ba5 Changes in during a merge 2025-07-26 13:28:47 +05:30
aa5998bc11 changes 2025-07-26 12:59:12 +05:30
7e5f5807f6 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 12:56:54 +05:30
75d4ca176d Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 2025-07-26 12:56:09 +05:30
1f3438e3a9 Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:55:14 +05:30
30b567d020 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:54:09 +05:30
1df2d50aba Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 12:51:44 +05:30
92d3f91950 UI changes in Employee Profile and Project Profile. 2025-07-26 12:51:44 +05:30
ad6937b02e Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 12:51:25 +05:30
ac101e1e81 Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 12:50:42 +05:30
f040528821 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-26 12:45:15 +05:30
72c9472643 When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-26 12:45:15 +05:30
248f14b8d2 Chnages in Header.js wihile user is assigned to single project. 2025-07-26 12:45:15 +05:30
9b7d808f58 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-26 12:44:53 +05:30
23e484774d Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 12:43:30 +05:30
ae973bf1a1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:41:42 +05:30
5956e64492 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 12:05:42 +05:30
f68f589a5e Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 2025-07-26 12:04:36 +05:30
1e8c836e4d Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:04:18 +05:30
9afee2934a Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:04:18 +05:30
aa550ed030 In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. 2025-07-26 12:04:18 +05:30
774f287615 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 12:04:18 +05:30
1d9de3dbca UI changes in Employee Profile and Project Profile. 2025-07-26 12:04:18 +05:30
bccd8a7bdd Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 12:04:17 +05:30
7b0cc6cdbe Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 12:04:17 +05:30
464c32c3ba revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-26 12:04:17 +05:30
18fb3a0f09 When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-26 12:04:17 +05:30
2bc0939d64 Chnages in Header.js wihile user is assigned to single project. 2025-07-26 12:04:17 +05:30
a23220fb66 Removing Console.log. 2025-07-26 12:04:17 +05:30
6ce2860457 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-26 12:04:17 +05:30
3bd2a17c97 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 12:04:17 +05:30
cdcc9b90e4 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:04:16 +05:30
d8f892e9f4 Added new field in contact create and update form 2025-07-26 12:03:38 +05:30
587029a766 Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 2025-07-26 12:03:38 +05:30
2d1cddb2e0 At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2025-07-26 12:03:38 +05:30
a02c72859f Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. 2025-07-26 12:02:32 +05:30
d3f21f33b6 added background color property for table row - 'tr-group'- that grouping entities 2025-07-25 18:17:18 +05:30
f209b7cb86 Merge pull request 'Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.' (#291) from Kartik_Task#808 into Issues_July_4W
Reviewed-on: #291
2025-07-25 09:45:43 +00:00
c2fe727bec Merge pull request 'Attendance Log Page Resets to First Page After Performing Action on Other Pages.' (#288) from Kartik_Bug#757 into Issues_July_4W
Reviewed-on: #288
2025-07-25 09:39:48 +00:00
0cb661687a Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 2025-07-25 11:52:30 +05:30
85bdc270ac Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:40:03 +05:30
678e6bccf6 Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757 2025-07-24 17:10:25 +05:30
4f64a23089 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:10:22 +05:30
da434ff649 Merge pull request 'In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.' (#287) from Kartik_Bug#542 into Issues_July_4W
Reviewed-on: #287
2025-07-24 10:41:55 +00:00
3de7ce30c4 Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285) from Kartik_Bug#787 into Issues_July_4W
Reviewed-on: #285
2025-07-24 10:38:48 +00:00
1e509501da Merge branch 'Kartik_Bug#799' into Issues_July_4W
# Conflicts:
#	src/components/Project/AssignTask.jsx
2025-07-24 16:04:30 +05:30
ba1864a9ff Merge pull request 'Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.' (#281) from Kartik_Bug#792 into Issues_July_4W
Reviewed-on: #281
2025-07-24 10:29:29 +00:00
95dde88d7a Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278) from Kartik_Bug795 into Issues_July_4W
Reviewed-on: #278
2025-07-24 10:14:09 +00:00
2c3c4087c8 Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277) from Kartik_Enhancement#759 into Issues_July_4W
Reviewed-on: #277
2025-07-24 10:10:56 +00:00
bc18cf9cc3 Merge pull request 'Added new field in contact create and update form' (#263) from Ashutosh_Enhancement_#632 into Issues_July_4W
Reviewed-on: #263
2025-07-24 10:05:41 +00:00
d42bb413e8 Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' (#270) from react-query-v2 into main
Reviewed-on: #270
2025-07-24 09:41:19 +00:00
a6f5c131a3 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 12:03:38 +05:30
0a890bf88a In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. 2025-07-24 10:59:13 +05:30
89674dd771 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-23 18:22:13 +05:30
d4c4454eb1 UI changes in Employee Profile and Project Profile. 2025-07-23 17:08:50 +05:30
8fd8f395c9 Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-23 15:47:41 +05:30
e485066bd1 Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-23 15:45:02 +05:30
d3822c3590 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-23 06:21:27 +00:00
f6d3c6b2ab When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-23 11:47:11 +05:30
df15367397 Chnages in Header.js wihile user is assigned to single project. 2025-07-23 11:10:34 +05:30
2f2acb7df3 Removing Console.log. 2025-07-23 10:55:30 +05:30
9dbec1e137 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-23 10:52:30 +05:30
a021a7b7b2 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-22 17:13:45 +05:30
e96187cfa1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-22 16:47:26 +05:30
820f80562f Merge pull request 'Kartik_Bug#785' (#274) from Kartik_Bug#785 into Issues_July_4W
Reviewed-on: #274
Merged
2025-07-22 09:29:12 +00:00
b5cf52ba49 Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 2025-07-22 09:29:12 +00:00
633e60d141 At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2025-07-22 09:29:12 +00:00
59c36d099b Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' (#275) from Kartik_Bug#789 into Issues_July_4W
Reviewed-on: #275
Merged
2025-07-22 09:27:01 +00:00
e207310f0e Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. 2025-07-22 12:53:54 +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
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
839dfa3dc3 removed unused code 2025-07-17 15:42:33 +05:30
b9c240261c selectProject was missing to defined in - useSuspendEmployee - therefor getting this - selected Project is not defined but actually employee is suspended properly, but show just extrap error msg 2025-07-17 13:07:36 +05:30
6bf33b27a0 Fixed: Prevent brief display of "No activities available" before task data loads
- Improved conditional rendering logic in WorkArea component
- Ensured "No activities" message only shows after data is loaded and empty
- Avoided flicker caused by initial undefined or empty task list state
2025-07-17 11:47:23 +05:30
59196b3cf0 added query hook for fetching and posting data 2025-07-17 09:52:14 +05:30
2a74333870 added middlerware for project selection 2025-07-16 18:40:35 +05:30
359a9114b4 Merge pull request 'Attendance_Weidget_feature' (#261) from Attendance_Weidget_feature into Issues_July_3W
Reviewed-on: #261
meregd
2025-07-16 13:08:25 +00:00
d2f761bd48 Changes in EmployeePage. 2025-07-16 13:08:25 +00:00
4a49bbd68d In table remove all Capitals letters and show small letters. 2025-07-16 13:08:25 +00:00
78909e2275 Adding Color at the time of tables where value is greater then 0 and all the table times to left align. 2025-07-16 13:08:25 +00:00
c1fb50c667 Creating a new weidget Attendance Overview and accroding to project selection data will seen. 2025-07-16 13:08:25 +00:00
b502b6b31e removed debugger 2025-07-16 18:35:43 +05:30
69c9f748f5 project properly moved on project details , on correct project where choosed project 2025-07-16 18:35:33 +05:30
2425387d8e display correctly activie,incative and all employee according user action 2025-07-16 18:30:06 +05:30
ea6d03ef75 fiex pagination in regularization issue 2025-07-16 18:15:46 +05:30
1978460169 added query fetching techniq in attendances 2025-07-16 16:17:49 +05:30
d6d98c7515 configure perfect scroll bar 2025-07-16 09:50:37 +05:30
c18b3529b2 removed unsed scroll bar css 2025-07-16 09:50:11 +05:30
c704982f3c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web 2025-07-15 18:14:46 +05:30
e9fb15697a changes employee list api 2025-07-15 18:14:41 +05:30
712001a559 Merge pull request 'Issues_July_2W: Project overview widgets' (#256) from Issues_July_2W into main
Reviewed-on: #256
2025-07-15 12:28:46 +00:00
0126d38b57 removed scrollbar on dashbord graph 2025-07-15 17:52:56 +05:30
47e458fe7c added choose all project option at dashboard 2025-07-15 17:06:47 +05:30
99f3ec19d3 Merge pull request 'Add an "All Projects" selection option in the global project dropdown.' (#253) from Kartik_Task#734 into Issues_July_2W
Reviewed-on: #253
Merged
2025-07-15 09:41:07 +00:00
3368403188 Changes in Dashboard dropdown adding All Projects Selection. 2025-07-15 09:41:07 +00:00
6ca72c7e5c added needed closed tag 2025-07-15 09:41:07 +00:00
5f8e5d16f8 Changes in Project Selection. 2025-07-15 09:41:07 +00:00
0ef60621fb Add an "All Projects" selection option in the global project dropdown. 2025-07-15 09:41:07 +00:00
8748193069 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-15 14:45:30 +05:30
999b8bfb99 added permission rights in daily task report 2025-07-15 10:34:35 +05:30
5ec982778d added view team memeber and all employee 2025-07-15 10:21:17 +05:30
679d5d167f dynamically updated completed planned work at project lis and workarea when going to create new sub task 2025-07-14 23:41:51 +05:30
01ccd2e758 add utility to calculate and format completion percentage from planned and completed work 2025-07-14 20:30:53 +05:30
d2b80b4f02 dynamically update planned and completed work in ProjectInfra and project list card on Task reported 2025-07-14 20:19:25 +05:30
788f0baee4 dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete 2025-07-14 20:18:36 +05:30
1718638a4b fixed card width in core.css 2025-07-14 18:17:07 +05:30
19e2fe377d Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 17:35:46 +05:30
918300c64c fixed css bug 2025-07-14 16:59:31 +05:30
fb1dec6c93 Added new field in contact create and update form 2025-07-02 15:06:01 +05:30
658 changed files with 64152 additions and 16393 deletions

3
.gitignore vendored
View File

@ -22,5 +22,4 @@ dist-ssr
*.njsproj
*.sln
*.sw?
.vs/
.scannerwork/
.vs/

0
.scannerwork/.sonar_lock Normal file
View File

View File

@ -0,0 +1,6 @@
projectKey=pms-react
serverUrl=https://sonar.marcoaiot.com
serverVersion=25.5.0.107428
dashboardUrl=https://sonar.marcoaiot.com/dashboard?id=pms-react
ceTaskId=ad6ba36a-08cb-400b-903e-94f173cac03f
ceTaskUrl=https://sonar.marcoaiot.com/api/ce/task?id=ad6ba36a-08cb-400b-903e-94f173cac03f

View File

@ -1,11 +1,11 @@
<!DOCTYPE html>
<html lang="en" lang="en" class="light-style layout-navbar-fixed layout-menu-fixed layout-compact" dir="ltr"
<html lang="en" lang="en" class="light-style layout-navbar-fixed layout-menu-fixed layout-compact layout-menu-collapsed " dir="ltr"
data-theme="theme-default" data-assets-path="/assets/" data-template="vertical-menu-template" data-style="light">
<!-- layout-menu-collapsed layout-menu-hover -->
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Marco PMS</title>
<title>OnFieldWork.com</title>
<meta name="description" content="" />
@ -27,6 +27,8 @@
<link rel="stylesheet" href="/assets/vendor/css/theme-default.css" class="template-customizer-theme-css" />
<link rel="stylesheet" href="/assets/css/core-extend.css" />
<link rel="stylesheet" href="/assets/css/default.css" />
<link rel="stylesheet" href="/assets/css/skeleton.css" />
<link rel="stylesheet" href="/assets/css/hover-utility.css" />
<link rel="stylesheet" href="/assets/vendor/libs/perfect-scrollbar/perfect-scrollbar.css" />
@ -43,6 +45,9 @@
<link rel="stylesheet" href="/assets/vendor/libs/animate-css/animate.css" />
<link rel="stylesheet" href="/assets/vendor/libs/sweetalert2/sweetalert2.css" />
<link rel="stylesheet" href="/assets/vendor/libs/spinkit/spinkit.css" />
<link rel="stylesheet" href="/assets/vendor/libs/tagify/tagify.css" />
<link rel="stylesheet" href="/assets/vendor/libs/tagify/tagify.js" />
<!-- Helpers -->
<script src="/assets/vendor/js/helpers.js"></script>
@ -51,7 +56,7 @@
<!-- Timer Picker -->
<!-- Flatpickr CSS -->
<link rel="stylesheet" href="/assets/vendor/libs/flatpickr/flatpickr.css" />
<link rel="stylesheet" href="./src/assets/vendor/libs/jquery-timepicker/jquery-timepicker.css" />
<link rel="stylesheet" href="/assets/vendor/libs/jquery-timepicker/jquery-timepicker.css" />
@ -91,6 +96,15 @@
<script src="/assets/js/main.js"></script>
<!-- Page JS -->
<script src="/assets/js/form-wizard-icons.js"></script>
<script src="/assets/js/dashboards-analytics.js"></script>
<!-- Bloack Ui -->
<!-- <script src="/assets/js/extended-ui-blockui.js"></script> -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<!-- BlockUI core plugin -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js"></script>
<script src="/assets/js/form-wizard-icons.js"></script>
<script src="/assets/js/dashboards-analytics.js"></script>

156
package-lock.json generated
View File

@ -18,6 +18,8 @@
"apexcharts": "^4.5.0",
"axios": "^1.7.9",
"axios-retry": "^4.5.0",
"crypto-js": "^4.2.0",
"date-fns": "^4.1.0",
"dotenv": "^16.4.7",
"dotenv-webpack": "^8.1.0",
"eventemitter3": "^5.0.1",
@ -36,6 +38,7 @@
"react-router-dom": "^6.20.1",
"react-toastify": "^11.0.2",
"sort-by": "^1.2.0",
"swiper": "^11.2.10",
"xlsx": "^0.18.5",
"zod": "^3.24.1"
},
@ -807,9 +810,9 @@
}
},
"node_modules/@jridgewell/source-map": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
"version": "0.3.11",
"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
"integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
"license": "MIT",
"peer": true,
"dependencies": {
@ -1550,13 +1553,13 @@
"peer": true
},
"node_modules/@types/node": {
"version": "22.13.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.13.tgz",
"integrity": "sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==",
"version": "24.5.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
"integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"undici-types": "~6.20.0"
"undici-types": "~7.12.0"
}
},
"node_modules/@types/prop-types": {
@ -1833,9 +1836,10 @@
}
},
"node_modules/acorn": {
"version": "8.14.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
"version": "8.15.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"license": "MIT",
"bin": {
"acorn": "bin/acorn"
},
@ -1843,6 +1847,19 @@
"node": ">=0.4.0"
}
},
"node_modules/acorn-import-phases": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
"integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=10.13.0"
},
"peerDependencies": {
"acorn": "^8.14.0"
}
},
"node_modules/acorn-jsx": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@ -2398,6 +2415,12 @@
"node": ">= 8"
}
},
"node_modules/crypto-js": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
"license": "MIT"
},
"node_modules/csstype": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@ -2455,6 +2478,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/date-fns": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
"license": "MIT",
"funding": {
"type": "github",
"url": "https://github.com/sponsors/kossnocorp"
}
},
"node_modules/debug": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@ -2613,9 +2646,9 @@
"integrity": "sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw=="
},
"node_modules/enhanced-resolve": {
"version": "5.18.1",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
"integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
"version": "5.18.3",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
"integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
"license": "MIT",
"peer": true,
"dependencies": {
@ -2729,9 +2762,9 @@
}
},
"node_modules/es-module-lexer": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
"integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
"integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
"license": "MIT",
"peer": true
},
@ -3126,9 +3159,9 @@
"dev": true
},
"node_modules/fast-uri": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
"integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
"funding": [
{
"type": "github",
@ -5151,9 +5184,9 @@
}
},
"node_modules/schema-utils": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
"integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
"license": "MIT",
"peer": true,
"dependencies": {
@ -5536,25 +5569,47 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/swiper": {
"version": "11.2.10",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-11.2.10.tgz",
"integrity": "sha512-RMeVUUjTQH+6N3ckimK93oxz6Sn5la4aDlgPzB+rBrG/smPdCTicXyhxa+woIpopz+jewEloiEE3lKo1h9w2YQ==",
"funding": [
{
"type": "patreon",
"url": "https://www.patreon.com/swiperjs"
},
{
"type": "open_collective",
"url": "http://opencollective.com/swiper"
}
],
"engines": {
"node": ">= 4.7.0"
}
},
"node_modules/tapable": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz",
"integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=6"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
}
},
"node_modules/terser": {
"version": "5.39.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
"integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
"version": "5.44.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.44.0.tgz",
"integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
"license": "BSD-2-Clause",
"peer": true,
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
"acorn": "^8.8.2",
"acorn": "^8.15.0",
"commander": "^2.20.0",
"source-map-support": "~0.5.20"
},
@ -5747,9 +5802,9 @@
}
},
"node_modules/undici-types": {
"version": "6.20.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
"version": "7.12.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
"integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
"license": "MIT",
"peer": true
},
@ -5877,9 +5932,9 @@
}
},
"node_modules/watchpack": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
"version": "2.4.4",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
"integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
"license": "MIT",
"peer": true,
"dependencies": {
@ -5897,21 +5952,23 @@
"license": "BSD-2-Clause"
},
"node_modules/webpack": {
"version": "5.98.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
"integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
"version": "5.101.3",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz",
"integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==",
"license": "MIT",
"peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.7",
"@types/estree": "^1.0.6",
"@types/estree": "^1.0.8",
"@types/json-schema": "^7.0.15",
"@webassemblyjs/ast": "^1.14.1",
"@webassemblyjs/wasm-edit": "^1.14.1",
"@webassemblyjs/wasm-parser": "^1.14.1",
"acorn": "^8.14.0",
"acorn": "^8.15.0",
"acorn-import-phases": "^1.0.3",
"browserslist": "^4.24.0",
"chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.17.1",
"enhanced-resolve": "^5.17.3",
"es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
@ -5921,11 +5978,11 @@
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
"neo-async": "^2.6.2",
"schema-utils": "^4.3.0",
"schema-utils": "^4.3.2",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.3.11",
"watchpack": "^2.4.1",
"webpack-sources": "^3.2.3"
"webpack-sources": "^3.3.3"
},
"bin": {
"webpack": "bin/webpack.js"
@ -5944,15 +6001,22 @@
}
},
"node_modules/webpack-sources": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
"integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/webpack/node_modules/@types/estree": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
"license": "MIT",
"peer": true
},
"node_modules/webpack/node_modules/eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",

View File

@ -21,6 +21,8 @@
"apexcharts": "^4.5.0",
"axios": "^1.7.9",
"axios-retry": "^4.5.0",
"crypto-js": "^4.2.0",
"date-fns": "^4.1.0",
"dotenv": "^16.4.7",
"dotenv-webpack": "^8.1.0",
"eventemitter3": "^5.0.1",
@ -39,6 +41,7 @@
"react-router-dom": "^6.20.1",
"react-toastify": "^11.0.2",
"sort-by": "^1.2.0",
"swiper": "^11.2.10",
"xlsx": "^0.18.5",
"zod": "^3.24.1"
},

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@
.login-box {
margin: 0 auto;
/* justify-content: center; */
/* width: 50%; */
width: 50%;
min-width: 350px;
}
@ -30,15 +30,8 @@
width: 45px;
}
.app-brand-logo-login {
width: 100px;
}
.app-brand-logo-border {
border: 1px solid #d5d5d5;
}
.app-brand-text {
font-size: 1.75rem;
font-size: 1rem;
letter-spacing: -0.5px;
/* text-transform: lowercase; */
}
@ -164,3 +157,22 @@
thead tr {
border-top: 1px solid white;
}
.app-brand-logo-login {
max-width: 50px; /* default for mobile */
height: auto; /* keep aspect ratio */
}
/* Tablet and up (≥768px) */
@media (min-width: 768px) {
.app-brand-logo-login {
max-width: 60px;
}
}
/* Desktop and up (≥1200px) */
@media (min-width: 1200px) {
.app-brand-logo-login {
max-width: 80px;
}
}

View File

@ -0,0 +1,86 @@
/* Hover background color */
.hover-bg-light:hover {
background-color: #f8f9fa !important;
}
.hover-bg-primary:hover {
background-color: var(--bs-primary) !important;
color: #fff !important;
}
.hover-bg-danger:hover {
background-color: #dc3545 !important;
color: #fff !important;
}
.hover-bg-success:hover {
background-color: var(--bg-success) !important;
color: #fff !important;
}
.hover-bg-warning:hover {
background-color: #ffc107 !important;
color: #212529 !important;
}
/* Hover text color */
.hover-text-primary:hover {
color: #0d6efd !important;
}
.hover-text-danger:hover {
color: #dc3545 !important;
}
.hover-text-success:hover {
color: #198754 !important;
}
.hover-text-muted:hover {
color: #6c757d !important;
}
/* Hover shadow */
.hover-shadow-sm:hover {
box-shadow: 0 .125rem .25rem rgba(0, 0, 0, 0.075);
}
.hover-shadow:hover {
box-shadow: 0 .5rem 1rem rgba(0, 0, 0, 0.15);
}
.hover-shadow-lg:hover {
box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175);
}
/* Hover scale */
.hover-scale:hover {
transform: scale(1.05);
}
.hover-scale-sm:hover {
transform: scale(1.03);
}
.hover-scale-lg:hover {
transform: scale(1.1);
}
/* Add smooth transition to hover effects */
.hover-transition {
transition: all 0.2s ease-in-out;
}
/* Hover border color */
.hover-border-primary:hover {
border-color: #0d6efd !important;
}
.hover-border-danger:hover {
border-color: #dc3545 !important;
}
.thick-divider {
height: 3px;
font-size: 10px;
}

32
public/assets/css/skeleton.css vendored Normal file
View File

@ -0,0 +1,32 @@
/* skeleton.css */
.skeleton {
background-color: #e2e8f0; /* Tailwind's gray-300 */
border-radius: 0.25rem; /* Tailwind's rounded */
position: relative;
overflow: hidden;
}
.skeleton::after {
content: '';
display: block;
position: absolute;
top: 0; left: -150px;
height: 100%;
width: 150px;
background: linear-gradient(
90deg,
transparent,
rgba(255, 255, 255, 0.4),
transparent
);
animation: pulse 1.5s infinite;
}
@keyframes pulse {
0% {
left: -150px;
}
100% {
left: 100%;
}
}

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg width="800px" height="800px" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="120" height="120" fill="#EFF1F3"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M33.2503 38.4816C33.2603 37.0472 34.4199 35.8864 35.8543 35.875H83.1463C84.5848 35.875 85.7503 37.0431 85.7503 38.4816V80.5184C85.7403 81.9528 84.5807 83.1136 83.1463 83.125H35.8543C34.4158 83.1236 33.2503 81.957 33.2503 80.5184V38.4816ZM80.5006 41.1251H38.5006V77.8751L62.8921 53.4783C63.9172 52.4536 65.5788 52.4536 66.6039 53.4783L80.5006 67.4013V41.1251ZM43.75 51.6249C43.75 54.5244 46.1005 56.8749 49 56.8749C51.8995 56.8749 54.25 54.5244 54.25 51.6249C54.25 48.7254 51.8995 46.3749 49 46.3749C46.1005 46.3749 43.75 48.7254 43.75 51.6249Z" fill="#687787"/>
</svg>

After

Width:  |  Height:  |  Size: 888 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 426 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 364 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 214 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -115,4 +115,74 @@ function Main () {
// Auto update menu collapsed/expanded based on the themeConfig
window.Helpers.setCollapsed(true, false);
// perfect scrolling
const verticalExample = document.getElementById('vertical-example'),
horizontalExample = document.getElementById('horizontal-example'),
horizVertExample = document.getElementById('both-scrollbars-example');
// Vertical Example
// --------------------------------------------------------------------
if (verticalExample) {
new PerfectScrollbar(verticalExample, {
wheelPropagation: false
});
}
// Horizontal Example
// --------------------------------------------------------------------
if (horizontalExample) {
new PerfectScrollbar(horizontalExample, {
wheelPropagation: false,
suppressScrollY: true
});
}
// Both vertical and Horizontal Example
// --------------------------------------------------------------------
if (horizVertExample) {
new PerfectScrollbar(horizVertExample, {
wheelPropagation: false
});
}
};
document.addEventListener("DOMContentLoaded", function () {
const html = document.documentElement;
/******************************
* SIDEBAR HOVER BEHAVIOR
******************************/
document.addEventListener("mouseover", function (e) {
const isInsideSidebar = e.target.closest("#layout-menu");
if (isInsideSidebar && html.classList.contains("layout-menu-collapsed")) {
html.classList.add("layout-menu-hover");
}
});
document.addEventListener("mouseout", function (e) {
const leftSidebar = !e.relatedTarget || !e.relatedTarget.closest("#layout-menu");
if (leftSidebar) {
html.classList.remove("layout-menu-hover");
}
});
/******************************
* TOGGLE MENU BUTTON OVERRIDE
******************************/
document.body.addEventListener("click", function (e) {
const btn = e.target.closest(".layout-menu-toggle");
if (!btn) return;
e.preventDefault();
html.classList.toggle("layout-menu-collapsed");
html.classList.remove("layout-menu-hover");
});
});

View File

@ -76,6 +76,7 @@
--bs-dark-border-subtle: #bfc0c6;
--bs-white-rgb: 255, 255, 255;
--bs-black-rgb: 34, 48, 62;
--bs-font-roboto:"Segoe UI", Roboto, "sans-serif",
--bs-font-sans-serif: "Public Sans", -apple-system, blinkmacsystemfont,
"Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
"Helvetica Neue", sans-serif;
@ -88,7 +89,7 @@
);
--bs-root-font-size: 16px;
--bs-body-font-family: var(--bs-font-sans-serif);
--bs-body-font-size: 0.8375rem;
--bs-body-font-size: 0.85rem;
--bs-body-font-weight: 400;
--bs-body-line-height: 1.375;
--bs-body-color: #646e78;
@ -454,7 +455,9 @@ table {
caption-side: bottom;
border-collapse: collapse;
}
.tr-group{
background-color: var(--bs-body-bg); /* apply globale color for table row, where grouping datewise*/
}
caption {
padding-top: 0.782rem;
padding-bottom: 0.782rem;
@ -836,7 +839,7 @@ progress {
}
.row {
--bs-gutter-x: 0.500rem;
--bs-gutter-x: 1.625rem;
--bs-gutter-y: 0;
display: flex;
flex-wrap: wrap;
@ -9057,7 +9060,7 @@ img[data-app-light-img][data-app-dark-img] {
}
.table th {
color: var(--bs-heading-color);
font-size: 0.8125rem;
font-size: 0.8025rem;
letter-spacing: 0.2px;
text-transform: uppercase;
}
@ -18607,6 +18610,13 @@ li:not(:first-child) .dropdown-item,
.min-vh-100 {
min-height: 100vh !important;
}
.page-min-h{
min-height: 70vh !important;
}
.modal-min-h{
min-height: 60vh !important;
}
.flex-fill {
flex: 1 1 auto !important;
@ -20335,7 +20345,7 @@ li:not(:first-child) .dropdown-item,
}
.fs-6 {
font-size: 0.9375rem !important;
font-size: 0.8375rem !important;
}
.fs-tiny {
@ -20471,7 +20481,10 @@ li:not(:first-child) .dropdown-item,
word-wrap: break-word !important;
word-break: break-word !important;
}
/* text-size */
.text-tiny{
font-size: 13px;
}
/* rtl:end:remove */
.text-primary {
--bs-text-opacity: 1;
@ -32536,3 +32549,33 @@ body:not(.modal-open) .layout-content-navbar .layout-navbar {
var(--bs-dark-contrast)
);
}
/* App colors classes */
.bg-gray-60{
background-color:var(--bs-gray-60)
}
.text-gray-60{
color:var(--bs-gray-60)
}
.bg-blue {
background-color:var(--bs-blue)
}
.bg-indigo {
background-color:var(--bs-indigo)
}
.text-indigo{
color:var(--bs-indigo)
}
.bg-red {
background-color:var(--bs-red)
}
.text-red{
color:var(--bs-red)
}
.text-blue{
color:var(--bs-blue)
}
.text-green{
color:var(--bs-green)
}

View File

@ -0,0 +1,837 @@
/* Config */
:root {
--sk-size: 40px;
--sk-color: #ff3e1d;
}
/* Utility class for centering */
.sk-center {
margin: auto;
}
/* Plane
<div class="sk-plane"></div>
*/
.sk-plane {
width: var(--sk-size);
height: var(--sk-size);
background-color: var(--sk-color);
animation: sk-plane 1.2s infinite ease-in-out;
}
@keyframes sk-plane {
0% {
transform: perspective(120px) rotateX(0deg) rotateY(0deg);
}
50% {
transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg);
}
100% {
transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg);
}
}
/* Chase
<div class="sk-chase">
<div class="sk-chase-dot"></div>
<div class="sk-chase-dot"></div>
<div class="sk-chase-dot"></div>
<div class="sk-chase-dot"></div>
<div class="sk-chase-dot"></div>
<div class="sk-chase-dot"></div>
</div>
*/
.sk-chase {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
animation: sk-chase 2.5s infinite linear both;
}
.sk-chase-dot {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
animation: sk-chase-dot 2s infinite ease-in-out both;
}
.sk-chase-dot:before {
content: "";
display: block;
width: 25%;
height: 25%;
background-color: var(--sk-color);
border-radius: 100%;
animation: sk-chase-dot-before 2s infinite ease-in-out both;
}
.sk-chase-dot:nth-child(1) {
animation-delay: -1.1s;
}
.sk-chase-dot:nth-child(2) {
animation-delay: -1s;
}
.sk-chase-dot:nth-child(3) {
animation-delay: -0.9s;
}
.sk-chase-dot:nth-child(4) {
animation-delay: -0.8s;
}
.sk-chase-dot:nth-child(5) {
animation-delay: -0.7s;
}
.sk-chase-dot:nth-child(6) {
animation-delay: -0.6s;
}
.sk-chase-dot:nth-child(1):before {
animation-delay: -1.1s;
}
.sk-chase-dot:nth-child(2):before {
animation-delay: -1s;
}
.sk-chase-dot:nth-child(3):before {
animation-delay: -0.9s;
}
.sk-chase-dot:nth-child(4):before {
animation-delay: -0.8s;
}
.sk-chase-dot:nth-child(5):before {
animation-delay: -0.7s;
}
.sk-chase-dot:nth-child(6):before {
animation-delay: -0.6s;
}
@keyframes sk-chase {
100% {
transform: rotate(360deg);
}
}
@keyframes sk-chase-dot {
80%, 100% {
transform: rotate(360deg);
}
}
@keyframes sk-chase-dot-before {
50% {
transform: scale(0.4);
}
100%, 0% {
transform: scale(1);
}
}
/* Bounce
<div class="sk-bounce">
<div class="sk-bounce-dot"></div>
<div class="sk-bounce-dot"></div>
</div>
*/
.sk-bounce {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
}
.sk-bounce-dot {
width: 100%;
height: 100%;
border-radius: 50%;
background-color: var(--sk-color);
opacity: 0.6;
position: absolute;
top: 0;
left: 0;
animation: sk-bounce 2s infinite cubic-bezier(0.455, 0.03, 0.515, 0.955);
}
.sk-bounce-dot:nth-child(2) {
animation-delay: -1s;
}
@keyframes sk-bounce {
0%, 100% {
transform: scale(0);
}
45%, 55% {
transform: scale(1);
}
}
/* Wave
<div class="sk-wave">
<div class="sk-wave-rect"></div>
<div class="sk-wave-rect"></div>
<div class="sk-wave-rect"></div>
<div class="sk-wave-rect"></div>
<div class="sk-wave-rect"></div>
</div>
*/
.sk-wave {
width: var(--sk-size);
height: var(--sk-size);
display: flex;
justify-content: space-between;
}
.sk-wave-rect {
background-color: var(--sk-color);
height: 100%;
width: 15%;
animation: sk-wave 1.2s infinite ease-in-out;
}
.sk-wave-rect:nth-child(1) {
animation-delay: -1.2s;
}
.sk-wave-rect:nth-child(2) {
animation-delay: -1.1s;
}
.sk-wave-rect:nth-child(3) {
animation-delay: -1s;
}
.sk-wave-rect:nth-child(4) {
animation-delay: -0.9s;
}
.sk-wave-rect:nth-child(5) {
animation-delay: -0.8s;
}
@keyframes sk-wave {
0%, 40%, 100% {
transform: scaleY(0.4);
}
20% {
transform: scaleY(1);
}
}
/* Pulse
<div class="sk-pulse"></div>
*/
.sk-pulse {
width: var(--sk-size);
height: var(--sk-size);
background-color: var(--sk-color);
border-radius: 100%;
animation: sk-pulse 1.2s infinite cubic-bezier(0.455, 0.03, 0.515, 0.955);
}
@keyframes sk-pulse {
0% {
transform: scale(0);
}
100% {
transform: scale(1);
opacity: 0;
}
}
/* Flow
<div class="sk-flow">
<div class="sk-flow-dot"></div>
<div class="sk-flow-dot"></div>
<div class="sk-flow-dot"></div>
</div>
*/
.sk-flow {
width: calc(var(--sk-size) * 1.3);
height: calc(var(--sk-size) * 1.3);
display: flex;
justify-content: space-between;
}
.sk-flow-dot {
width: 25%;
height: 25%;
background-color: var(--sk-color);
border-radius: 50%;
animation: sk-flow 1.4s cubic-bezier(0.455, 0.03, 0.515, 0.955) 0s infinite both;
}
.sk-flow-dot:nth-child(1) {
animation-delay: -0.3s;
}
.sk-flow-dot:nth-child(2) {
animation-delay: -0.15s;
}
@keyframes sk-flow {
0%, 80%, 100% {
transform: scale(0.3);
}
40% {
transform: scale(1);
}
}
/* Swing
<div class="sk-swing">
<div class="sk-swing-dot"></div>
<div class="sk-swing-dot"></div>
</div>
*/
.sk-swing {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
animation: sk-swing 1.8s infinite linear;
}
.sk-swing-dot {
width: 45%;
height: 45%;
position: absolute;
top: 0;
left: 0;
right: 0;
margin: auto;
background-color: var(--sk-color);
border-radius: 100%;
animation: sk-swing-dot 2s infinite ease-in-out;
}
.sk-swing-dot:nth-child(2) {
top: auto;
bottom: 0;
animation-delay: -1s;
}
@keyframes sk-swing {
100% {
transform: rotate(360deg);
}
}
@keyframes sk-swing-dot {
0%, 100% {
transform: scale(0.2);
}
50% {
transform: scale(1);
}
}
/* Circle
<div class="sk-circle">
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
<div class="sk-circle-dot"></div>
</div>
*/
.sk-circle {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
}
.sk-circle-dot {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
}
.sk-circle-dot:before {
content: "";
display: block;
width: 15%;
height: 15%;
background-color: var(--sk-color);
border-radius: 100%;
animation: sk-circle 1.2s infinite ease-in-out both;
}
.sk-circle-dot:nth-child(1) {
transform: rotate(30deg);
}
.sk-circle-dot:nth-child(2) {
transform: rotate(60deg);
}
.sk-circle-dot:nth-child(3) {
transform: rotate(90deg);
}
.sk-circle-dot:nth-child(4) {
transform: rotate(120deg);
}
.sk-circle-dot:nth-child(5) {
transform: rotate(150deg);
}
.sk-circle-dot:nth-child(6) {
transform: rotate(180deg);
}
.sk-circle-dot:nth-child(7) {
transform: rotate(210deg);
}
.sk-circle-dot:nth-child(8) {
transform: rotate(240deg);
}
.sk-circle-dot:nth-child(9) {
transform: rotate(270deg);
}
.sk-circle-dot:nth-child(10) {
transform: rotate(300deg);
}
.sk-circle-dot:nth-child(11) {
transform: rotate(330deg);
}
.sk-circle-dot:nth-child(1):before {
animation-delay: -1.1s;
}
.sk-circle-dot:nth-child(2):before {
animation-delay: -1s;
}
.sk-circle-dot:nth-child(3):before {
animation-delay: -0.9s;
}
.sk-circle-dot:nth-child(4):before {
animation-delay: -0.8s;
}
.sk-circle-dot:nth-child(5):before {
animation-delay: -0.7s;
}
.sk-circle-dot:nth-child(6):before {
animation-delay: -0.6s;
}
.sk-circle-dot:nth-child(7):before {
animation-delay: -0.5s;
}
.sk-circle-dot:nth-child(8):before {
animation-delay: -0.4s;
}
.sk-circle-dot:nth-child(9):before {
animation-delay: -0.3s;
}
.sk-circle-dot:nth-child(10):before {
animation-delay: -0.2s;
}
.sk-circle-dot:nth-child(11):before {
animation-delay: -0.1s;
}
@keyframes sk-circle {
0%, 80%, 100% {
transform: scale(0);
}
40% {
transform: scale(1);
}
}
/* Circle Fade
<div class="sk-circle-fade">
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
<div class="sk-circle-fade-dot"></div>
</div>
*/
.sk-circle-fade {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
}
.sk-circle-fade-dot {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
}
.sk-circle-fade-dot:before {
content: "";
display: block;
width: 15%;
height: 15%;
background-color: var(--sk-color);
border-radius: 100%;
animation: sk-circle-fade 1.2s infinite ease-in-out both;
}
.sk-circle-fade-dot:nth-child(1) {
transform: rotate(30deg);
}
.sk-circle-fade-dot:nth-child(2) {
transform: rotate(60deg);
}
.sk-circle-fade-dot:nth-child(3) {
transform: rotate(90deg);
}
.sk-circle-fade-dot:nth-child(4) {
transform: rotate(120deg);
}
.sk-circle-fade-dot:nth-child(5) {
transform: rotate(150deg);
}
.sk-circle-fade-dot:nth-child(6) {
transform: rotate(180deg);
}
.sk-circle-fade-dot:nth-child(7) {
transform: rotate(210deg);
}
.sk-circle-fade-dot:nth-child(8) {
transform: rotate(240deg);
}
.sk-circle-fade-dot:nth-child(9) {
transform: rotate(270deg);
}
.sk-circle-fade-dot:nth-child(10) {
transform: rotate(300deg);
}
.sk-circle-fade-dot:nth-child(11) {
transform: rotate(330deg);
}
.sk-circle-fade-dot:nth-child(1):before {
animation-delay: -1.1s;
}
.sk-circle-fade-dot:nth-child(2):before {
animation-delay: -1s;
}
.sk-circle-fade-dot:nth-child(3):before {
animation-delay: -0.9s;
}
.sk-circle-fade-dot:nth-child(4):before {
animation-delay: -0.8s;
}
.sk-circle-fade-dot:nth-child(5):before {
animation-delay: -0.7s;
}
.sk-circle-fade-dot:nth-child(6):before {
animation-delay: -0.6s;
}
.sk-circle-fade-dot:nth-child(7):before {
animation-delay: -0.5s;
}
.sk-circle-fade-dot:nth-child(8):before {
animation-delay: -0.4s;
}
.sk-circle-fade-dot:nth-child(9):before {
animation-delay: -0.3s;
}
.sk-circle-fade-dot:nth-child(10):before {
animation-delay: -0.2s;
}
.sk-circle-fade-dot:nth-child(11):before {
animation-delay: -0.1s;
}
@keyframes sk-circle-fade {
0%, 39%, 100% {
opacity: 0;
transform: scale(0.6);
}
40% {
opacity: 1;
transform: scale(1);
}
}
/* Grid
<div class="sk-grid">
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
<div class="sk-grid-cube"></div>
</div>
*/
.sk-grid {
width: var(--sk-size);
height: var(--sk-size);
/* Cube positions
* 1 2 3
* 4 5 6
* 7 8 9
*/
}
.sk-grid-cube {
width: 33.33%;
height: 33.33%;
background-color: var(--sk-color);
float: left;
animation: sk-grid 1.3s infinite ease-in-out;
}
.sk-grid-cube:nth-child(1) {
animation-delay: 0.2s;
}
.sk-grid-cube:nth-child(2) {
animation-delay: 0.3s;
}
.sk-grid-cube:nth-child(3) {
animation-delay: 0.4s;
}
.sk-grid-cube:nth-child(4) {
animation-delay: 0.1s;
}
.sk-grid-cube:nth-child(5) {
animation-delay: 0.2s;
}
.sk-grid-cube:nth-child(6) {
animation-delay: 0.3s;
}
.sk-grid-cube:nth-child(7) {
animation-delay: 0s;
}
.sk-grid-cube:nth-child(8) {
animation-delay: 0.1s;
}
.sk-grid-cube:nth-child(9) {
animation-delay: 0.2s;
}
@keyframes sk-grid {
0%, 70%, 100% {
transform: scale3D(1, 1, 1);
}
35% {
transform: scale3D(0, 0, 1);
}
}
/* Fold
<div class="sk-fold">
<div class="sk-fold-cube"></div>
<div class="sk-fold-cube"></div>
<div class="sk-fold-cube"></div>
<div class="sk-fold-cube"></div>
</div>
*/
.sk-fold {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
transform: rotateZ(45deg);
}
.sk-fold-cube {
float: left;
width: 50%;
height: 50%;
position: relative;
transform: scale(1.1);
}
.sk-fold-cube:before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: var(--sk-color);
animation: sk-fold 2.4s infinite linear both;
transform-origin: 100% 100%;
}
.sk-fold-cube:nth-child(2) {
transform: scale(1.1) rotateZ(90deg);
}
.sk-fold-cube:nth-child(4) {
transform: scale(1.1) rotateZ(180deg);
}
.sk-fold-cube:nth-child(3) {
transform: scale(1.1) rotateZ(270deg);
}
.sk-fold-cube:nth-child(2):before {
animation-delay: 0.3s;
}
.sk-fold-cube:nth-child(4):before {
animation-delay: 0.6s;
}
.sk-fold-cube:nth-child(3):before {
animation-delay: 0.9s;
}
@keyframes sk-fold {
0%, 10% {
transform: perspective(140px) rotateX(-180deg);
opacity: 0;
}
25%, 75% {
transform: perspective(140px) rotateX(0deg);
opacity: 1;
}
90%, 100% {
transform: perspective(140px) rotateY(180deg);
opacity: 0;
}
}
/* Wander
<div class="sk-wander">
<div class="sk-wander-cube"></div>
<div class="sk-wander-cube"></div>
<div class="sk-wander-cube"></div>
<div class="sk-wander-cube"></div>
</div>
*/
.sk-wander {
width: var(--sk-size);
height: var(--sk-size);
position: relative;
}
.sk-wander-cube {
background-color: var(--sk-color);
width: 20%;
height: 20%;
position: absolute;
top: 0;
left: 0;
--sk-wander-distance: calc(var(--sk-size) * 0.75);
animation: sk-wander 2s ease-in-out -2s infinite both;
}
.sk-wander-cube:nth-child(2) {
animation-delay: -0.5s;
}
.sk-wander-cube:nth-child(3) {
animation-delay: -1s;
}
@keyframes sk-wander {
0% {
transform: rotate(0deg);
}
25% {
transform: translateX(var(--sk-wander-distance)) rotate(-90deg) scale(0.6);
}
50% { /* Make FF rotate in the right direction */
transform: translateX(var(--sk-wander-distance)) translateY(var(--sk-wander-distance)) rotate(-179deg);
}
50.1% {
transform: translateX(var(--sk-wander-distance)) translateY(var(--sk-wander-distance)) rotate(-180deg);
}
75% {
transform: translateX(0) translateY(var(--sk-wander-distance)) rotate(-270deg) scale(0.6);
}
100% {
transform: rotate(-360deg);
}
}
:root {
--sk-size: 30px;
}
.sk-wave {
width: 40px;
white-space: nowrap;
}
.sk-fading-circle .sk-circle {
margin-top: 0;
margin-bottom: 0;
}
.sk-wave {
width: 40px;
white-space: nowrap;
}
.sk-fading-circle .sk-circle {
margin-top: 0;
margin-bottom: 0;
}

View File

@ -0,0 +1,879 @@
@charset "UTF-8";
:root {
--tagify-dd-color-primary: rgb(53,149,246);
--tagify-dd-bg-color: white;
--tagify-dd-item-pad: .3em .5em;
--tagify-dd-max-height: 300px;
}
.tagify {
--tags-disabled-bg: #F1F1F1;
--tags-border-color: #DDD;
--tags-hover-border-color: #CCC;
--tags-focus-border-color: #3595f6;
--tag-border-radius: 3px;
--tag-bg: rgba(167, 172, 178, 0.5);
--tag-hover: #D3E2E2;
--tag-text-color: black;
--tag-text-color--edit: black;
--tag-pad: 0.3em 0.5em;
--tag-inset-shadow-size: 2em;
--tag-invalid-color: #ff3e1d;
--tag-invalid-bg: rgba(255, 62, 29, 0.5);
--tag--min-width: 1ch;
--tag--max-width: auto;
--tag-hide-transition: 0.3s;
--tag-remove-bg: rgba(255, 62, 29, 0.3);
--tag-remove-btn-color: #7a838b;
--tag-remove-btn-bg: none;
--tag-remove-btn-bg--hover: #ff2804;
--input-color: inherit;
--placeholder-color: rgba(0, 0, 0, 0.4);
--placeholder-color-focus: rgba(0, 0, 0, 0.25);
--loader-size: .8em;
--readonly-striped: 1;
display: inline-flex;
align-items: flex-start;
flex-wrap: wrap;
border: 1px solid var(--tags-border-color);
padding: 0;
line-height: 0;
cursor: text;
outline: none;
position: relative;
box-sizing: border-box;
transition: 0.1s;
}
@keyframes tags--bump {
30% {
transform: scale(1.2);
}
}
@keyframes rotateLoader {
to {
transform: rotate(1turn);
}
}
.tagify:hover:not(.tagify--focus):not(.tagify--invalid) {
--tags-border-color: var(--tags-hover-border-color);
}
.tagify[disabled] {
background: var(--tags-disabled-bg);
filter: saturate(0);
opacity: 0.5;
pointer-events: none;
}
.tagify[readonly].tagify--select, .tagify[disabled].tagify--select {
pointer-events: none;
}
.tagify[readonly]:not(.tagify--mix):not(.tagify--select), .tagify[disabled]:not(.tagify--mix):not(.tagify--select) {
cursor: default;
}
.tagify[readonly]:not(.tagify--mix):not(.tagify--select) > .tagify__input, .tagify[disabled]:not(.tagify--mix):not(.tagify--select) > .tagify__input {
visibility: hidden;
width: 0;
margin: 5px 0;
}
.tagify[readonly]:not(.tagify--mix):not(.tagify--select) .tagify__tag > div, .tagify[disabled]:not(.tagify--mix):not(.tagify--select) .tagify__tag > div {
padding: var(--tag-pad);
}
.tagify[readonly]:not(.tagify--mix):not(.tagify--select) .tagify__tag > div::before, .tagify[disabled]:not(.tagify--mix):not(.tagify--select) .tagify__tag > div::before {
animation: readonlyStyles 1s calc(-1s * (var(--readonly-striped) - 1)) paused;
}
@keyframes readonlyStyles {
0% {
background: linear-gradient(45deg, var(--tag-bg) 25%, transparent 25%, transparent 50%, var(--tag-bg) 50%, var(--tag-bg) 75%, transparent 75%, transparent) 0/5px 5px;
box-shadow: none;
filter: brightness(0.95);
}
}
.tagify[readonly] .tagify__tag__removeBtn, .tagify[disabled] .tagify__tag__removeBtn {
display: none;
}
.tagify--loading .tagify__input > br:last-child {
display: none;
}
.tagify--loading .tagify__input::before {
content: none;
}
.tagify--loading .tagify__input::after {
content: "";
vertical-align: middle;
opacity: 1;
width: 0.7em;
height: 0.7em;
width: var(--loader-size);
height: var(--loader-size);
min-width: 0;
border: 3px solid;
border-color: #EEE #BBB #888 transparent;
border-radius: 50%;
animation: rotateLoader 0.4s infinite linear;
content: "" !important;
margin: -2px 0 -2px 0.5em;
}
.tagify--loading .tagify__input:empty::after {
margin-left: 0;
}
.tagify + input,
.tagify + textarea {
position: absolute !important;
left: -9999em !important;
transform: scale(0) !important;
}
.tagify__tag {
display: inline-flex;
align-items: center;
max-width: calc(var(--tag--max-width) - 10px);
margin-inline: 5px 0;
margin-block: 5px;
position: relative;
z-index: 1;
outline: none;
line-height: normal;
cursor: default;
transition: 0.13s ease-out;
}
.tagify__tag > div {
vertical-align: top;
box-sizing: border-box;
max-width: 100%;
padding: var(--tag-pad);
color: var(--tag-text-color);
line-height: inherit;
border-radius: var(--tag-border-radius);
white-space: nowrap;
transition: 0.13s ease-out;
}
.tagify__tag > div > * {
white-space: pre-wrap;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: top;
min-width: var(--tag--min-width);
max-width: var(--tag--max-width);
transition: 0.8s ease, 0.1s color;
}
.tagify__tag > div > *[contenteditable] {
outline: none;
user-select: text;
cursor: text;
margin: -2px;
padding: 2px;
max-width: 350px;
}
.tagify__tag > div::before {
content: "";
position: absolute;
border-radius: inherit;
inset: var(--tag-bg-inset, 0);
z-index: -1;
pointer-events: none;
transition: 120ms ease;
animation: tags--bump 0.3s ease-out 1;
box-shadow: 0 0 0 var(--tag-inset-shadow-size) var(--tag-bg) inset;
}
.tagify__tag:hover:not([readonly]) div::before, .tagify__tag:focus div::before {
--tag-bg-inset: -2.5px;
--tag-bg: var(--tag-hover);
}
.tagify__tag--loading {
pointer-events: none;
}
.tagify__tag--loading .tagify__tag__removeBtn {
display: none;
}
.tagify__tag--loading::after {
--loader-size: .4em;
content: "";
vertical-align: middle;
opacity: 1;
width: 0.7em;
height: 0.7em;
width: var(--loader-size);
height: var(--loader-size);
min-width: 0;
border: 3px solid;
border-color: #EEE #BBB #888 transparent;
border-radius: 50%;
animation: rotateLoader 0.4s infinite linear;
margin: 0 0.5em 0 -0.1em;
}
.tagify__tag--flash div::before {
animation: none;
}
.tagify__tag--hide {
width: 0 !important;
padding-left: 0;
padding-right: 0;
margin-left: 0;
margin-right: 0;
opacity: 0;
transform: scale(0);
transition: var(--tag-hide-transition);
pointer-events: none;
}
.tagify__tag--hide > div > * {
white-space: nowrap;
}
.tagify__tag.tagify--noAnim > div::before {
animation: none;
}
.tagify__tag.tagify--notAllowed:not(.tagify__tag--editable) div > span {
opacity: 0.5;
}
.tagify__tag.tagify--notAllowed:not(.tagify__tag--editable) div::before {
--tag-bg: var(--tag-invalid-bg);
transition: 0.2s;
}
.tagify__tag[readonly] .tagify__tag__removeBtn {
display: none;
}
.tagify__tag[readonly] > div::before {
animation: readonlyStyles 1s calc(-1s * (var(--readonly-striped) - 1)) paused;
}
@keyframes readonlyStyles {
0% {
background: linear-gradient(45deg, var(--tag-bg) 25%, transparent 25%, transparent 50%, var(--tag-bg) 50%, var(--tag-bg) 75%, transparent 75%, transparent) 0/5px 5px;
box-shadow: none;
filter: brightness(0.95);
}
}
.tagify__tag--editable > div {
color: var(--tag-text-color--edit);
}
.tagify__tag--editable > div::before {
box-shadow: 0 0 0 2px var(--tag-hover) inset !important;
}
.tagify__tag--editable > .tagify__tag__removeBtn {
pointer-events: none;
}
.tagify__tag--editable > .tagify__tag__removeBtn::after {
opacity: 0;
transform: translateX(100%) translateX(5px);
}
.tagify__tag--editable.tagify--invalid > div::before {
box-shadow: 0 0 0 2px var(--tag-invalid-color) inset !important;
}
.tagify__tag__removeBtn {
order: 5;
display: inline-flex;
align-items: center;
justify-content: center;
border-radius: 50px;
cursor: pointer;
font: 14px/1 Arial;
background: var(--tag-remove-btn-bg);
color: var(--tag-remove-btn-color);
width: 14px;
height: 14px;
margin-inline: auto 4.6666666667px;
overflow: hidden;
transition: 0.2s ease-out;
}
.tagify__tag__removeBtn::after {
content: "×";
transition: 0.3s, color 0s;
}
.tagify__tag__removeBtn:hover {
color: white;
background: var(--tag-remove-btn-bg--hover);
}
.tagify__tag__removeBtn:hover + div > span {
opacity: 0.5;
}
.tagify__tag__removeBtn:hover + div::before {
box-shadow: 0 0 0 var(--tag-inset-shadow-size) var(--tag-remove-bg, rgba(255, 62, 29, 0.3)) inset !important;
transition: box-shadow 0.2s;
}
.tagify:not(.tagify--mix) .tagify__input br {
display: none;
}
.tagify:not(.tagify--mix) .tagify__input * {
display: inline;
white-space: nowrap;
}
.tagify__input {
flex-grow: 1;
display: inline-block;
min-width: 110px;
margin: 5px;
padding: var(--tag-pad);
line-height: normal;
position: relative;
white-space: pre-wrap;
color: var(--input-color);
box-sizing: inherit;
/* Seems firefox newer versions don't need this any more
@supports ( -moz-appearance:none ){
&::before{
line-height: inherit;
position:relative;
}
}
*/
}
@-moz-document url-prefix() {}
.tagify__input:empty::before {
position: static;
}
.tagify__input:focus {
outline: none;
}
.tagify__input:focus::before {
transition: 0.2s ease-out;
opacity: 0;
transform: translatex(6px);
/* ALL MS BROWSERS: hide placeholder (on focus) otherwise the caret is placed after it, which is weird */
/* IE Edge 12+ CSS styles go here */
}
@supports (-ms-ime-align: auto) {
.tagify__input:focus::before {
display: none;
}
}
.tagify__input:focus:empty::before {
transition: 0.2s ease-out;
opacity: 1;
transform: none;
color: rgba(0, 0, 0, 0.25);
color: var(--placeholder-color-focus);
}
@-moz-document url-prefix() {
.tagify__input:focus:empty::after {
display: none;
}
}
.tagify__input::before {
content: attr(data-placeholder);
height: 1em;
line-height: 1em;
margin: auto 0;
z-index: 1;
color: var(--placeholder-color);
white-space: nowrap;
pointer-events: none;
opacity: 0;
position: absolute;
}
.tagify__input::after {
content: attr(data-suggest);
display: inline-block;
vertical-align: middle;
position: absolute;
min-width: calc(100% - 1.5em);
text-overflow: ellipsis;
overflow: hidden;
white-space: pre; /* allows spaces at the beginning */
color: var(--tag-text-color);
opacity: 0.3;
pointer-events: none;
max-width: 100px;
}
.tagify__input .tagify__tag {
margin: 0 1px;
}
.tagify--mix {
display: block;
}
.tagify--mix .tagify__input {
padding: 5px;
margin: 0;
width: 100%;
height: 100%;
line-height: 1.5;
display: block;
}
.tagify--mix .tagify__input::before {
height: auto;
display: none;
line-height: inherit;
}
.tagify--mix .tagify__input::after {
content: none;
}
.tagify--select::after {
content: ">";
opacity: 0.5;
position: absolute;
top: 50%;
right: 0;
bottom: 0;
font: 16px monospace;
line-height: 8px;
height: 8px;
pointer-events: none;
transform: translate(-150%, -50%) scaleX(1.2) rotate(90deg);
transition: 0.2s ease-in-out;
}
.tagify--select[aria-expanded=true]::after {
transform: translate(-150%, -50%) rotate(270deg) scaleY(1.2);
}
.tagify--select .tagify__tag {
position: absolute;
top: 0;
right: 1.8em;
bottom: 0;
}
.tagify--select .tagify__tag div {
display: none;
}
.tagify--select .tagify__input {
width: 100%;
}
.tagify--empty .tagify__input::before {
transition: 0.2s ease-out;
opacity: 1;
transform: none;
display: inline-block;
width: auto;
}
.tagify--mix .tagify--empty .tagify__input::before {
display: inline-block;
}
.tagify--focus {
--tags-border-color: var(--tags-focus-border-color);
transition: 0s;
}
.tagify--invalid {
--tags-border-color: #ff3e1d;
}
.tagify__dropdown {
position: absolute;
z-index: 9999;
transform: translateY(-1px);
border-top: 1px solid var(--tagify-dd-color-primary);
overflow: hidden;
}
.tagify__dropdown[dir=rtl] {
transform: translate(-100%, -1px);
}
.tagify__dropdown[placement=top] {
margin-top: 0;
transform: translateY(-100%);
}
.tagify__dropdown[placement=top] .tagify__dropdown__wrapper {
border-top-width: 1.1px;
border-bottom-width: 0;
}
.tagify__dropdown[position=text] {
box-shadow: 0 0 0 3px rgba(var(--tagify-dd-color-primary), 0.1);
font-size: 0.9em;
}
.tagify__dropdown[position=text] .tagify__dropdown__wrapper {
border-width: 1px;
}
.tagify__dropdown__wrapper {
max-height: var(--tagify-dd-max-height);
overflow: hidden;
overflow-x: hidden;
background: var(--tagify-dd-bg-color);
border: 1px solid;
border-color: var(--tagify-dd-color-primary);
border-bottom-width: 1.5px;
border-top-width: 0;
box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.2);
transition: 0.3s cubic-bezier(0.5, 0, 0.3, 1), transform 0.15s;
animation: dd-wrapper-show 0s 0.3s forwards;
}
@keyframes dd-wrapper-show {
to {
overflow-y: auto;
}
}
.tagify__dropdown__header:empty {
display: none;
}
.tagify__dropdown__footer {
display: inline-block;
margin-top: 0.5em;
padding: var(--tagify-dd-item-pad);
font-size: 0.7em;
font-style: italic;
opacity: 0.5;
}
.tagify__dropdown__footer:empty {
display: none;
}
.tagify__dropdown--initial .tagify__dropdown__wrapper {
max-height: 20px;
transform: translateY(-1em);
}
.tagify__dropdown--initial[placement=top] .tagify__dropdown__wrapper {
transform: translateY(2em);
}
.tagify__dropdown__item {
box-sizing: border-box;
padding: var(--tagify-dd-item-pad);
margin: 1px;
white-space: pre-wrap;
cursor: pointer;
border-radius: 2px;
position: relative;
outline: none;
max-height: 60px;
max-width: 100%;
/* custom hidden transition effect is needed for horizontal-layout suggestions */
}
.tagify__dropdown__item--active {
background: var(--tagify-dd-color-primary);
color: white;
}
.tagify__dropdown__item:active {
filter: brightness(105%);
}
.tagify__dropdown__item--hidden {
padding-top: 0;
padding-bottom: 0;
margin: 0 1px;
pointer-events: none;
overflow: hidden;
max-height: 0;
transition: var(--tagify-dd-item--hidden-duration, 0.3s) !important;
}
.tagify__dropdown__item--hidden > * {
transform: translateY(-100%);
opacity: 0;
transition: inherit;
}
/* Suggestions items */
.tagify__dropdown.users-list {
font-size: 1rem;
}
.tagify__dropdown.users-list .addAll {
display: block !important;
}
.tagify__dropdown.users-list .tagify__dropdown__item {
padding: 0.5em 0.7em;
display: grid;
grid-template-columns: auto 1fr;
gap: 0 1em;
grid-template-areas: "avatar name" "avatar email";
}
.tagify__dropdown.users-list .tagify__dropdown__item__avatar-wrap {
grid-area: avatar;
width: 36px;
height: 36px;
border-radius: 50%;
overflow: hidden;
transition: 0.1s ease-out;
}
.tagify__dropdown.users-list img {
width: 100%;
vertical-align: top;
}
.tagify__dropdown.users-list strong {
grid-area: name;
width: 100%;
align-self: center;
font-weight: 500;
}
.tagify__dropdown.users-list span {
grid-area: email;
width: 100%;
font-size: 0.9em;
opacity: 0.6;
}
/* Tags items */
.tagify__tag {
white-space: nowrap;
}
.tagify__tag .tagify__tag__avatar-wrap {
width: 22px;
height: 22px;
white-space: normal;
border-radius: 50%;
margin-right: 5px;
transition: 0.12s ease-out;
vertical-align: middle;
}
.tagify__tag img {
width: 100%;
vertical-align: top;
}
[dir=rtl] .tagify__tag .tagify__tag__avatar-wrap {
margin-left: 5px;
margin-right: auto;
}
.light-style .tagify__dropdown.users-list .tagify__dropdown__item__avatar-wrap {
background: #f5f5f9;
}
.light-style .tagify__tag .tagify__tag__avatar-wrap {
background: #f5f5f9;
}
.light-style .tagify__dropdown.users-list .addAll {
border-bottom: 1px solid #e4e6e8;
}
.dark-style .tagify__dropdown.users-list .tagify__dropdown__item__avatar-wrap {
background: #232333;
}
.dark-style .tagify__tag .tagify__tag__avatar-wrap {
background: #232333;
}
.dark-style .tagify__dropdown.users-list .addAll {
border-bottom: 1px solid #4e4f6c;
}
.tags-inline .tagify__dropdown__wrapper {
padding: 0 0.4375rem 0.4375rem 0.4375rem;
}
.tags-inline .tagify__dropdown__item {
display: inline-block;
border-radius: 3px;
padding: 0.3em 0.5em;
margin: 0.4375rem 0.4375rem 0 0;
font-size: 0.85em;
transition: 0s;
}
[dir=rtl] .tags-inline .tagify__dropdown__item {
margin: 0.4375rem 0 0 0.4375rem;
}
.light-style .tags-inline .tagify__dropdown__item {
border: 1px solid #e4e6e8;
color: #646e78;
}
.dark-style .tags-inline .tagify__dropdown__item {
border: 1px solid #4e4f6c;
color: #b2b2c4;
}
.tagify-email-list {
display: inline-block;
min-width: 0;
border: none;
/* Do not show the "remove tag" (x) button when only a single tag remains */
}
.tagify-email-list.tagify {
padding: 0 !important;
padding-bottom: calc(0.4375rem - var(--bs-border-width)) !important;
}
.tagify-email-list.tagify {
padding: 0 !important;
padding-bottom: calc(0.4375rem - var(--bs-border-width)) !important;
}
.tagify-email-list.tagify.tagify--focus {
padding-left: 0 !important;
}
.tagify-email-list .tagify__tag {
margin: 0;
margin-inline-start: 0 !important;
margin-inline-end: 0.625rem !important;
margin-bottom: 0.4375rem !important;
}
.tagify-email-list .tagify__tag > div {
padding: 0.21875rem 0.4375rem !important;
padding-inline: 0.875rem !important;
}
.tagify-email-list .tagify__tag:only-of-type > div {
padding-inline: 0.4375rem !important;
}
.tagify-email-list .tagify__tag:only-of-type .tagify__tag__removeBtn {
display: none;
}
.tagify-email-list .tagify__tag__removeBtn {
opacity: 0;
transform: translateX(-6px) scale(0.5);
margin-left: -3ch;
transition: 0.12s;
position: absolute;
inset-inline-end: 0;
}
.tagify-email-list .tagify__tag:hover .tagify__tag__removeBtn {
transform: none;
opacity: 1;
margin-left: -1ch;
}
.tagify-email-list .tagify__input {
display: none;
}
.tagify__tag > div {
border-radius: 50rem;
}
[dir=rtl] .tagify-email-list .tagify__tag {
margin: 0 0.4375rem 0.4375rem 0;
}
[dir=rtl] .tagify-email-list .tagify__tag:hover .tagify__tag__removeBtn {
margin-left: auto;
margin-right: -1ch;
}
[dir=rtl] .tagify-email-list .tagify__tag__removeBtn {
transform: translateX(6px) scale(0.5);
margin-left: auto;
margin-right: -3ch;
}
.light-style .tagify-email-list .tagify__tag--editable:not(.tagify--invalid) > div::before {
box-shadow: 0 0 0 2px #e4e6e8 inset !important;
}
.dark-style .tagify-email-list .tagify__tag--editable:not(.tagify--invalid) > div::before {
box-shadow: 0 0 0 2px #4e4f6c inset !important;
}
.tagify.form-control {
transition: none;
display: flex;
align-items: flex-end;
/* padding: calc(2px - var(--bs-border-width)) 0.4375rem 0.4231rem !important; */
padding: calc(2px - var(--bs-border-width)) 0.4375rem 0.2rem !important;
}
.fv-plugins-bootstrap5-row-invalid .tagify.form-control {
padding: 0 calc(0.4375rem - var(--bs-border-width)) calc(0.4375rem - 2px) !important;
}
.tagify.tagify--focus, .tagify.form-control:focus {
padding: 0 calc(0.4375rem - var(--bs-border-width)) 0.3606rem !important;
border-width: 2px;
}
.tagify__tag, .tagify__input {
margin: 0.1875rem 0.625rem 0 0 !important;
line-height: 1;
}
.tagify__input {
line-height: 1.5rem;
}
.tagify__input:empty::before {
top: 4px;
}
.tagify__tag > div {
line-height: 1.5rem;
padding: 0 0 0 0.4375rem;
}
.tagify__tag__removeBtn {
margin-right: 0.1375rem;
margin-left: 0.21875rem;
font-family: "boxicons";
font-size: 1rem;
opacity: 0.7;
}
.tagify__tag__removeBtn:hover {
background: none;
color: #ff2804 !important;
}
.tagify__tag__removeBtn::after {
content: "\ef06";
}
.tagify__tag:hover:not([readonly]) div::before, .tagify__tag:focus div::before {
top: 0px;
right: 0px;
bottom: 0px;
left: 0px;
}
.tagify__dropdown {
transform: translateY(0);
}
.tagify[readonly]:not(.tagify--mix) .tagify__tag > div {
padding: 0 0.4375rem 0 0.4375rem !important;
}
.tagify__input {
padding: 0;
}
.tagify__tag-text {
font-size: 0.8125rem;
font-weight: 500;
}
.tagify.form-control {
padding-top: 0.1412rem !important;
}
.tagify.tagify--focus, .tagify.form-control:focus {
padding-top: calc(0.1412rem - 1px) !important;
}
.tagify__tag__removeBtn {
margin-inline-end: 0.3rem;
}
[dir=rtl] .tagify__tag, [dir=rtl] .tagify__input {
margin: 0.4375rem 0 0 0.4375rem;
}
[dir=rtl] .tagify + input,
[dir=rtl] .tagify + textarea {
left: 0;
right: -9999em !important;
}
[dir=rtl] .tagify__tag > div {
padding: 0 0.6875rem 0 0;
}
[dir=rtl] .tagify__tag__removeBtn {
margin-left: 0.4375rem;
margin-right: 0.21875rem;
}
.light-style .tagify__tag > div::before {
box-shadow: 0 0 0 1.3em rgba(34, 48, 62, 0.08) inset;
}
.light-style .tagify__tag .tagify__tag-text {
color: #384551;
}
.light-style .tagify__tag:hover:not([readonly]) div::before, .light-style .tagify__tag:focus div::before {
box-shadow: 0 0 0 1.3em rgba(34, 48, 62, 0.12) inset;
}
.light-style .tagify__tag__removeBtn {
color: #7a838b;
}
.light-style .tagify__tag__removeBtn:hover + div::before {
background: rgba(255, 62, 29, 0.3);
}
.light-style .tagify:hover:not([readonly]) {
border-color: #ced1d5;
}
.light-style .tagify__input::before {
color: #a7acb2 !important;
}
.light-style .tagify__dropdown {
box-shadow: 0 0.25rem 0.75rem 0 rgba(34, 48, 62, 0.14);
border-top-color: #e4e6e8;
}
.light-style .tagify__dropdown__wrapper {
background: #fff;
border-color: #e4e6e8;
}
.dark-style .tagify__tag > div::before {
box-shadow: 0 0 0 1.3em rgba(230, 230, 241, 0.08) inset;
}
.dark-style .tagify__tag > div .tagify__tag-text {
color: #d5d5e2;
}
.dark-style .tagify__tag:hover:not([readonly]) div::before, .dark-style .tagify__tag:focus div::before {
box-shadow: 0 0 0 1.3em rgba(230, 230, 241, 0.12) inset;
}
.dark-style .tagify__tag__removeBtn {
color: #a1a1b5;
}
.dark-style .tagify__tag__removeBtn:hover + div::before {
background: rgba(255, 62, 29, 0.3);
}
.dark-style .tagify:hover:not([readonly]) {
border-color: #5f607b;
}
.dark-style .tagify__input::before {
color: #7e7f96 !important;
}
.dark-style .tagify[readonly]:not(.tagify--mix) .tagify__tag > div::before {
background: linear-gradient(45deg, #5f607b 25%, transparent 25%, transparent 50%, #5f607b 50%, #5f607b 75%, transparent 75%, transparent) 0/5px 5px;
}
.dark-style .tagify[readonly]:not(.tagify--mix):not(.tagify--select) .tagify__tag > div::before {
animation: none;
box-shadow: none;
}
.dark-style .tagify__dropdown {
box-shadow: 0 0.25rem 0.75rem 0 rgba(20, 20, 29, 0.24);
border-top-color: #4e4f6c;
}
.dark-style .tagify__dropdown__wrapper {
box-shadow: 0 0.25rem 0.75rem 0 rgba(20, 20, 29, 0.24);
background: #2b2c40;
border-color: #4e4f6c;
}

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 411 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 787 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
public/img/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

Some files were not shown because too many files have changed in this diff Show More