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

เพิ่มฟิลที่นั่งสอบ

Browse source
This commit is contained in:
Kittapath 2023-03-29 12:55:20 +07:00
parent 5c7a655a66
commit a93dcbbd20
10 changed files with 1285 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Data/Migrations/ApplicationDbContextModelSnapshot.cs
View file

@ -270,6 +270,16 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
b.Property<Guid?>("RelationshipId")
.HasColumnType("char(36)");
b.Property<string>("SeatNumber")
.HasColumnType("longtext")
.HasComment("เลขที่นั่งสอบ");
b.Property<string>("Status")
.IsRequired()
.HasMaxLength(20)
.HasColumnType("varchar(20)")
.HasComment("สถานะผู้สมัคร");
b.Property<string>("Telephone")
.HasMaxLength(20)
.HasColumnType("varchar(20)")
@ -281,12 +291,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasColumnType("varchar(40)")
.HasComment("User Id ผู้สมัคร");
b.Property<string>("status")
.IsRequired()
.HasMaxLength(20)
.HasColumnType("varchar(20)")
.HasComment("สถานะผู้สมัคร");
b.HasKey("Id");
b.HasIndex("CitizenDistrictId");

1220
Migrations/20230329044404_Update table Candidate add seatnumber.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

40
Migrations/20230329044404_Update table Candidate add seatnumber.cs Normal file
View file

@ -0,0 +1,40 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Recurit.Exam.Service.Migrations
{
/// <inheritdoc />
public partial class UpdatetableCandidateaddseatnumber : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "status",
table: "Candidates",
newName: "Status");
migrationBuilder.AddColumn<string>(
name: "SeatNumber",
table: "Candidates",
type: "longtext",
nullable: true,
comment: "เลขที่นั่งสอบ")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "SeatNumber",
table: "Candidates");
migrationBuilder.RenameColumn(
name: "Status",
table: "Candidates",
newName: "status");
}
}
}

2
Models/Candidate.cs
View file

@ -14,6 +14,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
[Required, MaxLength(20), Comment("สถานะผู้สมัคร")]
public string Status { get; set; } = "register";
[Comment("เลขที่นั่งสอบ")]
public string? SeatNumber { get; set; }

2
Models/PeriodExam.cs
View file

@ -19,7 +19,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
public int? Round { get; set; }
[Comment("ค่าธรรมเนียม")]
public float? Fee { get; set; }
public float? Fee { get; set; } = 0;
[Comment("ปีงบประมาณ")]
public int? Year { get; set; }

8
Properties/launchSettings.json
View file

@ -4,7 +4,7 @@
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7007;http://localhost:5261",
"applicationUrl": "https://localhost:7007;http://localhost:5262",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
@ -18,7 +18,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true,
"applicationUrl": "http://localhost:5261"
"applicationUrl": "http://localhost:5262"
},
"https": {
"commandName": "Project",
@ -28,13 +28,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:7007;http://localhost:5261"
"applicationUrl": "https://localhost:7007;http://localhost:5262"
},
"https-api": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7007;http://localhost:5261",
"applicationUrl": "https://localhost:7007;http://localhost:5262",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},

4
Services/CandidateService.cs
View file

@ -243,6 +243,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
if (exam == null)
throw new Exception(GlobalMessages.ExamNotFound);
var _candidateNumber = await _context.Candidates.AsQueryable()
.CountAsync(x => x.PeriodExam == exam);
var _candidate = await _context.Candidates.AsQueryable()
.FirstOrDefaultAsync(x => x.PeriodExam == exam && x.UserId == UserId);
if (_candidate == null)
@ -257,6 +260,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
CreatedFullName = FullName ?? "",
LastUpdateFullName = FullName ?? "",
UserId = UserId ?? "",
SeatNumber = "CDC-" + (_candidateNumber + 1),
};
await _context.Candidates.AddAsync(candidate);

2
appsettings.Development.json
View file

@ -18,7 +18,7 @@
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
"Issuer": "https://identity.frappet.com/realms/bma-ehr-exam"
"Issuer": "https://identity.frappet.com/realms/bma-ehr"
},
"EPPlus": {
"ExcelPackage": {

2
appsettings.json
View file

@ -18,7 +18,7 @@
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
"Issuer": "https://identity.frappet.com/realms/bma-ehr-exam"
"Issuer": "https://identity.frappet.com/realms/bma-ehr"
},
"EPPlus": {
"ExcelPackage": {

4
wwwroot/keycloak.json
View file

@ -1,7 +1,7 @@
{
"realm": "bma-ehr-exam",
"realm": "bma-ehr",
"auth-server-url": "https://identity.frappet.com",
"ssl-required": "external",
"resource": "bma-ehr-exam",
"resource": "bma-ehr",
"public-client": true
}