marco.pms.web

admin/marco.pms.web

Fork 0

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

b885c9a8b9 Merge branch 'pramod_Task#185' into Issue_May_2W Vikas Nale 2025-05-07 11:54:38 +05:30
5e96a2f7f5 Merge pull request 'Bug#182 - Add fallback error message handling with server response support' (#68) from pramod_Bug#182 into Issue_May_2W Vikas Nale 2025-05-07 06:21:25 +00:00
679f9bec26 Add fallback error message handling with server response support Pramod Mahajan 2025-05-06 16:37:06 +05:30
a00ab0f13d Tiggeer Toast with valide message Pramod Mahajan 2025-05-06 16:33:04 +05:30
d48c6fd7e3 added activity icons, location coulms. if click on location it move on google map Pramod Mahajan 2025-05-06 23:13:55 +05:30
9802746267 handled loading properly Pramod Mahajan 2025-05-06 23:12:08 +05:30
7ef148ac32 only display pagination if have data greather than 5 Pramod Mahajan 2025-05-06 22:58:27 +05:30
8696070249 pagination only display if have records greather than 20 Pramod Mahajan 2025-05-06 22:53:53 +05:30
099a3bcc36 handled proper loading, pagination only display if record have greather than 5 and added refresh button Pramod Mahajan 2025-05-06 22:52:59 +05:30
6f81b99dcd Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#185 Pramod Mahajan 2025-05-06 22:31:42 +05:30
c920ec88fd Added fuctionality to Displayed Date-Wise Based on Selected Date Range ashutosh.nehete 2025-05-06 18:28:56 +05:30
2482a79f9c Merge pull request 'Trigger the message after a successfully updated Activity' (#67) from pramod_enhance#168 into Issue_May_2W Vikas Nale 2025-05-06 12:52:13 +00:00
1bcc534308 added toast for success msg Pramod Mahajan 2025-05-06 16:06:00 +05:30
321b73e2c0 Merge pull request 'show correct message after all employees are assigned to a project' (#65) from pramod_Bug#177 into Issue_May_2W Vikas Nale 2025-05-06 12:47:27 +00:00
f45febb82c show correct message after all employees are assigned to a project - fixed issue where loader spinner stayed active after API call - added setLoading(false) in useAllEmployee hook after API call - now message All employee assigned to Project." shows properly Pramod Mahajan 2025-05-06 11:35:02 +05:30
ff9818fb3c Merge pull request 'after refresh attednace page, now it able get employee default selectedproject.' (#63) from pramod_Bug#178 into Issue_May_2W Vikas Nale 2025-05-06 12:45:19 +00:00
174b3f3bee removed console Pramod Mahajan 2025-05-06 10:32:40 +05:30
1a651ac5bc after refresh attednace page, now it able get employee default selectedproject. Pramod Mahajan 2025-05-06 10:29:58 +05:30
7bb7b37b60 Merge pull request 'Resolve data loading issue in DailyTask by defaulting to first project' (#64) from pramod_Bug#184 into Issue_May_2W Vikas Nale 2025-05-06 12:19:42 +00:00
6e60c6568e removed console Pramod Mahajan 2025-05-06 17:08:48 +05:30
55ed11b55f removed unused code Pramod Mahajan 2025-05-06 17:08:31 +05:30
fc0edabaec Add fallback error message handling with server response support Pramod Mahajan 2025-05-06 16:37:06 +05:30
c4ebf6262f Tiggeer Toast with valide message Pramod Mahajan 2025-05-06 16:33:04 +05:30
2498432c0e added toast for success msg Pramod Mahajan 2025-05-06 16:06:00 +05:30
46856873cb employee will moved if click one employee name Pramod Mahajan 2025-05-06 15:43:29 +05:30
d2785d2e8c removed attendance page Pramod Mahajan 2025-05-06 15:39:55 +05:30
0c0476a86f moved attendance tap at first Pramod Mahajan 2025-05-06 15:38:27 +05:30
cbe439e632 added employee attendance tab with date filtering and pagination in profile page Pramod Mahajan 2025-05-06 15:36:46 +05:30
09cdd675e3 addded current employee log Pramod Mahajan 2025-05-06 15:36:09 +05:30
29e3f8da8c removed console Pramod Mahajan 2025-05-06 15:35:22 +05:30
c00b33926a created new repo for attendanceByEmployee Pramod Mahajan 2025-05-06 15:26:14 +05:30
f1e3ce4504 created new slice for employeeAttendance Pramod Mahajan 2025-05-06 15:24:39 +05:30
5cde0adffe configured employeeAttendance slice in store Pramod Mahajan 2025-05-06 15:24:06 +05:30
51d2b375f8 show correct message after all employees are assigned to a project - fixed issue where loader spinner stayed active after API call - added setLoading(false) in useAllEmployee hook after API call - now message All employee assigned to Project." shows properly Pramod Mahajan 2025-05-06 11:35:02 +05:30
8483114f4d set selectedProject on page refresh in DailyTask.jsx - added fallback logic to select first project if selectedProject is undefined or 1 - used initialized flag to prevent multiple dispatches Pramod Mahajan 2025-05-06 11:00:13 +05:30
5fa6ab2cdf removed console Pramod Mahajan 2025-05-06 10:32:40 +05:30
3bf8fbd123 after refresh attednace page, now it able get employee default selectedproject. Pramod Mahajan 2025-05-06 10:29:58 +05:30
029254e548 Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity Vikas Nale 2025-05-05 18:20:24 +05:30
e0264030f5 handle merge issues in chart and build error Vikas Nale 2025-05-05 17:47:02 +05:30
56c8b31938 Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid Pramod Mahajan 2025-05-05 17:35:35 +05:30
31b8bd1c7a added reload variable for refreshing update edit activity data Pramod Mahajan 2025-05-05 17:34:54 +05:30
be16c74a94 made editactivitymodal form , user can modify activity Pramod Mahajan 2025-05-05 17:33:28 +05:30
c52914b1ef Merge pull request 'Implement the functionality required to handle employee suspension.' (#62) from Ashutosh_Feature#174_Suspend_Employee into Ashutosh_Enhancement#132_Int_To_Guid Vikas Nale 2025-05-05 12:02:52 +00:00
3677b80cfa added edit task modal, and changed compeletd work and plannedwork Pramod Mahajan 2025-05-05 17:32:05 +05:30
477cc5ab73 resolved merged conflict Pramod Mahajan 2025-05-05 17:30:09 +05:30
1f6a85d507 added redux variable for reload component Pramod Mahajan 2025-05-05 17:29:06 +05:30
3ca2c9e0c5 Implement the functionality required to handle employee suspension. ashutosh.nehete 2025-05-05 17:25:43 +05:30
4a326fb1ea Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid Pramod Mahajan 2025-05-05 15:37:26 +05:30
1bd858ca73 Display middle name for employee on Teams and Employees page Vikas Nale 2025-05-05 13:30:09 +05:30
3cf13d0bb6 Handle widget chart tooltip Vikas Nale 2025-05-05 12:36:41 +05:30
098aa9749f resolved merge conflict Pramod Mahajan 2025-05-05 11:34:12 +05:30
4b3f8cc50f Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid Pramod Mahajan 2025-05-05 09:51:35 +05:30
d06cfd97a7 icon issue Vikas Nale 2025-05-04 23:12:40 +05:30
311c2afb98 handle infra icon issue Vikas Nale 2025-05-04 23:05:46 +05:30
8de7b4b5c3 hide dependent fields until parent selection; handle undefined project ID in useProjectDetails Pramod Mahajan 2025-05-04 23:00:32 +05:30
498665c811 conditional rendering for building/floor/work area dropdowns Pramod Mahajan 2025-05-04 22:57:27 +05:30
9ef09f9536 added filter for project cards list view Pramod Mahajan 2025-05-04 19:58:28 +05:30
04a25d58f4 added condition for manageInfr for edit and delete activity Pramod Mahajan 2025-05-04 19:41:59 +05:30
148f4b79e7 added loading indicator for project employee list during API call Pramod Mahajan 2025-05-04 19:38:32 +05:30
8607dbb49b replaced isModalOpen with modalopen for modal visibility control Pramod Mahajan 2025-05-04 19:25:11 +05:30
8be60953ba removed unuse code - useModal Pramod Mahajan 2025-05-04 19:09:25 +05:30
4055a4532c updated message when no employees are available ,hide search and "Assign to Project" button while loading, show loader Pramod Mahajan 2025-05-04 19:03:55 +05:30
4b9f5d737a removed unused code Pramod Mahajan 2025-05-04 18:59:18 +05:30
e86d43c6e9 show loading spinner when modifying a project from the dropdown Pramod Mahajan 2025-05-04 18:58:39 +05:30
a96fa8efc7 show loading... initially instead of "No projects found" message at ui Pramod Mahajan 2025-05-04 18:53:34 +05:30
294c13878d show delete spinner only for the employee being removed Pramod Mahajan 2025-05-04 18:50:53 +05:30
b3906f460e filxed filtering project by project status Pramod Mahajan 2025-05-04 18:41:46 +05:30
2e2a5438d8 Hide infra manage buttons if not allowed Vikas Nale 2025-05-04 13:12:34 +05:30
028f717ae2 Change Page size for master and employees Vikas Nale 2025-05-04 13:00:21 +05:30
a14e5c88b4 Dynamic date range for DateRange Picker in task allocation log Vikas Nale 2025-05-04 12:50:53 +05:30
b07101d4aa Add employee list icon in header Vikas Nale 2025-05-04 12:50:24 +05:30
9f3e526c26 removed unused ModalContext ashutosh.nehete 2025-05-04 12:33:23 +05:30
149b51c1c2 Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid ashutosh.nehete 2025-05-04 12:32:04 +05:30
d1227a786b view button color changed, success to seconday ashutosh.nehete 2025-05-04 12:31:43 +05:30
cd2e563e1d Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid Vikas Nale 2025-05-04 12:30:52 +05:30
5af745958e Handle project list loading issue Vikas Nale 2025-05-04 12:30:46 +05:30
2fb08a0044 added sorting group by name, checkIn , checkOut, regularize, approved and reject ashutosh.nehete 2025-05-04 12:30:35 +05:30
f1e22e944e added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day. ashutosh.nehete 2025-05-04 12:24:27 +05:30
213ca4067e 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 ashutosh.nehete 2025-05-04 12:23:04 +05:30
1ffda41f16 Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid ashutosh.nehete 2025-05-04 12:20:20 +05:30
d5cbe67d3e update TimePicker slot logic based on check-in and check-out time conditions ashutosh.nehete 2025-05-04 12:20:16 +05:30
542748f12c Avoid calling UserRoles and Employess api multiple times from Infra page Vikas Nale 2025-05-04 12:18:27 +05:30
292f80c9a8 config checkIn and checkout in handleModalData for which slots show to user ashutosh.nehete 2025-05-04 12:12:53 +05:30
bd91f60e08 passed checkout time to timepicker as props ashutosh.nehete 2025-05-04 12:11:50 +05:30
9e1dc8e203 thresh_hold changed ashutosh.nehete 2025-05-04 12:10:07 +05:30
e53635f910 time slot should display according activity ashutosh.nehete 2025-05-04 12:09:05 +05:30
0c8f201d0c Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid Pramod Mahajan 2025-05-04 12:00:29 +05:30
4bd574772f filtering projects according to logged user at data layer Pramod Mahajan 2025-05-04 12:00:10 +05:30
abdb17ecf4 Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid ashutosh.nehete 2025-05-04 11:54:18 +05:30
8718aede85 removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster ashutosh.nehete 2025-05-04 11:54:08 +05:30
3d62071fb6 Remove AADHAR card validation while creating user Vikas Nale 2025-05-04 11:41:11 +05:30
bb23d10996 Fixed bug of not getting data of correct project when going to attendance page ashutosh.nehete 2025-05-04 09:32:12 +05:30
8ad81f02db Removed unnecessary filtering from the UI. Pramod Mahajan 2025-05-04 02:48:54 +05:30
d34ccfb33c Move project filtering logic into useProjects hook; remove redundant UI filtering Pramod Mahajan 2025-05-04 02:47:50 +05:30
bbb02009b2 Prevent fetch calls with undefined selectedProject Pramod Mahajan 2025-05-04 02:47:09 +05:30
d177c4a6fc Added Manage Task Permission Pramod Mahajan 2025-05-04 02:44:05 +05:30
a6ea64539a Added 'Manage Task' permission to ensure only authorized users can access or perform task-related actions Pramod Mahajan 2025-05-04 02:43:20 +05:30
a7129c4187 Removed unnecessary logged-in user project filtering from the UI. Pramod Mahajan 2025-05-04 02:41:34 +05:30
1fea83b629 removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster Pramod Mahajan 2025-05-04 00:01:02 +05:30
1bbc8fd422 Conver Int to Guid ashutosh.nehete 2025-05-03 21:43:15 +05:30