Commit Graph

Select branches

Hide Pull Requests

Acititvity_Images

Activity_Hierarchy

AppMenu

Approve_Task

Approve_Task_Feature

Ashtuosh_Bug#191_Incorrect_Success_Message

Ashtush_Task#265_Delete_Contact_Category

AshutoshEnhancement#332_Added_Filter_To_Contact_List

Ashutosh_#375_To_#381

Ashutosh_ActivityMaster_managenment

Ashutosh_AddServerHeade_False

Ashutosh_AllowCredentials

Ashutosh_AppSettings_Changes

Ashutosh_ApprovedBy_In_Attendes

Ashutosh_Bug#108_Attendance_log

Ashutosh_Bug#114_Email_Template_Not_Found

Ashutosh_Bug#117_Null_Validation_In_Attendance_Log

Ashutosh_Bug#119_Remove_CheckList_Item

Ashutosh_Bug#125_Unable_To_Add_Checklist_Item

Ashutosh_Bug#127_Regularization_Time_Validation

Ashutosh_Bug#1461

Ashutosh_Bug#1498

Ashutosh_Bug#18_Project_Duplicate

Ashutosh_Bug#1_Cors_Configuration

Ashutosh_Bug#37_Attendance_Issues

Ashutosh_Bug#529

Ashutosh_Bug#935

Ashutosh_Bug_#74_Attendance_Regularization_Date

Ashutosh_Bug_#75_Employee_duplicatation

Ashutosh_Contact_Note_CRUD

Ashutosh_CreateNewTenant

Ashutosh_Dashboard

Ashutosh_Employee_Update_Validation

Ashutosh_Enhancement#1347

Ashutosh_Enhancement#1452

Ashutosh_Enhancement#172_Show_InactiveEmployees

Ashutosh_Enhancement#198_Added_IsSystem

Ashutosh_Enhancement#199_Manage_Employee_FromBody

Ashutosh_Enhancement#206_Added_WorkCategory_In_WorkItem

Ashutosh_Enhancement#276_TodaysPlanned

Ashutosh_Enhancement#413_Manage_Employee

Ashutosh_Enhancement#456_Self_Attendance

Ashutosh_Enhancement#496_ShortName

Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3

Ashutosh_Enhancement_#123_Possible_Null_Reference

Ashutosh_Enhancement_#1293

Ashutosh_Enhancement_#1297

Ashutosh_Enhancement_#1355

Ashutosh_Enhancement_#214_Report_Task_At_Zero

Ashutosh_Enhancement_#622

Ashutosh_Enhancement_#631

Ashutosh_Feature#170_Task_Deletion

Ashutosh_Feature#174_Suspend_Employee

Ashutosh_Feature#183_Get_AttendanceLogs_By_EmployeeId

Ashutosh_Feature#208_WorkCategory_Master_Table

Ashutosh_Feature_Permission

Ashutosh_Forum_APIs

Ashutosh_Get_All_Permission

Ashutosh_JWT_Token

Ashutosh_Null_Refrenance_Warning_Fixed

Ashutosh_Refactor

Ashutosh_SCRUM-58_Time_Discrepancies_Attendance

Ashutosh_SCRUM-62_Decodeing_Token_Reset_password

Ashutosh_Subscription_Plan

Ashutosh_Task#1009

Ashutosh_Task#1010

Ashutosh_Task#1011

Ashutosh_Task#1013

Ashutosh_Task#1018

Ashutosh_Task#1019

Ashutosh_Task#1025

Ashutosh_Task#1026

Ashutosh_Task#1027

Ashutosh_Task#1029

Ashutosh_Task#1036

Ashutosh_Task#106_Upload_Whitelist_Only

Ashutosh_Task#1225

Ashutosh_Task#1239

Ashutosh_Task#1246

Ashutosh_Task#124_Models_And_Dto

Ashutosh_Task#1360

Ashutosh_Task#14_TenantProfile

Ashutosh_Task#16_UpdateTenant

Ashutosh_Task#226_Create_Contact

