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
DirectorY_Manage_Changes
Document_Manag
Document_Manager
Encrypted_Reponse
Expense_Bug#828
Expense_Bugs
Expense_Manangement_Feature
Expense_TransactionId
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#1675
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
#534
#535
#536
#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
DirectorY_Manage_Changes
Document_Manag
Document_Manager
Encrypted_Reponse
Expense_Bug#828
Expense_Bugs
Expense_Manangement_Feature
Expense_TransactionId
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#1675
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
#534
#535
#536
#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
-
c3643683c8
added filter action while apply filter
Pramod Mahajan
2025-05-27 12:31:48 +05:30 -
1e7a8e81b9
revert 4acf0caf7be07b758276fdfaa89707e0547884ee
pramod.mahajan
2025-05-27 06:51:49 +00:00 -
4acf0caf7b
removed unused code
Pramod Mahajan
2025-05-27 12:17:31 +05:30 -
c4d647f361
Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task-#355
Pramod Mahajan
2025-05-27 12:10:47 +05:30 -
d8de4ebc11
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task-#355
Pramod Mahajan
2025-05-27 11:59:10 +05:30 -
33151c2c16
Convert all date to DD-MM-YYYY accross all component.
kartik.sharma
2025-05-27 11:53:56 +05:30 -
b479325816
Merge pull request 'In Assign Role popup double loading is visible.' (#148) from Kartik_Bug#367 into Issue_May_5W
Vikas Nale
2025-05-27 06:20:13 +00:00 -
ad145db3c7
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory
Pramod Mahajan
2025-05-27 10:15:06 +05:30 -
96008d0159
removed fixed height
Pramod Mahajan
2025-05-27 10:00:15 +05:30 -
7b3a9568f3
changed font size and added icon for category
Pramod Mahajan
2025-05-27 09:59:45 +05:30 -
2c7b17af40
added filter action movement
Pramod Mahajan
2025-05-27 09:58:51 +05:30 -
126ed3809f
In Assign Role popup double loading is visible.
kartik.sharma
2025-05-27 09:58:20 +05:30 -
d393f276d0
removed project validation, not required
Pramod Mahajan
2025-05-26 16:15:38 +05:30 -
c27c33bee2
removed overflow property for labels
Pramod Mahajan
2025-05-26 16:10:25 +05:30 -
e15a7b887d
Merge pull request 'In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.' (#147) from Kartik_Enhancement#362 into Issue_May_5W
Vikas Nale
2025-05-26 09:36:49 +00:00 -
2224b10842
Merge pull request 'pramod_Task-#355 : implemented Manage Buckets modal with bucket creation and listing' (#145) from pramod_Task-#355 into Feature_Directory
Vikas Nale
2025-05-26 09:36:34 +00:00 -
8abb8a3aa5
added API methods for creating and updating directory buckets
Pramod Mahajan
2025-05-25 00:26:01 +05:30 -
51c3857675
splited Directory component into smaller components
Pramod Mahajan
2025-05-25 00:24:56 +05:30 -
8f94cf6e2d
added new modal for bucket management and splited code
Pramod Mahajan
2025-05-25 00:23:10 +05:30 -
199cf4867f
created new component for bucket managment
Pramod Mahajan
2025-05-25 00:22:12 +05:30 -
06c0c5ebb3
added schema for bucket form validation
Pramod Mahajan
2025-05-25 00:21:33 +05:30 -
16f40f7566
Merge branch 'pramod_Task-#358' into Feature_Directory
Vikas Nale
2025-05-26 15:00:25 +05:30 -
d11174984d
Merge branch 'pramod_Task-#227' into Feature_Directory
Vikas Nale
2025-05-26 14:58:56 +05:30 -
35ca496166
added support for creating tags with space or enter keys
Pramod Mahajan
2025-05-26 13:33:18 +05:30 -
9763c45592
In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.
kartik.sharma
2025-05-26 12:54:24 +05:30 -
7ff4280b4d
added backdrop
Pramod Mahajan
2025-05-26 12:52:41 +05:30 -
3bae9f20d1
Inceased manage bucket modal size md to lg
Pramod Mahajan
2025-05-26 12:52:17 +05:30 -
478b0ddad0
Merge pull request 'Dashboard Component View.' (#146) from Kartik_Development#26 into Issue_May_4W
Vikas Nale
2025-05-26 05:52:13 +00:00 -
4445ef18ab
Dashboard Component View.
kartik.sharma
2025-05-26 11:19:59 +05:30 -
fb1edd46db
added API methods for creating and updating directory buckets
Pramod Mahajan
2025-05-25 00:26:01 +05:30 -
b8ba3b835e
splited Directory component into smaller components
Pramod Mahajan
2025-05-25 00:24:56 +05:30 -
89eaca4189
added new modal for bucket management and splited code
Pramod Mahajan
2025-05-25 00:23:10 +05:30 -
98c6e9edbe
created new component for bucket managment
Pramod Mahajan
2025-05-25 00:22:12 +05:30 -
0bc56c82cf
added schema for bucket form validation
Pramod Mahajan
2025-05-25 00:21:33 +05:30 -
7a1a55f52f
Merge branch 'Kartik_Bug#301' into Issue_May_4W
Vikas Nale
2025-05-24 20:48:37 +05:30 -
ae18b51668
Removing Unnecessary gap in Assign Employee popup from Teams.
kartik.sharma
2025-05-24 18:52:56 +05:30 -
ff56245119
Merge pull request 'pramod_Task#351: Contact Tag Delete and Update' (#141) from pramod_Task#351 into Feature_Directory
Vikas Nale
2025-05-24 12:22:59 +00:00 -
1cdaefbec4
added EditcontactCatgorry component in modal for update
Pramod Mahajan
2025-05-24 17:27:47 +05:30 -
36b09747b0
created new component for update contact category
Pramod Mahajan
2025-05-24 17:27:03 +05:30 -
695369cbf8
modified url endpoint
Pramod Mahajan
2025-05-24 17:26:20 +05:30 -
dcaa9ae7ec
Add support for deleting contact categories
Pramod Mahajan
2025-05-24 16:27:11 +05:30 -
4c73060b82
Merge pull request 'Error message work Properly.' (#140) from Kartik_Enhancement#279 into Issue_May_4W
Vikas Nale
2025-05-24 10:52:41 +00:00 -
decc388bf1
Error message work Properly.
kartik.sharma
2025-05-24 16:05:16 +05:30 -
c9c970834d
Error message work Properly.
kartik.sharma
2025-05-24 16:05:16 +05:30 -
79e38f6cd5
modified url for delete and update contact tag
Pramod Mahajan
2025-05-24 16:02:46 +05:30 -
3593e7d46c
added new modal for edit contact tag and delete contact tag
Pramod Mahajan
2025-05-24 16:02:16 +05:30 -
d931eca2fd
Merge branch 'Kartik_Enhancement#274' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Enhancement#274
kartik.sharma
2025-05-24 16:01:44 +05:30 -
20e04ecab5
Error Message is now work properly.
kartik.sharma
2025-05-24 16:00:58 +05:30 -
144817aef6
added new component for Edit contact Tag
Pramod Mahajan
2025-05-24 16:00:23 +05:30 -
7804e44b85
Error message in Manage floor popup in Infrastructure.
kartik.sharma
2025-05-24 15:54:31 +05:30 -
9d90f05f1c
Merge pull request 'Adding Switch button in attendence component.' (#129) from Kartik_Enhancement#274 into Issue_May_4W
Vikas Nale
2025-05-24 10:17:20 +00:00 -
8d8a5edb19
Change label from "Pending" to "Pending Actions"
Vikas Nale
2025-05-24 15:46:51 +05:30 -
a60d7f7a25
Changes in Attendance Switch on-off button.
kartik.sharma
2025-05-24 13:30:40 +05:30 -
3157a30948
Adding Switch button in attendence component.
kartik.sharma
2025-05-22 16:39:42 +05:30 -
79c5a79803
Change label from "Pending" to "Pending Actions"
Vikas Nale
2025-05-24 15:46:51 +05:30 -
9b26924eba
Merge pull request 'Correction in Assign Task popup.' (#137) from Kartik_Enhancement#352 into Issue_May_4W
Vikas Nale
2025-05-24 10:12:32 +00:00 -
a6c6a73899
Correction in Assign Task popup.
kartik.sharma
2025-05-24 14:45:29 +05:30 -
2b18f80b56
Changes in Attendance Switch on-off button.
kartik.sharma
2025-05-24 13:30:40 +05:30 -
aa50aeff98
Merge branch 'Kartik_Enhancement#335' into Issue_May_4W
Vikas Nale
2025-05-24 10:27:20 +05:30 -
78d7b9b521
Merge branch 'Kartik_Enhancement#336' into Issue_May_4W
Vikas Nale
2025-05-24 10:26:01 +05:30 -
7afa4f4449
Merge branch 'Kartik_Enhancement#337' into Issue_May_4W
Vikas Nale
2025-05-24 10:24:28 +05:30 -
9e57e21b8c
Merge branch 'Kartik_Enhancement#338' into Issue_May_4W
Vikas Nale
2025-05-24 10:22:08 +05:30 -
9a60cebc42
Merge pull request 'Move all the project-related code from the Dashboard component into a new component named 'Projects'.' (#131) from Kartik_Enhancement#334 into Issue_May_4W
Vikas Nale
2025-05-24 04:49:05 +00:00 -
889b5ab069
Merge pull request 'pramod_Enhancement-#333' (#136) from pramod_Enhancement-#333 into Feature_Directory
Vikas Nale
2025-05-24 04:39:57 +00:00 -
bcc09851d3
no more need
Pramod Mahajan
2025-05-23 18:25:25 +05:30 -
45cd17c808
added feature active and inactive not displays
Pramod Mahajan
2025-05-23 18:24:19 +05:30 -
d9ce90e20e
modified table column, if inactive contacts hide action column
Pramod Mahajan
2025-05-23 18:23:27 +05:30 -
385f08e752
added in List view active or inactive contacts
Pramod Mahajan
2025-05-23 18:22:01 +05:30 -
52ec9408d2
added on more params - active
Pramod Mahajan
2025-05-23 18:20:09 +05:30 -
64973029cc
modified display active as well as inactives contact
Pramod Mahajan
2025-05-23 16:59:14 +05:30 -
7e4f4c8973
modified GetContact method of taking parma active or inactive
Pramod Mahajan
2025-05-23 16:58:03 +05:30 -
6943f4e9ca
modified enable option only active contact
Pramod Mahajan
2025-05-23 16:56:52 +05:30 -
af996196a1
modified hook, for taking active or incative params
Pramod Mahajan
2025-05-23 16:55:42 +05:30 -
38607ab482
Move all the Teams-related code from the Dashboard component into a new component named 'Teams'
kartik.sharma
2025-05-23 14:38:28 +05:30 -
377c024e33
Move all the Tasks-related code from the Dashboard component into a new component named 'Tasks'.
kartik.sharma
2025-05-23 14:25:04 +05:30 -
5e462a88f7
Move all the Projects Completion Status-related code from the Dashboard component into a new component named 'Projects Completion Status'.
kartik.sharma
2025-05-23 14:18:53 +05:30 -
cf11e995de
Move all the project-related code from the Dashboard component into a new component named 'Progress Overview by Project'.
kartik.sharma
2025-05-23 13:56:50 +05:30 -
7cc9181fb9
Move all the project-related code from the Dashboard component into a new component named 'Projects'.
kartik.sharma
2025-05-23 11:18:58 +05:30 -
7970bce60d
Merge branch 'Kartik_Enhancement#319' into Issue_May_4W
Vikas Nale
2025-05-23 10:45:20 +05:30 -
b4d3e6453f
Merge pull request 'Implemented delete functionality for contacts' (#130) from pramod_Task-#321 into Feature_Directory
pramod.mahajan
2025-05-22 13:12:14 +00:00 -
ab47a44c60
display not found msg if data is empty
Pramod Mahajan
2025-05-22 18:20:34 +05:30 -
10e38353aa
correct note added time
Pramod Mahajan
2025-05-22 18:19:38 +05:30 -
e372405ac0
split common use fun in util file
Pramod Mahajan
2025-05-22 18:18:34 +05:30 -
0cefb98ac1
created separet util. fun file for directory components
Pramod Mahajan
2025-05-22 18:17:51 +05:30 -
c78f94b17f
pin bucket name on card
Pramod Mahajan
2025-05-22 18:17:01 +05:30 -
55f17daf0f
modified filter functionality- added apply call function button
Pramod Mahajan
2025-05-22 17:10:43 +05:30 -
141bb866d2
Adding Switch button in attendence component.
kartik.sharma
2025-05-22 16:39:42 +05:30 -
a69dd50425
changed filter name
Pramod Mahajan
2025-05-22 15:08:27 +05:30 -
279f2403d2
Correction in date box in checkin checkout popup from Attendence component.
kartik.sharma
2025-05-22 14:20:51 +05:30 -
396706dcf5
Merge pull request 'Adding Date Box in Check-in and Check-out popup from Attendence component.' (#126) from Kartik_Enhancement#319 into Issue_May_4W
Vikas Nale
2025-05-22 06:12:24 +00:00 -
af4a40bf81
Adding Date Box in Check-in and Check-out popup from Attendence component.
kartik.sharma
2025-05-21 16:27:45 +05:30 -
d5ba7eaac1
Merge pull request 'Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.' (#125) from Bug#318_Kartik into Issue_May_4W
Vikas Nale
2025-05-22 06:11:23 +00:00 -
5cb1e55292
Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.
kartik.sharma
2025-05-21 11:53:57 +05:30 -
3b82653f23
implement contact deletion with confirmation and toast feedback
Pramod Mahajan
2025-05-21 22:39:07 +05:30 -
7147116d8e
added delete contact api
Pramod Mahajan
2025-05-21 22:37:00 +05:30 -
2643f1b2d5
Merge pull request 'pramod_Task-#320' (#127) from pramod_Task-#320 into Feature_Directory
pramod.mahajan
2025-05-21 12:55:34 +00:00 -
228c178acf
add side-by-side filtering UI for Buckets and Categories with flex layout
Pramod Mahajan
2025-05-21 18:18:49 +05:30 -
cb5cacaee0
added filtering by category and buckets
Pramod Mahajan
2025-05-21 17:44:17 +05:30 -
1d90c631ef
Merge pull request 'pramod_Task-#251: A "Notes" section appears in the contact view modal, allowing users to add a note for the selected contact.' (#124) from pramod_Task-#251 into Feature_Directory
pramod.mahajan
2025-05-21 11:00:03 +00:00 -
ad0be79943
updated cache
Pramod Mahajan
2025-05-21 16:28:44 +05:30