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

dbbbf9ee02 added data props in confrima modal Pramod Mahajan 2025-05-09 15:13:04 +05:30
c3fd891b8a Changed header alignment to left-aligned in Project list view, employee list view and master view ashutosh.nehete 2025-05-09 13:29:40 +05:30
a816d4fdeb added confirmation modal inside team, wherevener delete employee confirm modal appear. Pramod Mahajan 2025-05-09 13:27:52 +05:30
c29a76a36c Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#120deleteConfirmModal Pramod Mahajan 2025-05-09 13:02:13 +05:30
51e61aac79 Merge pull request 'Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.' (#86) from Ashutosh_Enhancement#199_Manage_Employee_FromBody into Issue_May_2W Vikas Nale 2025-05-09 06:36:26 +00:00
8af759bb45 Deleted unnecessary components to clean up and optimize the codebase. ashutosh.nehete 2025-05-09 10:21:57 +05:30
1887ccf2c0 Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed. ashutosh.nehete 2025-05-08 19:36:36 +05:30
f591f2f30b Merge pull request 'Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.' (#87) from Ashtuosh_Bug#191_Incorrect_Success_Message into Issue_May_2W Vikas Nale 2025-05-09 06:34:57 +00:00
8251d875e3 Added proper success messages upon creation and update of building, floor, and work area for improved user feedback. ashutosh.nehete 2025-05-07 16:58:33 +05:30
6e600e899c Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W Pramod Mahajan 2025-05-09 10:52:40 +05:30
a67e984181 Deleted unnecessary components to clean up and optimize the codebase. ashutosh.nehete 2025-05-09 10:21:57 +05:30
a90aa77cf6 Provided proper parameter to employee list api for ont to include inactive employees ashutosh.nehete 2025-05-09 10:20:54 +05:30
89317079b7 Updated inline styles to conditionally set 'display' and 'backgroundColor' based on showModal2 state. Ensures modal appears with a dark overlay when active and is hidden otherwise. Pramod Mahajan 2025-05-09 10:20:26 +05:30
ff7f61b338 added one more property in avoid column Pramod Mahajan 2025-05-09 10:04:50 +05:30
432ac93288 Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed. ashutosh.nehete 2025-05-08 19:36:36 +05:30
0ac2dc36ff Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W Pramod Mahajan 2025-05-08 18:27:53 +05:30
9f2dfadcfd added delete repository for Job Role, Activity and Application Role Pramod Mahajan 2025-05-08 18:27:43 +05:30
a9cd2097d6 added isSystem property in hiddenColumns because this field will broken table. Pramod Mahajan 2025-05-08 18:25:18 +05:30
6c5b62eb40 added delete functionality for each master Pramod Mahajan 2025-05-08 18:23:27 +05:30
f76b524ded changed padding of modal-body and and button postion Pramod Mahajan 2025-05-08 18:22:03 +05:30
0fc43bb55b minor gui changes Vikas Nale 2025-05-08 16:45:33 +05:30
13fb930a77 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#141 pramod_Bug#141 Pramod Mahajan 2025-05-08 15:56:30 +05:30
284d36e5ac Merge pull request 'Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees' (#85) from Ashutosh_Enhancement#198_Added_IsSystem into Issue_May_2W Vikas Nale 2025-05-08 10:15:33 +00:00
ba763f986d Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees ashutosh.nehete 2025-05-08 15:29:27 +05:30
e856220173 Merge pull request 'restrict employee search to first and last name fields only' (#81) from pramod_Bug#150 into Issue_May_2W Vikas Nale 2025-05-08 10:15:07 +00:00
9ac15d3cf7 restrict employee search to first and last name fields only Pramod Mahajan 2025-05-08 12:00:58 +05:30
9a885c2b72 Merge pull request 'handled server negative response, in user readable format' (#84) from pramod_Bug-#163 into Issue_May_2W Vikas Nale 2025-05-08 10:14:54 +00:00
3161288871 handled server negative response, in user readable format Pramod Mahajan 2025-05-08 15:23:45 +05:30
2242569e48 Merge pull request 'project list or card will display 10 per page.' (#83) from pramod_Feature-#51 into Issue_May_2W Vikas Nale 2025-05-08 10:14:02 +00:00
7fa502f44c project list or card will display 10 per page. Pramod Mahajan 2025-05-08 13:19:28 +05:30
1ae1a45cb1 Merge pull request 'showing custom delete confirmation modal in master module until API is ready' (#82) from pramod_Bug#141 into Issue_May_2W Vikas Nale 2025-05-08 10:13:49 +00:00
4175fb67c6 showing custom delete confirmation modal in master module until API is ready Pramod Mahajan 2025-05-08 12:45:05 +05:30
670efbe1bf Merge pull request 'Reset Select Activity field and remove used activity after task submission' (#80) from pramod_Bug#171 into Issue_May_2W Vikas Nale 2025-05-08 10:13:19 +00:00
865cc7a366 Reset Select Activity field and remove used activity after task submission Pramod Mahajan 2025-05-08 11:43:48 +05:30
4fe09330c1 Merge pull request 'added va;idation for contact person. it will accept only alphabetical character' (#79) from pramod_Bug#197 into Issue_May_2W Vikas Nale 2025-05-08 10:12:23 +00:00
b004fe8c15 added va;idation for contact person. it will accept only alphabetical character Pramod Mahajan 2025-05-08 11:05:33 +05:30
a521c76fe6 Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees ashutosh.nehete 2025-05-08 15:29:27 +05:30
d6a025517f handled server negative response, in user readable format Pramod Mahajan 2025-05-08 15:23:45 +05:30
d6d61894a7 project list or card will display 10 per page. Pramod Mahajan 2025-05-08 13:19:28 +05:30
fe9d0ff986 showing custom delete confirmation modal in master module until API is ready Pramod Mahajan 2025-05-08 12:45:05 +05:30
99caaa1704 restrict employee search to first and last name fields only Pramod Mahajan 2025-05-08 12:00:58 +05:30
427ab0f2eb Reset Select Activity field and remove used activity after task submission Pramod Mahajan 2025-05-08 11:43:48 +05:30
505c9a46db Merge pull request 'added form submission logic with loading state management' (#78) from pramod_Bug#196 into Issue_May_2W Vikas Nale 2025-05-08 05:39:24 +00:00
6c4c6db0d7 added form submission logic with loading state management Pramod Mahajan 2025-05-08 10:45:49 +05:30
d81482583e Merge pull request 'status filter dropdown available for both view card and list' (#77) from pramod_Bug#195 into Issue_May_2W Vikas Nale 2025-05-08 05:38:44 +00:00
6c9fd4d20a status filter dropdown available for both view card and list Pramod Mahajan 2025-05-08 10:25:09 +05:30
ddf9e86235 Merge pull request 'Added a toggle switch in the Employee List module to view active and inactive employees separately.' (#76) from Ashutosh_Enhancement#172_Show_InactiveEmployees into Issue_May_2W Vikas Nale 2025-05-08 05:38:27 +00:00
a3867dfb2f Added a toggle switch in the Employee List module to view active and inactive employees separately. ashutosh.nehete 2025-05-08 10:05:42 +05:30
0180793456 Merge pull request 'dcrease table row size' (#75) from pramod_bug#173TableRowHeight into Issue_May_2W Vikas Nale 2025-05-08 05:37:33 +00:00
4f9d2f091a dcrease table row size Pramod Mahajan 2025-05-08 10:12:43 +05:30
5fa7d563f9 Merge pull request 'hide relase date column when active employee and modified column name of role to project role' (#74) from pramod_Bug#189 into Issue_May_2W Vikas Nale 2025-05-08 05:37:06 +00:00
8f8ee765f7 added va;idation for contact person. it will accept only alphabetical character Pramod Mahajan 2025-05-08 11:05:33 +05:30
0675a676a0 added form submission logic with loading state management Pramod Mahajan 2025-05-08 10:45:49 +05:30
0eb2738b3a status filter dropdown available for both view card and list Pramod Mahajan 2025-05-08 10:25:09 +05:30
89a07cf23e dcrease table row size Pramod Mahajan 2025-05-08 10:12:43 +05:30
28fea51988 Added a toggle switch in the Employee List module to view active and inactive employees separately. ashutosh.nehete 2025-05-08 10:05:42 +05:30
8a1cbebced hide relase date coumen when active employee and modified column name of role to project role Pramod Mahajan 2025-05-07 18:54:53 +05:30
ef2fdf899c Merge branch 'pramod_Task#186DeleteActivity' into Issue_May_2W Vikas Nale 2025-05-07 17:31:50 +05:30
e61ba5b53a remove unused menus Vikas Nale 2025-05-07 17:29:58 +05:30
1598842436 modified delete modal msg Pramod Mahajan 2025-05-07 17:19:41 +05:30
71bb1c25dd changed position of header Pramod Mahajan 2025-05-07 17:18:57 +05:30
00c56788ed removed directory menu Pramod Mahajan 2025-05-07 17:14:30 +05:30
5427fda41e Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity Pramod Mahajan 2025-05-07 17:01:31 +05:30
620bf064c9 changed class to className Pramod Mahajan 2025-05-07 16:58:54 +05:30
c941c617a5 Added proper success messages upon creation and update of building, floor, and work area for improved user feedback. ashutosh.nehete 2025-05-07 16:58:33 +05:30
16a9cab12a Handled wrong implementation on attendance log popup to show Attendance By Employee name Vikas Nale 2025-05-07 16:56:56 +05:30
18125f7c6a Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W Vikas Nale 2025-05-07 16:43:50 +05:30
3607bdc77d increase page size Vikas Nale 2025-05-07 16:43:21 +05:30
7c7b5a9be7 changed class to className Pramod Mahajan 2025-05-07 16:42:19 +05:30
a8ba185bb8 Merge pull request 'Added validation to the Completed Work field to prevent negative values.' (#72) from Ashutosh_Bug#192_Negative_Completed_Work into Issue_May_2W Gitea Admin 2025-05-07 11:11:26 +00:00
144f8a0595 Added validation to the Completed Work field to prevent negative values. ashutosh.nehete 2025-05-07 16:22:09 +05:30
f3bedf5826 handled console error Pramod Mahajan 2025-05-07 16:41:25 +05:30
e0994c6f43 deleted this component. no more used Pramod Mahajan 2025-05-07 16:40:04 +05:30
a2f23ee5ae Merge pull request 'Implemented date-wise grouping of the Attendance Log based on the selected date range.' (#71) from Ashutosh_Bug#180_Display_Attendance_Log_BasedOnDate into Issue_May_2W Gitea Admin 2025-05-07 11:09:54 +00:00
e5f6ac23ef removed console and unused code Pramod Mahajan 2025-05-07 16:38:01 +05:30
007b657e89 changed class to className Pramod Mahajan 2025-05-07 16:35:42 +05:30
73efd67fbc removed console Pramod Mahajan 2025-05-07 16:33:32 +05:30
7c81c87f18 removed unused code Pramod Mahajan 2025-05-07 16:32:34 +05:30
cc1c378a3d changed class to className Pramod Mahajan 2025-05-07 16:27:19 +05:30
9682de0854 customize confirm modal Pramod Mahajan 2025-05-07 16:23:35 +05:30
cf0a0f00b2 removed unused code Pramod Mahajan 2025-05-07 16:22:11 +05:30
a2aeee6f28 Added validation to the Completed Work field to prevent negative values. ashutosh.nehete 2025-05-07 16:22:09 +05:30
e795881c79 Implemented date-wise grouping of the Attendance Log based on the selected date range. ashutosh.nehete 2025-05-07 16:04:38 +05:30
50f48d27f2 Handle menu navigation from shortcut so that smoot navigation happens and page does not reload Vikas Nale 2025-05-07 15:53:03 +05:30
55aa6ec499 Merge pull request 'Fixed issue where expired sessions showed "Unauthorized User" by implementing token refresh or redirect to login page.' (#70) from Ashutosh_Bug#190_Request_JWT_Token into Issue_May_2W Vikas Nale 2025-05-07 08:09:35 +00:00
12c592b59c Fixed issue where expired sessions showed "Unauthorized User" by implementing token refresh or redirect to login page. ashutosh.nehete 2025-05-07 13:20:01 +05:30
130fffcc16 remove minor error while code review Vikas Nale 2025-05-07 13:16:02 +05:30
9e3101ebf4 Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity Pramod Mahajan 2025-05-07 13:00:09 +05:30
978c7b8e4b removed unused code, console Pramod Mahajan 2025-05-07 12:54:25 +05:30
76e88aad88 removed unused code , console Pramod Mahajan 2025-05-07 12:53:18 +05:30
bca43633ae Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W Pramod Mahajan 2025-05-07 12:49:42 +05:30
cf23803b99 added recored by column Pramod Mahajan 2025-05-07 12:49:29 +05:30
9c41788a6c increased modal md to lg Pramod Mahajan 2025-05-07 12:49:04 +05:30
85dbd419f3 Merge branch 'pramod_enhance#168' into Issue_May_2W Vikas Nale 2025-05-07 12:05:56 +05:30
a8f816748c Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W Vikas Nale 2025-05-07 12:05:31 +05:30
70babf0e94 Merge branch 'Ashutosh_Bug#181_Order_By_AssignmentDate' into Issue_May_2W Vikas Nale 2025-05-07 12:04:36 +05:30
9895a5ac89 Merge pull request 'Added fuctionality to Displayed Date-Wise Based on Selected Date Range' (#69) from Ashutosh_Bug#181_Order_By_AssignmentDate into Issue_May_2W Vikas Nale 2025-05-07 06:33:11 +00:00
a60cd6b1a9 Added row background color and also changed message on report submit Vikas Nale 2025-05-07 12:02:30 +05:30
25127659c8 Added fuctionality to Displayed Date-Wise Based on Selected Date Range ashutosh.nehete 2025-05-06 18:28:56 +05:30
4d76ea4bbd Added row background color and also changed message on report submit Vikas Nale 2025-05-07 12:02:30 +05:30