admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Activity_Hierarchy #94

Open
ashutosh.nehete wants to merge 15 commits from Activity_Hierarchy into main
pull from: Activity_Hierarchy
merge into: admin:main
Conversation 0 Commits 15 Files Changed 19 +9408 -153
ashutosh.nehete commented 2025-06-27 06:38:49 +00:00
Collaborator
Copy Link

This pull request includes the complete implementation of the Activity Hierarchy within the Master module only.

This pull request includes the complete implementation of the Activity Hierarchy within the Master module only.
ashutosh.nehete added 5 commits 2025-06-27 06:38:49 +00:00
ashutosh.nehete added 6 commits 2025-07-01 10:29:38 +00:00
ashutosh.nehete added 1 commit 2025-07-31 06:04:40 +00:00
ashutosh.nehete added 1 commit 2025-07-31 06:09:15 +00:00
ashutosh.nehete added 1 commit 2025-08-22 05:43:11 +00:00
ashutosh.nehete added 1 commit 2025-08-22 06:00:42 +00:00
This pull request has changes conflicting with the target branch.
  • Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
  • Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
  • Marco.Pms.Model/Dtos/Activities/CreateActivityMasterDto.cs
  • Marco.Pms.Model/Dtos/Master/ActivityGroupDto.cs
  • Marco.Pms.Model/Dtos/Master/ServiceMasterDto.cs
  • Marco.Pms.Model/Master/ActivityGroupMaster.cs
  • Marco.Pms.Model/Master/ActivityMaster.cs
  • Marco.Pms.Model/ViewModels/Master/ActivityGroupMasterVM.cs
  • Marco.Pms.Services/Controllers/MasterController.cs
  • Marco.Pms.Services/Helpers/MasterHelper.cs
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Activity_Hierarchy:Activity_Hierarchy
git checkout Activity_Hierarchy
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ashutosh.nehete kartik.sharma pooja.mali pramod.mahajan umesh.desai vaibhav.surve vikas.nale admin
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: admin/marco.pms.api#94
No description provided.
Delete Branch "Activity_Hierarchy"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?