add duty-time and poi (จาก google maps ไปก่อน)

2023-11-09 14:35:08 +07:00 · 2023-11-09 14:35:08 +07:00 · 78f8c0813c
commit 78f8c0813c
parent 43932f742b
30 changed files with 3395 additions and 4 deletions
--- a/.github/workflows/release_leave.yaml
+++ b/.github/workflows/release_leave.yaml
@ -0,0 +1,87 @@
+name: release-dev
+run-name: release-dev ${{ github.actor }}
+on:
+    # push:
+    #   tags:
+    #     - 'v[0-9]+.[0-9]+.[0-9]+'
+    # tags-ignore:
+    #   - '2.*'
+    # Allow run workflow manually from Action tab
+    workflow_dispatch:
+env:
+    REGISTRY: docker.frappet.com
+    IMAGE_NAME: ehr/bma-ehr-leave-service
+    DEPLOY_HOST: frappet.com
+    COMPOSE_PATH: /home/frappet/docker/bma-ehr-leave
+    TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
+
+jobs:
+    # act workflow_dispatch -W .github/workflows/release_leave.yaml --input IMAGE_VER=leave-1.0.0 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
+    release-dev:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            # skip Set up QEMU because it fail on act and container
+            - name: Gen Version
+              id: gen_ver
+              run: |
+                  if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
+                    IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
+                  else
+                    IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
+                  fi
+                  if [[ $IMAGE_VER == '' ]]; then
+                    IMAGE_VER='test-vBeta'
+                  fi
+                  echo '::set-output name=image_ver::'$IMAGE_VER
+            - name: Test Version
+              run: |
+                  echo $GITHUB_REF
+                  echo ${{ steps.gen_ver.outputs.image_ver }}
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v2
+            - name: Login in to registry
+              uses: docker/login-action@v2
+              with:
+                  registry: ${{env.REGISTRY}}
+                  username: ${{secrets.DOCKER_USER}}
+                  password: ${{secrets.DOCKER_PASS}}
+            - name: Build and load local docker image
+              uses: docker/build-push-action@v3
+              with:
+                  context: .
+                  platforms: linux/amd64
+                  file: BMA.EHR.Leave.Service/Dockerfile
+                  push: true
+                  tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
+
+            - name: Reload docker compose
+              uses: appleboy/ssh-action@v0.1.8
+              with:
+                  host: ${{env.DEPLOY_HOST}}
+                  username: frappet
+                  password: ${{ secrets.SSH_PASSWORD }}
+                  port: 22
+                  script: |
+                      cd "${{env.COMPOSE_PATH}}"
+                      docker-compose pull
+                      docker-compose up -d
+                      echo "${{ steps.gen_ver.outputs.image_ver }}"> success
+            - uses: snow-actions/line-notify@v1.1.0
+              if: success()
+              with:
+                  access_token: ${{ env.TOKEN_LINE }}
+                  message: |
+                      -Success✅✅✅
+                      Image: ${{env.IMAGE_NAME}}
+                      Version: ${{ github.event.inputs.IMAGE_VER }}
+                      By: ${{secrets.DOCKER_USER}}
+            - uses: snow-actions/line-notify@v1.1.0
+              if: failure()
+              with:
+                  access_token: ${{ env.TOKEN_LINE }}
+                  message: |
+                      -Failure❌❌❌
+                      Image: ${{env.IMAGE_NAME}}
+                      Version: ${{ github.event.inputs.IMAGE_VER }}
+                      By: ${{secrets.DOCKER_USER}}
--- a/BMA.EHR.Application/ApplicationServicesRegistration.cs
+++ b/BMA.EHR.Application/ApplicationServicesRegistration.cs
@ -1,6 +1,7 @@
 using BMA.EHR.Application.Messaging;
 using BMA.EHR.Application.Repositories;
 using BMA.EHR.Application.Repositories.Commands;
+using BMA.EHR.Application.Repositories.Leaves;
 using BMA.EHR.Application.Repositories.MessageQueue;
 using BMA.EHR.Application.Repositories.Reports;
 using Microsoft.Extensions.DependencyInjection;
@ -34,6 +35,8 @@ namespace BMA.EHR.Application
            services.AddTransient<CandidateReportRepository>();
            services.AddTransient<MinIOExamService>();

+            services.AddTransient<DutyTimeRepository>();
+
            return services;
        }
    }
--- a/BMA.EHR.Application/Repositories/Leaves/DutyTimeRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/DutyTimeRepository.cs
@ -0,0 +1,56 @@
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Application.Messaging;
+using BMA.EHR.Domain.Models.Leave;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+
+namespace BMA.EHR.Application.Repositories.Leaves
+{
+    public class DutyTimeRepository : GenericRepository<Guid, DutyTime>
+    {
+        #region " Fields "
+
+        private readonly IApplicationDBContext _dbContext;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly OrganizationCommonRepository _organizationCommonRepository;
+        private readonly UserProfileRepository _userProfileRepository;
+        private readonly IConfiguration _configuration;
+        private readonly EmailSenderService _emailSenderService;
+
+        #endregion
+
+        #region " Constructor and Destuctor "
+
+        public DutyTimeRepository(IApplicationDBContext dbContext,
+                                 IHttpContextAccessor httpContextAccessor,
+                                 OrganizationCommonRepository organizationCommonRepository,
+                                 UserProfileRepository userProfileRepository,
+                                 IConfiguration configuration,
+                                 EmailSenderService emailSenderService) : base(dbContext, httpContextAccessor)
+        {
+            _dbContext = dbContext;
+            _httpContextAccessor = httpContextAccessor;
+            _organizationCommonRepository = organizationCommonRepository;
+            _userProfileRepository = userProfileRepository;
+            _configuration = configuration;
+            _emailSenderService = emailSenderService;
+        }
+
+        #endregion
+
+        #region " Properties "
+
+        protected Guid UserOrganizationId
+        {
+            get
+            {
+                if (UserId != null || UserId != "")
+                    return _userProfileRepository.GetUserOCId(Guid.Parse(UserId!));
+                else
+                    return Guid.Empty;
+            }
+        }
+
+        #endregion
+    }
+}
--- a/BMA.EHR.Command.Service/Program.cs
+++ b/BMA.EHR.Command.Service/Program.cs
@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Versioning;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Serilog;
@ -124,9 +123,9 @@ var app = builder.Build();
    app.UseMiddleware<ErrorHandlerMiddleware>();

    // apply migrations
