Skip to content

Commit c3d581b

Browse files
committed
update progress report demo
1 parent 5cb97fb commit c3d581b

12 files changed

+1225
-1822
lines changed

source code/TestDebugASPNET/MySqlBackup.NET/QueryExpress.cs

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -476,29 +476,25 @@ public static void ConvertToSqlFormat(StringBuilder sb, Object ob, MySqlColumn c
476476
if (wrapStringWithSingleQuote)
477477
sb.AppendFormat("'");
478478

479-
if (col != null)
479+
if (col != null && col.TimeFractionLength > 0)
480480
{
481-
if (col.MySqlDataType == "date")
482-
{
483-
sb.AppendFormat(((DateTime)ob).ToString("yyyy-MM-dd", _dateFormatInfo));
484-
}
485-
else if(col.MySqlDataType == "datetime")
486-
{
481+
sb.AppendFormat(((DateTime)ob).ToString("yyyy-MM-dd HH:mm:ss", _dateFormatInfo));
482+
sb.Append(".");
483+
string _microsecond = ((DateTime)ob).ToString("".PadLeft(col.TimeFractionLength, 'f'));
484+
sb.Append(_microsecond);
485+
}
486+
else if (col != null)
487+
{
488+
if (col.MySqlDataType == "datetime")
487489
sb.AppendFormat(((DateTime)ob).ToString("yyyy-MM-dd HH:mm:ss", _dateFormatInfo));
488-
}
490+
else if (col.MySqlDataType == "date")
491+
sb.AppendFormat(((DateTime)ob).ToString("yyyy-MM-dd", _dateFormatInfo));
489492
}
490493
else
491494
{
492495
sb.AppendFormat(((DateTime)ob).ToString("yyyy-MM-dd HH:mm:ss", _dateFormatInfo));
493496
}
494497

495-
if (col != null && col.TimeFractionLength > 0)
496-
{
497-
sb.Append(".");
498-
string _microsecond = ((DateTime)ob).ToString("".PadLeft(col.TimeFractionLength, 'f'));
499-
sb.Append(_microsecond);
500-
}
501-
502498
if (wrapStringWithSingleQuote)
503499
sb.AppendFormat("'");
504500
}

source code/TestDebugASPNET/TestDebugASPNET.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
<Content Include="cssjs\ProgressReportWidget2-3.js" />
138138
<Content Include="pages\About.aspx" />
139139
<Content Include="pages\apiMain.aspx" />
140-
<Content Include="pages\apiProgressReport2-2.aspx" />
141140
<Content Include="pages\apiProgressReport2.aspx" />
142141
<Content Include="pages\apiProgressReport3.aspx" />
143142
<Content Include="pages\DatabaseDumpViewer.aspx" />
@@ -195,13 +194,6 @@
195194
<Compile Include="pages\apiMain.aspx.designer.cs">
196195
<DependentUpon>apiMain.aspx</DependentUpon>
197196
</Compile>
198-
<Compile Include="pages\apiProgressReport2-2.aspx.cs">
199-
<DependentUpon>apiProgressReport2-2.aspx</DependentUpon>
200-
<SubType>ASPXCodeBehind</SubType>
201-
</Compile>
202-
<Compile Include="pages\apiProgressReport2-2.aspx.designer.cs">
203-
<DependentUpon>apiProgressReport2-2.aspx</DependentUpon>
204-
</Compile>
205197
<Compile Include="pages\apiProgressReport2.aspx.cs">
206198
<DependentUpon>apiProgressReport2.aspx</DependentUpon>
207199
<SubType>ASPXCodeBehind</SubType>

source code/TestDebugASPNET/cssjs/ProgressReportWidget2-3.js

Lines changed: 160 additions & 147 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)