hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
Kittapath 2024-06-25 09:49:16 +07:00
commit 41474b407d
29 changed files with 39708 additions and 3703 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Domain/Models/HR/ProfileInsignia.cs
View file

@ -35,7 +35,9 @@ namespace BMA.EHR.Domain.Models.HR
[Comment("เอกสารอ้างอิง (ลงวันที่)")]
public DateTime? RefCommandDate { get; set; }
public virtual List<ProfileInsigniaHistory> ProfileInsigniaHistorys { get; set; } = new List<ProfileInsigniaHistory>();
public virtual Profile? Profile { get; set; }
//public virtual Profile? Profile { get; set; }
public Guid ProfileId { get; set; } // link to profile
[Comment("หมายเหตุ")]
public string? Note { get; set; }

13
BMA.EHR.Domain/Models/Insignias/InsigniaManageOrganiation.cs
View file

@ -1,9 +1,5 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using BMA.EHR.Domain.Models.Base;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Documents;
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Domain.Models.Base;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Domain.Models.Insignias
{
@ -11,8 +7,9 @@ namespace BMA.EHR.Domain.Models.Insignias
{
[Comment("จำนวนทั้งหมด")]
public int Total { get; set; }
[Comment("Fk Table OrganizationOrganization")]
public OrganizationOrganization OrganizationOrganization { get; set; }
[Comment("รหัสหน่วยงาน")]
public Guid OrganizationId { get; set; }
//public OrganizationOrganization OrganizationOrganization { get; set; }
[Comment("Fk Table InsigniaManage")]
public InsigniaManage InsigniaManage { get; set; }
public virtual List<InsigniaManageProfile> InsigniaManageProfiles { get; set; } = new List<InsigniaManageProfile>();

13
BMA.EHR.Domain/Models/Insignias/InsigniaManageProfile.cs
View file

@ -11,18 +11,27 @@ namespace BMA.EHR.Domain.Models.Insignias
{
[Comment("สถานะการคืน")]
public bool Status { get; set; }
[Comment("ยืมวันที่")]
public DateTime? BorrowDate { get; set; }
[Comment("Fk Table OrganizationOrganization Borrow")]
public OrganizationOrganization? BorrowOrganization { get; set; }
//public OrganizationOrganization? BorrowOrganization { get; set; }
public Guid? BorrowOrganizationId { get; set; }
[Comment("คืนวันที่")]
public DateTime? ReturnDate { get; set; }
[Comment("Fk Table OrganizationOrganization Return")]
public OrganizationOrganization? ReturnOrganization { get; set; }
//public OrganizationOrganization? ReturnOrganization { get; set; }
public Guid? ReturnOrganizationId { get; set; }
[Comment("เหตุผลคืน")]
public string? ReturnReason { get; set; }
[Comment("Fk Table InsigniaNoteProfile")]
public InsigniaNoteProfile InsigniaNoteProfile { get; set; }
[Comment("Fk Table InsigniaManageOrganiation")]
public InsigniaManageOrganiation InsigniaManageOrganiation { get; set; }
}

6
BMA.EHR.Domain/Models/Insignias/InsigniaNoteProfile.cs
View file

@ -54,7 +54,11 @@ namespace BMA.EHR.Domain.Models.Insignias
public Document? DocReturnInsignia { get; set; }
[Comment("หน่วยงานคืนเครื่องราชฯ")]
public OrganizationEntity? OrgReturnInsignia { get; set; }
public Profile Profile { get; set; }
public Guid? ProfileId { get; set; }
//public Profile Profile { get; set; }
public Insignia RequestInsignia { get; set; }
public InsigniaNote InsigniaNote { get; set; }
}

5
BMA.EHR.Domain/Models/Insignias/InsigniaRequest.cs
View file

@ -18,8 +18,9 @@ namespace BMA.EHR.Domain.Models.Insignias
public InsigniaPeriod Period { get; set; }
public OrganizationEntity Organization { get; set; }
[Comment("Fk Id Document")]
//public OrganizationEntity Organization { get; set; }
public Guid OrganizationId { get; set; }
public Document? Document { get; set; }
public virtual List<InsigniaRequestProfile> RequestProfiles { get; set; } = new List<InsigniaRequestProfile>();

4
BMA.EHR.Domain/Models/Insignias/InsigniaRequestProfile.cs
View file

@ -49,7 +49,9 @@ namespace BMA.EHR.Domain.Models.Insignias
[Comment("แจ้งเตือน ผลการประเมินการปฏิบัติราชการในรอบ 5 ปี ต่ำกว่าระดับดี (น้อยกว่าร้อยละ 70)")]
public bool? MarkRate { get; set; } = false;
public Profile Profile { get; set; }
//public Profile Profile { get; set; }
public Guid ProfileId { get; set; }
public Insignia RequestInsignia { get; set; }

3
BMA.EHR.Domain/Models/Organizations/ProfilePosition.cs
View file

@ -10,7 +10,8 @@ namespace BMA.EHR.Domain.Models.Organizations
{
public OrganizationPositionEntity? OrganizationPosition { get; set; }
public Profile? Profile { get; set; }
public Profile? Profile { get; set; }
public bool IsActive { get; set; } = true;
public bool IsPublished { get; set; } = true;
}