Ashutosh_Task#228_Update_Contact

Ashutosh_Task#229_Create_Contact_Category

Ashutosh_Task#230_Get_Contact_By_Id

Ashutosh_Task#231_Get_Contact_By_BucketId

Ashutosh_Task#233_Update_Contact_Category

Ashutosh_Task#234_Get_COntact_Category_By_Id

Ashutosh_Task#235_Get_Contact_Category_List

Ashutosh_Task#246_Get_Note_List_By_ContactID

Ashutosh_Task#249_Create_Bucket

Ashutosh_Task#250_Update_Bucket

Ashutosh_Task#263_Delete_Contact

Ashutosh_Task#266_Delete_Contact_Tag

Ashutosh_Task#269_Delete_Bucket

Ashutosh_Task#316_Daily_Project_Report

Ashutosh_Task#317_Get_Organization_List

Ashutosh_Task#346_Pending_Attendance

Ashutosh_Task#347_Project_Attendance_Report

Ashutosh_Task#348_Activities_Report

Ashutosh_Task#356_Directory_Management

Ashutosh_Task#387_Assign_Bucket

Ashutosh_Task#469_Mobile_Login

Ashutosh_Task#471_Create_MPIN

Ashutosh_Task#480_Send_OTP

Ashutosh_Task#483_Login_OTP

Ashutosh_Task#484_Login_MPIN

Ashutosh_Task#513

Ashutosh_Task#663

Ashutosh_Task#767

Ashutosh_Task#980

Ashutosh_Task_#1362

Ashutosh_Task_#237

Ashutosh_Task_#67_Request_Demo

Ashutosh_Task_#79_Get_Industries_API

Ashutosh_Tasl#236_Create_ContactTag

Ashutosh_User_Validations

Attendance_Weidget_feature

Brevo_Mailling

Change_MPIN_Digits

Collection_Management

Directory_Refactor

Document_Manager

Expanses_Management_Feature

Feature_Directory

Feature_Forum

Feature_Image_Gallary

Feature_Task_management

Firebase_Implementation

GlobalSelectProject

Image_Gallery

Issue_Jun_1W

Issue_Jun_1W_2

Issue_Jun_2W

Issue_May_3W

Issue_May_4W

Issue_May_5W

Issues_April_4W

Issues_Aug_1W

Issues_July_1W

Issues_July_4W

Issues_June_3W

Issues_May_2W

Issuses

Mobile_Logger_Feature

OnFieldWork_V1

Organization_Management

ProjectDetails_Split_API

SingalR_Integration

TeanantManagement

TenantManagementV1

Tenant_Management

UserRights

Vaibhav_Resolved_Issues

contact_import

main

pramod_Refactoring#12_UniqueApplicationRole

pramod_Task#238

pramod_Task#282

pramod_Task#448

pramod_Task#455

pramod_Task#465

pramod_Task#474

pramod_Task-#237_Update_Contact_Tag

profile_page

tmp-releae-head

vikas#387_code_review

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

#15

#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

