Commit Graph

Select branches

Hide Pull Requests

Adding_Chips_Expense

AppMenu

Attendance_Regularize_Issues

Bug#752RefreshToken

Collection_Management

Document_Manag

Document_Manager

Expense_Bug#828

Expense_Bugs

Expense_Manangement_Feature

Expense_Weidget_main

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

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_filter

Intefrating_API_Dashboard

Issues_Aug_1W

Issues_Aug_2W

Issues_July_1W

Issues_July_2W

Issues_July_3W

Issues_July_4W

Issues_Oct_1W

Issues_Oct_main_2W

Issues_Sep_1W

Issues_Sep_1W_V2

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#1392

Kartik_Bug#1394

Kartik_Bug#1395

Kartik_Bug#1408

Kartik_Bug#1417

Kartik_Bug#1418

Kartik_Bug#1425

Kartik_Bug#1426

Kartik_Bug#1429

Kartik_Bug#1434

Kartik_Bug#1436

Kartik_Bug#1437

Kartik_Bug#1450

Kartik_Bug#1451

Kartik_Bug#1455

Kartik_Bug#1462

Kartik_Bug#1463

Kartik_Bug#1469

Kartik_Bug#1497

Kartik_Bug#1499

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_Directory_Changes#805

Kartik_Enhancement#1053

Kartik_Enhancement#1433

Kartik_Enhancement#1446

Kartik_Enhancement#1448

Kartik_Enhancement#807

Kartik_Enhancement#948

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#1465

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_1459

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

OnFieldWork_V1

OnField_Issues_Oct_2W

Organization_Management

ProjectUpdationForOrganizaion

Refactor_Directory

Refactor_Expenses

Service_Org_Task_1495

Services_Master

SingalR_Integration

TeamAssignToProject

Tenant_Manag

Tenant_Management

UI_Changes_Add_Skeleton

UI_Changes_DirectoryFilter

UI_Changes_PMS

activity_image

collection_dev

cosmatic-changes

filter_offcanvas

hotchanges_projectPermission

hotfix/MasterActivity

kartik_Bug#628

landing_page_1

landing_page_with_new_theme

loader_implmentation

login-layout-changes

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

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

#49

#5

#50

#51

#52

#53

#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

Mono Color

