9e6cfdb659
Changes in Attendance tab.
...
1. Filter the view to show only "Today's" attendance.
2. Display today's date prominently above the names in that tab.
2025-05-17 10:58:14 +00:00
6e2d640542
"In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'. A previous issue caused the message 'Expected string, received null' to appear initially."
2025-05-17 10:58:14 +00:00
48f013edd5
On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'.
2025-05-17 10:57:50 +00:00
21b2feb13f
Update the Project List component column names:
...
1.Change 'Planned' to 'Completed/Planned'
2.Change 'Completed' to 'Today's Planned
2025-05-17 10:57:50 +00:00
27cf6f2703
Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.
2025-05-17 10:57:50 +00:00
33efad9b06
Info-icon add
2025-05-17 10:57:31 +00:00
01b43ecc13
modified assign task popup from daily task planning.
...
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
2025-05-17 10:57:31 +00:00
d20b54a71c
Modified assign task popup from Daily task planning component.
2025-05-17 10:57:31 +00:00
5535ff21fa
Modified popup of Assign Task.
2025-05-17 10:57:31 +00:00
ad3533a567
Removing extra gap in Assign employee popup from project list >Team.
2025-05-17 10:54:45 +00:00
f6cbc3acc9
Info-icon add
2025-05-17 16:10:11 +05:30
72d557ad90
Removing extra gap in Assign employee popup from project list >Team.
2025-05-17 14:21:28 +05:30
1b92c30d33
modified assign task popup from daily task planning.
...
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
2025-05-17 13:14:17 +05:30
Pramod Mahajan
c7b5a0ba7d
created new contact form
2025-05-16 19:14:34 +05:30
Pramod Mahajan
085f45210e
changed coulmn
2025-05-16 19:09:24 +05:30
Pramod Mahajan
7cfe04de2e
modified TagInput, for array an object
2025-05-16 19:08:41 +05:30
Pramod Mahajan
1c1a1da8a0
removed backdrop
2025-05-16 19:07:15 +05:30
115b49ac44
Modified assign task popup from Daily task planning component.
2025-05-16 16:53:51 +05:30
Pramod Mahajan
d8df891370
added createContactTg component inside MasterModal
2025-05-15 21:48:44 +05:30
Pramod Mahajan
dcc611b768
created new createContactMaster component
2025-05-15 21:47:51 +05:30
0a1f76afb6
Modified popup of Assign Task.
2025-05-15 19:40:09 +05:30
Pramod Mahajan
40df12de86
added CreateContactCategory in master modal
2025-05-15 12:28:37 +00:00
Pramod Mahajan
74ed8d3c4f
created new constact category master
2025-05-15 12:28:37 +00:00
Pramod Mahajan
cc98f34b44
displaye contacts in List View
2025-05-15 12:19:57 +05:30
Pramod Mahajan
7d07002555
visible assign task button in mobile view
2025-05-15 05:46:40 +00:00
aa0bdb7a57
Implemented Pushover to display permission descriptions when editing or creating application role
2025-05-13 18:48:40 +05:30
c8ad72a2da
added Assign_view progress task permission.
2025-05-13 12:40:10 +05:30
Pramod Mahajan
d398a6cb39
added dropdwon for action view
2025-05-13 11:32:09 +05:30
Pramod Mahajan
4fb337533e
added bootstrap accordation
2025-05-13 11:30:43 +05:30
Pramod Mahajan
db098f9fdc
manage floor header size for collap
2025-05-13 11:29:56 +05:30
Pramod Mahajan
aa2ca6565b
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#154
2025-05-12 16:36:55 +05:30
Pramod Mahajan
bf797503f5
added accordionn for floor
2025-05-12 16:34:44 +05:30
bf097bc884
Added a popup to allow editing of employee information directly in the Employee Profile.
2025-05-12 15:45:17 +05:30
a3608a49bd
remove sneat lables from application
2025-05-12 15:37:31 +05:30
a7aa815691
Merge branch 'Ashutosh_Enhancement#205_Added_WorkCategory_Dropdown' into Issue_May_2W
2025-05-12 14:49:33 +05:30
Pramod Mahajan
926168bb07
Modified report comments section.
2025-05-12 09:18:29 +00:00
e8ac267d46
Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views.
2025-05-12 14:40:13 +05:30
cf204f376d
Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions.
2025-05-12 07:58:33 +00:00
8db6a16e15
revert 1827757f19bd15c05029e1ca9c72de3a65a68bf1
...
revert updated regularization logic based on 48-hour checkout threshold
- This update was mistakenly implemented in the wrong branch. Moving it here to align with the correct workflow.- pramod_Bug#-27
2025-05-12 07:58:04 +00:00
Pramod Mahajan
2188f109cb
disable Edit button and show "Please wait" message during activity update API call
2025-05-12 07:58:04 +00:00
Pramod Mahajan
292c920941
added loader during submitting form data.
2025-05-12 07:58:04 +00:00
Pramod Mahajan
af6a6faa46
ensure activity updates reflect in Daily Task Planning without page refresh
2025-05-12 07:58:04 +00:00
Pramod Mahajan
216e9b0db0
updated regularization logic based on 48-hour checkout threshold for attendanceLogs.
2025-05-12 07:57:40 +00:00
658c2776f1
Merge branch 'pramod_Task#207' into Issue_May_2W
2025-05-10 19:23:23 +05:30
f26b708564
Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null.
2025-05-10 13:38:05 +00:00
Pramod Mahajan
6bb1f98ae7
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207,
2025-05-10 19:06:34 +05:30
96963527df
Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality.
2025-05-10 17:56:35 +05:30
Pramod Mahajan
16fd31eef7
added reset and setloader false once request completed
2025-05-10 10:42:37 +00:00
Pramod Mahajan
636076ed56
passed reset and loading method inside handleSubmitForm function.
2025-05-10 10:42:37 +00:00
Pramod Mahajan
c4a221807f
changed class too className
2025-05-10 10:41:59 +00:00
