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

Merge branch 'develop' into dev

Browse source 
* develop:
  fix download report error
  build reload image
This commit is contained in:
Warunee Tamkoo 2025-11-04 09:04:36 +07:00
commit 486cd2fd40
5 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/discord-notify.yml vendored Normal file
View file

@ -0,0 +1,22 @@
name: Discord PR Notify
on:
pull_request:
types: [opened]
jobs:
discord:
runs-on: ubuntu-latest
steps:
- name: Send Discord
run: |
curl -X POST "${{ secrets.DISCORD_WEBHOOK_PULLREQUEST }}" \
-H "Content-Type: application/json" \
-d '{
"embeds": [{
"title": "🔔 **Service:** ${{ github.repository }}",
"description": "👤 **Author:** ${{ github.event.pull_request.user.login }}\n🌿 **Branch:** ${{ github.event.pull_request.head.ref }} → ${{ github.event.pull_request.base.ref }}\n📦 **Pull Request:** [#${{ github.event.pull_request.number }} - ${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})",
"color": 5814783,
"timestamp": "${{ github.event.pull_request.created_at }}"
}]
}'

4
Controllers/ExamReportController.cs
View file

@ -230,7 +230,9 @@ namespace BMA.EHR.Report.Service.Controllers
CitizenId = p.CitizenId == null ? "-" : (p.CitizenId),
p.Prefix,
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
DateOfBirth = (p.DateOfBirth.ToThaiShortDate()),
DateOfBirth = p.DateOfBirth.HasValue && p.DateOfBirth.Value != DateTime.MinValue
? p.DateOfBirth.Value.ToThaiShortDate()
: "",
Gender = p.Gendor,
Degree = p.Educations.First().Degree,
Major = p.Educations.First().Major,

4
Controllers/RecruitReportController.cs
View file

@ -192,7 +192,9 @@ namespace BMA.EHR.Report.Service.Controllers
CitizenId = p.CitizenId,
p.Prefix,
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
DateOfBirth = p.DateOfBirth.ToThaiShortDate(),
DateOfBirth = p.DateOfBirth.HasValue && p.DateOfBirth.Value != DateTime.MinValue
? p.DateOfBirth.Value.ToThaiShortDate()
: "",
Gender = p.Gendor,
Degree = p.Educations.First().Degree,
Major = p.Educations.First().Major,

8
Models/Exam/Disable/Disable.cs
View file

@ -35,7 +35,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables
public string Religion { get; set; } = string.Empty;
[Required]
public DateTime DateOfBirth { get; set; }
public DateTime? DateOfBirth { get; set; }
[MaxLength(20)]
public string Marry { get; set; } = string.Empty;
@ -49,7 +49,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables
[MaxLength(200)]
public string CitizenCardIssuer { get; set; } = string.Empty;
public DateTime CitizenCardExpireDate { get; set; }
public DateTime? CitizenCardExpireDate { get; set; }
[MaxLength(200)]
public string Remark { get; set; } = string.Empty;
@ -73,9 +73,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables
public DateTime CreatedDate { get; set; } = DateTime.Now;
public DateTime ModifiedDate { get; set; }
public DateTime? ModifiedDate { get; set; }
public DateTime ApplyDate { get; set; }
public DateTime? ApplyDate { get; set; }
public string? PositionName { get; set; }
public string? PositionType { get; set; }

8
Models/Recruits/Recruit.cs
View file

@ -35,7 +35,7 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits
public string Religion { get; set; } = string.Empty;
[Required]
public DateTime DateOfBirth { get; set; }
public DateTime? DateOfBirth { get; set; }
[MaxLength(20)]
public string Marry { get; set; } = string.Empty;
@ -49,7 +49,7 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits
[MaxLength(200)]
public string CitizenCardIssuer { get; set; } = string.Empty;
public DateTime CitizenCardExpireDate { get; set; }
public DateTime? CitizenCardExpireDate { get; set; }
[MaxLength(200)]
public string Remark { get; set; } = string.Empty;
@ -73,9 +73,9 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits
public DateTime CreatedDate { get; set; } = DateTime.Now;
public DateTime ModifiedDate { get; set; }
public DateTime? ModifiedDate { get; set; }
public DateTime ApplyDate { get; set; }
public DateTime? ApplyDate { get; set; }
public string? PositionName { get; set; }
public string? PositionType { get; set; }