|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
f56fd23cbf
|
In Create Project popup change the noraml date selection to DatePicker.
|
2025-09-05 11:12:31 +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 |
|
|
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 |
|
|
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 |
|
|
a602bebc5e
|
implement landing page UI
|
2025-08-16 17:09:20 +05:30 |
|
|
ee2c973d01
|
change label
|
2025-08-16 12:57:47 +05:30 |
|
|
4d66ebeb50
|
changes in otp page.
|
2025-08-05 11:48:10 +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 |
|