ปรับรายงานให้ ไม่ตกบรรทัด

This commit is contained in:
nakorn
2021-10-31 21:48:44 +07:00
parent 7baab53365
commit 0d0e309589
9 changed files with 2616 additions and 0 deletions

View File

@@ -14,6 +14,8 @@ namespace TTSW.EF {
public DbSet<eva_create_evaluation_detailEntity> eva_create_evaluation_detail { get; set; }
//public DbSet<eva_create_evaluation_detail_agreementEntity> eva_create_evaluation_detail_agreement { get; set; }
public DbSet<eva_evaluation_achievementEntity> eva_evaluation_achievement { get; set; }
public DbSet<eva_evaluation_achievement_detailEntity> eva_evaluation_achievement_detail { get; set; }
public DbSet<eva_evaluation_behaviorEntity> eva_evaluation_behavior { get; set; }
public DbSet<eva_evaluation_groupEntity> eva_evaluation_group { get; set; }
public DbSet<eva_evaluation_group_detailEntity> eva_evaluation_group_detail { get; set; }

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,46 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class Addachievement_detail : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "eva_evaluation_achievement_detail",
columns: table => new
{
id = table.Column<Guid>(nullable: false),
created = table.Column<DateTime>(nullable: false),
updated = table.Column<DateTime>(nullable: false),
isActive = table.Column<bool>(nullable: false),
create_evaluation_detail_id = table.Column<int>(nullable: true),
achievement_id = table.Column<int>(nullable: true),
achievement_detail = table.Column<string>(maxLength: 16000, nullable: true),
achievement_order = table.Column<int>(nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_eva_evaluation_achievement_detail", x => x.id);
table.ForeignKey(
name: "FK_eva_evaluation_achievement_detail_eva_create_evaluation_det~",
column: x => x.create_evaluation_detail_id,
principalTable: "eva_create_evaluation_detail",
principalColumn: "id",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_eva_evaluation_achievement_detail_create_evaluation_detail_~",
table: "eva_evaluation_achievement_detail",
column: "create_evaluation_detail_id");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "eva_evaluation_achievement_detail");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,74 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class ManageAchievement : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_eva_evaluation_achievement_detail_eva_create_evaluation_det~",
table: "eva_evaluation_achievement_detail");
migrationBuilder.DropIndex(
name: "IX_eva_evaluation_achievement_detail_create_evaluation_detail_~",
table: "eva_evaluation_achievement_detail");
migrationBuilder.DropColumn(
name: "create_evaluation_detail_id",
table: "eva_evaluation_achievement_detail");
migrationBuilder.AddColumn<string>(
name: "achievement_line1",
table: "eva_evaluation_achievement",
maxLength: 16000,
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_eva_evaluation_achievement_detail_achievement_id",
table: "eva_evaluation_achievement_detail",
column: "achievement_id");
migrationBuilder.AddForeignKey(
name: "FK_eva_evaluation_achievement_detail_eva_evaluation_achievemen~",
table: "eva_evaluation_achievement_detail",
column: "achievement_id",
principalTable: "eva_evaluation_achievement",
principalColumn: "id",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_eva_evaluation_achievement_detail_eva_evaluation_achievemen~",
table: "eva_evaluation_achievement_detail");
migrationBuilder.DropIndex(
name: "IX_eva_evaluation_achievement_detail_achievement_id",
table: "eva_evaluation_achievement_detail");
migrationBuilder.DropColumn(
name: "achievement_line1",
table: "eva_evaluation_achievement");
migrationBuilder.AddColumn<int>(
name: "create_evaluation_detail_id",
table: "eva_evaluation_achievement_detail",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_eva_evaluation_achievement_detail_create_evaluation_detail_~",
table: "eva_evaluation_achievement_detail",
column: "create_evaluation_detail_id");
migrationBuilder.AddForeignKey(
name: "FK_eva_evaluation_achievement_detail_eva_create_evaluation_det~",
table: "eva_evaluation_achievement_detail",
column: "create_evaluation_detail_id",
principalTable: "eva_create_evaluation_detail",
principalColumn: "id",
onDelete: ReferentialAction.Restrict);
}
}
}

View File

@@ -461,6 +461,9 @@ namespace tb320eva.Migrations
b.Property<string>("achievement")
.HasMaxLength(16000);
b.Property<string>("achievement_line1")
.HasMaxLength(16000);
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
@@ -534,6 +537,30 @@ namespace tb320eva.Migrations
b.ToTable("eva_evaluation_achievement_attach");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b =>
{
b.Property<Guid>("id");
b.Property<string>("achievement_detail")
.HasMaxLength(16000);
b.Property<int?>("achievement_id");
b.Property<int?>("achievement_order");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<DateTime>("updated");
b.HasKey("id");
b.HasIndex("achievement_id");
b.ToTable("eva_evaluation_achievement_detail");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
{
b.Property<int>("id");
@@ -1087,6 +1114,13 @@ namespace tb320eva.Migrations
.HasForeignKey("achievement_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement")
.WithMany()
.HasForeignKey("achievement_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")

View File

@@ -61,5 +61,8 @@ namespace TodoAPI2.Models
[MaxLength(255)]
public string target_score5 { get; set; }
[MaxLength(16000)]
public string achievement_line1 { get; set; }
}
}

View File

@@ -144,6 +144,38 @@ namespace TodoAPI2.Models
return newkey.Value;
}
private void ManageDetail(eva_evaluation_achievementEntity entity)
{
var oldDetail = from x in _repository.Context.eva_evaluation_achievement_detail
where x.achievement_id == entity.id
select x;
_repository.Context.eva_evaluation_achievement_detail.RemoveRange(oldDetail);
if (!string.IsNullOrEmpty(entity.achievement))
{
var sp = entity.achievement.Split("^");
int i = 0;
foreach (var s in sp)
{
if (i == 0)
{
entity.achievement_line1 = s.Trim();
}
else
{
var n = new eva_evaluation_achievement_detailEntity();
n.id = Guid.NewGuid();
n.achievement_order = i;
n.achievement_id = entity.id;
n.achievement_detail = s.Trim();
_repository.Context.Add(n);
}
i++;
}
_repository.Context.SaveChanges();
}
}
public eva_evaluation_achievementViewModel Insert(eva_evaluation_achievementInputModel model)
{
var entity = GetEntity(model);
@@ -176,6 +208,7 @@ namespace TodoAPI2.Models
}
var inserted = _repository.Insert(entity);
ManageDetail(inserted);
return Get(inserted.id);
}
@@ -235,6 +268,7 @@ namespace TodoAPI2.Models
var updated = _repository.Update(id, existingEntity);
ManageDetail(updated);
return Get(updated.id);
}
else

View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Threading.Tasks;
using TTSW.EF;
using TTSW.Utils;
using TTSW.Constant;
using TTSW.Common;
using System.IO;
namespace TodoAPI2.Models
{
public class eva_evaluation_achievement_detailEntity : BaseEntity2<Guid>
{
[ForeignKey("achievement_id")]
public eva_evaluation_achievementEntity eva_evaluation_achievement { get; set; }
public int? achievement_id { get; set; }
[MaxLength(16000)]
public string achievement_detail { get; set; }
public int? achievement_order { get; set; }
}
}