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

DirectorY_Manage_Changes

Document_Manag

Document_Manager

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

#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

b268763283 changed navigation tab layout Pramod Mahajan 2025-05-29 17:21:07 +05:30
767d8abd19 changed font size Pramod Mahajan 2025-05-29 17:20:27 +05:30
5531d408f9 corrected state name, mismatched Pramod Mahajan 2025-05-29 10:12:56 +05:30
3330565dcb added margin btwn bucket name in filter dropdwon Pramod Mahajan 2025-05-29 10:12:14 +05:30
4628dea561 Fixed case mismatch in error rendering (BucketIds ➝ bucketIds) Pramod Mahajan 2025-05-29 10:10:47 +05:30
6fa0107792 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task-#398 pramod_Task-#398 Pramod Mahajan 2025-05-29 20:12:08 +05:30
c00a0ecff1 removed unused props Pramod Mahajan 2025-05-29 20:11:26 +05:30
7e0acf00bd display contact profile data Pramod Mahajan 2025-05-29 20:10:15 +05:30
bc9cbd61f3 Added id check before calling fetchContactNotes function Pramod Mahajan 2025-05-29 20:09:35 +05:30
25bd5550c6 Add restore feature for deleted notes Pramod Mahajan 2025-05-29 20:08:31 +05:30
069d12ecd6 aded validation for tags and rename label to bucket Pramod Mahajan 2025-05-29 20:05:43 +05:30
054c129ba5 removed new contact button form header Pramod Mahajan 2025-05-29 20:01:42 +05:30
3ed2048e45 changed table column email to role Pramod Mahajan 2025-05-29 19:59:24 +05:30
114aac089b added restore feature for contacts Pramod Mahajan 2025-05-29 19:58:45 +05:30
f9d94d1b18 fixed console warning Pramod Mahajan 2025-05-29 19:57:24 +05:30
0069b48ca8 added wrapped DirProver for context Pramod Mahajan 2025-05-29 19:56:18 +05:30
2b65f92f54 Support tag creation on spacebar key Pramod Mahajan 2025-05-29 19:55:36 +05:30
5a59e79160 changed useDirectory hook calling format Pramod Mahajan 2025-05-29 17:26:07 +05:30
b9f24e9954 changed delete contact Url Pramod Mahajan 2025-05-29 17:24:58 +05:30
a2e34b91dc changed navigation tab layout Pramod Mahajan 2025-05-29 17:21:07 +05:30
e94e41a952 changed font size Pramod Mahajan 2025-05-29 17:20:27 +05:30
766f5d31bf corrected state name, mismatched Pramod Mahajan 2025-05-29 10:12:56 +05:30
ecebef71c1 added margin btwn bucket name in filter dropdwon Pramod Mahajan 2025-05-29 10:12:14 +05:30
93977ba5b6 Fixed case mismatch in error rendering (BucketIds ➝ bucketIds) Pramod Mahajan 2025-05-29 10:10:47 +05:30
225f22153d Merge pull request 'pramod_Task-#398 : Added Access Permission For 'Manage Buckets' Role' (#159) from pramod_Task-#398 into Feature_Directory pramod.mahajan 2025-05-28 19:47:44 +00:00
8c66a9a083 Prevent error by safely accessing bucket creator with optional chaining Pramod Mahajan 2025-05-29 00:46:58 +05:30
2a5e075db5 added directory permission Ids Pramod Mahajan 2025-05-29 00:33:44 +05:30
80a213595d added manager permission for directory Pramod Mahajan 2025-05-29 00:33:01 +05:30
0f323a7594 removed eaxtra gap between avatra and name Pramod Mahajan 2025-05-29 00:32:05 +05:30
8c43d07488 Merge pull request 'pramod_Task-#390 : Tasks for Bucket Admin' (#158) from pramod_Task-#390 into Feature_Directory pramod.mahajan 2025-05-28 13:46:15 +00:00
6b5bc8c729 modified not url Pramod Mahajan 2025-05-28 19:06:51 +05:30
ba5b07b608 user can update and assign bucket to emp Pramod Mahajan 2025-05-28 18:51:48 +05:30
875656dbf5 modified table layout Pramod Mahajan 2025-05-28 18:50:14 +05:30
e22ab1ae05 removed console Pramod Mahajan 2025-05-28 18:49:44 +05:30
416f8e6621 added classAvatar for other classes Pramod Mahajan 2025-05-28 18:13:10 +05:30
51f7e473f4 add auto suggestion field for orgnaization Pramod Mahajan 2025-05-28 17:22:00 +05:30
e6cdff1ed6 modifled column size Pramod Mahajan 2025-05-28 17:21:32 +05:30
cb0800b103 added assign-bucket api Pramod Mahajan 2025-05-28 16:41:20 +05:30
b02c599130 buckets can assign employee Pramod Mahajan 2025-05-28 16:40:54 +05:30
33ab6fbdaa Status code 400 showing on Logs tab and Daily Progress Report datepicker issue. kartik.sharma 2025-05-28 16:03:35 +05:30
3e615b3cd6 Merge pull request 'Comments popup submit button issue.' (#154) from Kartik_Bug#389 into Issue_May_5W Vikas Nale 2025-05-28 10:29:14 +00:00
627d4f898e Adding new Weidget in Dashboadr name is "Pending Attendance". kartik.sharma 2025-05-28 13:06:03 +05:30
16301def0c Merge pull request 'pramod_Task-#357 : Added Admin Update and Delete Functionality in Manage Buckets Modal' (#155) from pramod_Task-#357 into Feature_Directory pramod.mahajan 2025-05-28 07:03:52 +00:00
61e8c78245 added float button Pramod Mahajan 2025-05-28 12:25:20 +05:30
a0930197d9 modified useBucket for refetch data Pramod Mahajan 2025-05-28 12:25:02 +05:30
c6e9d3fcbe added bucket fdisplay field in contact profile Pramod Mahajan 2025-05-28 12:24:11 +05:30
b478e7e4a7 added refresh button Pramod Mahajan 2025-05-28 12:22:45 +05:30
0880540560 Comments popup submit button issue. kartik.sharma 2025-05-28 12:03:36 +05:30
054a7780db rename method post to delete Pramod Mahajan 2025-05-28 12:00:28 +05:30
1f864ac08c wrapped in context FabContext Pramod Mahajan 2025-05-28 11:59:47 +05:30
cea094cd89 added float contaxt , action can take form any component Pramod Mahajan 2025-05-28 11:59:12 +05:30
cae2f2fffd intergated delete api Pramod Mahajan 2025-05-28 11:58:16 +05:30
fc30db8532 added validation for bucket at least one bucket required Pramod Mahajan 2025-05-28 11:57:48 +05:30
0ec3d0c3e3 created new float button component Pramod Mahajan 2025-05-28 11:57:21 +05:30
e05130ab5c Comments popup submit button problem. kartik.sharma 2025-05-28 11:55:23 +05:30
a553ac2fe2 added delete bucket api Pramod Mahajan 2025-05-28 10:45:33 +05:30
e316858c0a center empty state messages in employee table with spacing Pramod Mahajan 2025-05-28 00:05:27 +05:30
ed72f29f01 removed fixed height from select label field Pramod Mahajan 2025-05-27 23:11:58 +05:30
f8c3a6e767 add card-minHeight class for consistent card sizing Pramod Mahajan 2025-05-27 22:57:10 +05:30
fc82989577 added .card-minHeight class with 430px min-height Pramod Mahajan 2025-05-27 22:32:47 +05:30
6605293c47 added sorting button to table header Pramod Mahajan 2025-05-27 22:23:32 +05:30
c382d9238d created new hook for sorting table data Pramod Mahajan 2025-05-27 22:18:44 +05:30
45e88c07a9 increased padding for suggestion menu Pramod Mahajan 2025-05-27 22:17:56 +05:30
c1020f4693 Merge pull request 'Correction in Comment popup from Daily Progress Report.' (#152) from Kartik_Bug#350 into Issue_May_5W ashutosh.nehete 2025-05-27 11:56:52 +00:00
94c9430406 Changes in Comment popup kartik.sharma 2025-05-27 17:24:14 +05:30
cd3983dd19 Correction in Comment popup from Daily Progress Report. kartik.sharma 2025-05-27 16:36:22 +05:30
792fcd6965 Changes in Comment popup kartik.sharma 2025-05-27 17:24:14 +05:30
69abd207c6 Correction in Comment popup from Daily Progress Report. kartik.sharma 2025-05-27 16:36:22 +05:30
a68bd7dc38 Merge pull request 'In Create New Project form is not empty when we click on cancel button or cross.' (#151) from Kartik_bug#386 into Issue_May_5W ashutosh.nehete 2025-05-27 10:57:12 +00:00
235ddb58ba In Create New Project form is not empty when we click on cancel button or cross. kartik.sharma 2025-05-27 15:06:12 +05:30
0c40543f87 In Create New Project form is not empty when we click on cancel button or cross. kartik.sharma 2025-05-27 15:06:12 +05:30
eb0e424a18 created new hook useOrganization Pramod Mahajan 2025-05-27 15:05:35 +05:30
3f7456e5e7 replaced standard input with custom InputSuggestions component for organization field Pramod Mahajan 2025-05-27 15:04:55 +05:30
478aedf2ae added marign for select item Pramod Mahajan 2025-05-27 15:03:21 +05:30
866049e385 added mirgin form bottom for select badge Pramod Mahajan 2025-05-27 15:02:42 +05:30
8786f01b40 created new component for organization sugger field Pramod Mahajan 2025-05-27 15:01:34 +05:30
b198e7142a Merge pull request 'Convert all date to DD-MM-YYYY accross all component.' (#150) from Kartik_Bug#368 into Issue_May_5W Vikas Nale 2025-05-27 07:53:31 +00:00
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. kartik.sharma 2025-05-27 11:53:56 +05:30
d3f7c44922 removed table header icons Pramod Mahajan 2025-05-27 12:53:58 +05:30
466f11382a removed table header icons Pramod Mahajan 2025-05-27 12:50:47 +05:30
3072759ba8 incresed modal width for manage buckets Pramod Mahajan 2025-05-27 12:47:47 +05:30
a17a32a7cf added background color, backdrop Pramod Mahajan 2025-05-27 12:46:36 +05:30
991a833dbf removed fix height Pramod Mahajan 2025-05-27 12:39:54 +05:30
5287b40cd0 changed font size Pramod Mahajan 2025-05-27 12:37:02 +05:30
dd35de14a7 removed project select validation, it no longer required Pramod Mahajan 2025-05-27 12:35:23 +05:30
8fba237173 changed font-size Pramod Mahajan 2025-05-27 12:33:25 +05:30
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