-    await using var scope = app.Services.CreateAsyncScope();
-    await using var db = scope.ServiceProvider.GetRequiredService<ApplicationDBContext>();
-    await db.Database.MigrateAsync();
+    //await using var scope = app.Services.CreateAsyncScope();
+    //await using var db = scope.ServiceProvider.GetRequiredService<ApplicationDBContext>();
+    //await db.Database.MigrateAsync();

    // seed default data
    await CommandDataSeeder.SeedData(app);
--- a/BMA.EHR.Domain/Models/Leave/DutyTime.cs
+++ b/BMA.EHR.Domain/Models/Leave/DutyTime.cs
@ -0,0 +1,30 @@
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Domain.Models.Leave
+{
+    public class DutyTime : EntityBase
+    {
+        [Required, Comment("คำอธิบาย")]
+        public string Description { get; set; } = string.Empty;
+
+        [Required, Comment("เวลาเข้างานช่วงเช้า")]
+        public string StartTimeMorning { get; set; } = "00:00";
+
+        [Required, Comment("เวลาออกงานช่วงเช้า")]
+        public string EndTimeMorning { get; set; } = "00:00";
+
+        [Required, Comment("เวลาเข้างานช่วงบ่าย")]
+        public string StartTimeAfternoon { get; set; } = "00:00";
+
+        [Required, Comment("เวลาออกงานช่วงบ่าย")]
+        public string EndTimeAfternoon { get; set; } = "00:00";
+
+        [Required, Comment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)")]
+        public bool IsDefault { get; set; } = false;
+
+        [Required, Comment("สถานะการเปิดใช้งาน (เปิด/ปิด)")]
+        public bool IsActive { get; set; } = true;
+    }
+}
--- a/BMA.EHR.Domain/Shared/GlobalMessages.cs
+++ b/BMA.EHR.Domain/Shared/GlobalMessages.cs
@ -124,5 +124,10 @@

        #endregion

+        #region " Leave "
+
+        public static readonly string StartTimeGreaterEnd = "เวลาเริ่มต้นต้องน้อยกว่าเวลาสิ้นสุดเท่านั้น";
+
+        #endregion
    }
 }
--- a/BMA.EHR.Infrastructure/InfrastructureServiceRegistration.cs
+++ b/BMA.EHR.Infrastructure/InfrastructureServiceRegistration.cs
@ -43,6 +43,21 @@ namespace BMA.EHR.Infrastructure

            services.AddScoped<IApplicationDBExamContext>(provider => provider.GetService<ApplicationDBExamContext>());

+            // leave db context
+            var connectionStringLeave = configuration.GetConnectionString("LeaveConnection");
+
+            services.AddDbContext<LeaveDbContext>(options =>
+                options.UseMySql(connectionStringLeave, ServerVersion.AutoDetect(connectionStringLeave),
+                b =>
+                {
+                    b.MigrationsAssembly(typeof(LeaveDbContext).Assembly.FullName);
+                    b.MigrationsHistoryTable("__LeaveMigrationsHistory");
+
+                }),
+                ServiceLifetime.Transient);
+
+            services.AddScoped<IApplicationDBContext>(provider => provider.GetService<LeaveDbContext>());
+
            return services;
        }

--- a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20231109045253_Add
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20231109045253_Add
@ -0,0 +1,112 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    [Migration("20231109045253_Add Duty-Time 2")]
+    partial class AddDutyTime2
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    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<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    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>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20231109045253_Add
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20231109045253_Add
@ -0,0 +1,59 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddDutyTime2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterDatabase()
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "DutyTimes",
+                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"),
+                    Description = table.Column<string>(type: "longtext", nullable: false, comment: "คำอธิบาย")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StartTimeMorning = table.Column<string>(type: "longtext", nullable: false, comment: "เวลาเข้างานช่วงเช้า")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EndTimeMorning = table.Column<string>(type: "longtext", nullable: false, comment: "เวลาออกงานช่วงเช้า")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StartTimeAfternoon = table.Column<string>(type: "longtext", nullable: false, comment: "เวลาเข้างานช่วงบ่าย")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EndTimeAfternoon = table.Column<string>(type: "longtext", nullable: false, comment: "เวลาออกงานช่วงบ่าย")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsDefault = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "สถานะการเปิดใช้งาน (เปิด/ปิด)")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DutyTimes", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "DutyTimes");
+        }
+    }
+}
--- a/BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs
@ -0,0 +1,109 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    partial class LeaveDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    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<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    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>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
+++ b/BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs
@ -3,6 +3,7 @@ using BMA.EHR.Domain.Models.Commands.Core;
 using BMA.EHR.Domain.Models.Documents;
 using BMA.EHR.Domain.Models.HR;
 using BMA.EHR.Domain.Models.Insignias;
+using BMA.EHR.Domain.Models.Leave;
 using BMA.EHR.Domain.Models.MetaData;
 using BMA.EHR.Domain.Models.Notifications;
 using BMA.EHR.Domain.Models.OrganizationEmployee;
@ -345,6 +346,8 @@ namespace BMA.EHR.Infrastructure.Persistence

        #endregion

