Commit Graph
Select branches
Hide Pull Requests
Adding_Chips_Expense
Adding_Multiple_FileUpload
Adding_New_Dropdown
Adding_Toggle_Button
Adding_dropdown
AppMenu
Assigned_Employee_Job_Role
Attendance_Regularize_Issues
Attendance_Tabs
Branch_Detail_View
Bug#752RefreshToken
Collection_Service_Project
Document_Manag
Document_Manager
Expense_Bug#828
Expense_Bugs
Expense_Manangement_Feature
Feature#772_NEWExpenseType_Master
Feature#773_EditExpenseType
Feature#774_DeleteExpenseType
Feature#777_EditPaymentMode
Feature#778_DeletePaymentMode
Feature#804_ExpnseFilter
Feature-#776NewPaymentMode
Feature-#809_ExpenseStatsuMang
Feature_Directory
Feature_Expense
Finance_Export_Functionality
Finance_Form_Layout
GlobalSelectProject
HofixedIssues_July_4W
HotChanges_04_10_25
HotChanges_06-10-25
HotChanges_09_10_25
HotChanges_10_10_25
HotChanges_11_10_25
Image_Gallery_FilterChips
Image_Gallery_filter
Implementing_TimeLine
Intefrating_API_Dashboard
Inventary_Management
Issues_Aug_1W
Issues_Aug_2W
Issues_Expense
Issues_Expense_2W
Issues_July_1W
Issues_July_2W
Issues_July_3W
Issues_July_4W
Issues_Nov_4W
Issues_Oct_1W
Issues_Oct_4W_V1
Issues_Oct_main_2W
Issues_Sep_1W
Issues_Sep_1W_V2
Jobs_Side_Panel
Jun_Widget
Kartik#Enhancement#1444
Kartik_Bug#1015
Kartik_Bug#1016
Kartik_Bug#1024
Kartik_Bug#1028
Kartik_Bug#1037
Kartik_Bug#1039
Kartik_Bug#1041
Kartik_Bug#1042
Kartik_Bug#1045
Kartik_Bug#1052
Kartik_Bug#1056
Kartik_Bug#1064
Kartik_Bug#1071
Kartik_Bug#1080
Kartik_Bug#1081
Kartik_Bug#1096
Kartik_Bug#1100
Kartik_Bug#1104
Kartik_Bug#1113
Kartik_Bug#1115
Kartik_Bug#1123
Kartik_Bug#1180
Kartik_Bug#1250
Kartik_Bug#1261
Kartik_Bug#1292
Kartik_Bug#1295
Kartik_Bug#1298
Kartik_Bug#1300
Kartik_Bug#1301
Kartik_Bug#1306
Kartik_Bug#1350
Kartik_Bug#1353
Kartik_Bug#1359
Kartik_Bug#1366
Kartik_Bug#1369
Kartik_Bug#1370
Kartik_Bug#1372
Kartik_Bug#1381
Kartik_Bug#1388
Kartik_Bug#1390
Kartik_Bug#1391
Kartik_Bug#1392
Kartik_Bug#1394
Kartik_Bug#1395
Kartik_Bug#1408
Kartik_Bug#1417
Kartik_Bug#1418
Kartik_Bug#1425
Kartik_Bug#1434
Kartik_Bug#1437
Kartik_Bug#1450
Kartik_Bug#1451
Kartik_Bug#1455
Kartik_Bug#1462
Kartik_Bug#1463
Kartik_Bug#1469
Kartik_Bug#1496
Kartik_Bug#1497
Kartik_Bug#1499
Kartik_Bug#1534
Kartik_Bug#1657
Kartik_Bug#1661
Kartik_Bug#1666
Kartik_Bug#1773
Kartik_Bug#493
Kartik_Bug#494
Kartik_Bug#611
Kartik_Bug#664
Kartik_Bug#717
Kartik_Bug#793
Kartik_Bug#797
Kartik_Bug#798
Kartik_Bug#799
Kartik_Bug#800
Kartik_Bug#805
Kartik_Bug#830
Kartik_Bug#836
Kartik_Bug#841
Kartik_Bug#842
Kartik_Bug#862
Kartik_Bug#869
Kartik_Bug#873
Kartik_Bug#884
Kartik_Bug#886
Kartik_Bug#887
Kartik_Bug#888
Kartik_Bug#889
Kartik_Bug#891
Kartik_Bug#895
Kartik_Bug#906
Kartik_Bug#907
Kartik_Bug#908
Kartik_Bug#909
Kartik_Bug#910
Kartik_Bug#915
Kartik_Bug#919
Kartik_Bug#920
Kartik_Bug#929
Kartik_Bug#932
Kartik_Bug#933
Kartik_Bug#941
Kartik_Bug#944
Kartik_Bug#955
Kartik_Bug#956
Kartik_Bug#962
Kartik_Bug#972
Kartik_Bug#973
Kartik_Bug#974
Kartik_Bug#976
Kartik_Bug#978
Kartik_Bug#979
Kartik_Bug_V1#1525
Kartik_Bug_V1#1537
Kartik_Bug_V1#1539
Kartik_Bug_V1#1543
Kartik_Bug_V1#1564
Kartik_Bug_V1#1569
Kartik_Bug_V1#1572
Kartik_Directory_Changes#805
Kartik_Enhancement#1053
Kartik_Enhancement#1448
Kartik_Enhancement#1468
Kartik_Enhancement#807
Kartik_Enhancement#948
Kartik_Enhancement_918
Kartik_Filter_Changes#800
Kartik_ProjectList#628
Kartik_Task#1079
Kartik_Task#1227
Kartik_Task#1229
Kartik_Task#1230
Kartik_Task#1303
Kartik_Task#1345
Kartik_Task#1361
Kartik_Task#1374
Kartik_Task#1402
Kartik_Task#1405
Kartik_Task#1459
Kartik_Task#1477
Kartik_Task#400
Kartik_Task#414
Kartik_Task#425
Kartik_Task#470
Kartik_Task#512
Kartik_Task#832
Kartik_Task#839
Kartik_Task#953
Kartik_Task#969
Kartik_Task750
Kartik_Task857
Kartik_Task_#832_ProjectSelection
Kartik_Task_Att#1236
Kartik_Task_AttFilter#1235
Kartik_Task_AtteOrg#1264
Kartik_Task_DailyProgress#1232
Kartik_Task_DailyTask#1231
Kartik_Task_Infra#1265
Kartik_Task_InfraMask#1266
Kartik_Task_OrgCol_att#1238
Kartik_Task_TeamGrid#1259
Landing_pages
MasterModalRefactor
Master_Services
Multiple_File_Uploader
OnFieldWork_V1
OnField_Issues_Oct_2W
Organization_Hierarchy
Organization_Management
Payment_Getway_Management
Payment_Getway_Management_onField
PmsGrid
ProjectUpdationForOrganizaion
Project_Branch_Management
Purchase_Invoice_Management
Purchase_Invoice_Update
Purchase_Payment
Recurring_Expense
Refactor_Directory
Refactor_Expenses
Response_Encryption
Service_Management_CardView
Service_Org_Task_1495
Service_Project_ListView
Service_Project_Managment
Services_Bugs
Services_Master
SideBarCollapsed
SingalR_Integration
TeamAssignToProject
Tenant_Manag
Tenant_Management
UI_Changes_Add_Skeleton
UI_Changes_DirectoryFilter
UI_Changes_PMS
View_Recurring_Expense
Weidget_Dashboard_Services
Weidget_Dashoard_Jobs
activity_image
collection_dev
cosmatic-changes
dpr-report
filter_offcanvas
hotchanges_projectPermission
hotfix/MasterActivity
issues_Oct_4W
kartik_Bug#628
landing-page-consmatic-changes-migration
landing_page_1
landing_page_with_new_theme
loader_implmentation
login-layout-changes
main
migrate_main
newFeature_Directory
organization_level_login
organization_management
pramod_Bug#128
pramod_Bug#141
pramod_Bug#152InfraModals
pramod_Task#111
pramod_Task#207
pramod_Task#294
pramod_Task#482
pramod_Task#505
pramod_Task-#398
profile_page
react-query
upgrade_Expense
vikas_16_dockerdeployment
vikas_deploy
vikas_widget_project_overview
#1
#10
#100
#101
#102
#103
#104
#105
#106
#107
#108
#109
#11
#110
#111
#112
#113
#114
#115
#116
#117
#118
#119
#12
#120
#121
#122
#123
#124
#125
#126
#127
#128
#129
#13
#130
#131
#132
#133
#134
#135
#136
#137
#138
#139
#14
#140
#141
#142
#143
#144
#145
#146
#147
#148
#149
#15
#150
#151
#152
#153
#154
#155
#156
#157
#158
#159
#16
#160
#161
#162
#163
#164
#165
#166
#167
#168
#169
#17
#170
#171
#172
#173
#174
#175
#176
#177
#178
#179
#18
#180
#181
#182
#183
#184
#185
#186
#187
#188
#189
#19
#190
#191
#192
#193
#194
#195
#196
#197
#198
#199
#2
#20
#200
#201
#202
#203
#204
#205
#206
#207
#208
#209
#21
#210
#211
#212
#213
#214
#215
#216
#217
#218
#219
#22
#220
#221
#222
#223
#224
#225
#226
#227
#228
#229
#23
#230
#231
#232
#233
#234
#235
#236
#237
#238
#239
#24
#240
#241
#242
#243
#244
#245
#246
#247
#248
#249
#25
#250
#251
#252
#253
#254
#255
#256
#257
#258
#259
#26
#260
#261
#262
#263
#264
#265
#266
#267
#268
#269
#27
#270
#271
#272
#273
#274
#275
#276
#277
#278
#279
#28
#280
#281
#282
#283
#284
#285
#286
#287
#288
#289
#29
#290
#291
#292
#293
#294
#295
#296
#297
#298
#299
#3
#30
#300
#301
#302
#303
#304
#305
#306
#307
#308
#309
#31
#310
#311
#312
#313
#314
#315
#316
#317
#318
#319
#32
#320
#321
#322
#323
#324
#325
#326
#327
#328
#329
#33
#330
#331
#332
#333
#334
#335
#336
#337
#338
#339
#34
#340
#341
#342
#343
#344
#345
#346
#347
#348
#349
#35
#350
#351
#352
#353
#354
#355
#356
#357
#358
#359
#36
#360
#361
#362
#363
#364
#365
#366
#367
#368
#369
#37
#370
#371
#372
#373
#374
#375
#376
#377
#378
#379
#38
#380
#381
#382
#383
#384
#385
#386
#387
#388
#389
#39
#390
#391
#392
#393
#394
#395
#396
#397
#398
#399
#4
#40
#400
#401
#402
#403
#404
#405
#406
#407
#408
#409
#41
#410
#411
#412
#413
#414
#415
#416
#417
#418
#419
#42
#420
#421
#422
#423
#424
#425
#426
#427
#428
#429
#43
#430
#431
#432
#433
#434
#435
#436
#437
#438
#439
#44
#440
#441
#442
#443
#444
#445
#446
#447
#448
#449
#45
#450
#451
#452
#453
#454
#455
#456
#457
#458
#459
#46
#460
#461
#462
#463
#464
#465
#466
#467
#468
#469
#47
#470
#471
#472
#473
#474
#475
#476
#477
#478
#479
#48
#480
#481
#482
#483
#484
#485
#486
#487
#488
#489
#49
#490
#491
#492
#493
#494
#495
#496
#497
#498
#499
#5
#50
#500
#501
#502
#503
#504
#505
#506
#507
#508
#509
#51
#510
#511
#512
#513
#514
#515
#516
#517
#518
#519
#52
#520
#521
#522
#523
#524
#525
#526
#527
#528
#529
#53
#530
#531
#532
#533
#54
#55
#56
#57
#58
#59
#6
#60
#61
#62
#63
#64
#65
#66
#67
#68
#69
#7
#70
#71
#72
#73
#74
#75
#76
#77
#78
#79
#8
#80
#81
#82
#83
#84
#85
#86
#87
#88
#89
#9
#90
#91
#92
#93
#94
#95
#96
#97
#98
#99
Select branches
Hide Pull Requests
Adding_Chips_Expense
Adding_Multiple_FileUpload
Adding_New_Dropdown
Adding_Toggle_Button
Adding_dropdown
AppMenu
Assigned_Employee_Job_Role
Attendance_Regularize_Issues
Attendance_Tabs
Branch_Detail_View
Bug#752RefreshToken
Collection_Service_Project
Document_Manag
Document_Manager
Expense_Bug#828
Expense_Bugs
Expense_Manangement_Feature
Feature#772_NEWExpenseType_Master
Feature#773_EditExpenseType
Feature#774_DeleteExpenseType
Feature#777_EditPaymentMode
Feature#778_DeletePaymentMode
Feature#804_ExpnseFilter
Feature-#776NewPaymentMode
Feature-#809_ExpenseStatsuMang
Feature_Directory
Feature_Expense
Finance_Export_Functionality
Finance_Form_Layout
GlobalSelectProject
HofixedIssues_July_4W
HotChanges_04_10_25
HotChanges_06-10-25
HotChanges_09_10_25
HotChanges_10_10_25
HotChanges_11_10_25
Image_Gallery_FilterChips
Image_Gallery_filter
Implementing_TimeLine
Intefrating_API_Dashboard
Inventary_Management
Issues_Aug_1W
Issues_Aug_2W
Issues_Expense
Issues_Expense_2W
Issues_July_1W
Issues_July_2W
Issues_July_3W
Issues_July_4W
Issues_Nov_4W
Issues_Oct_1W
Issues_Oct_4W_V1
Issues_Oct_main_2W
Issues_Sep_1W
Issues_Sep_1W_V2
Jobs_Side_Panel
Jun_Widget
Kartik#Enhancement#1444
Kartik_Bug#1015
Kartik_Bug#1016
Kartik_Bug#1024
Kartik_Bug#1028
Kartik_Bug#1037
Kartik_Bug#1039
Kartik_Bug#1041
Kartik_Bug#1042
Kartik_Bug#1045
Kartik_Bug#1052
Kartik_Bug#1056
Kartik_Bug#1064
Kartik_Bug#1071
Kartik_Bug#1080
Kartik_Bug#1081
Kartik_Bug#1096
Kartik_Bug#1100
Kartik_Bug#1104
Kartik_Bug#1113
Kartik_Bug#1115
Kartik_Bug#1123
Kartik_Bug#1180
Kartik_Bug#1250
Kartik_Bug#1261
Kartik_Bug#1292
Kartik_Bug#1295
Kartik_Bug#1298
Kartik_Bug#1300
Kartik_Bug#1301
Kartik_Bug#1306
Kartik_Bug#1350
Kartik_Bug#1353
Kartik_Bug#1359
Kartik_Bug#1366
Kartik_Bug#1369
Kartik_Bug#1370
Kartik_Bug#1372
Kartik_Bug#1381
Kartik_Bug#1388
Kartik_Bug#1390
Kartik_Bug#1391
Kartik_Bug#1392
Kartik_Bug#1394
Kartik_Bug#1395
Kartik_Bug#1408
Kartik_Bug#1417
Kartik_Bug#1418
Kartik_Bug#1425
Kartik_Bug#1434
Kartik_Bug#1437
Kartik_Bug#1450
Kartik_Bug#1451
Kartik_Bug#1455
Kartik_Bug#1462
Kartik_Bug#1463
Kartik_Bug#1469
Kartik_Bug#1496
Kartik_Bug#1497
Kartik_Bug#1499
Kartik_Bug#1534
Kartik_Bug#1657
Kartik_Bug#1661
Kartik_Bug#1666
Kartik_Bug#1773
Kartik_Bug#493
Kartik_Bug#494
Kartik_Bug#611
Kartik_Bug#664
Kartik_Bug#717
Kartik_Bug#793
Kartik_Bug#797
Kartik_Bug#798
Kartik_Bug#799
Kartik_Bug#800
Kartik_Bug#805
Kartik_Bug#830
Kartik_Bug#836
Kartik_Bug#841
Kartik_Bug#842
Kartik_Bug#862
Kartik_Bug#869
Kartik_Bug#873
Kartik_Bug#884
Kartik_Bug#886
Kartik_Bug#887
Kartik_Bug#888
Kartik_Bug#889
Kartik_Bug#891
Kartik_Bug#895
Kartik_Bug#906
Kartik_Bug#907
Kartik_Bug#908
Kartik_Bug#909
Kartik_Bug#910
Kartik_Bug#915
Kartik_Bug#919
Kartik_Bug#920
Kartik_Bug#929
Kartik_Bug#932
Kartik_Bug#933
Kartik_Bug#941
Kartik_Bug#944
Kartik_Bug#955
Kartik_Bug#956
Kartik_Bug#962
Kartik_Bug#972
Kartik_Bug#973
Kartik_Bug#974
Kartik_Bug#976
Kartik_Bug#978
Kartik_Bug#979
Kartik_Bug_V1#1525
Kartik_Bug_V1#1537
Kartik_Bug_V1#1539
Kartik_Bug_V1#1543
Kartik_Bug_V1#1564
Kartik_Bug_V1#1569
Kartik_Bug_V1#1572
Kartik_Directory_Changes#805
Kartik_Enhancement#1053
Kartik_Enhancement#1448
Kartik_Enhancement#1468
Kartik_Enhancement#807
Kartik_Enhancement#948
Kartik_Enhancement_918
Kartik_Filter_Changes#800
Kartik_ProjectList#628
Kartik_Task#1079
Kartik_Task#1227
Kartik_Task#1229
Kartik_Task#1230
Kartik_Task#1303
Kartik_Task#1345
Kartik_Task#1361
Kartik_Task#1374
Kartik_Task#1402
Kartik_Task#1405
Kartik_Task#1459
Kartik_Task#1477
Kartik_Task#400
Kartik_Task#414
Kartik_Task#425
Kartik_Task#470
Kartik_Task#512
Kartik_Task#832
Kartik_Task#839
Kartik_Task#953
Kartik_Task#969
Kartik_Task750
Kartik_Task857
Kartik_Task_#832_ProjectSelection
Kartik_Task_Att#1236
Kartik_Task_AttFilter#1235
Kartik_Task_AtteOrg#1264
Kartik_Task_DailyProgress#1232
Kartik_Task_DailyTask#1231
Kartik_Task_Infra#1265
Kartik_Task_InfraMask#1266
Kartik_Task_OrgCol_att#1238
Kartik_Task_TeamGrid#1259
Landing_pages
MasterModalRefactor
Master_Services
Multiple_File_Uploader
OnFieldWork_V1
OnField_Issues_Oct_2W
Organization_Hierarchy
Organization_Management
Payment_Getway_Management
Payment_Getway_Management_onField
PmsGrid
ProjectUpdationForOrganizaion
Project_Branch_Management
Purchase_Invoice_Management
Purchase_Invoice_Update
Purchase_Payment
Recurring_Expense
Refactor_Directory
Refactor_Expenses
Response_Encryption
Service_Management_CardView
Service_Org_Task_1495
Service_Project_ListView
Service_Project_Managment
Services_Bugs
Services_Master
SideBarCollapsed
SingalR_Integration
TeamAssignToProject
Tenant_Manag
Tenant_Management
UI_Changes_Add_Skeleton
UI_Changes_DirectoryFilter
UI_Changes_PMS
View_Recurring_Expense
Weidget_Dashboard_Services
Weidget_Dashoard_Jobs
activity_image
collection_dev
cosmatic-changes
dpr-report
filter_offcanvas
hotchanges_projectPermission
hotfix/MasterActivity
issues_Oct_4W
kartik_Bug#628
landing-page-consmatic-changes-migration
landing_page_1
landing_page_with_new_theme
loader_implmentation
login-layout-changes
main
migrate_main
newFeature_Directory
organization_level_login
organization_management
pramod_Bug#128
pramod_Bug#141
pramod_Bug#152InfraModals
pramod_Task#111
pramod_Task#207
pramod_Task#294
pramod_Task#482
pramod_Task#505
pramod_Task-#398
profile_page
react-query
upgrade_Expense
vikas_16_dockerdeployment
vikas_deploy
vikas_widget_project_overview
#1
#10
#100
#101
#102
#103
#104
#105
#106
#107
#108
#109
#11
#110
#111
#112
#113
#114
#115
#116
#117
#118
#119
#12
#120
#121
#122
#123
#124
#125
#126
#127
#128
#129
#13
#130
#131
#132
#133
#134
#135
#136
#137
#138
#139
#14
#140
#141
#142
#143
#144
#145
#146
#147
#148
#149
#15
#150
#151
#152
#153
#154
#155
#156
#157
#158
#159
#16
#160
#161
#162
#163
#164
#165
#166
#167
#168
#169
#17
#170
#171
#172
#173
#174
#175
#176
#177
#178
#179
#18
#180
#181
#182
#183
#184
#185
#186
#187
#188
#189
#19
#190
#191
#192
#193
#194
#195
#196
#197
#198
#199
#2
#20
#200
#201
#202
#203
#204
#205
#206
#207
#208
#209
#21
#210
#211
#212
#213
#214
#215
#216
#217
#218
#219
#22
#220
#221
#222
#223
#224
#225
#226
#227
#228
#229
#23
#230
#231
#232
#233
#234
#235
#236
#237
#238
#239
#24
#240
#241
#242
#243
#244
#245
#246
#247
#248
#249
#25
#250
#251
#252
#253
#254
#255
#256
#257
#258
#259
#26
#260
#261
#262
#263
#264
#265
#266
#267
#268
#269
#27
#270
#271
#272
#273
#274
#275
#276
#277
#278
#279
#28
#280
#281
#282
#283
#284
#285
#286
#287
#288
#289
#29
#290
#291
#292
#293
#294
#295
#296
#297
#298
#299
#3
#30
#300
#301
#302
#303
#304
#305
#306
#307
#308
#309
#31
#310
#311
#312
#313
#314
#315
#316
#317
#318
#319
#32
#320
#321
#322
#323
#324
#325
#326
#327
#328
#329
#33
#330
#331
#332
#333
#334
#335
#336
#337
#338
#339
#34
#340
#341
#342
#343
#344
#345
#346
#347
#348
#349
#35
#350
#351
#352
#353
#354
#355
#356
#357
#358
#359
#36
#360
#361
#362
#363
#364
#365
#366
#367
#368
#369
#37
#370
#371
#372
#373
#374
#375
#376
#377
#378
#379
#38
#380
#381
#382
#383
#384
#385
#386
#387
#388
#389
#39
#390
#391
#392
#393
#394
#395
#396
#397
#398
#399
#4
#40
#400
#401
#402
#403
#404
#405
#406
#407
#408
#409
#41
#410
#411
#412
#413
#414
#415
#416
#417
#418
#419
#42
#420
#421
#422
#423
#424
#425
#426
#427
#428
#429
#43
#430
#431
#432
#433
#434
#435
#436
#437
#438
#439
#44
#440
#441
#442
#443
#444
#445
#446
#447
#448
#449
#45
#450
#451
#452
#453
#454
#455
#456
#457
#458
#459
#46
#460
#461
#462
#463
#464
#465
#466
#467
#468
#469
#47
#470
#471
#472
#473
#474
#475
#476
#477
#478
#479
#48
#480
#481
#482
#483
#484
#485
#486
#487
#488
#489
#49
#490
#491
#492
#493
#494
#495
#496
#497
#498
#499
#5
#50
#500
#501
#502
#503
#504
#505
#506
#507
#508
#509
#51
#510
#511
#512
#513
#514
#515
#516
#517
#518
#519
#52
#520
#521
#522
#523
#524
#525
#526
#527
#528
#529
#53
#530
#531
#532
#533
#54
#55
#56
#57
#58
#59
#6
#60
#61
#62
#63
#64
#65
#66
#67
#68
#69
#7
#70
#71
#72
#73
#74
#75
#76
#77
#78
#79
#8
#80
#81
#82
#83
#84
#85
#86
#87
#88
#89
#9
#90
#91
#92
#93
#94
#95
#96
#97
#98
#99
-
b1cb715c84
made separate useActivityMaster hook that directly calling inside taskModal
Pramod Mahajan
2025-05-03 19:21:43 +05:30 -
02f37be504
Merge branch 'Issues_April_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_April_5W
Pramod Mahajan
2025-05-03 13:57:39 +05:30 -
80f2cce931
prevent unnecessary activity master refresh on task form submission
Pramod Mahajan
2025-05-03 13:56:21 +05:30 -
9aaedede20
Add colors to floor and workarea in infra panel to identify them easily
Vikas Nale
2025-05-03 13:15:24 +05:30 -
7d5d262728
normalize activity data to ensure consistent display names.
Pramod Mahajan
2025-05-03 12:25:23 +05:30 -
80d64c87c6
Improve safety and sorting for building dropdown
Pramod Mahajan
2025-05-03 11:07:57 +05:30 -
5be4f781cf
safely sort and render building options with fallbacks
pramod_Bug#152InfraModals
Pramod Mahajan
2025-05-03 10:37:08 +05:30 -
18e4b91754
Merge pull request 'pramod_Bug#152InfraModals' (#58) from pramod_Bug#152InfraModals into Issues_April_5W
Vikas Nale
2025-05-03 04:40:13 +00:00 -
6496fd7eb2
sorted all dropdown list
Pramod Mahajan
2025-05-03 10:07:18 +05:30 -
6daf3f8a35
sorted activity list in ascedning order.
Pramod Mahajan
2025-05-03 09:38:31 +05:30 -
1a98aeb934
added Toast and modal open until not close using button
Pramod Mahajan
2025-05-03 01:28:30 +05:30 -
8f42cb8cf6
removed debugger and close modal fun
Pramod Mahajan
2025-05-03 01:03:45 +05:30 -
4a77fb82a4
added Toast and modal not close until click on close button
Pramod Mahajan
2025-05-03 01:02:27 +05:30 -
fe0b023580
revent WorkArea modal from closing after form submission
Pramod Mahajan
2025-05-02 17:26:49 +05:30 -
f98efe4b38
prevent close createTask modal
Pramod Mahajan
2025-05-02 17:14:39 +05:30 -
5cc5ff49c2
sorted all dropdown list
Pramod Mahajan
2025-05-03 10:07:18 +05:30 -
5e3ef399b2
sorted activity list in ascedning order.
Pramod Mahajan
2025-05-03 09:38:31 +05:30 -
df4d66413d
added Toast and modal open until not close using button
Pramod Mahajan
2025-05-03 01:28:30 +05:30 -
4037fb76fd
removed debugger and close modal fun
Pramod Mahajan
2025-05-03 01:03:45 +05:30 -
b039bf345b
added Toast and modal not close until click on close button
Pramod Mahajan
2025-05-03 01:02:27 +05:30 -
9a923732ba
revent WorkArea modal from closing after form submission
Pramod Mahajan
2025-05-02 17:26:49 +05:30 -
130000f05f
prevent close createTask modal
Pramod Mahajan
2025-05-02 17:14:39 +05:30 -
55fed17fe2
removed unused ModalContext
Pramod Mahajan
2025-05-02 14:28:27 +05:30 -
c3d3529d34
view button color changed, success to seconday
Pramod Mahajan
2025-05-02 14:27:32 +05:30 -
062f0d98d5
added sorting group by name, checkIn , checkOut, regularize, approved and reject
Pramod Mahajan
2025-05-02 14:26:52 +05:30 -
8e04dd2191
added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day.
Pramod Mahajan
2025-05-02 14:25:10 +05:30 -
cb2950338c
added one more codition if emp checkIn and checkOut and checkout day is current , so ee can able to checkIn otherwise their attendance approved of that day
Pramod Mahajan
2025-05-02 14:23:18 +05:30 -
9b045ec727
Merge pull request 'remove accordion functionality from DailyTask component' (#56) from pramod_Bug#135 into Issues_April_5W
Vikas Nale
2025-05-02 04:51:46 +00:00 -
8b9206ec74
remove accordion functionality from DailyTask component
Pramod Mahajan
2025-04-30 20:53:06 +05:30 -
f8c39cce66
Merge pull request 'add required validation for plannedTask using Zod schema' (#55) from pramod_bug138 into Issues_April_5W
Vikas Nale
2025-05-02 04:49:11 +00:00 -
22be64d393
update TimePicker slot logic based on check-in and check-out time conditions
Pramod Mahajan
2025-05-01 02:40:11 +05:30 -
4e2c7e2adb
config checkIn and checkout in handleModalData for which slots show to user
Pramod Mahajan
2025-05-01 02:39:08 +05:30 -
6372362a33
passed checkout time to timepicker as props
Pramod Mahajan
2025-05-01 02:37:53 +05:30 -
ceba57884c
thresh_hold chnaged
Pramod Mahajan
2025-05-01 02:36:37 +05:30 -
82a40165e0
remove accordion functionality from DailyTask component
Pramod Mahajan
2025-04-30 20:53:06 +05:30 -
d966cbe23e
add required validation for plannedTask using Zod schema
Pramod Mahajan
2025-04-30 18:24:35 +05:30 -
101565e4ae
add required validation for plannedTask using Zod schema
pramod_Bug#128
Pramod Mahajan
2025-04-30 17:20:59 +05:30 -
852b95d7ee
Merge branch 'Issues_April_5W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#128
Pramod Mahajan
2025-04-30 17:19:18 +05:30 -
26ab62cb3b
Merge pull request 'pramod_Bug#128' (#54) from pramod_Bug#128 into Issues_April_5W
Vikas Nale
2025-04-30 11:25:39 +00:00 -
047fcc3222
Safe jobRoleId filter in AssignRoleModel and ensure onClose works in form submit
Pramod Mahajan
2025-04-30 16:08:44 +05:30 -
655967746f
handle modal visibility with React state instead of Bootstrap
Pramod Mahajan
2025-04-30 16:03:48 +05:30 -
84f0e52f90
Merge pull request 'pramod_Bug#126ManageRole - Role selection UI bugs, empty state handling, and async refactor' (#53) from pramod_Bug#126ManageRole into Issues_April_5W
Vikas Nale
2025-04-30 11:25:17 +00:00 -
d262244358
Safe jobRoleId filter in AssignRoleModel and ensure onClose works in form submit
Pramod Mahajan
2025-04-30 16:08:44 +05:30 -
4f13b70ed8
handle modal visibility with React state instead of Bootstrap
Pramod Mahajan
2025-04-30 16:03:48 +05:30 -
58c3f22744
time slot should display according activity
Pramod Mahajan
2025-04-30 13:30:00 +05:30 -
ee2d44b5fc
fixed useEmployeeRoles to return [] when employee has no roles and some changed for fetching logic to use async/await
Pramod Mahajan
2025-04-30 00:03:08 +05:30 -
75507707c0
Handle role deselection and employee switching
Pramod Mahajan
2025-04-29 23:56:36 +05:30 -
fec6de8a54
removed console
Pramod Mahajan
2025-04-29 23:54:59 +05:30 -
0b797a8c58
Add ErrorPage component to handle route errors
Pramod Mahajan
2025-04-29 11:05:18 +05:30 -
7e45f6c429
Fixed issue where logged-in users couldn't select future time slots
Pramod Mahajan
2025-04-29 11:04:21 +05:30 -
c53aa1ec92
Add activity column to logs for clearer action tracking
Pramod Mahajan
2025-04-29 00:56:01 +05:30 -
4f1cf7c0a5
Update logs to reflect check-in/check-out operations immediately
Pramod Mahajan
2025-04-29 00:54:31 +05:30 -
054ef8fd17
Updated TimePicker to disable future times and allow only current or past selections
Pramod Mahajan
2025-04-29 00:51:31 +05:30 -
5b88c86df5
added Spinning Animation for refresh button
Pramod Mahajan
2025-04-29 00:49:52 +05:30 -
f42b2d2724
clean up unused code
Pramod Mahajan
2025-04-29 00:48:58 +05:30 -
6b241b14de
Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active
Pramod Mahajan
2025-04-29 00:47:32 +05:30 -
6dc30f8e2a
modified project/team api, it can fromdate to todate
Pramod Mahajan
2025-04-29 00:43:10 +05:30 -
bf7adc2cc6
immediately update log attendances after marking attendance
Pramod Mahajan
2025-04-29 00:41:16 +05:30 -
9b742a2f7f
removed console
Pramod Mahajan
2025-04-28 12:04:33 +05:30 -
4a2dcd82d4
comment default option -select a Job role.
Pramod Mahajan
2025-04-28 12:02:40 +05:30 -
d88fd3180f
modified request for manage role.
Pramod Mahajan
2025-04-28 11:36:34 +05:30 -
a84cb355c8
changed image and directory icons
Pramod Mahajan
2025-04-28 09:27:49 +05:30 -
fbc9ba7ae4
updated master activity api url
Pramod Mahajan
2025-04-28 09:27:05 +05:30 -
b595fe6a0f
added id in roles obj request
Pramod Mahajan
2025-04-26 22:56:59 +05:30 -
66703de72e
changed btn size. to sm
Pramod Mahajan
2025-04-26 18:43:06 +05:30 -
1ca337067a
fixed previous role feature to current user role.
Pramod Mahajan
2025-04-26 18:31:20 +05:30 -
3777d4b7c5
set default view is cards
Pramod Mahajan
2025-04-26 18:25:02 +05:30 -
c0a766e7e1
Email field will be empty once response is received.
Pramod Mahajan
2025-04-26 18:17:56 +05:30 -
c900dc80a9
hide uneccessary msg or fixed loading condition for create new employee
Pramod Mahajan
2025-04-26 18:15:49 +05:30 -
162c91c1aa
Merge pull request 'pramod_Task#105' (#52) from pramod_Task#105 into Issues_April_4W
Gitea Admin
2025-04-25 11:02:03 +00:00 -
dbd84def0d
remove unnecessary stuff
Pramod Mahajan
2025-04-25 12:36:59 +05:30 -
8c96edea17
added new directory page for conatct -list page
Pramod Mahajan
2025-04-25 12:32:51 +05:30 -
98a327fbb6
added new one route -directory
Pramod Mahajan
2025-04-25 12:32:04 +05:30 -
c3e75f3f48
changed Status-filter icon size
Pramod Mahajan
2025-04-25 12:31:25 +05:30 -
d08b64dc3b
added new directory tab
Pramod Mahajan
2025-04-25 12:30:02 +05:30 -
a1a3da61db
new directory components
Pramod Mahajan
2025-04-25 12:29:36 +05:30 -
786a5a689e
made custome TagInput.
Pramod Mahajan
2025-04-25 12:28:56 +05:30 -
3160da69d2
added one more css property radius
Pramod Mahajan
2025-04-25 12:28:30 +05:30 -
a7e9605ae3
added css for scroll bar modified
Pramod Mahajan
2025-04-25 12:26:56 +05:30 -
a2f6d77dcd
Merge pull request 'pramod_Feature#51ProjectLisFilter' (#51) from pramod_Feature#51ProjectLisFilter into Issues_April_4W
Gitea Admin
2025-04-25 11:00:43 +00:00 -
a92a041333
Prevent multiple API calls and display correct data for selected project
Pramod Mahajan
2025-04-24 11:54:00 +05:30 -
d2d1c3cc86
default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions.
Pramod Mahajan
2025-04-24 10:31:40 +05:30 -
f2f7898970
joining date will no wrap
Pramod Mahajan
2025-04-24 10:26:31 +05:30 -
b53286672a
remove unnecessary stuff
Pramod Mahajan
2025-04-25 12:36:59 +05:30 -
de231145d4
added new directory page for conatct -list page
Pramod Mahajan
2025-04-25 12:32:51 +05:30 -
8eab23bb36
added new one route -directory
Pramod Mahajan
2025-04-25 12:32:04 +05:30 -
0a200f5aa3
changed Status-filter icon size
Pramod Mahajan
2025-04-25 12:31:25 +05:30 -
3bda6b5ceb
added new directory tab
Pramod Mahajan
2025-04-25 12:30:02 +05:30 -
a08089d1b9
new directory components
Pramod Mahajan
2025-04-25 12:29:36 +05:30 -
15aa726857
made custome TagInput.
Pramod Mahajan
2025-04-25 12:28:56 +05:30 -
3563c0a857
added one more css property radius
Pramod Mahajan
2025-04-25 12:28:30 +05:30 -
77b7faa875
added css for scroll bar modified
Pramod Mahajan
2025-04-25 12:26:56 +05:30 -
dbfd536ba3
Prevent multiple API calls and display correct data for selected project
Pramod Mahajan
2025-04-24 11:54:00 +05:30 -
2dd324e725
Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Feature#51ProjectLisFilter
Pramod Mahajan
2025-04-24 11:09:02 +05:30 -
e102abb117
default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions.
Pramod Mahajan
2025-04-24 10:31:40 +05:30 -
fd9a02aa4f
joining date will no wrap
Pramod Mahajan
2025-04-24 10:26:31 +05:30 -
b30f3b8d98
Merge pull request 'pramod_Feature#51ProjectLisFilter' (#50) from pramod_Feature#51ProjectLisFilter into Issues_April_4W
Gitea Admin
2025-04-23 09:05:08 +00:00 -
3ee5a71cc9
added status and search filter filter
Pramod Mahajan
2025-04-23 12:16:40 +05:30 -
c61cb3bb63
added userPermissions
Pramod Mahajan
2025-04-23 12:14:30 +05:30 -
38fbc6dc84
reafactor code for reuasability
Pramod Mahajan
2025-04-23 11:08:02 +05:30