From 9b94f9cf91c43ce629cdab468180b2a5fe9b663d Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 5 Apr 2023 15:03:22 +0700
Subject: [PATCH] fixed

---
 Dockerfile.dev                             | 7 ++++---
 wwwroot/reports/durable_articles_three.frx | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 7686f6a..46ee29a 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,11 +1,12 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 as build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build-env
 WORKDIR /source
+COPY Packages/. Packages/.
 COPY . .
-RUN dotnet restore --configfile nuget.config
+RUN dotnet restore -s /source/Packages -s https://api.nuget.org/v3/index.json
 RUN dotnet build
 RUN dotnet publish -o /publish --configuration Release;
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0
+FROM mcr.microsoft.com/dotnet/aspnet:3.1
 COPY . .
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends apt-utils
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y fontconfig
diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx
index ce9f4a8..df64925 100644
--- a/wwwroot/reports/durable_articles_three.frx
+++ b/wwwroot/reports/durable_articles_three.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="04/05/2023 14:12:22" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="04/05/2023 15:01:34" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -220,7 +220,7 @@
       <TextObject Name="Text100" Top="28.35" Width="812.7" Height="28.35" Text="คำอธิบายรวม" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text101" Top="56.7" Width="812.7" Height="85.05" Text="[durable_articles_three.description_included]" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text102" Top="141.75" Width="812.7" Height="28.35" Text="คำอธิบายเพิ่มเติม" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data9" Top="174.81" Width="831.6" Height="311.85" DataSource="descript_more">
+      <DataBand Name="Data9" Top="174.59" Width="831.6" Height="311.85" DataSource="descript_more">
         <PictureObject Name="Picture1" Top="37.8" Width="831.6" Height="179.55" DataColumn="durable_articles_three.descript_more.image_description"/>
         <TextObject Name="Text103" Top="226.8" Width="831.6" Height="85.05" Text="[durable_articles_three.descript_more.remark]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text134" Width="831.6" Height="37.8" Text="[durable_articles_three.descript_more.descript]" Font="TH SarabunPSK, 16pt"/>
@@ -250,9 +250,9 @@
       <DataBand Name="Data10" Top="65.69" Width="831.6" Height="37.8" DataSource="data_detail">
         <TextObject Name="Text108" Width="831.6" Height="37.8" Text="[durable_articles_three.specification_data.data_detail.list]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH Sarabun New, 16pt"/>
         <DataBand Name="Data23" Top="107.98" Width="831.6" Height="47.25" DataSource="data_detail">
-          <TextObject Name="Text111" Left="18.9" Width="812.7" Height="47.25" Text="[durable_articles_three.specification_data.data_detail.attribute]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 14pt"/>
+          <TextObject Name="Text111" Left="18.9" Width="812.7" Height="47.25" CanGrow="true" CanShrink="true" GrowToBottom="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.attribute]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 14pt"/>
           <DataBand Name="Data20" Top="159.73" Width="831.6" Height="85.05" DataSource="data_detail2">
-            <TextObject Name="Text135" Left="37.8" Width="812.7" Height="85.05" Text="[durable_articles_three.specification_data.data_detail.data_detail2.attribute]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 14pt"/>
+            <TextObject Name="Text135" Left="37.8" Width="831.6" Height="85.05" CanGrow="true" CanShrink="true" GrowToBottom="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.data_detail2.attribute]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 14pt" LineHeight="20"/>
           </DataBand>
         </DataBand>
       </DataBand>