Commit Graph

Select branches

Hide Pull Requests

Activity_Hierarchy

Approve_Task

Ashutosh_ActivityMaster_managenment

Ashutosh_AddServerHeade_False

Ashutosh_AllowCredentials

Ashutosh_Bug#108_Attendance_log

Ashutosh_Bug#114_Email_Template_Not_Found

Ashutosh_Bug#119_Remove_CheckList_Item

Ashutosh_Bug#125_Unable_To_Add_Checklist_Item

Ashutosh_Bug#18_Project_Duplicate

Ashutosh_Bug#1_Cors_Configuration

Ashutosh_Bug#37_Attendance_Issues

Ashutosh_Bug_#74_Attendance_Regularization_Date

Ashutosh_Bug_#75_Employee_duplicatation

Ashutosh_CreateNewTenant

Ashutosh_Dashboard

Ashutosh_Employee_Update_Validation

Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3

Ashutosh_Enhancement_#123_Possible_Null_Reference

Ashutosh_Enhancement_#214_Report_Task_At_Zero

Ashutosh_Forum_APIs

Ashutosh_JWT_Token

Ashutosh_Null_Refrenance_Warning_Fixed

Ashutosh_SCRUM-58_Time_Discrepancies_Attendance

Ashutosh_SCRUM-62_Decodeing_Token_Reset_password

Ashutosh_Task#106_Upload_Whitelist_Only

Ashutosh_Task#14_TenantProfile

Ashutosh_Task#1609

Ashutosh_Task#16_UpdateTenant

Ashutosh_Task_#67_Request_Demo

Ashutosh_Task_#79_Get_Industries_API

Ashutosh_User_Validations

Brevo_Mailling

Change_MPIN_Digits

Dynamic_Filter

Feature_Image_Gallary

Feature_Task_management

Finance_Dashboards

Inventory_Management

Issues_April_4W

Issuses

OnFieldWork_V1

Payment_Gatway_Management_OFW

Project_Report_Datewise

Purchase_Invoice_Management

Response_Encryption

Service_Project_Management

SideMenu_Management

TeanantManagement

TenantManagementV1

Update_Email_Template

Upgrade_Expense

Upgrade_Expense_Main

UserRights

Vaibhav_Resolved_Issues

Weidget_Dashboard_Jobs

contact_import

main

pramod_Refactoring#12_UniqueApplicationRole

pramod_Task#448

vikas_38_featurepermission_issue

#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

#16

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#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

