OrderRequestHRDto

MTWorkHR.API/Program.cs

@@ -41,7 +41,7 @@ var config = new AppSettingsConfiguration();
 // Add services to the container.
 builder.Services.AddDbContext<HRDataContext>(options =>
 {
-    options.UseSqlServer(config.ConnectionStrings.MTWorkHRConnectionString);
+    options.UseSqlServer(config.ConnectionStrings.LocalConnectionString);
     //  options.UseSqlServer(builder.Configuration.GetSection("ConnectionStrings:MTWorkHRConnectionString").Value);
 });
 

MTWorkHR.Application/Dtos/Attendance/OrderRequestHRDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MTWorkHR.Application.Models;
+using MTWorkHR.Core.Entities;
+using MTWorkHR.Core.Entities.Base;
+using MTWorkHR.Core.Global;
+
+namespace MTWorkHR.Application.Models
+{
+    public class OrderRequestHRDto : EntityDto
+    {
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+        public int OrderTypeId { get; set; }
+        public int? LeaveTypeId { get; set; }
+        public string? RequestComments { get; set; }
+        public ApprovalStatusEnum OrderStatus { get; set; }
+        public string? OrderTypeName { get; set; }
+        public string? LeaveTypeName { get; set; }
+
+    }
+}

MTWorkHR.Application/Dtos/Contract/ContractHRDto.cs

@@ -69,7 +69,7 @@ namespace MTWorkHR.Application.Models
 
         //__________________HR data_________-
         public List<TeamDto>? TeamList { get; set; }
-        public List<OrderRequestDto>? OrderList { get; set; }
+        public List<OrderRequestHRDto>? OrderList { get; set; }
         //-------------------------------
         public List<ContractTaskDto>? ContractTasks { get; set; }
         public List<ProjectStageDto>? ProjectStages { get; set; }

MTWorkHR.Application/Mapper/MappingProfile.cs

@@ -111,6 +111,9 @@ namespace MTWorkHR.Application.Mapper
             CreateMap<AttendanceDto, Attendance>().ForMember(d => d.CreateDate, o => o.Ignore());
             CreateMap<OrderAllocation, OrderAllocationDto>().ReverseMap().ForMember(d => d.CreateDate, o => o.Ignore());
             CreateMap<OrderRequest, OrderRequestDto>().ReverseMap().ForMember(d => d.CreateDate, o => o.Ignore());
+            CreateMap<OrderRequest, OrderRequestHRDto>().ForMember(d => d.LeaveTypeName, o=> o.MapFrom(s=> s.LeaveType != null ? GlobalInfo.lang == "ar" ? s.LeaveType.NameAr: s.LeaveType.NameEn:""))
+                .ForMember(d => d.OrderTypeName, o => o.MapFrom(s => s.OrderType != null ? GlobalInfo.lang == "ar" ? s.OrderType.NameAr : s.OrderType.NameEn:""));
+            
             CreateMap<OrderType, OrderTypeDto>().ReverseMap();
             CreateMap<LeaveType, LeaveTypeDto>().ReverseMap();
             CreateMap<CompanyDto, Company>().ForMember(d => d.CreateDate, o => o.Ignore()).ForMember(d => d.CreateUser, o => o.Ignore());

MTWorkHR.Application/Services/Contract/ContractService.cs

@@ -231,7 +231,8 @@ namespace MTWorkHR.Application.Services
                 response.SpentVacations = entity.VacationDays - response.RestVacations;
                 //__-----------Order Requests----
                 var orderRequestsList = await _unitOfWork.OrderRequest.GetAllUserOrdersAsync(entity.UserId, contractId);
-                var orderList = MapperObject.Mapper.Map<List<OrderRequestDto>>(orderRequestsList.Item1);
+                var vacationsList = orderRequestsList.Item1.Where(o => o.OrderStatus == ApprovalStatusEnum.Approved && o.OrderTypeId == 1 && (o.LeaveTypeId == 1 || o.LeaveTypeId == 2));
+                var orderList = MapperObject.Mapper.Map<List<OrderRequestHRDto>>(vacationsList);
                 response.OrderList = orderList;
                 /////------------------------
                 var invoiceList = await _unitOfWork.Invoice.GetAllUserInvoices(contractId);

MTWorkHR.Infrastructure/InfrastructureServiceRegistration.cs

@@ -32,7 +32,7 @@ namespace MTWorkHR.Infrastructure
             
             services.AddDbContext<HRDataContext>(options =>
                 options.UseSqlServer(
-                    config.ConnectionStrings.MTWorkHRConnectionString  //configuration.GetSection("ConnectionString:MTWorkHRConnectionString").Value
+                    config.ConnectionStrings.LocalConnectionString  //configuration.GetSection("ConnectionString:MTWorkHRConnectionString").Value
                     ));
            
             services.AddIdentity<ApplicationUser, ApplicationRole>().AddEntityFrameworkStores<HRDataContext>().AddDefaultTokenProviders();