+       
+
        public ApplicationDBContext(DbContextOptions<ApplicationDBContext> options) : base(options)
        {
        }
--- a/BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs
+++ b/BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs
@ -0,0 +1,30 @@
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Domain.Models.Leave;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Infrastructure.Persistence
+{
+    public class LeaveDbContext : DbContext, IApplicationDBContext
+    {
+        #region " Leave "
+
+        public DbSet<DutyTime> DutyTimes { get; set; }
+
+        #endregion
+
+
+        public LeaveDbContext(DbContextOptions<LeaveDbContext> options) : base(options)
+        {
+        }
+
+        public Task<int> SaveChangesAsync()
+        {
+            return base.SaveChangesAsync();
+        }
+
+        public void Attatch<T>(T entity) where T : class
+        {
+            Attach(entity);
+        }
+    }
+}
--- a/BMA.EHR.Leave.Service/BMA.EHR.Leave.Service.csproj
+++ b/BMA.EHR.Leave.Service/BMA.EHR.Leave.Service.csproj
@ -0,0 +1,61 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>349e3764-b6a4-4dce-969a-e6976cd10d3e</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.Command.Service</RootNamespace>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <None Include="..\.dockerignore" Link=".dockerignore">
+	    <DependentUpon>$(DockerDefaultDockerfile)</DependentUpon>
+	  </None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="iTextSharp" Version="5.5.13.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" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.31.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+		<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" />
+		<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+		<PackageReference Include="Sentry.AspNetCore" Version="3.33.1" />
+		<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
+		<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
+		<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Update="wwwroot\index.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\keycloak.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\keycloak.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+</Project>
--- a/BMA.EHR.Leave.Service/ConfigureSwaggerOptions.cs
+++ b/BMA.EHR.Leave.Service/ConfigureSwaggerOptions.cs
@ -0,0 +1,85 @@
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.Extensions.Options;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Reflection;
+
+namespace BMA.EHR.Command.Service
+{
+    public class ConfigureSwaggerOptions : IConfigureNamedOptions<SwaggerGenOptions>
+    {
+        private readonly IApiVersionDescriptionProvider _provider;
+
+        public ConfigureSwaggerOptions(
+            IApiVersionDescriptionProvider provider)
+        {
+            _provider = provider;
+        }
+
+        public void Configure(SwaggerGenOptions options)
+        {
+            // add swagger document for every API version discovered
+            foreach (var description in _provider.ApiVersionDescriptions)
+            {
+                options.EnableAnnotations();
+
+                options.SwaggerDoc(
+                    description.GroupName,
+                    CreateVersionInfo(description));
+            }
+
+            options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+            {
+                In = ParameterLocation.Header,
+                Description = "Please enter a valid token",
+                Name = "Authorization",
+                Type = SecuritySchemeType.Http,
+                BearerFormat = "JWT",
+                Scheme = "Bearer"
+            });
+
+            options.AddSecurityRequirement(new OpenApiSecurityRequirement
+            {
+                {
+                    new OpenApiSecurityScheme
+                    {
+                        Reference = new OpenApiReference
+                        {
+                            Type = ReferenceType.SecurityScheme,
+                            Id = "Bearer"
+                        }
+                    },
+                    new string[]{}
+                }
+            });
+
+            // generate the XML docs that'll drive the swagger docs
+            var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+            var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+            options.IncludeXmlComments(xmlPath);
+        }
+
+        public void Configure(string name, SwaggerGenOptions options)
+        {
+            Configure(options);
+        }
+
+        private OpenApiInfo CreateVersionInfo(
+                ApiVersionDescription desc)
+        {
+            var info = new OpenApiInfo()
+            {
+                Title = "BMA EHR Leave Service Document",
+                Version = desc.ApiVersion.ToString(),
+                
+            };
+
+            if (desc.IsDeprecated)
+            {
+                info.Description += " This API version has been deprecated. Please use one of the new APIs available from the explorer.";
+            }
+
+            return info;
+        }
+    }
+}
--- a/BMA.EHR.Leave.Service/Controllers/CheckInController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/CheckInController.cs
@ -0,0 +1,114 @@
+using BMA.EHR.Application.Repositories;
+using BMA.EHR.Application.Repositories.Leaves;
+using BMA.EHR.Command.Service.DTOs.POI;
+using BMA.EHR.Domain.Common;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Swashbuckle.AspNetCore.Annotations;
+using System.Security.Claims;
+
+namespace BMA.EHR.Command.Service.Controllers
+{
+    [Route("api/v{version:apiVersion}/leave/check-in")]
+    [ApiVersion("1.0")]
+    [ApiController]
+    [Produces("application/json")]
+    [Authorize]
+    [SwaggerTag("API ระบบลงเวลาทำงาน")]
+    public class CheckInController : BaseController
+    {
+        #region " Fields "
+
+        private readonly DutyTimeRepository _repository;
+        private readonly LeaveDbContext _context;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IWebHostEnvironment _hostingEnvironment;
+        private readonly IConfiguration _configuration;
+        private readonly UserProfileRepository _userProfileRepository;
+
+        #endregion
+
+        #region " Constuctor and Destructor "
+
+        public CheckInController(DutyTimeRepository repository,
+                                LeaveDbContext context,
+                                IHttpContextAccessor httpContextAccessor,
+                                IWebHostEnvironment hostingEnvironment,
+                                IConfiguration configuration,
+                                UserProfileRepository userProfileRepository)
+        {
+            _repository = repository;
+            _context = context;
+            _httpContextAccessor = httpContextAccessor;
+            _hostingEnvironment = hostingEnvironment;
+            _configuration = configuration;
+            _userProfileRepository = userProfileRepository;
+        }
+
+        #endregion
+
+        #region " Properties "
+
+        private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+
+        private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
+
+        private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1");
+
+        private Guid OcId
+        {
+            get
+            {
+                if (UserId != null || UserId != "")
+                    return _userProfileRepository.GetUserOCId(Guid.Parse(UserId!));
+                else
+                    return Guid.Empty;
+            }
+        }
+
+        #endregion
+
+        #region " Methods "
+
+        [HttpPost("locations")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        [AllowAnonymous]
+        public async Task<ActionResult<ResponseObject>> ListPOIAsync([FromBody] GetPOIDto data)
+        {
+            var api_url = $"https://maps.googleapis.com/maps/api/place/nearbysearch/json?location={data.Lat},{data.Lon}&types=point_of_interest&radius=50000&sensor=false&language=th&key=AIzaSyDXKvpU4hinlCKGOEJUgLDbx9yCSZe3woc";
+
+            using (var client = new HttpClient())
+            {
+                var req = new HttpRequestMessage(HttpMethod.Get, api_url);
+
+                var res = await client.SendAsync(req);
+                var result = await res.Content.ReadAsStringAsync();
+                var poi_result = JsonConvert.DeserializeObject<GetPOIResultDto>(result);
+
+                var poi_data = new List<POIResultDto>();
+
+                if (poi_result != null)
+                {
+                    foreach (var r in poi_result.results.Take(5))
+                    {
+                        poi_data.Add(new POIResultDto
+                        {
+                            Id = r.place_id,
+                            Name = r.name,
+                            Latitude = r.geometry.location.lat,
+                            Longitude = r.geometry.location.lng,
+                        });
+                    }
+                }
+
+                return Success(poi_data);
+            }
+        }
+
+        #endregion
+    }
+}
--- a/BMA.EHR.Leave.Service/Controllers/DutyTimeController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/DutyTimeController.cs
@ -0,0 +1,269 @@
+using BMA.EHR.Application.Repositories;
+using BMA.EHR.Application.Repositories.Leaves;
+using BMA.EHR.Command.Service.DTOs.DutyTime;
+using BMA.EHR.Domain.Common;
+using BMA.EHR.Domain.Models.Leave;
+using BMA.EHR.Domain.Shared;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Swashbuckle.AspNetCore.Annotations;
+using System.Security.Claims;
+
+namespace BMA.EHR.Command.Service.Controllers
+{
+    [Route("api/v{version:apiVersion}/leave/duty-time")]
+    [ApiVersion("1.0")]
+    [ApiController]
+    [Produces("application/json")]
+    [Authorize]
+    [SwaggerTag("API ระบบจัดการรอบการลงเวลาทำงาน")]
+    public class DutyTimeController : BaseController
+    {
+        #region " Fields "
+
+        private readonly DutyTimeRepository _repository;
+        private readonly LeaveDbContext _context;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IWebHostEnvironment _hostingEnvironment;
+        private readonly IConfiguration _configuration;
+        private readonly UserProfileRepository _userProfileRepository;
+
+        #endregion
+
+        #region " Constuctor and Destructor "
+
+        public DutyTimeController(DutyTimeRepository repository,
+                                LeaveDbContext context,
+                                IHttpContextAccessor httpContextAccessor,
+                                IWebHostEnvironment hostingEnvironment,
+                                IConfiguration configuration,
+                                UserProfileRepository userProfileRepository)
+        {
+            _repository = repository;
+            _context = context;
+            _httpContextAccessor = httpContextAccessor;
+            _hostingEnvironment = hostingEnvironment;
+            _configuration = configuration;
+            _userProfileRepository = userProfileRepository;
+        }
+
+        #endregion
+
+        #region " Properties "
+
+        private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+
+        private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
+
+        private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1");
+
+        private Guid OcId
+        {
+            get
+            {
+                if (UserId != null || UserId != "")
+                    return _userProfileRepository.GetUserOCId(Guid.Parse(UserId!));
+                else
+                    return Guid.Empty;
+            }
+        }
+
+        #endregion
+
+        #region " Methods "
+
+        /// <summary>
+        /// LV1_004 - ข้อมูลทั้งหมดของรอบการปฏิบัติงาน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetAllAsync()
+        {
+            var data = await _repository.GetAllAsync();
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// ข้อมูลของรอบการปฏิบัติงาน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetByIdAsync(Guid id)
+        {
+            var data = await _repository.GetByIdAsync(id);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// LV1_001 - สร้างรอบการปฏิบัติงาน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostAsync([FromBody] CreateDutyTimeDto data)
+        {
+            // validate
+            var startMorning = TimeOnly.Parse(data.StartTimeMorning);
+            var endMorning = TimeOnly.Parse(data.EndTimeMorning);
+            var startAfternoon = TimeOnly.Parse(data.StartTimeAfternoon);
+            var endAfternoon = TimeOnly.Parse(data.EndTimeAfternoon);
+
+            if (startMorning >= endMorning)
+            {
+                throw new Exception(GlobalMessages.StartTimeGreaterEnd);
+            }
+
+            if (startAfternoon >= endAfternoon)
+            {
+                throw new Exception(GlobalMessages.StartTimeGreaterEnd);
+            }
+
+            var oldData = await _repository.GetAllAsync();
+            if (oldData == null || oldData.Count == 0)
+            {
+                var inserted = new DutyTime
+                {
+                    Id = Guid.NewGuid(),
+                    Description = data.Description,
+                    StartTimeMorning = data.StartTimeMorning,
+                    EndTimeMorning = data.EndTimeMorning,
+                    StartTimeAfternoon = data.StartTimeAfternoon,
+                    EndTimeAfternoon = data.EndTimeAfternoon,
+                    IsActive = true,
+                    IsDefault = true,
+                };
+
+                var ret = await _repository.AddAsync(inserted);
+
+                return Success(ret);
+            }
+            else
+            {
+                if (data.IsDefault)
+                {
+                    foreach (var d in oldData)
+                    {
+                        d.IsDefault = false;
+                        await _repository.UpdateAsync(d);
+                    }
+                }
+
+                var inserted = new DutyTime
+                {
+                    Id = Guid.NewGuid(),
+                    Description = data.Description,
+                    StartTimeMorning = data.StartTimeMorning,
+                    EndTimeMorning = data.EndTimeMorning,
+                    StartTimeAfternoon = data.StartTimeAfternoon,
+                    EndTimeAfternoon = data.EndTimeAfternoon,
+                    IsActive = true,
+                    IsDefault = data.IsDefault,
+                };
+
+                var ret = await _repository.AddAsync(inserted);
+
+                return Success(ret);
+            }
+        }
+
+
+        /// <summary>
+        /// LV1_002 - แก้ไขรอบการปฏิบัติงาน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutAsync(Guid id, [FromBody] UpdateDutyTimeDto data)
+        {
+            var oldData = await _repository.GetByIdAsync(id);
+            if (oldData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+            else
+            {             
+                var oldDataList = await _repository.GetAllAsync();
+                if (data.IsDefault)
+                {
+                    foreach (var d in oldDataList)
+                    {
+                        d.IsDefault = false;
+                        await _repository.UpdateAsync(d);
+                    }
+                }
+
+                oldData.Description = data.Description;
+                oldData.IsDefault = data.IsDefault;
+                oldData.IsActive = data.IsActive;
+
+                await _repository.UpdateAsync(oldData);
+
+                return Success(oldData);
+
+            }
+        }
+
+
+        /// <summary>
+        /// LV1_003 - ลบรอบการปฏิบัติงาน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpDelete("{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> DeleteAsync(Guid id)
+        {
+            var oldData = await _repository.GetByIdAsync(id);
+            if (oldData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+            else
+            {
+                if (oldData.IsActive || oldData.IsDefault)
+                {
+                    throw new Exception("ไม่สามารถลบรอบการปฏิบัติงานที่ยังใช้งานอยู่ได้");
+                }
+
+                await _repository.DeleteAsync(oldData);
+                return Success();
+            }
+        }
+
+        #endregion
+    }
+}
--- a/BMA.EHR.Leave.Service/DTOs/DutyTime/CreateDutyTimeDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/DutyTime/CreateDutyTimeDto.cs
@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Command.Service.DTOs.DutyTime
+{
+    public class CreateDutyTimeDto
+    {
+
+        [Required, Comment("คำอธิบาย")]
+        public string Description { get; set; } = string.Empty;
+
+        [Required, Comment("เวลาเข้างานช่วงเช้า")]
+        public string StartTimeMorning { get; set; } = "00:00";
+
+        [Required, Comment("เวลาออกงานช่วงเช้า")]
+        public string EndTimeMorning { get; set; } = "00:00";
+
+        [Required, Comment("เวลาเข้างานช่วงบ่าย")]
+        public string StartTimeAfternoon { get; set; } = "00:00";
+
+        [Required, Comment("เวลาออกงานช่วงบ่าย")]
+        public string EndTimeAfternoon { get; set; } = "00:00";
+
+        [Required, Comment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)")]
+        public bool IsDefault { get; set; } = false;
+    }
+}
--- a/BMA.EHR.Leave.Service/DTOs/DutyTime/UpdateDutyTimeDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/DutyTime/UpdateDutyTimeDto.cs
@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Command.Service.DTOs.DutyTime
+{
+    public class UpdateDutyTimeDto
+    {
+        [Required, Comment("คำอธิบาย")]
+        public string Description { get; set; } = string.Empty;
+
+        [Required, Comment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)")]
+        public bool IsDefault { get; set; } = false;
+
+        [Required, Comment("สถานะการเปิดใช้งาน (เปิด/ปิด)")]
+        public bool IsActive { get; set; } = true;
+    }
+}
--- a/BMA.EHR.Leave.Service/DTOs/POI/GetPOIDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/POI/GetPOIDto.cs
@ -0,0 +1,9 @@
+namespace BMA.EHR.Command.Service.DTOs.POI
+{
+    public class GetPOIDto
+    {
+        public double Lat { get; set; } = 0;
+
+        public double Lon { get; set; } = 0;
+    }
+}
--- a/BMA.EHR.Leave.Service/DTOs/POI/GetPOIResultDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/POI/GetPOIResultDto.cs
@ -0,0 +1,28 @@
+namespace BMA.EHR.Command.Service.DTOs.POI
+{
+    public class GetPOIResultDto
+    {
+        public List<POIItem> results { get; set; } = new List<POIItem>();
+    }
+
+    public class POIItem
+    {
+        public string place_id { get; set; } = string.Empty;
+
+        public string name { get; set; } = string.Empty;
+
+        public GeometryItem geometry { get; set; } = new();
+    }
+
+    public class GeometryItem
+    {
+        public LocationItem location { get; set; } = new();
+    }
+
+    public class LocationItem
+    {
+        public double lat { get; set; } = 0;
+
+        public double lng { get; set; } = 0;
+    }
+}
--- a/BMA.EHR.Leave.Service/DTOs/POI/POIResultDto.cs
+++ b/BMA.EHR.Leave.Service/DTOs/POI/POIResultDto.cs
@ -0,0 +1,13 @@
+namespace BMA.EHR.Command.Service.DTOs.POI
+{
+    public class POIResultDto
+    {
+        public string Id { get; set; } = string.Empty;
+
+        public string Name { get; set; } = string.Empty;
+
+        public double Latitude { get; set; } = 0;
+
+        public double Longitude { get; set; } = 0;
+    }
+}
--- a/BMA.EHR.Leave.Service/Dockerfile
+++ b/BMA.EHR.Leave.Service/Dockerfile
@ -0,0 +1,27 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+
+COPY ["BMA.EHR.Domain/BMA.EHR.Domain.csproj", "BMA.EHR.Domain/"]
+COPY ["BMA.EHR.Application/BMA.EHR.Application.csproj", "BMA.EHR.Application/"]
+COPY ["BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj", "BMA.EHR.Infrastructure/"]
+COPY ["BMA.EHR.Leave.Service/BMA.EHR.Leave.Service.csproj", "BMA.EHR.Leave.Service/"]
+
+RUN dotnet restore "BMA.EHR.Leave.Service/BMA.EHR.Leave.Service.csproj"
+COPY . .
+WORKDIR "/src/BMA.EHR.Leave.Service"
+RUN dotnet build "BMA.EHR.Leave.Service.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "BMA.EHR.Leave.Service.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "BMA.EHR.Leave.Service.dll"]
--- a/BMA.EHR.Leave.Service/Program.cs
+++ b/BMA.EHR.Leave.Service/Program.cs
@ -0,0 +1,162 @@
+using BMA.EHR.Application;
+using BMA.EHR.Command.Service;
+using BMA.EHR.Domain.Middlewares;
+using BMA.EHR.Infrastructure;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Versioning;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.Logging;
+using Microsoft.IdentityModel.Tokens;
+using Serilog;
+using Serilog.Exceptions;
+using Serilog.Sinks.Elasticsearch;
+using System.Reflection;
+using System.Text;
+
+var builder = WebApplication.CreateBuilder(args);
+{
+    var issuer = builder.Configuration["Jwt:Issuer"];
+    var key = builder.Configuration["Jwt:Key"];
+
+
+    IdentityModelEventSource.ShowPII = true;
+
+    builder.Services.AddHttpContextAccessor();
+
+    builder.Services.AddApiVersioning(opt =>
+    {
+        opt.DefaultApiVersion = new ApiVersion(1, 0);
+        opt.AssumeDefaultVersionWhenUnspecified = true;
+        opt.ReportApiVersions = true;
+        opt.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
+                                                        new HeaderApiVersionReader("x-api-version"),
+                                                        new MediaTypeApiVersionReader("x-api-version"));
+    });
+
+    builder.Services.AddVersionedApiExplorer(setup =>
+    {
+        setup.GroupNameFormat = "'v'VVV";
+        setup.SubstituteApiVersionInUrl = true;
+    });
+
+    builder.Services.AddEndpointsApiExplorer();
+
+    // Authorization
+    builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme).AddJwtBearer(opt =>
+    {
+        opt.SaveToken = true;
+        opt.RequireHttpsMetadata = false; //false for dev
+        opt.Authority = issuer;
+        opt.TokenValidationParameters = new()
+        {
+            ValidateIssuer = true,
+            ValidateAudience = false,
+            ValidateLifetime = true,
+            ValidateIssuerSigningKey = true,
+            ValidIssuer = issuer,
+            IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(key))
+        };
+    });
+    builder.Services.AddAuthorization();
+
+    // use serilog
+    ConfigureLogs();
+    builder.Host.UseSerilog();
+
+    // Add config CORS
+    builder.Services.AddCors(options => options.AddDefaultPolicy(builder =>
+    {
+        builder
+            .AllowAnyOrigin()
+            .AllowAnyMethod()
+            .AllowAnyHeader()
+            .SetIsOriginAllowedToAllowWildcardSubdomains();
+    }));
+
+
+    // Add services to the container.
+    builder.Services.AddApplication();
+    builder.Services.AddPersistence(builder.Configuration);
+
+    builder.Services.AddControllers(options =>
+    {
+        options.SuppressAsyncSuffixInActionNames = false;
+    })
+    .AddNewtonsoftJson(x => x.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore);
+
+    builder.Services.AddSwaggerGen();
+    builder.Services.ConfigureOptions<ConfigureSwaggerOptions>();
+
+    builder.Services.AddHealthChecks();
+}
+
+var app = builder.Build();
+{
+    var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionDescriptionProvider>();
+
+    if (app.Environment.IsDevelopment())
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI(options =>
+        {
+            foreach (var description in apiVersionDescriptionProvider.ApiVersionDescriptions)
+            {
+                options.SwaggerEndpoint($"/swagger/{description.GroupName}/swagger.json",
+                    description.GroupName.ToUpperInvariant());
+            }
+        });
+    }
+
+    app.MapHealthChecks("/health");
+
+
+    app.UseHttpsRedirection();
+    app.UseCors();
+    app.UseAuthentication();
+    app.UseAuthorization();
+    app.UseDefaultFiles();
+    app.UseStaticFiles();
+    app.MapControllers();
+    app.UseMiddleware<ErrorHandlerMiddleware>();
+
+    // apply migrations
+    await using var scope = app.Services.CreateAsyncScope();
+    await using var db = scope.ServiceProvider.GetRequiredService<LeaveDbContext>();
+    await db.Database.MigrateAsync();
+
+    app.Run();
+}
+
+void ConfigureLogs()
+{
+    var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+    var configuration = new ConfigurationBuilder()
+        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+        .AddJsonFile(
+            $"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json",
+            optional: true)
+        .Build();
+
+    Log.Logger = new LoggerConfiguration()
+        .Enrich.FromLogContext()
+        .MinimumLevel.Error()
+        .WriteTo.Console()
+        .Enrich.WithExceptionDetails()
+        .WriteTo.Elasticsearch(ConfigureElasticSink(configuration, environment ?? ""))
+        .Enrich.WithProperty("Environment", environment)
+        .ReadFrom.Configuration(configuration)
+        .CreateLogger();
+}
+
+ElasticsearchSinkOptions ConfigureElasticSink(IConfigurationRoot configuration, string environment)
+{
+    return new ElasticsearchSinkOptions(new Uri(configuration["ElasticConfiguration:Uri"] ?? ""))
+    {
+        AutoRegisterTemplate = true,
+        IndexFormat = $"{Assembly.GetExecutingAssembly()?.GetName()?.Name?.ToLower().Replace(".", "-")}-{environment?.ToLower().Replace(".", "-")}"
+    };
+}
+
--- a/BMA.EHR.Leave.Service/Properties/launchSettings.json
+++ b/BMA.EHR.Leave.Service/Properties/launchSettings.json
@ -0,0 +1,51 @@
+{
+    "profiles": {
+        "https": {
+            "commandName": "Project",
+            "launchBrowser": true,
+            "launchUrl": "swagger",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "dotnetRunMessages": true,
+            "applicationUrl": "https://localhost:7283;http://localhost:5028"
+        },
+        "http": {
+            "commandName": "Project",
+            "launchBrowser": true,
+            "launchUrl": "swagger",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "dotnetRunMessages": true,
+            "applicationUrl": "http://localhost:5028"
+        },
+        "IIS Express": {
+            "commandName": "IISExpress",
+            "launchBrowser": true,
+            "launchUrl": "swagger",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        },
+        "Docker": {
+            "commandName": "Docker",
+            "launchBrowser": true,
+            "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+            "environmentVariables": {
+                "ASPNETCORE_URLS": "https://+:443;http://+:80"
+            },
+            "publishAllPorts": true,
+            "useSSL": true
+        }
+    },
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:27010",
+      "sslPort": 44373
+    }
+  }
+}
--- a/BMA.EHR.Leave.Service/appsettings.Development.json
+++ b/BMA.EHR.Leave.Service/appsettings.Development.json
@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
--- a/BMA.EHR.Leave.Service/appsettings.json
+++ b/BMA.EHR.Leave.Service/appsettings.json
@ -0,0 +1,48 @@
+{
+    "Serilog": {
+        "MinimumLevel": {
+            "Default": "Information",
+            "Override": {
+                "Microsoft": "Information",
+                "System": "Warning"
+            }
+        }
+    },
+    "ElasticConfiguration": {
+        "Uri": "http://localhost:9200"
+    },
+    "AllowedHosts": "*",
+    "ConnectionStrings": {
+        //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
+        "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "ExamConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "LeaveConnection": "server=192.168.4.11;user=root;password=P@ssw0rd;port=3306;database=bma_ehr_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+    },
+    "Jwt": {
+        "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
+        "Issuer": "https://id.frappet.synology.me/realms/bma-ehr"
+    },
+    "EPPlus": {
+        "ExcelPackage": {
+            "LicenseContext": "NonCommercial"
+        }
+    },
+    "MinIO": {
+        "Endpoint": "https://s3cluster.frappet.com/",
+        "AccessKey": "frappet",
+        "SecretKey": "FPTadmin2357",
+        "BucketName": "bma-ehr-fpt"
+    },
+    "Protocol": "HTTPS",
+    "Node": {
+        "API": "https://bma-ehr.frappet.synology.me/api/v1/probation"
+    },
+    "Mail": {
+        "Server": "mail.bangkok.go.th",
+        "User": "saraban.csc.rd@bangkok.go.th",
+        "Password": "Saraban5222",
+        "MailFrom": "saraban.csc.rd@bangkok.go.th",
+        "Port": "25"
+    },
+    "API": "https://bma-ehr.frappet.synology.me/api/v1"
+}
--- a/BMA.EHR.Leave.Service/wwwroot/index.html
+++ b/BMA.EHR.Leave.Service/wwwroot/index.html
@ -0,0 +1,184 @@
+<!--
+  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+  ~ and other contributors as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<html>
+<head>
+    <script src="./keycloak.js"></script>
+</head>
+<body>
+
+    <div>
+        <button onclick="keycloak.login()">Login</button>
+        <button onclick="keycloak.login({ action: 'UPDATE_PASSWORD' })">Update Password</button>
+        <button onclick="keycloak.logout()">Logout</button>
+        <button onclick="keycloak.register()">Register</button>
+        <button onclick="keycloak.accountManagement()">Account</button>
+        <button onclick="refreshToken(9999)">Refresh Token</button>
+        <button onclick="refreshToken(30)">Refresh Token (if <30s validity)</button>
+        <button onclick="loadProfile()">Get Profile</button>
+        <button onclick="updateProfile()">Update profile</button>
+        <button onclick="loadUserInfo()">Get User Info</button>
+        <button onclick="output(keycloak.tokenParsed)">Show Token</button>
+        <button onclick="output(keycloak.refreshTokenParsed)">Show Refresh Token</button>
+        <button onclick="output(keycloak.idTokenParsed)">Show ID Token</button>
+        <button onclick="showExpires()">Show Expires</button>
+        <button onclick="output(keycloak)">Show Details</button>
+        <button onclick="output(keycloak.createLoginUrl())">Show Login URL</button>
+        <button onclick="output(keycloak.createLogoutUrl())">Show Logout URL</button>
+        <button onclick="output(keycloak.createRegisterUrl())">Show Register URL</button>
+        <button onclick="output(keycloak.createAccountUrl())">Show Account URL</button>
+
+    </div>
+
+    <h2>Result</h2>
+<pre style="background-color: #ddd; border: 1px solid #ccc; padding: 10px; word-wrap: break-word; white-space: pre-wrap;" id="output"></pre>
+
+    <h2>Events</h2>
+<pre style="background-color: #ddd; border: 1px solid #ccc; padding: 10px; word-wrap: break-word; white-space: pre-wrap;" id="events"></pre>
+
+
+    <script>
+    function loadProfile() {
+        keycloak.loadUserProfile().success(function(profile) {
+            output(profile);
+        }).error(function() {
+            output('Failed to load profile');
+        });
+    }
+
+    function updateProfile() {
+        var url = keycloak.createAccountUrl().split('?')[0];
+        var req = new XMLHttpRequest();
+        req.open('POST', url, true);
+        req.setRequestHeader('Accept', 'application/json');
+        req.setRequestHeader('Content-Type', 'application/json');
+        req.setRequestHeader('Authorization', 'bearer ' + keycloak.token);
+
+        req.onreadystatechange = function () {
+            if (req.readyState == 4) {
+                if (req.status == 200) {
+                    output('Success');
+                } else {
+                    output('Failed');
+                }
+            }
+        }
+
+        req.send('{"email":"myemail@foo.bar","firstName":"test","lastName":"bar"}');
+    }
+
+    function loadUserInfo() {
+        keycloak.loadUserInfo().success(function(userInfo) {
+            output(userInfo);
+        }).error(function() {
+            output('Failed to load user info');
+        });
+    }
+
+    function refreshToken(minValidity) {
+        keycloak.updateToken(minValidity).then(function(refreshed) {
+            if (refreshed) {
+                output(keycloak.tokenParsed);
+            } else {
+                output('Token not refreshed, valid for ' + Math.round(keycloak.tokenParsed.exp + keycloak.timeSkew - new Date().getTime() / 1000) + ' seconds');
+            }
+        }).catch(function() {
+            output('Failed to refresh token');
+        });
+    }
+
+    function showExpires() {
+        if (!keycloak.tokenParsed) {
+            output("Not authenticated");
+            return;
+        }
+
+        var o = 'Token Expires:\t\t' + new Date((keycloak.tokenParsed.exp + keycloak.timeSkew) * 1000).toLocaleString() + '\n';
+        o += 'Token Expires in:\t' + Math.round(keycloak.tokenParsed.exp + keycloak.timeSkew - new Date().getTime() / 1000) + ' seconds\n';
+
+        if (keycloak.refreshTokenParsed) {
+            o += 'Refresh Token Expires:\t' + new Date((keycloak.refreshTokenParsed.exp + keycloak.timeSkew) * 1000).toLocaleString() + '\n';
+            o += 'Refresh Expires in:\t' + Math.round(keycloak.refreshTokenParsed.exp + keycloak.timeSkew - new Date().getTime() / 1000) + ' seconds';
+        }
+
+        output(o);
+    }
+
+    function output(data) {
+        if (typeof data === 'object') {
+            data = JSON.stringify(data, null, '  ');
+        }
+        document.getElementById('output').innerHTML = data;
+    }
+
+    function event(event) {
+        var e = document.getElementById('events').innerHTML;
+        document.getElementById('events').innerHTML = new Date().toLocaleString() + "\t" + event + "\n" + e;
+    }
+
+    var keycloak = Keycloak();
+
+    keycloak.onAuthSuccess = function () {
+        event('Auth Success');
+    };
+
+    keycloak.onAuthError = function (errorData) {
+        event("Auth Error: " + JSON.stringify(errorData) );
+    };
+
+    keycloak.onAuthRefreshSuccess = function () {
+        event('Auth Refresh Success');
+    };
+
+    keycloak.onAuthRefreshError = function () {
+        event('Auth Refresh Error');
+    };
+
+    keycloak.onAuthLogout = function () {
+        event('Auth Logout');
+    };
+
+    keycloak.onTokenExpired = function () {
+        event('Access token expired.');
+    };
+
+    keycloak.onActionUpdate = function (status) {
+        switch (status) {
+            case 'success':
+                event('Action completed successfully'); break;
+            case 'cancelled':
+                event('Action cancelled by user'); break;
+            case 'error':
+                event('Action failed'); break;
+        }
+    };
+
+    // Flow can be changed to 'implicit' or 'hybrid', but then client must enable implicit flow in admin console too
+    var initOptions = {
+        responseMode: 'fragment',
+        flow: 'standard'
+    };
+
+    keycloak.init(initOptions).then(function(authenticated) {
+        output('Init Success (' + (authenticated ? 'Authenticated' : 'Not Authenticated') + ')');
+    }).catch(function() {
+        output('Init Error');
+    });
+
+    </script>
+</body>
+</html>
--- a/BMA.EHR.Leave.Service/wwwroot/keycloak.js
+++ b/BMA.EHR.Leave.Service/wwwroot/keycloak.js
--- a/BMA.EHR.Leave.Service/wwwroot/keycloak.json
+++ b/BMA.EHR.Leave.Service/wwwroot/keycloak.json
@ -0,0 +1,7 @@
+{
+  "realm": "bma-ehr",
+  "auth-server-url": "https://id.frappet.synology.me",
+  "ssl-required": "external",
+  "resource": "bma-ehr",
+  "public-client": true
+}
--- a/BMA.EHR.Solution.sln
+++ b/BMA.EHR.Solution.sln
@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BMA.EHR.Retirement.Service"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BMA.EHR.Report.Service", "BMA.EHR.Report.Service\BMA.EHR.Report.Service.csproj", "{26FE7B1C-771B-4940-9F40-326A7AD53F1C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMA.EHR.Leave.Service", "BMA.EHR.Leave.Service\BMA.EHR.Leave.Service.csproj", "{0F15B902-82D7-4878-B12D-B36C14E8EDBC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -73,6 +75,10 @@ Global
 		{26FE7B1C-771B-4940-9F40-326A7AD53F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26FE7B1C-771B-4940-9F40-326A7AD53F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26FE7B1C-771B-4940-9F40-326A7AD53F1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -89,6 +95,7 @@ Global
 		{04B37ACD-65CF-44ED-BC40-B5E7A71C374B} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F}
 		{3FFE378C-387F-42EA-96E2-68E63BB295F9} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F}
 		{26FE7B1C-771B-4940-9F40-326A7AD53F1C} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F}
+		{0F15B902-82D7-4878-B12D-B36C14E8EDBC} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3111A492-1818-4438-B718-75199D8E779A}