• 281a956ac8 fixed directory header layout pramod.mahajan 2025-10-11 12:43:37 +05:30
• 31882c3d12 REMOVED UNNEEDED CARD CLASS pramod.mahajan 2025-10-11 11:13:38 +05:30
• 006ca21e1d imported PreviwDocument compoent that was missing pramod.mahajan 2025-10-11 10:52:02 +05:30
• df41f4c82d Adding Chips in Directory Contact and Notes Page. Kartik_Task#1465 Kartik Sharma 2025-10-11 10:30:15 +05:30
• a64635cd37 Fix: Ensure orgData can be cleared when opening Organization Modal pramod.mahajan 2025-10-11 10:29:40 +05:30
• 9b8c8c34ab Merge pull request 'HotChanges_10_10_25' (#472) from HotChanges_10_10_25 into main pramod.mahajan 2025-10-10 14:50:04 +00:00
• 704ba79289 prevent to select future date HotChanges_10_10_25 pramod.mahajan 2025-10-10 20:17:06 +05:30
• bb2d7b8923 added pading in check-in check-out form pramod.mahajan 2025-10-10 19:54:20 +05:30
• 3440467107 wapped header content into separated div pramod.mahajan 2025-10-10 18:25:19 +05:30
• f4edcfd2f3 changed prod url pramod.mahajan 2025-10-10 18:18:20 +05:30
• 62e5c6899a profile icon should display always at end pramod.mahajan 2025-10-10 18:17:24 +05:30
• 00a23b3de9 changed class for table responsive pramod.mahajan 2025-10-10 18:11:43 +05:30
• 79161a8ede prevent to pick future date pramod.mahajan 2025-10-10 18:09:35 +05:30
• 860779d096 fixed service list show in Dialy Task pramod.mahajan 2025-10-10 18:08:21 +05:30
• a2067e150d fixed service list show pramod.mahajan 2025-10-10 17:51:12 +05:30
• c921dbff09 fixed u pramod.mahajan 2025-10-10 17:49:14 +05:30
• e84da2dcb0 Merge pull request 'Kartik_Task_1459 :- Adding Export Excel and PDF in Directory.' (#469) from Kartik_Task_1459 into OnFieldWork_V1 pramod.mahajan 2025-10-10 11:24:30 +00:00
• 4ba7c72e78 Removing ExportUtils.js file. Kartik Sharma 2025-10-10 14:48:34 +05:30
• 9939973d8d Adding Excel and PDF export in Directory. Kartik Sharma 2025-10-10 14:43:11 +05:30
• e17c2064ac Merge pull request 'UI updation in Expense Breakdown' (#471) from Kartik_Bug#1463 into OnFieldWork_V1 pramod.mahajan 2025-10-10 11:24:02 +00:00
• 9580c9234c UI updation in Expense Breakdown Kartik Sharma 2025-10-10 15:44:24 +05:30
• edce5ef614 added newhook that return only organization employee for employee list (Active or Inactive) pramod.mahajan 2025-10-10 16:48:22 +05:30
• dd944b3414 datepicker should not take future date pramod.mahajan 2025-10-10 16:46:34 +05:30
• 13d3572cf6 fixed datepicke ui pramod.mahajan 2025-10-10 16:45:43 +05:30
• 44b3f842f2 Correction in Date Ranger in Attendance Logs. Kartik Sharma 2025-10-10 16:36:39 +05:30
• 9de0b1a0df Project List view UI implementation. Kartik Sharma 2025-10-10 16:00:52 +05:30
• f15793fa93 UI updation in Expense Breakdown Kartik_Bug#1463 Kartik Sharma 2025-10-10 15:44:24 +05:30
• 0dd7c19457 added navigation hook to replace path pramod.mahajan 2025-10-10 15:37:59 +05:30
• fbb68a4488 Correction in DataRangePicker for date range box and Calender. Kartik Sharma 2025-10-10 15:24:34 +05:30
• 2ee7b292e7 UI updation in Header file at dropdown in mobile view. Kartik Sharma 2025-10-10 15:12:50 +05:30
• d37e4106b6 Removing ExportUtils.js file. Kartik_Task_1459 Kartik Sharma 2025-10-10 14:48:34 +05:30
• cb7b0144a8 Adding Excel and PDF export in Directory. Kartik Sharma 2025-10-10 14:43:11 +05:30
• 8f2149e0ed Adding Excel and PDF in Directory. Kartik_Task#1459 Kartik Sharma 2025-10-10 14:18:07 +05:30
• 3cc4f0b416 mismatch service api fixed pramod.mahajan 2025-10-10 14:15:30 +05:30
• c1a8b87a2c Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into OnFieldWork_V1 pramod.mahajan 2025-10-10 12:48:42 +05:30
• 24501b3c76 persist date pramod.mahajan 2025-10-10 12:48:37 +05:30
• ef00516256 Changes in Dashboard weidget Attendance and Monthly weidget when no data show. Kartik Sharma 2025-10-10 12:11:12 +05:30
• f8095ac9bf upgraded progress pramod.mahajan 2025-10-10 10:55:51 +05:30
• f867a692ed fixed : whenever open modal that not come exiten data pramod.mahajan 2025-10-09 18:49:14 +05:30
• 85b4b830d3 Merge pull request 'Kartik_Enhancement#1448 : Document filters chips' (#468) from Kartik_Enhancement#1448 into OnFieldWork_V1 pramod.mahajan 2025-10-09 12:57:36 +00:00
• c1c333008f added document filter chips pramod.mahajan 2025-10-09 18:25:03 +05:30
• 5370d0eb9d Adding Chips in Document. Kartik Sharma 2025-10-09 17:50:56 +05:30
• 5cbd6c427a Adding Chips in Document. Kartik Sharma 2025-10-09 16:11:51 +05:30
• 5057738d8b Merge pull request 'Directory tab inside Project Profile page not displayed properly (tab within tab issue)' (#464) from Kartik_Bug#1408 into OnFieldWork_V1 pramod.mahajan 2025-10-09 12:56:40 +00:00
• 063bbee681 Changes directory View. Kartik Sharma 2025-10-09 10:58:58 +05:30
• 3dc667db73 Directory tab inside Project Profile page not displayed properly (tab within tab issue) Kartik Sharma 2025-10-08 18:15:28 +05:30
• 2f2c31db9f Merge pull request 'Added 3-dots menu in the Employee Module with ‘Show Inactive Employees’ and Export functionalities inside the menu.' (#466) from Kartik_Enhancement#1433 into OnFieldWork_V1 pramod.mahajan 2025-10-09 12:55:56 +00:00
• 0dc540eec2 Added 3-dots menu in the Employee Module with ‘Show Inactive Employees’ and Export functionalities inside the menu. Kartik Sharma 2025-10-09 10:41:32 +05:30
• 9dab29d93c added document filter chips Kartik_Enhancement#1448 pramod.mahajan 2025-10-09 18:25:03 +05:30
• fc7c33ee54 added right status variable name pramod.mahajan 2025-10-09 17:51:27 +05:30
• c686b388f4 Adding Chips in Document. Kartik Sharma 2025-10-09 17:50:56 +05:30
• 6280abf95e added marging between fltes input box pramod.mahajan 2025-10-09 17:32:39 +05:30
• 1200937097 Merge pull request 'HotChanges_09_10_25 : Added Daily Task Filter' (#467) from HotChanges_09_10_25 into main pramod.mahajan 2025-10-09 12:00:21 +00:00
• 5d1ccb9572 changed buttons size HotChanges_09_10_25 pramod.mahajan 2025-10-09 17:25:03 +05:30
• 91ffc5a0e0 added filter for DailyTask Report pramod.mahajan 2025-10-09 17:23:04 +05:30
• 1c4804fed2 added for serviceI dropdown list pramod.mahajan 2025-10-09 16:48:15 +05:30
• 0e5e716df2 removed debuggger pramod.mahajan 2025-10-09 16:20:43 +05:30
• cbb52087c3 Adding Chips in Document. Kartik Sharma 2025-10-09 16:11:51 +05:30
• aecaee7116 addded project when project goin to update state pramod.mahajan 2025-10-09 15:38:59 +05:30
• eeb886ec36 Removing consol.log in regularize Kartik Sharma 2025-10-09 14:58:11 +05:30
• 210b01513e Removing Project name column in Attendance Logs and Regularize. Kartik Sharma 2025-10-09 14:56:00 +05:30
• b2e2214143 Changes directory View. Kartik_Bug#1408 Kartik Sharma 2025-10-09 10:58:58 +05:30
• 745e1df091 Added 3-dots menu in the Employee Module with ‘Show Inactive Employees’ and Export functionalities inside the menu. Kartik_Enhancement#1433 Kartik Sharma 2025-10-09 10:41:32 +05:30
• 2fe297c6b6 Adding 2 columns in Regularize column Request at and Requested by Kartik Sharma 2025-10-09 10:27:13 +05:30
• ffd7f15488 Merge pull request 'Attendance Tab Should Display All Records for Each Employee' (#465) from Kartik_Bug#1425 into OnFieldWork_V1 pramod.mahajan 2025-10-08 13:38:09 +00:00
• 7f33d5e6bd Attendance Tab Should Display All Records for Each Employee Kartik Sharma 2025-10-08 18:25:01 +05:30
• 108ca1cc96 Merge pull request 'Adding NA and updation in Excel,PDF and Print functionality in Employee list.' (#463) from Kartik_Bug#1436 into OnFieldWork_V1 pramod.mahajan 2025-10-08 13:37:48 +00:00
• 0b1a276898 Adding NA and updation in Excel,PDF and Print functionality in Employee list. Kartik Sharma 2025-10-08 18:00:53 +05:30
• 6246dbd23f Merge pull request 'Missing title in View popup' (#462) from Kartik#Enhancement#1444 into OnFieldWork_V1 pramod.mahajan 2025-10-08 13:37:18 +00:00
• af3bf11beb Missing title in View popup Kartik Sharma 2025-10-08 17:49:25 +05:30
• 2e5951d9d1 Merge pull request 'Expense Type label to be renamed to Expense Category.' (#461) from Kartik_Enhancement#1446 into OnFieldWork_V1 pramod.mahajan 2025-10-08 13:37:02 +00:00
• cdc5e32554 Expense Type label to be renamed to Expense Category. Kartik Sharma 2025-10-08 17:41:20 +05:30
• 6f8735d03e Merge pull request 'Selected organization should remain visible after navigating back' (#460) from Kartik_Bug#1381 into Issues_Oct_1W Issues_Oct_1W pramod.mahajan 2025-10-08 13:36:43 +00:00
• 51374f612b Updation in SPIRD Id selection. Kartik Sharma 2025-10-07 15:00:45 +05:30
• 2eb96b222c Selected organization should remain visible after navigating back Kartik Sharma 2025-10-07 14:34:10 +05:30
• bce58aade6 Merge pull request 'Show Meaningful Message When No Employees Exist in a Service Under Project Teams' (#458) from Kartik_Bug#1395 into Issues_Oct_1W pramod.mahajan 2025-10-08 13:23:58 +00:00
• fae11d7b8c Show Meaningful Message When No Employees Exist in a Service Under Project Teams Kartik Sharma 2025-10-07 12:25:30 +05:30
• f417194ad3 Merge pull request 'Removing border line in directory contact tab.' (#457) from Kartik_Bug#1429 into Issues_Oct_1W pramod.mahajan 2025-10-08 13:23:40 +00:00
• 5e10e5080f Removing border line in directory contact tab. Kartik Sharma 2025-10-07 11:39:19 +05:30
• f6f528c394 Merge pull request 'Adding percentage in Infrastructure.' (#456) from Kartik_Bug#1350 into Issues_Oct_1W pramod.mahajan 2025-10-08 13:23:22 +00:00
• 6151fa9424 Adding percentage in Infrastructure. Kartik Sharma 2025-10-07 11:23:03 +05:30
• 00353b23d6 Merge pull request 'UI updation in Organization view and Search button' (#444) from Kartik_Bug#1388 into Issues_Oct_1W pramod.mahajan 2025-10-08 13:23:05 +00:00
• 9ddf530710 UI updation in Organization view and Search button Kartik Sharma 2025-09-30 17:48:11 +05:30
• bc047a84fc Adding processpending in ExpenseStatus. Kartik Sharma 2025-10-08 18:49:24 +05:30
• 654a8c2400 Attendance Tab Should Display All Records for Each Employee Kartik_Bug#1425 Kartik Sharma 2025-10-08 18:25:01 +05:30
• 5c8a6c8c65 Directory tab inside Project Profile page not displayed properly (tab within tab issue) Kartik Sharma 2025-10-08 18:15:28 +05:30
• 0779a34b4d Adding NA and updation in Excel,PDF and Print functionality in Employee list. Kartik_Bug#1436 Kartik Sharma 2025-10-08 18:00:53 +05:30
• f9dcefb71a Missing title in View popup Kartik#Enhancement#1444 Kartik Sharma 2025-10-08 17:49:25 +05:30
• 74619e6cc3 Expense Type label to be renamed to Expense Category. Kartik_Enhancement#1446 Kartik Sharma 2025-10-08 17:41:20 +05:30
• 0511ed6d82 Changes in Attendance module for all projects. Kartik Sharma 2025-10-08 13:52:06 +05:30
• bc933f4c64 Adding Search box in Expense Paid by dropdown. Kartik Sharma 2025-10-08 11:29:51 +05:30
• bd3645aae6 In Modify project add project.id on UseProjectDetails Kartik Sharma 2025-10-08 10:58:31 +05:30
• 1107144201 Updation in SPIRD Id selection. Kartik_Bug#1381 Kartik Sharma 2025-10-07 15:00:45 +05:30
• 97dca1a10b removed unused code pramod.mahajan 2025-10-07 14:53:48 +05:30
• 30144695f9 Selected organization should remain visible after navigating back Kartik Sharma 2025-10-07 14:34:10 +05:30
• c35eacca5a addded filter added inside api pramod.mahajan 2025-10-07 14:02:25 +05:30
• 5e27ed36fa Merge pull request 'HotChanges_06-10-25 : Image Gallery and Attendanc CheckIn check-Out' (#459) from HotChanges_06-10-25 into main pramod.mahajan 2025-10-07 07:12:49 +00:00
• 8bcfcc5718 fixed attendance - check In -out and persisted date range from Redux store for attendance logs pramod.mahajan 2025-10-07 12:17:27 +05:30
• ad1bef4f7b added gallery and gallery filter pramod.mahajan 2025-10-06 16:05:22 +05:30
• a22f9e0c12 Show Meaningful Message When No Employees Exist in a Service Under Project Teams Kartik_Bug#1395 Kartik Sharma 2025-10-07 12:25:30 +05:30