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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-09-08 15:46:10 +07:00
commit 866a47d58e
28 changed files with 33270 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

31
BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
View file

@ -54,29 +54,26 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
}
}
public async Task PushNotificationAsync(Guid ReceiverUserId, string Subject, string Body, bool IsSendNotification = true, bool IsSendInbox = false, bool IsSendMail = false)
public async Task PushNotificationAsync(Guid ReceiverUserId, string Subject, string Body, string Payload = "", bool IsSendInbox = false, bool IsSendMail = false)
{
try
{
var profile = await _dbContext.Set<Profile>().FirstOrDefaultAsync(x => x.Id == ReceiverUserId);
if (profile != null)
{
if (IsSendNotification == true)
_dbContext.Set<Notification>().Add(new Notification
{
_dbContext.Set<Notification>().Add(new Notification
{
Body = Body,
ReceiverUserId = ReceiverUserId,
Type = "",
Payload = "",
CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
}
Body = Body,
ReceiverUserId = ReceiverUserId,
Type = "",
Payload = Payload,
CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
if (IsSendInbox == true)
{
_dbContext.Set<Inbox>().Add(new Inbox
@ -84,7 +81,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
Subject = Subject,
Body = Body,
ReceiverUserId = ReceiverUserId,
Payload = "",
Payload = Payload,
CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now,

58
BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
View file

@ -7,7 +7,9 @@ using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using System.Configuration;
using System.Net.Http.Headers;
using BMA.EHR.Application.Responses;
using BMA.EHR.Application.Responses;
using BMA.EHR.Application.Repositories.MessageQueue;
using BMA.EHR.Domain.Models.Probation;
namespace BMA.EHR.Application.Repositories.Reports
{
@ -17,22 +19,25 @@ namespace BMA.EHR.Application.Repositories.Reports
private readonly IApplicationDBContext _dbContext;
private readonly IWebHostEnvironment _hostingEnvironment;
private readonly NotificationRepository _repositoryNoti;
#endregion
#region " Constructor and Destructor "
public ProbationReportRepository(IApplicationDBContext dbContext, IWebHostEnvironment hostEnvironment)
public ProbationReportRepository(IApplicationDBContext dbContext,
NotificationRepository repositoryNoti,
IWebHostEnvironment hostEnvironment)
{
_dbContext = dbContext;
_hostingEnvironment = hostEnvironment;
_repositoryNoti = repositoryNoti;
}
#endregion
#region " Methods "
#region แบบมอบหมายงาน ฯ
public async Task<object> GetProbationAssignAsync(Guid assign_id, string token)
{
@ -46,18 +51,18 @@ namespace BMA.EHR.Application.Repositories.Reports
var result = await res.Content.ReadAsStringAsync();
probation_assign = JsonConvert.DeserializeObject<ProbationAssignResponse>(result);
if(probation_assign.data != null)
if (probation_assign.data != null)
{
//Profile ผู้ทดลองงาน
string[] date_start_parts = string.IsNullOrEmpty(probation_assign.data.assign.date_start) ? null : probation_assign.data.assign.date_start.Split('-');
string[] date_finish_parts = string.IsNullOrEmpty(probation_assign.data.assign.date_finish) ? null : probation_assign.data.assign.date_finish.Split('-');
//Mentors
string[] date_mentor1_parts = probation_assign.data.mentors.Count > 0 ? probation_assign.data.mentors[0].dated.Split('-') : null ;
string[] date_mentor1_parts = probation_assign.data.mentors.Count > 0 ? probation_assign.data.mentors[0].dated.Split('-') : null;
string[] date_mentor2_parts = probation_assign.data.mentors.Count > 1 ? probation_assign.data.mentors[1].dated.Split('-') : null;
//Commander
string[] date_commander_parts = string.IsNullOrEmpty(probation_assign.data.commander.dated) ? null : probation_assign.data.commander.dated.Split('-');
return new
return new
{
Name = string.IsNullOrEmpty(probation_assign.data.profile.name) ? string.Empty : probation_assign.data.profile.name,
Position = string.IsNullOrEmpty(probation_assign.data.profile.Position) ? string.Empty : probation_assign.data.profile.Position,
@ -72,7 +77,7 @@ namespace BMA.EHR.Application.Repositories.Reports
NameMentor2 = string.IsNullOrEmpty(probation_assign.data.mentors[1].name) ? string.Empty : probation_assign.data.mentors[1].name,
DateMentor2 = string.IsNullOrEmpty(date_mentor2_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_mentor2_parts[0], date_mentor2_parts[1], date_mentor2_parts[2]),
PositionMentor2 = string.IsNullOrEmpty(probation_assign.data.mentors[1].Position) ? string.Empty : probation_assign.data.mentors[1].Position,
NameCommander = string.IsNullOrEmpty(probation_assign.data.commander.name) ? string.Empty : probation_assign.data.commander.name,
NameCommander = string.IsNullOrEmpty(probation_assign.data.commander.name) ? string.Empty : probation_assign.data.commander.name,
DateCommander = string.IsNullOrEmpty(date_commander_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_commander_parts[0], date_commander_parts[1], date_commander_parts[2]),
PositionCommander = string.IsNullOrEmpty(probation_assign.data.commander.Position) ? string.Empty : probation_assign.data.commander.Position,
Jobs = probation_assign.data.jobs.ToList(),
@ -118,14 +123,14 @@ namespace BMA.EHR.Application.Repositories.Reports
string[] achievement_improve_desc = new string[evaluate_record.data.evaluate.Count];
string[] behavior_strength_desc = new string[evaluate_record.data.evaluate.Count];
string[] behavior_improve_desc = new string[evaluate_record.data.evaluate.Count];
foreach (var evaluate in evaluate_record.data.evaluate)
foreach (var evaluate in evaluate_record.data.evaluate)
{
int inx = 0;
evaluate.no = !string.IsNullOrEmpty(evaluate.no) ? evaluate.no.ToThaiNumber() : null;
date_start_round_parts = !string.IsNullOrEmpty(evaluate.date_start) ? evaluate.date_start.Split('-') : null;
evaluate.date_start = ConvertDateMonthYear(date_start_round_parts[0], date_start_round_parts[1], date_start_round_parts[2]);
date_finish_round_parts = !string.IsNullOrEmpty(evaluate.date_finish) ? evaluate.date_finish.Split('-') : null;
evaluate.date_finish = ConvertDateMonthYear(date_finish_round_parts[0], date_finish_round_parts[1], date_finish_round_parts[2]);
evaluate.date_finish = ConvertDateMonthYear(date_finish_round_parts[0], date_finish_round_parts[1], date_finish_round_parts[2]);
achievement_strength_desc[inx] = !string.IsNullOrEmpty(evaluate.achievement_strength_desc) ? evaluate.achievement_strength_desc : string.Empty;
achievement_improve_desc[inx] = !string.IsNullOrEmpty(evaluate.achievement_improve_desc) ? evaluate.achievement_improve_desc : string.Empty;
behavior_strength_desc[inx] = !string.IsNullOrEmpty(evaluate.behavior_strength_desc) ? evaluate.behavior_strength_desc : string.Empty;
@ -195,7 +200,8 @@ namespace BMA.EHR.Application.Repositories.Reports
string[] evaluate_assessor_dated = evaluate_assign.data.evaluate.commander_dated.Split('-');
return new {
return new
{
No = evaluate_assign.data.evaluate.no,
EvaluateDateStart = ConvertDateMonthYear(evaluate_date_start_parts[0], evaluate_date_start_parts[1], evaluate_date_start_parts[2]),
EvaluateDateFinish = ConvertDateMonthYear(evaluate_date_finish_parts[0], evaluate_date_finish_parts[1], evaluate_date_finish_parts[2]),
@ -207,7 +213,7 @@ namespace BMA.EHR.Application.Repositories.Reports
DateStart = ConvertDateMonthYear(date_start_parts[0], date_start_parts[1], date_start_parts[2]),
DateFinish = ConvertDateMonthYear(date_finish_parts[0], date_finish_parts[1], date_finish_parts[2]),
//table1 ผลสัมฤทธิ์
KnowledgeLevel1 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "1" ? "/": string.Empty,
KnowledgeLevel1 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "1" ? "/" : string.Empty,
KnowledgeLevel2 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "2" ? "/" : string.Empty,
KnowledgeLevel3 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "3" ? "/" : string.Empty,
KnowledgeLevel4 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "4" ? "/" : string.Empty,
@ -451,7 +457,7 @@ namespace BMA.EHR.Application.Repositories.Reports
string[] evaluate_date_finish_parts = evaluate_assign.data.evaluate.date_finish.Split('-');
DateTime currentDate = DateTime.Now;
string[] date_curent_parts = currentDate.ToString("yyyy-MM-dd").Split('-');
if(string.IsNullOrEmpty(evaluate_assign.data.chairman.Position))
if (string.IsNullOrEmpty(evaluate_assign.data.chairman.Position))
{
evaluate_assign.data.chairman.Position = string.Empty;
}
@ -490,12 +496,34 @@ namespace BMA.EHR.Application.Repositories.Reports
{
year = year.ToInteger().ToThaiYear().ToString().ToThaiNumber();
month = month.ToInteger().ToThaiMonth();
date = date.StartsWith("0") ? date.Substring(1).ToThaiNumber(): date.ToThaiNumber();
date = date.StartsWith("0") ? date.Substring(1).ToThaiNumber() : date.ToThaiNumber();
return $"วันที่ {date} เดือน {month} พ.ศ. {year}";
}
#endregion
#endregion
public async Task NotifyProbation()
{
var cronjobNotis = await _dbContext.Set<CronjobNotiProbation>()
.AsQueryable()
.ToListAsync();
foreach (var cronjobNoti in cronjobNotis)
{
if (cronjobNoti.ReceiveDate.Date == DateTime.Now.Date && cronjobNoti.IsSendNoti == false)
{
await _repositoryNoti.PushNotificationAsync(
cronjobNoti.ReceiverUserId,
cronjobNoti.Subject,
cronjobNoti.Body,
cronjobNoti.Payload,
cronjobNoti.IsSendInbox,
cronjobNoti.IsSendMail
);
cronjobNoti.IsSendNoti = true;
}
}
await _dbContext.SaveChangesAsync();
}
}
}

38
BMA.EHR.Domain/Models/Probation/CronjobNotiProbation.cs Normal file
View file

@ -0,0 +1,38 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Domain.Models.Organizations;
using BMA.EHR.Domain.Models.Documents;
using BMA.EHR.Domain.Models.HR;
using System.ComponentModel.DataAnnotations.Schema;
namespace BMA.EHR.Domain.Models.Probation
{
public class CronjobNotiProbation : EntityBase
{
[Required, MaxLength(200), Comment("หัวเรื่อง")]
public string Subject { get; set; }
[Required, Column(TypeName = "text"), Comment("รายละเอียดข้อความ")]
public string Body { get; set; }
[Required, Comment("รหัสผู้รับข้อความ")]
public Guid ReceiverUserId { get; set; }
[Column(TypeName = "text"), Comment("สิงที่แนบมาด้วย")]
public string Payload { get; set; } = "";
[Required, Comment("ส่งอีเมล์หรือไม่?")]
public bool IsSendMail { get; set; } = false;
[Required, Comment("ส่งกล่องข้อความหรือไม่?")]
public bool IsSendInbox { get; set; } = false;
[Required, Comment("ส่งการแจ้งเตือนหรือยัง")]
public bool IsSendNoti { get; set; } = false;
[Required, Comment("วันที่ได้รับ")]
public DateTime ReceiveDate { get; set; } = DateTime.Now;
}
}

16267
BMA.EHR.Infrastructure/Migrations/20230908074108_add table cronjobprobation.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

186
BMA.EHR.Infrastructure/Migrations/20230908074108_add table cronjobprobation.cs Normal file
View file

@ -0,0 +1,186 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class addtablecronjobprobation : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "Year",
table: "InsigniaPeriods",
type: "int",
nullable: false,
comment: "ปี",
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<string>(
name: "Type",
table: "InsigniaPeriods",
type: "varchar(10)",
maxLength: 10,
nullable: true,
comment: "ประเภทการขอ",
oldClrType: typeof(string),
oldType: "varchar(10)",
oldMaxLength: 10,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<DateTime>(
name: "StartDate",
table: "InsigniaPeriods",
type: "datetime(6)",
nullable: false,
comment: "วันที่เริ่ม",
oldClrType: typeof(DateTime),
oldType: "datetime(6)");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "InsigniaPeriods",
type: "varchar(200)",
maxLength: 200,
nullable: true,
comment: "ชื่อรอบเสนอขอเครื่องราชฯ",
oldClrType: typeof(string),
oldType: "varchar(200)",
oldMaxLength: 200,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<DateTime>(
name: "EndDate",
table: "InsigniaPeriods",
type: "datetime(6)",
nullable: false,
comment: "วันที่สิ้นสุด",
oldClrType: typeof(DateTime),
oldType: "datetime(6)");
migrationBuilder.AlterColumn<int>(
name: "Amount",
table: "InsigniaPeriods",
type: "int",
maxLength: 50,
nullable: false,
comment: "จำนวนวันแจ้งเตือนล่วงหน้า",
oldClrType: typeof(int),
oldType: "int",
oldMaxLength: 50);
migrationBuilder.CreateTable(
name: "CronjobNotiProbations",
columns: table => new
{
Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
.Annotation("MySql:CharSet", "utf8mb4"),
LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
.Annotation("MySql:CharSet", "utf8mb4"),
CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
.Annotation("MySql:CharSet", "utf8mb4"),
LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
.Annotation("MySql:CharSet", "utf8mb4"),
Subject = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "หัวเรื่อง")
.Annotation("MySql:CharSet", "utf8mb4"),
Body = table.Column<string>(type: "text", nullable: false, comment: "รายละเอียดข้อความ")
.Annotation("MySql:CharSet", "utf8mb4"),
ReceiverUserId = table.Column<Guid>(type: "char(36)", nullable: false, comment: "รหัสผู้รับข้อความ", collation: "ascii_general_ci"),
Payload = table.Column<string>(type: "text", nullable: false, comment: "สิงที่แนบมาด้วย")
.Annotation("MySql:CharSet", "utf8mb4"),
IsSendMail = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "ส่งอีเมล์หรือไม่?"),
IsSendInbox = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "ส่งกล่องข้อความหรือไม่?"),
ReceiveDate = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "วันที่ได้รับ")
},
constraints: table =>
{
table.PrimaryKey("PK_CronjobNotiProbations", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "CronjobNotiProbations");
migrationBuilder.AlterColumn<int>(
name: "Year",
table: "InsigniaPeriods",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int",
oldComment: "ปี");
migrationBuilder.AlterColumn<string>(
name: "Type",
table: "InsigniaPeriods",
type: "varchar(10)",
maxLength: 10,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(10)",
oldMaxLength: 10,
oldNullable: true,
oldComment: "ประเภทการขอ")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<DateTime>(
name: "StartDate",
table: "InsigniaPeriods",
type: "datetime(6)",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันที่เริ่ม");
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "InsigniaPeriods",
type: "varchar(200)",
maxLength: 200,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(200)",
oldMaxLength: 200,
oldNullable: true,
oldComment: "ชื่อรอบเสนอขอเครื่องราชฯ")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<DateTime>(
name: "EndDate",
table: "InsigniaPeriods",
type: "datetime(6)",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "datetime(6)",
oldComment: "วันที่สิ้นสุด");
migrationBuilder.AlterColumn<int>(
name: "Amount",
table: "InsigniaPeriods",
type: "int",
maxLength: 50,
nullable: false,
oldClrType: typeof(int),
oldType: "int",
oldMaxLength: 50,
oldComment: "จำนวนวันแจ้งเตือนล่วงหน้า");
}
}
}

16271
BMA.EHR.Infrastructure/Migrations/20230908075709_update table cronjobprobation add issendnoti.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

30
BMA.EHR.Infrastructure/Migrations/20230908075709_update table cronjobprobation add issendnoti.cs Normal file
View file

@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablecronjobprobationaddissendnoti : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsSendNoti",
table: "CronjobNotiProbations",
type: "tinyint(1)",
nullable: false,
defaultValue: false,
comment: "ส่งการแจ้งเตือนหรือยัง");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsSendNoti",
table: "CronjobNotiProbations");
}
}
}

106
BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs
View file

@ -5765,7 +5765,8 @@ namespace BMA.EHR.Infrastructure.Migrations
b.Property<int>("Amount")
.HasMaxLength(50)
.HasColumnType("int");
.HasColumnType("int")
.HasComment("จำนวนวันแจ้งเตือนล่วงหน้า");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)")
@ -5787,7 +5788,8 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("User Id ที่สร้างข้อมูล");
b.Property<DateTime>("EndDate")
.HasColumnType("datetime(6)");
.HasColumnType("datetime(6)")
.HasComment("วันที่สิ้นสุด");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)")
@ -5818,7 +5820,8 @@ namespace BMA.EHR.Infrastructure.Migrations
b.Property<string>("Name")
.HasMaxLength(200)
.HasColumnType("varchar(200)");
.HasColumnType("varchar(200)")
.HasComment("ชื่อรอบเสนอขอเครื่องราชฯ");
b.Property<Guid?>("ReliefDocId")
.HasColumnType("char(36)");
@ -5828,14 +5831,17 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("ราบการยื่นขอ");
b.Property<DateTime>("StartDate")
.HasColumnType("datetime(6)");
.HasColumnType("datetime(6)")
.HasComment("วันที่เริ่ม");
b.Property<string>("Type")
.HasMaxLength(10)
.HasColumnType("varchar(10)");
.HasColumnType("varchar(10)")
.HasComment("ประเภทการขอ");
b.Property<int>("Year")
.HasColumnType("int");
.HasColumnType("int")
.HasComment("ปี");
b.HasKey("Id");
@ -12591,6 +12597,94 @@ namespace BMA.EHR.Infrastructure.Migrations
b.ToTable("PlacementTypes");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Probation.CronjobNotiProbation", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)")
.HasColumnOrder(0)
.HasComment("PrimaryKey")
.HasAnnotation("Relational:JsonPropertyName", "id");
b.Property<string>("Body")
.IsRequired()
.HasColumnType("text")
.HasComment("รายละเอียดข้อความ");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)")
.HasColumnOrder(100)
.HasComment("สร้างข้อมูลเมื่อ");
b.Property<string>("CreatedFullName")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("varchar(200)")
.HasColumnOrder(104)
.HasComment("ชื่อ User ที่สร้างข้อมูล");
b.Property<string>("CreatedUserId")
.IsRequired()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnOrder(101)
.HasComment("User Id ที่สร้างข้อมูล");
b.Property<bool>("IsSendInbox")
.HasColumnType("tinyint(1)")
.HasComment("ส่งกล่องข้อความหรือไม่?");
b.Property<bool>("IsSendMail")
.HasColumnType("tinyint(1)")
.HasComment("ส่งอีเมล์หรือไม่?");
b.Property<bool>("IsSendNoti")
.HasColumnType("tinyint(1)")
.HasComment("ส่งการแจ้งเตือนหรือยัง");
b.Property<string>("LastUpdateFullName")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("varchar(200)")
.HasColumnOrder(105)
.HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
b.Property<string>("LastUpdateUserId")
.IsRequired()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnOrder(103)
.HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
b.Property<DateTime?>("LastUpdatedAt")
.HasColumnType("datetime(6)")
.HasColumnOrder(102)
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<string>("Payload")
.IsRequired()
.HasColumnType("text")
.HasComment("สิงที่แนบมาด้วย");
b.Property<DateTime>("ReceiveDate")
.HasColumnType("datetime(6)")
.HasComment("วันที่ได้รับ");
b.Property<Guid>("ReceiverUserId")
.HasColumnType("char(36)")
.HasComment("รหัสผู้รับข้อความ");
b.Property<string>("Subject")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("varchar(200)")
.HasComment("หัวเรื่อง");
b.HasKey("Id");
b.ToTable("CronjobNotiProbations");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Retirement.RetirementDeceased", b =>
{
b.Property<Guid>("Id")

7
BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
View file

@ -9,6 +9,7 @@ using BMA.EHR.Domain.Models.OrganizationEmployee;
using BMA.EHR.Domain.Models.Organizations;
using BMA.EHR.Domain.Models.Organizations.Report2;
using BMA.EHR.Domain.Models.Placement;
using BMA.EHR.Domain.Models.Probation;
using BMA.EHR.Domain.Models.Retirement;
using Microsoft.EntityFrameworkCore;
@ -332,6 +333,12 @@ namespace BMA.EHR.Infrastructure.Persistence
#endregion
#region " Probation "
public DbSet<CronjobNotiProbation> CronjobNotiProbations { get; set; }
#endregion
public ApplicationDBContext(DbContextOptions<ApplicationDBContext> options) : base(options)
{
}

2
BMA.EHR.Insignia.Service/Program.cs
View file

@ -158,7 +158,7 @@ var app = builder.Build();
var manager = new RecurringJobManager();
if (manager != null)
{
manager.AddOrUpdate("SendNotifyFirstRound", Job.FromExpression<InsigniaReportRepository>(x => x.NotifyInsignia()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
manager.AddOrUpdate("แจ้งเตือนรอบเครื่องราชฯ", Job.FromExpression<InsigniaReportRepository>(x => x.NotifyInsignia()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
}
// apply migrations

2
BMA.EHR.Insignia.Service/appsettings.json
View file

@ -32,7 +32,7 @@
"BucketName": "bma-ehr-fpt"
},
"KeycloakCron": {
"Hour": "15",
"Hour": "08",
"Minute": "00"
},
"Protocol": "HTTPS"

3
BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj
View file

@ -12,6 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hangfire" Version="1.8.5" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />

87
BMA.EHR.Placement.Service/Controllers/NotifyController.cs
View file

@ -1,9 +1,11 @@
using BMA.EHR.Application.Repositories;
using BMA.EHR.Application.Repositories.MessageQueue;
using BMA.EHR.Domain.Common;
using BMA.EHR.Domain.Extensions;
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Domain.Models.Notifications;
using BMA.EHR.Domain.Models.Placement;
using BMA.EHR.Domain.Models.Probation;
using BMA.EHR.Domain.Shared;
using BMA.EHR.Infrastructure.Persistence;
using BMA.EHR.Placement.Service.Requests;
@ -28,13 +30,16 @@ namespace BMA.EHR.Placement.Service.Controllers
private readonly ApplicationDBContext _context;
private readonly MinIOService _documentService;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly NotificationRepository _repositoryNoti;
public NotifyController(PlacementRepository repository,
ApplicationDBContext context,
MinIOService documentService,
NotificationRepository repositoryNoti,
IHttpContextAccessor httpContextAccessor)
{
_repository = repository;
_repositoryNoti = repositoryNoti;
_context = context;
_documentService = documentService;
_httpContextAccessor = httpContextAccessor;
@ -55,54 +60,42 @@ namespace BMA.EHR.Placement.Service.Controllers
if (profile == null)
return Error(GlobalMessages.DataNotFound);
if (req.IsSendNotification == true)
await _repositoryNoti.PushNotificationAsync(
req.ReceiverUserId,
req.Subject,
req.Body,
req.Payload,
req.IsSendInbox,
req.IsSendMail
);
return Success();
}
[HttpPost("cronjob")]
public async Task<ActionResult<ResponseObject>> CornjobProbation([FromBody] NotiCronjobProbationRequest req)
{
var profile = await _context.Profiles.FirstOrDefaultAsync(x => x.Id == req.ReceiverUserId);
if (profile == null)
return Error(GlobalMessages.DataNotFound);
_context.CronjobNotiProbations.Add(new CronjobNotiProbation
{
_context.Notifications.Add(new Notification
{
Body = req.Body,
ReceiverUserId = req.ReceiverUserId,
Type = "",
Payload = "",
CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
}
if (req.IsSendInbox == true)
{
_context.Inboxes.Add(new Inbox
{
Subject = req.Subject,
Body = req.Body,
ReceiverUserId = req.ReceiverUserId,
Payload = "",
CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
}
if (req.IsSendMail == true)
{
// _context.Notifications.Add(new Notification
// {
// Body = req.Body,
// ReceiverUserId = req.ReceiverUserId,
// Type = "",
// Payload = "",
// CreatedUserId = UserId ?? "System Administrator",
// CreatedFullName = FullName ?? "",
// CreatedAt = DateTime.Now,
// LastUpdateFullName = FullName ?? "System Administrator",
// LastUpdateUserId = UserId ?? "",
// LastUpdatedAt = DateTime.Now,
// });
}
IsSendNoti = false,
Subject = req.Subject,
Body = req.Body,
ReceiverUserId = req.ReceiverUserId,
Payload = req.Payload,
IsSendMail = req.IsSendMail,
IsSendInbox = req.IsSendInbox,
ReceiveDate = req.ReceiveDate,
CreatedUserId = UserId ?? "System Administrator",
CreatedFullName = FullName ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
await _context.SaveChangesAsync();
return Success();

14
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -373,7 +373,7 @@ namespace BMA.EHR.Placement.Service.Controllers
}
}
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"),
Guid.Parse("08db721d-add6-47b0-8a13-5f45d106e8d1"),
$"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำขอโอน",
$"{profile.Prefix?.Name}{profile.FirstName} {profile.LastName} ได้ทำการยื่นคำขอโอนไปยัง {req.Organization}"
);
@ -427,6 +427,8 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> AdminConfirm(Guid id)
{
var uppdated = await _context.PlacementTransfers
.Include(x => x.Profile)
.ThenInclude(x => x.Prefix)
.FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null)
return Error(GlobalMessages.PlacementTransferNotFound, 404);
@ -435,6 +437,16 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";
uppdated.LastUpdatedAt = DateTime.Now;
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"),
$"{uppdated.Profile.Prefix?.Name}{uppdated.Profile.FirstName} {uppdated.Profile.LastName} ได้ทำการยื่นคำขอโอนได้รับการอนุมัติ",
$"{uppdated.Profile.Prefix?.Name}{uppdated.Profile.FirstName} {uppdated.Profile.LastName} ได้ทำการยื่นคำขอโอนไปยัง {uppdated.Organization}ได้รับการอนุมัติ"
);
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08db721d-ada0-4e64-89d3-7584a893d8b8"),
$"{uppdated.Profile.Prefix?.Name}{uppdated.Profile.FirstName} {uppdated.Profile.LastName} ได้ทำการยื่นคำขอโอน",
$"{uppdated.Profile.Prefix?.Name}{uppdated.Profile.FirstName} {uppdated.Profile.LastName} ได้ทำการยื่นคำขอโอนไปยัง {uppdated.Organization}ได้รับการอนุมัติ"
);
await _context.SaveChangesAsync();
return Success();

16
BMA.EHR.Placement.Service/Filters/CustomAuthorizeFilter.cs Normal file
View file

@ -0,0 +1,16 @@
using System.Diagnostics.CodeAnalysis;
using Hangfire.Dashboard;
namespace BMA.EHR.Placement.Service.Filters
{
public class CustomAuthorizeFilter : IDashboardAuthorizationFilter
{
public bool Authorize([NotNull] DashboardContext context)
{
//var httpcontext = context.GetHttpContext();
//return httpcontext.User.Identity.IsAuthenticated;
return true;
}
}
}

41
BMA.EHR.Placement.Service/Program.cs
View file

@ -10,11 +10,17 @@ using Microsoft.AspNetCore.Mvc.Versioning;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Logging;
using Microsoft.IdentityModel.Tokens;
using Hangfire;
using Hangfire.Common;
using Hangfire.MySql;
using Serilog;
using Serilog.Exceptions;
using Serilog.Sinks.Elasticsearch;
using System.Reflection;
using System.Text;
using System.Transactions;
using BMA.EHR.Placement.Service.Filters;
using BMA.EHR.Application.Repositories.Reports;
var builder = WebApplication.CreateBuilder(args);
{
@ -89,7 +95,31 @@ var builder = WebApplication.CreateBuilder(args);
builder.Services.AddSwaggerGen();
builder.Services.ConfigureOptions<ConfigureSwaggerOptions>();
// Register DbContext
var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection");
builder.Services.AddDbContext<ApplicationDBContext>(options =>
options.UseMySql(defaultConnection, ServerVersion.AutoDetect(defaultConnection)));
builder.Services.AddHealthChecks();
// Add Hangfire services.
builder.Services.AddHangfire(configuration => configuration
.SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
.UseSimpleAssemblyNameTypeSerializer()
.UseRecommendedSerializerSettings()
.UseStorage(
new MySqlStorage(
defaultConnection,
new MySqlStorageOptions
{
TransactionIsolationLevel = IsolationLevel.ReadCommitted,
QueuePollInterval = TimeSpan.FromSeconds(15),
JobExpirationCheckInterval = TimeSpan.FromHours(1),
CountersAggregateInterval = TimeSpan.FromMinutes(5),
PrepareSchemaIfNecessary = true,
DashboardJobListLimit = 50000,
TransactionTimeout = TimeSpan.FromMinutes(1),
TablesPrefix = "Hangfire"
})));
builder.Services.AddHangfireServer();
}
var app = builder.Build();
@ -111,7 +141,7 @@ var app = builder.Build();
app.MapHealthChecks("/health");
app.UseHttpsRedirection();
app.UseCors();
app.UseAuthentication();
@ -120,6 +150,15 @@ var app = builder.Build();
app.UseStaticFiles();
app.MapControllers();
app.UseMiddleware<ErrorHandlerMiddleware>();
app.UseHangfireDashboard("/hangfire", new DashboardOptions()
{
Authorization = new[] { new CustomAuthorizeFilter() }
});
var manager = new RecurringJobManager();
if (manager != null)
{
manager.AddOrUpdate("แจ้งเตือนระบบทดลองงาน", Job.FromExpression<ProbationReportRepository>(x => x.NotifyProbation()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local);
}
// apply migrations
await using var scope = app.Services.CreateAsyncScope();

16
BMA.EHR.Placement.Service/Requests/NotiCronjobProbationRequest.cs Normal file
View file

@ -0,0 +1,16 @@
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Placement.Service.Requests
{
public class NotiCronjobProbationRequest
{
public string Subject { get; set; }
public string Body { get; set; }
public string Payload { get; set; }
public Guid ReceiverUserId { get; set; }
public bool IsSendMail { get; set; }
public bool IsSendInbox { get; set; }
public DateTime ReceiveDate { get; set; }
}
}

1
BMA.EHR.Placement.Service/Requests/NotiRequest.cs
View file

@ -7,6 +7,7 @@ namespace BMA.EHR.Placement.Service.Requests
{
public string Subject { get; set; }
public string Body { get; set; }
public string Payload { get; set; }
public Guid ReceiverUserId { get; set; }
public bool IsSendMail { get; set; }
public bool IsSendInbox { get; set; }

4
BMA.EHR.Placement.Service/appsettings.json
View file

@ -31,5 +31,9 @@
"SecretKey": "FPTadmin2357",
"BucketName": "bma-ehr-fpt"
},
"KeycloakCron": {
"Hour": "08",
"Minute": "00"
},
"Protocol": "HTTPS"
}

194
BMA.EHR.Report.Service/Controllers/InsigniaReportController.cs
View file

@ -1,5 +1,6 @@
using BMA.EHR.Application.Repositories.Reports;
using BMA.EHR.Domain.Common;
using BMA.EHR.Domain.Models.Insignias;
using DocumentFormat.OpenXml.Drawing;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@ -13,7 +14,7 @@ namespace BMA.EHR.Report.Service.Controllers
[ApiVersion("2.0")]
[ApiController]
[Produces("application/json")]
[Authorize]
//[Authorize]
[SwaggerTag("API รายงานระบบเครื่องราชอิสริยาภรณ์")]
public class InsigniaReportController : BaseController
{
@ -88,7 +89,8 @@ namespace BMA.EHR.Report.Service.Controllers
{
_Khr1List.Add(new
{
RowNo = _data.GetType().GetProperty("RowNo").GetValue(_data),
//RowNo = _data.GetType().GetProperty("RowNo").GetValue(_data),
RowNo = _Khr1List.Count + 1,
DepartmentName = _data.GetType().GetProperty("DepartmentName").GetValue(_data),
G1Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
G1Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
@ -100,7 +102,7 @@ namespace BMA.EHR.Report.Service.Controllers
G4Female = _data.GetType().GetProperty("G4Female").GetValue(_data),
G5Male = _data.GetType().GetProperty("G5Male").GetValue(_data),
G5Female = _data.GetType().GetProperty("G5Female").GetValue(_data),
reason = string.Empty,
Remark = _data.GetType().GetProperty("Remark").GetValue(_data),
});
}
var tbl = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
@ -169,7 +171,6 @@ namespace BMA.EHR.Report.Service.Controllers
{
_Khr2List.Add(new
{
//RowNo = _data.GetType().GetProperty("RowNo").GetValue(_data),
RowNo = _Khr2List.Count+1,
DepartmentName = _data.GetType().GetProperty("DepartmentName").GetValue(_data),
G1Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
@ -190,6 +191,7 @@ namespace BMA.EHR.Report.Service.Controllers
G8Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
G9Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
G9Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
Remark = _data.GetType().GetProperty("Remark").GetValue(_data),
});
}
var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
@ -229,6 +231,9 @@ namespace BMA.EHR.Report.Service.Controllers
try
{
var data = await _repository.GetKhr3Report(id);
var YearInsignalPeriod = await _repository.GetYearInsigniaPeriod(id);
var TwoYearInsignalPeriod = await _repository.Get2YearInsigniaPeriod(id);
var Date = await _repository.GetDateInsigniaPeriod(id);
var mimeType = "";
switch (exportType.Trim().ToLower())
{
@ -236,12 +241,47 @@ namespace BMA.EHR.Report.Service.Controllers
case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break;
case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break;
}
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"41-แบบ ขร3 บัญชีรายชื่อข้าราชการผู้ขอพระราชทานเครื่องราชฯ.trdp");
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
ReportPackager reportPacker = new ReportPackager();
Telerik.Reporting.Report? report = null;
using (var sourceStream = System.IO.File.OpenRead(rptFile))
{
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
}
return File(contentData, mimeType, $"แบบ ขร3.{exportType.Trim().ToLower()}");
report.ReportParameters["YearInsigniaPeriod"].Value = YearInsignalPeriod;
report.ReportParameters["TwoYearInsignalPeriod"].Value = TwoYearInsignalPeriod;
report.ReportParameters["EndDate"].Value = Date.GetType().GetProperty("EndDate").GetValue(Date);
//int count = ((IEnumerable<object>)data).Count();
//int counter = 0;
//var _Khr3LeftList = new List<dynamic>();
//var _Khr3RightList = new List<dynamic>();
//foreach(var _data in data)
//{
// _Khr3LeftList.Add(new
// {
// RowNo = _Khr3LeftList.Count +1,
// FullName = _data.GetType().GetProperty("FullName").GetValue(_data),
// OCName = _data.GetType().GetProperty("OCName").GetValue(_data),
// InsigniaName = _data.GetType().GetProperty("InsigniaName").GetValue(_data),
// });
//}
//var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
//tbl1.DataSource = _Khr3LeftList;
//var tbl2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"];
//tbl2.DataSource = _Khr3RightList;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
{
ReportDocument = report,
};
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
return File(result.DocumentBytes, mimeType, $"แบบ ขร3.{exportType.Trim().ToLower()}");
}
catch
{
@ -266,6 +306,8 @@ namespace BMA.EHR.Report.Service.Controllers
try
{
var data = await _repository.GetKhr4Report(id);
var YearInsignalPeriod = await _repository.GetYearInsigniaPeriod(id);
var TwoYearInsignalPeriod = await _repository.Get2YearInsigniaPeriod(id);
var mimeType = "";
switch (exportType.Trim().ToLower())
{
@ -281,9 +323,30 @@ namespace BMA.EHR.Report.Service.Controllers
{
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
}
report.ReportParameters["YearInsigniaPeriod"].Value = YearInsignalPeriod;
report.ReportParameters["TwoYearInsignalPeriod"].Value = TwoYearInsignalPeriod;
var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
tbl1.DataSource = data;
var _Khr4List = new List<dynamic>();
foreach (var _data in data)
{
_Khr4List.Add(new
{
RowNo = _Khr4List.Count + 1,
FullName = _data.GetType().GetProperty("FullName").GetValue(_data),
CitizenId = _data.GetType().GetProperty("CitizenId").GetValue(_data),
Type = _data.GetType().GetProperty("Type").GetValue(_data),
Level = _data.GetType().GetProperty("Level").GetValue(_data),
DateStart = _data.GetType().GetProperty("DateStart").GetValue(_data),
SalaryAmount = _data.GetType().GetProperty("SalaryAmount").GetValue(_data),
Position = _data.GetType().GetProperty("Position").GetValue(_data),
InsigniaRecv = _data.GetType().GetProperty("InsigniaRecv").GetValue(_data),
InsigniaRecvDate = _data.GetType().GetProperty("InsigniaRecvDate").GetValue(_data),
InsigniaRequest = _data.GetType().GetProperty("InsigniaRequest").GetValue(_data),
Remark = _data.GetType().GetProperty("Remark").GetValue(_data),
});
}
tbl1.DataSource = _Khr4List;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
@ -354,7 +417,9 @@ namespace BMA.EHR.Report.Service.Controllers
{
try
{
var data = await _repository.GetSummaryCoinReport(id);
var SummaryTotal = await _repository.GetSummaryTotalCoinReport(id);
var YearInsignalPeriod = await _repository.GetYearInsigniaPeriod(id);
var mimeType = "";
switch (exportType.Trim().ToLower())
{
@ -364,9 +429,41 @@ namespace BMA.EHR.Report.Service.Controllers
}
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp");
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
ReportPackager reportPacker = new ReportPackager();
Telerik.Reporting.Report? report = null;
using (var sourceStream = System.IO.File.OpenRead(rptFile))
{
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
}
report.ReportParameters["YearInsigniaPeriod"].Value = YearInsignalPeriod;
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
var _Khr6List = new List<dynamic>();
foreach (var _data in data)
{
_Khr6List.Add(new
{
RowNo = _Khr6List.Count + 1,
DepartmentName = _data.GetType().GetProperty("DepartmentName").GetValue(_data),
G1Male = _data.GetType().GetProperty("G1Male").GetValue(_data),
G1Female = _data.GetType().GetProperty("G1Female").GetValue(_data),
G2Male = _data.GetType().GetProperty("G2Male").GetValue(_data),
G2Female = _data.GetType().GetProperty("G2Female").GetValue(_data),
Remark = _data.GetType().GetProperty("Remark").GetValue(_data),
});
}
tbl1.DataSource = _Khr6List;
var tbl2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"];
tbl2.DataSource = SummaryTotal;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
{
ReportDocument = report,
};
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
return File(result.DocumentBytes, mimeType, $"บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ{exportType.Trim().ToLower()}");
}
catch
@ -391,7 +488,8 @@ namespace BMA.EHR.Report.Service.Controllers
{
try
{
var data = await _repository.GetCoinReport(id);
var YearInsignalPeriod = await _repository.GetYearInsigniaPeriod(id);
var mimeType = "";
switch (exportType.Trim().ToLower())
{
@ -401,9 +499,37 @@ namespace BMA.EHR.Report.Service.Controllers
}
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"45-บัญชีแสดงรายชื่อผู้ขอพระราชทานเหรียญจักรพรรดิมาลา.trdp");
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
ReportPackager reportPacker = new ReportPackager();
Telerik.Reporting.Report? report = null;
using (var sourceStream = System.IO.File.OpenRead(rptFile))
{
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
}
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
report.ReportParameters["YearInsignalPeriod"].Value = YearInsignalPeriod;
//var _Khr3List = new List<dynamic>();
//int maxRows = 25;
//for (int i = 0; i < maxRows; i++)
//{
// _Khr3List.Add(new
// {
// RowNo = i + 1,
// FullName = string.Empty
// });
//}
//var tbl1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
//tbl1.DataSource = _Khr3List;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
{
ReportDocument = report,
};
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
return File(result.DocumentBytes, mimeType, $"บัญชีแสดงรายชื่อผู้ขอพระราชทานเหรียญจักรพรรดิมาลา.{exportType.Trim().ToLower()}");
}
catch
@ -428,7 +554,8 @@ namespace BMA.EHR.Report.Service.Controllers
{
try
{
var profile = await _repository.GetProfileInsignia(id);
var data = await _repository.GetHistorySalaryReport(id);
var mimeType = "";
switch (exportType.Trim().ToLower())
{
@ -438,9 +565,42 @@ namespace BMA.EHR.Report.Service.Controllers
}
var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"46-ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.trdp");
var contentData = _reportGenerator.GenerateReport(rptFile, exportType);
ReportPackager reportPacker = new ReportPackager();
Telerik.Reporting.Report? report = null;
using (var sourceStream = System.IO.File.OpenRead(rptFile))
{
report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
}
return File(contentData, mimeType, $"insignia.{exportType.Trim().ToLower()}");
report.ReportParameters["FullName"].Value = profile.GetType().GetProperty("FullName").GetValue(profile);
report.ReportParameters["Position"].Value = profile.GetType().GetProperty("Position").GetValue(profile);
report.ReportParameters["OCName"].Value = profile.GetType().GetProperty("OCName").GetValue(profile);
report.ReportParameters["BirthDate"].Value = profile.GetType().GetProperty("BirthDate").GetValue(profile);
var historysalary = new List<dynamic>();
foreach (var _data in data)
{
historysalary.Add(new
{
DateTh = _data.GetType().GetProperty("DateTh").GetValue(_data),
Position = _data.GetType().GetProperty("Position").GetValue(_data),
OCName = _data.GetType().GetProperty("OCName").GetValue(_data),
Age = _data.GetType().GetProperty("Age").GetValue(_data),
Amount = _data.GetType().GetProperty("Amount").GetValue(_data),
Remark = _data.GetType().GetProperty("Remark").GetValue(_data),
});
}
var tbl1 = (Telerik.Reporting.Table)report.Items["detailsection1"].Items["table1"];
tbl1.DataSource = historysalary;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
InstanceReportSource instanceReportSource = new InstanceReportSource()
{
ReportDocument = report,
};
ReportProcessor reportProcessor = new ReportProcessor(_configuration);
RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
return File(result.DocumentBytes, mimeType, $"ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.{exportType.Trim().ToLower()}");
}
catch

BIN
BMA.EHR.Report.Service/Reports/39-แบบ ขร1 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นสายสะพาย.trdp
View file

Binary file not shown.

BIN
BMA.EHR.Report.Service/Reports/40-แบบ ขร2 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นต่ำกว่าสายสะพาย.trdp
View file

Binary file not shown.

BIN
BMA.EHR.Report.Service/Reports/41-แบบ ขร3 บัญชีรายชื่อข้าราชการผู้ขอพระราชทานเครื่องราชฯ.trdp
View file

Binary file not shown.

BIN
BMA.EHR.Report.Service/Reports/42-แบบ ขร4 บัญชีแสดงคุณสมบัติของข้าราชการซึ่งเสนอขอเครื่องราชฯ.trdp
View file

Binary file not shown.

BIN
BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp
View file

Binary file not shown.

BIN
BMA.EHR.Report.Service/Reports/45-บัญชีแสดงรายชื่อผู้ขอพระราชทานเหรียญจักรพรรดิมาลา.trdp
View file

Binary file not shown.

BIN
BMA.EHR.Report.Service/Reports/46-ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.trdp
View file

Binary file not shown.

4
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -537,7 +537,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
item.ReceiveUser.Id,
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
profile.IsSendNotification,
"",
profile.IsSendInbox,
profile.IsSendMail
);
@ -551,7 +551,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
item.ReceiveUser.Id,
$"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.Profile.FirstName} {item.RetirementDeceased.Profile.LastName}",
item.IsSendNotification,
"",
item.IsSendInbox,
item.IsSendMail
);