• c06dc8ebe7 Selecting the default services in project allocation ashutosh.nehete 2025-10-09 16:00:26 +05:30
• 8609db64d2 Made the serviceId is nullable in project allocation ashutosh.nehete 2025-10-09 15:23:37 +05:30
• ef597b2bb7 Added the project ID in attendance VM ashutosh.nehete 2025-10-09 11:28:06 +05:30
• 4acc61f03a Added the Requested by in attendance table ashutosh.nehete 2025-10-08 17:54:37 +05:30
• c47b0da7b8 Showing the list of all attendance even if user have selfattendance permissons ashutosh.nehete 2025-10-08 14:16:24 +05:30
• d180d5d60e Changed the variable from totalCount to totalAmount ashutosh.nehete 2025-10-08 12:32:09 +05:30
• 60eefa78c0 Corrected the total amount sent in expense pending dashboard ashutosh.nehete 2025-10-08 12:30:34 +05:30
• b1af96b923 Added the name of the project name in view model ashutosh.nehete 2025-10-08 12:16:25 +05:30
• 629c4541d6 Removed the logic to save the FCM from verify FCM API ashutosh.nehete 2025-10-08 11:35:43 +05:30
• e831f50505 Removed the logic to save the FCM from verify FCM API ashutosh.nehete 2025-10-08 11:33:34 +05:30
• e93408c00d Removed the FCM token verify MPIN API ashutosh.nehete 2025-10-08 11:30:47 +05:30
• ba88fbced6 Removed the FCM token from MPIN verify API ashutosh.nehete 2025-10-08 11:27:30 +05:30
• 16e509ccbd Hided the tenant management feature permissions from tenant other than super tenant ashutosh.nehete 2025-10-08 11:03:29 +05:30
• 8a4a056c2d Added the query parameter to get all employee in basic employee API ashutosh.nehete 2025-10-08 10:56:05 +05:30
• 13d2e1cd7d Corrected the mistake of showing all images except selected project ashutosh.nehete 2025-10-07 12:34:48 +05:30
• 26acfec408 Added the todays completed tasks ashutosh.nehete 2025-10-06 18:33:37 +05:30
• 3bd38f3c68 Changed the logic in API to get Attendance logs by employee ashutosh.nehete 2025-10-06 16:10:58 +05:30
• f6e8a0d5e2 Sloved missing veriable issue ashutosh.nehete 2025-10-06 15:29:56 +05:30
• 0561e356d8 Added the condition to get all records in expense monthly report API ashutosh.nehete 2025-10-06 15:29:00 +05:30
• 2e29dc9946 Chnaged the check for persentages ashutosh.nehete 2025-10-06 14:42:29 +05:30
• db752a4678 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api ashutosh.nehete 2025-10-06 13:16:31 +05:30
• 245182eb07 Added the attendance persentage and task persentage ashutosh.nehete 2025-10-06 13:15:48 +05:30
• 9daf76c6eb return all employees when allEmployee=true pramod.mahajan 2025-10-05 00:24:26 +05:30
• c33afa58c3 Solved spelling mistake ashutosh.nehete 2025-10-04 17:51:58 +05:30
• 4ceb5c3cb2 Changed the authontication logic for delete contact notes ashutosh.nehete 2025-10-04 17:50:18 +05:30
• d0dabf776b Added the condition to not get services object in project allocation ashutosh.nehete 2025-10-04 17:26:08 +05:30
• 04223578ad Added the ExpenseUId in expenses tables ashutosh.nehete 2025-10-04 16:56:04 +05:30
• e2ee3f325c Added the Distinct in expense filter ashutosh.nehete 2025-10-04 12:38:22 +05:30
• 6441103e30 Chnaged the search to searchString in get directory list API ashutosh.nehete 2025-10-04 12:35:15 +05:30
• d380dfebd2 Added the ExpensTypes in expense list API and get expenese filter API ashutosh.nehete 2025-10-04 12:25:02 +05:30
• 658fa8cd23 Changed he expense UID format ashutosh.nehete 2025-10-04 10:45:38 +05:30
• 3afdad29b2 Added total amout in expense pending dashboard ashutosh.nehete 2025-10-03 17:13:23 +05:30
• 8f463ce90d Added ExpenseUId in expense table ashutosh.nehete 2025-10-03 15:24:59 +05:30
• 590476a8aa Added the APi to get count of pending expenses ashutosh.nehete 2025-10-03 14:32:59 +05:30
• 548e714ea9 Getting the monthly expenses report based on project and category ashutosh.nehete 2025-10-03 12:53:19 +05:30
• 91f4305995 Added the projectId in get expense pending list API ashutosh.nehete 2025-10-03 11:08:15 +05:30
• 7e15c517ac Optimized the dashboard APIs for expenses ashutosh.nehete 2025-10-03 10:54:38 +05:30
• 9332d9cc0b Added the API to get list pending expenses according to permissions ashutosh.nehete 2025-10-01 18:12:51 +05:30
• f94a7de4ab change email in complete system ashutosh.nehete 2025-10-01 17:46:11 +05:30
• 541ed28bd2 Added the new deashboard report of expenses ashutosh.nehete 2025-10-01 17:32:48 +05:30
• 0e1d20156f Check if email exist in total tenant ashutosh.nehete 2025-10-01 17:16:27 +05:30
• eb3a65428e Modyfied the attendance report API ashutosh.nehete 2025-10-01 15:09:51 +05:30
• 87c5de87a1 Checking in organization not in tenant ashutosh.nehete 2025-10-01 12:19:03 +05:30
• 5eda1773b7 Chnaged the sequence of buttons in sequece ashutosh.nehete 2025-10-01 11:33:56 +05:30
• b3f54962ab Removed hasProjectAccess check from document controller ashutosh.nehete 2025-10-01 10:55:00 +05:30
• 040e7df32b Removed the permission check from project details API ashutosh.nehete 2025-10-01 10:32:04 +05:30
• 0066e20c43 Removed the tenant check from find employee query in document controller ashutosh.nehete 2025-10-01 10:23:46 +05:30
• 7659eadd00 Added the check before sending mail when adding application access to employee ashutosh.nehete 2025-10-01 10:10:01 +05:30
• 824381bb49 Added the project section in side menu ashutosh.nehete 2025-10-01 09:53:40 +05:30
• 207a44acd7 Checking if have directory admin permission in delete contact API ashutosh.nehete 2025-09-30 21:32:59 +05:30
• 7775f58d69 Added the check to check if has directory admin permission ashutosh.nehete 2025-09-30 21:13:56 +05:30
• 91be729b41 Changed the logic of getting all employees in get employee list API ashutosh.nehete 2025-09-30 20:53:54 +05:30
• 0bd57d29d8 Removed the Authorization of hub ashutosh.nehete 2025-09-30 20:31:57 +05:30
• b442bb4bbc Changed the logic to get tenantId in auth controller ashutosh.nehete 2025-09-30 20:23:54 +05:30
• ca3e47c1e6 Changed theexpenses Vms ashutosh.nehete 2025-09-30 20:11:29 +05:30
• 061512d501 Removed the organization ID from manage employee DTO ashutosh.nehete 2025-09-30 19:44:00 +05:30
• 71cc442054 getting the all project through get project list API ashutosh.nehete 2025-09-30 19:28:09 +05:30
• bab03a8e47 Getting all employees in attendence module regardless of project ashutosh.nehete 2025-09-30 18:17:24 +05:30
• 8ddb414e91 Added the organization type in assignd organization list ashutosh.nehete 2025-09-30 18:08:07 +05:30
• d8329f1fab Removed the tenant check from master services ashutosh.nehete 2025-09-30 17:10:30 +05:30
• d0912cca56 Merge pull request 'Organization_Management' (#142) from Organization_Management into main ashutosh.nehete 2025-09-30 09:05:14 +00:00
• d957c692f1 Added new API to get monthly attendance report ashutosh.nehete 2025-09-30 14:34:29 +05:30
• 40ca680f45 Added the Organization sub-menu in project menu in MenuStaticMaster ashutosh.nehete 2025-09-30 12:42:29 +05:30
• 8dee7b0fa2 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-30 12:36:39 +05:30
• 1e1fe6692d Added the permission check in note create API ashutosh.nehete 2025-09-30 12:34:58 +05:30
• 0df13975a7 Added logic to add hard coded menu if menu from mongodb connot be found ashutosh.nehete 2025-09-30 12:30:04 +05:30
• 8fb5aa632d Removed the cache get logic from expenses get APIs ashutosh.nehete 2025-09-30 12:26:10 +05:30
• 7e4d4b0f5b Chnaged the log to check if sprid in used wile searching ashutosh.nehete 2025-09-30 11:40:43 +05:30
• 64bde99ab5 Corrected the check to add self organization ashutosh.nehete 2025-09-30 10:18:15 +05:30
• 90851a3349 Added HasAdmin check when adding note for contact ashutosh.nehete 2025-09-29 17:22:45 +05:30
• 2c0cd87227 Sloved the issue in get task list where user is getting the list of all tasks accept the task of selected project ashutosh.nehete 2025-09-29 16:50:38 +05:30
• c3670eaab9 Added Primary organization of tenant in get organization list ashutosh.nehete 2025-09-29 14:48:42 +05:30
• 1cd8203d27 Added the PMC, Promotor and Primary organization of the tenant in list of assigned organization to project ashutosh.nehete 2025-09-29 14:33:57 +05:30
• 5df66b79ca Added check to check the Designation in create contact API ashutosh.nehete 2025-09-29 11:15:14 +05:30
• 31da8a4402 Added the AsNoTracking in GetCurrentEmployeeAsync and get permission Ids helper functions ashutosh.nehete 2025-09-29 10:18:44 +05:30
• 27a2610388 Added the HasApplicationAccess in Employee VM ashutosh.nehete 2025-09-29 10:08:14 +05:30
• cd175c4fdf Added the services in organization details API ashutosh.nehete 2025-09-29 09:42:21 +05:30
• d6145ee0ba Added the forgin key for approver in attends table ashutosh.nehete 2025-09-27 14:50:51 +05:30
• 04086ed7e0 Creating the application user in manage employee API through mobile ashutosh.nehete 2025-09-27 14:18:42 +05:30
• a9b4b79ee4 Added the service ID and Organization ID in get project allocation API ashutosh.nehete 2025-09-27 10:33:42 +05:30
• 70092e5601 Added the created by and updated by in organization update API ashutosh.nehete 2025-09-26 16:12:46 +05:30
• 33cd7113a7 Merge pull request 'Add new API to get organization details' (#141) from Ashutosh_Task_#1362 into Organization_Management ashutosh.nehete 2025-09-26 10:26:46 +00:00
• 1d4d61ef2c Add new API to get organization details ashutosh.nehete 2025-09-26 15:53:38 +05:30
• f93686c1df Removed the Activity from master menu ashutosh.nehete 2025-09-26 14:59:24 +05:30
• f2213db807 Added organizationId filter to the employee list for organization assiged to the project ashutosh.nehete 2025-09-26 11:43:44 +05:30
• eddbdde355 Merge pull request 'Added new API to get list of employees assigned to project and filtered by services and organizations' (#140) from Ashutosh_Task#1360 into Organization_Management ashutosh.nehete 2025-09-26 06:02:25 +00:00
• 0048281616 Added new API to get list of employees assigned to project and filtered by services and organizations ashutosh.nehete 2025-09-26 11:30:28 +05:30
• f248557704 Optimized the Organization APIs ashutosh.nehete 2025-09-25 17:17:21 +05:30
• 18d590ccbe Added the promotor and PMC in project VM ashutosh.nehete 2025-09-25 16:56:21 +05:30
• 4c6070fee5 Merge pull request 'Added the service Id in Query parameter to get infra details API' (#139) from Ashutosh_Enhancement_#1355 into Organization_Management ashutosh.nehete 2025-09-25 10:16:20 +00:00
• 0fb5c3935d Added the service Id in Query parameter to get infra details API ashutosh.nehete 2025-09-25 15:45:47 +05:30
• 2f052174aa Changed the VM when creating and updating project ashutosh.nehete 2025-09-25 12:37:57 +05:30
• 2258771229 Merge pull request 'Enhanced the Create and update project API' (#138) from Ashutosh_Enhancement#1347 into Organization_Management ashutosh.nehete 2025-09-25 06:50:39 +00:00
• e4e49595e6 Enhanced the Create and update project API ashutosh.nehete 2025-09-25 12:18:44 +05:30
• 44d2827dcc Added the global services ids list parameter in create tenant DTO ashutosh.nehete 2025-09-25 09:54:08 +05:30
• fef3db297c Mapping the tenant with organization when creating the organization ashutosh.nehete 2025-09-24 19:43:45 +05:30
• 0d4d4c3754 Seprated the service ID in task list from filter ashutosh.nehete 2025-09-24 19:35:16 +05:30
• 162d735d16 Added new API to get employee list ashutosh.nehete 2025-09-24 19:20:21 +05:30
• 38e1f7a0fc Added no tracking in upate bucket API ashutosh.nehete 2025-09-24 17:47:08 +05:30
• fe1dfd7293 Getting the employee list of user's organization only ashutosh.nehete 2025-09-24 17:23:32 +05:30