• 000cf74c1f Added Directory controller file ashutosh.nehete 2025-05-14 15:38:47 +05:30
• f30ae5ed5c Models, DTOs (Data Transfer Objects), and view models have been created for the directory. ashutosh.nehete 2025-05-14 15:27:36 +05:30
• ad4b618bee revert c7e89630eb494454c1322bdf4cf29ab076af7b86 ashutosh.nehete 2025-05-14 09:51:01 +00:00
• b05c3509ad Models, DTOs (Data Transfer Objects), and view models have been created for the directory. ashutosh.nehete 2025-05-14 15:17:05 +05:30
• 235ca073ce Merge pull request 'Ashutosh_Task#316_Daily_Project_Report' (#74) from Ashutosh_Task#316_Daily_Project_Report into Issue_May_4W Issue_May_4W Vikas Nale 2025-05-26 06:12:16 +00:00
• 276b253e2d Added fixed height to table elements ashutosh.nehete 2025-05-26 11:25:13 +05:30
• 7e70297e7c Added an Email service and API to send an Email of daily project progress report ashutosh.nehete 2025-05-23 10:37:58 +05:30
• 01598f3196 Added fixed height to table elements Ashutosh_Task#316_Daily_Project_Report ashutosh.nehete 2025-05-26 11:25:13 +05:30
• f1a7394aa2 Merge pull request 'Add Directory Management Feature with Permission Handling' (#73) from Ashutosh_Task#356_Directory_Management into Feature_Directory ashutosh.nehete 2025-05-24 10:46:51 +00:00
• 71aee738f4 Add Directory Management Feature with Permission Handling Ashutosh_Task#356_Directory_Management ashutosh.nehete 2025-05-24 15:45:43 +05:30
• 56aeceb1f9 Merge pull request 'Implemented an API endpoint that retrieves the number of planned tasks and completed tasks for a specific project on a given date' (#72) from Ashutosh_Task#348_Activities_Report into Issue_May_4W Vikas Nale 2025-05-24 06:35:33 +00:00
• 40134d1f14 Implemented an API endpoint that retrieves the number of planned tasks and completed tasks for a specific project on a given date Ashutosh_Task#348_Activities_Report ashutosh.nehete 2025-05-24 10:49:46 +05:30
• 52ee06d47e Merge pull request 'Implemented an API endpoint that retrieves the attendance records for a specific project on a given date' (#71) from Ashutosh_Task#347_Project_Attendance_Report into Issue_May_4W Vikas Nale 2025-05-24 04:58:05 +00:00
• 7ddcc8cf13 Implemented an API endpoint that retrieves the attendance records for a specific project on a given date Ashutosh_Task#347_Project_Attendance_Report ashutosh.nehete 2025-05-24 10:12:56 +05:30
• 6b33c4baf4 Merge pull request 'Implemented an API to retrieve a pending checkout and pending regularization request for logged in employee' (#70) from Ashutosh_Task#346_Pending_Attendance into Issue_May_4W Vikas Nale 2025-05-24 04:34:01 +00:00
• 0414c2366e Implemented an API to retrieve a pending checkout and pending regularization request for logged in employee Ashutosh_Task#346_Pending_Attendance ashutosh.nehete 2025-05-23 17:42:55 +05:30
• bcca8cab80 Merge pull request 'Implemented an API to update Contact Category Master' (#69) from Ashutosh_Task#233_Update_Contact_Category into Feature_Directory Vikas Nale 2025-05-23 05:45:52 +00:00
• 7c09cf49e1 Implemented an API to update Contact Category Master ashutosh.nehete 2025-05-22 20:27:13 +05:30
• 4801229f1e Merge pull request 'Implemented an API to update Buckets for grouping contacts.' (#68) from Ashutosh_Task#250_Update_Bucket into Feature_Directory Vikas Nale 2025-05-23 05:45:38 +00:00
• a14bbb06a6 Implemented an API to update Buckets for grouping contacts. ashutosh.nehete 2025-05-22 19:48:45 +05:30
• 4d84c53ce7 Added an Email service and API to send an Email of daily project progress report ashutosh.nehete 2025-05-23 10:37:58 +05:30
• 95aef84a3a Accepting List of buckets and categories Ids rather than as payload ashutosh.nehete 2025-05-22 22:10:51 +05:30
• 27b04bcf34 Implemented an API to update Contact Category Master Ashutosh_Task#233_Update_Contact_Category ashutosh.nehete 2025-05-22 20:27:13 +05:30
• 9af27770f5 Implemented an API to update Buckets for grouping contacts. Ashutosh_Task#250_Update_Bucket ashutosh.nehete 2025-05-22 19:48:45 +05:30
• e0af0b5ba3 Merge pull request 'Implemented filtering functionality for Get Contact List API' (#67) from AshutoshEnhancement#332_Added_Filter_To_Contact_List into Feature_Directory Vikas Nale 2025-05-22 13:19:27 +00:00
• 23e8eedf17 Implemented filtering functionality for Get Contact List API AshutoshEnhancement#332_Added_Filter_To_Contact_List ashutosh.nehete 2025-05-22 17:26:51 +05:30
• f6027131e3 Merge pull request 'Implemented an API to suspend a Contact' (#66) from Ashutosh_Task#263_Delete_Contact into Feature_Directory Vikas Nale 2025-05-22 06:13:50 +00:00
• bb561187fb Update Marco.Pms.Services/Helpers/DirectoryHelper.cs ashutosh.nehete 2025-05-21 13:05:08 +00:00
• fe5e58dce0 Implemented an API to suspend a Contact ashutosh.nehete 2025-05-21 17:29:20 +05:30
• 472cca4e0a Merge pull request 'created api for contact Tag Update' (#65) from pramod_Task-#237_Update_Contact_Tag into Feature_Directory Vikas Nale 2025-05-22 06:13:09 +00:00
• 9224aca3ff created api for contact Tag Update Pramod Mahajan 2025-05-20 10:00:57 +05:30
• 99dc95d4dc Update Marco.Pms.Services/Helpers/DirectoryHelper.cs Ashutosh_Task#263_Delete_Contact ashutosh.nehete 2025-05-21 13:05:08 +00:00
• ee3b06852a Implemented an API to suspend a Contact ashutosh.nehete 2025-05-21 17:29:20 +05:30
• a68e1ab74b Merge pull request 'Implemented an API to retrieve a list of organizations provided in the contacts.' (#64) from Ashutosh_Task#317_Get_Organization_List into Feature_Directory Vikas Nale 2025-05-21 07:43:24 +00:00
• 9fbf55eeb5 Implemented an API to retrieve a list of organizations provided in the contacts. Ashutosh_Task#317_Get_Organization_List ashutosh.nehete 2025-05-21 10:28:17 +05:30
• d1b899f846 Merge pull request 'Created an API to get contact profile by its Id' (#63) from Ashutosh_Task#230_Get_Contact_By_Id into Feature_Directory Vikas Nale 2025-05-20 08:17:43 +00:00
• d8d234a838 changed all list in contact profile view model to non-nullable and set default value to empty list Ashutosh_Task#230_Get_Contact_By_Id ashutosh.nehete 2025-05-20 12:38:09 +05:30
• 55d3cb04b1 created api for contact Tag Update pramod_Task-#237_Update_Contact_Tag Pramod Mahajan 2025-05-20 10:00:57 +05:30
• 6eea98c5a1 Created an API to get contact profile by its Id ashutosh.nehete 2025-05-20 09:46:03 +05:30
• 68c393c05d Add template for project status report Vikas Nale 2025-05-19 16:49:26 +05:30
• 4e3d981beb Merge pull request 'Moved variable configuration to development and production appsettings' (#62) from Ashutosh_AppSettings_Changes into Issue_May_3W Issue_May_3W Vikas Nale 2025-05-19 09:47:43 +00:00
• 5693bbba17 Changed tag validation ashutosh.nehete 2025-05-19 13:18:32 +05:30
• 7833d79541 MOved variable configuration to development and production appsettings Ashutosh_AppSettings_Changes ashutosh.nehete 2025-05-19 12:44:48 +05:30
• 9767390636 Addd migrations fro Typo ashutosh.nehete 2025-05-19 11:09:30 +05:30
• 24d2cbbfce Corrected the typo of ContactTagtId to ContactTagId ashutosh.nehete 2025-05-19 10:57:17 +05:30
• 9f311237a9 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Directory ashutosh.nehete 2025-05-17 18:35:40 +05:30
• 6d38e005bc Added an API to add a note to specific contact ashutosh.nehete 2025-05-17 16:45:43 +05:30
• 37eba7a47f Added an API to suspend a n existing Contact-note ashutosh.nehete 2025-05-17 16:45:10 +05:30
• 1be23802c7 Added an API to Update existing Contact-note ashutosh.nehete 2025-05-17 16:44:24 +05:30
• 0685a12c62 Added an API to get contact category by its size ashutosh.nehete 2025-05-17 16:24:01 +05:30
• 18067732ed added an API to get a list of contact-notes by contact ID ashutosh.nehete 2025-05-17 16:13:35 +05:30
• c16f9a08d9 Added an API to deleted ContactTag as well remove entries in contact-tag mapping table related to that tag ashutosh.nehete 2025-05-17 14:33:14 +05:30
• c330023ee7 Added functionality to stop recreating tas of same name ashutosh.nehete 2025-05-17 13:31:35 +05:30
• 8288a19dd8 properly mapped the updated Dto to contact table ashutosh.nehete 2025-05-17 12:41:02 +05:30
• 8c938b545e Refetched the contact in update contact API ashutosh.nehete 2025-05-17 12:28:54 +05:30
• 38e5ad664e added an API to get list of contacts by bucket id and added project- contact mapping table ashutosh.nehete 2025-05-17 12:09:54 +05:30
• 54d6d5f1bd Added an API to delete existing contact category ashutosh.nehete 2025-05-17 12:15:23 +05:30
• 326ceecdbf Revert "added an API to get list of contacts by bucket id and added project- contact mapping table" ashutosh.nehete 2025-05-17 11:53:48 +05:30
• e78cc74246 added an API to get list of contacts by bucket id and added project- contact mapping table ashutosh.nehete 2025-05-17 11:52:45 +05:30
• b50cda12b8 When checking in exsiting tag change Id from mapping Id to Tag ID ashutosh.nehete 2025-05-16 15:13:29 +05:30
• ccf339ca0b Added an API to create bucket ashutosh.nehete 2025-05-15 22:23:08 +05:30
• 22be364a0a Fixed the errorof finding tag in wrong table ashutosh.nehete 2025-05-15 22:38:24 +05:30
• d86a85389e Added an API to create a contact tag ashutosh.nehete 2025-05-15 22:30:29 +05:30
• ccd28908d0 Added an API to Get a list of buckets Assigned to that employee ashutosh.nehete 2025-05-15 19:26:55 +05:30
• c803a570c4 added api to get list of contact tag Pramod Mahajan 2025-05-15 18:52:43 +05:30
• 711b47ddf4 Added an API to update existing contact ashutosh.nehete 2025-05-15 18:36:44 +05:30
• c2223e4029 Created an endpoint to fetch list of all contact category in that tenant ashutosh.nehete 2025-05-15 14:59:30 +05:30
• 84cfdc29b2 Created an API to create the Contact category ashutosh.nehete 2025-05-15 12:51:23 +05:30
• dac586f498 Added logs to the 'Get List of Contacts' endpoint. ashutosh.nehete 2025-05-15 11:38:31 +05:30
• dbaabb1728 Added an API to create contact and populate related tables as well ashutosh.nehete 2025-05-15 10:52:04 +05:30
• 78f95d6f81 Added an API to create contact and populate related tables as well ashutosh.nehete 2025-05-15 10:52:04 +05:30
• 13d6bf94d9 created GetListOfContact custome function Pramod Mahajan 2025-05-15 11:06:46 +05:30
• e3dfcb4ee0 Added DirectoryHelper in helper folder ashutosh.nehete 2025-05-14 17:51:57 +05:30
• 7c37007a07 Added Migration for contact related tables ashutosh.nehete 2025-05-14 16:10:07 +05:30
• c2c486a11d An API skeleton has been added. ashutosh.nehete 2025-05-14 15:44:30 +05:30
• 109c8bbb81 Added Directory controller file ashutosh.nehete 2025-05-14 15:38:47 +05:30
• d4d1a13228 Models, DTOs (Data Transfer Objects), and view models have been created for the directory. ashutosh.nehete 2025-05-14 15:27:36 +05:30
• c5ef5e5d7c revert c7e89630eb494454c1322bdf4cf29ab076af7b86 ashutosh.nehete 2025-05-14 09:51:01 +00:00
• a4b1a25ced Models, DTOs (Data Transfer Objects), and view models have been created for the directory. ashutosh.nehete 2025-05-14 15:17:05 +05:30
• c0336513c4 Merge pull request 'Ashutosh_Contact_Note_CRUD' (#61) from Ashutosh_Contact_Note_CRUD into Feature_Directory Gitea Admin 2025-05-17 11:18:02 +00:00
• 077af5ac59 Added an API to add a note to specific contact Ashutosh_Contact_Note_CRUD ashutosh.nehete 2025-05-17 16:45:43 +05:30
• 651785720f Added an API to suspend a n existing Contact-note ashutosh.nehete 2025-05-17 16:45:10 +05:30
• 948457a83f Added an API to Update existing Contact-note ashutosh.nehete 2025-05-17 16:44:24 +05:30
• 824dd45d4c Merge pull request 'Added an API to get contact category by its id' (#60) from Ashutosh_Task#234_Get_COntact_Category_By_Id into Feature_Directory Gitea Admin 2025-05-17 11:03:01 +00:00
• 37f0606bb0 Added an API to get contact category by its size ashutosh.nehete 2025-05-17 16:24:01 +05:30
• 05dd8680da Merge pull request 'added an API to get a list of contact-notes by contact ID' (#59) from Ashutosh_Task#246_Get_Note_List_By_ContactID into Feature_Directory Gitea Admin 2025-05-17 11:02:34 +00:00
• 20a5cf060f Added an API to get contact category by its size Ashutosh_Task#234_Get_COntact_Category_By_Id ashutosh.nehete 2025-05-17 16:24:01 +05:30
• b0758a58ae added an API to get a list of contact-notes by contact ID Ashutosh_Task#246_Get_Note_List_By_ContactID ashutosh.nehete 2025-05-17 16:13:35 +05:30
• 64e4525fcf Merge pull request 'Added an API to deleted ContactTag as well remove entries in contact-tag mapping table related to that tag' (#58) from Ashutosh_Task#266_Delete_Contact_Tag into Feature_Directory Gitea Admin 2025-05-17 09:48:06 +00:00
• cbddc5c9ce Added an API to deleted ContactTag as well remove entries in contact-tag mapping table related to that tag ashutosh.nehete 2025-05-17 14:33:14 +05:30
• e97a83e7c0 Merge pull request 'added an API to get list of contacts by bucket id and added project- contact mapping table' (#56) from Ashutosh_Task#231_Get_Contact_By_BucketId into Feature_Directory Gitea Admin 2025-05-17 09:47:42 +00:00
• 1305742055 Added functionality to stop recreating tas of same name ashutosh.nehete 2025-05-17 13:31:35 +05:30
• 895f22c62a properly mapped the updated Dto to contact table ashutosh.nehete 2025-05-17 12:41:02 +05:30
• f836f0dfb8 Refetched the contact in update contact API ashutosh.nehete 2025-05-17 12:28:54 +05:30
• 823da8d2cb added an API to get list of contacts by bucket id and added project- contact mapping table ashutosh.nehete 2025-05-17 12:09:54 +05:30
• cc8f7a339b Added an API to deleted ContactTag as well remove entries in contact-tag mapping table related to that tag Ashutosh_Task#266_Delete_Contact_Tag ashutosh.nehete 2025-05-17 14:33:14 +05:30
• 1d03ff0e09 Merge pull request 'Added an API to delete existing contact category' (#57) from Ashtush_Task#265_Delete_Contact_Category into Feature_Directory Gitea Admin 2025-05-17 08:52:12 +00:00
• a5aab4fd18 Added functionality to stop recreating tas of same name Ashutosh_Task#231_Get_Contact_By_BucketId ashutosh.nehete 2025-05-17 13:31:35 +05:30
• 2a282c0fdf properly mapped the updated Dto to contact table ashutosh.nehete 2025-05-17 12:41:02 +05:30
• db544239ea Refetched the contact in update contact API ashutosh.nehete 2025-05-17 12:28:54 +05:30