|
|
b0e359e428
|
Change in Team and InfraStructure component when select a project.
|
2025-07-30 17:32:49 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fb1dec6c93
|
Added new field in contact create and update form
|
2025-07-02 15:06:01 +05:30 |
|
