on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'revision/DailyReport' into dev

Browse Source
This commit is contained in:
ngfrolov 2022-09-29 16:25:11 +05:00
commit 591e1a6ef2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudInfrastructure/Services/DailyReport/DailyReportMakerExcel.cs
View File

@ -44,7 +44,9 @@ namespace AsbCloudInfrastructure.Services.DailyReport
timeBalance.Draw(sheet); timeBalance.Draw(sheet);
blockDimensionless.Draw(sheet); blockDimensionless.Draw(sheet);
blockSaub.Draw(sheet); blockSaub.Draw(sheet);
blockSign.Draw(sheet); blockSign.Draw(sheet);
//sheet.Columns().AdjustToContents(); // Adjust column width
sheet.Rows().AdjustToContents();
} }
} }
} }

8
AsbCloudInfrastructure/Services/DailyReport/XLExtentions.cs
View File

@ -10,12 +10,12 @@ namespace AsbCloudInfrastructure.Services.DailyReport
var mergedRange = range.Merge(); var mergedRange = range.Merge();
mergedRange.FirstCell()._SetValue(value); mergedRange.FirstCell()._SetValue(value);
var colWidth = mergedRange.FirstCell().WorksheetColumn().Width; var colWidth = mergedRange.FirstCell().WorksheetColumn().Width;
var maxCharsToWrap = colWidth / (0.05d * mergedRange.FirstCell().Style.Font.FontSize); var maxCharsToWrap = colWidth / (0.1d * mergedRange.FirstCell().Style.Font.FontSize);
if (value is string valueString && valueString.Length > maxCharsToWrap) if (value is string valueString && valueString.Length > maxCharsToWrap)
{ {
var row = mergedRange.FirstCell().WorksheetRow(); var row = mergedRange.FirstCell().WorksheetRow();
var baseHeight = row.Height; var baseHeight = row.Height;
row.Height = 0.45d * baseHeight * Math.Ceiling(1d + valueString.Length / maxCharsToWrap); row.Height = 0.5d * baseHeight * Math.Ceiling(1d + valueString.Length / maxCharsToWrap);
} }
mergedRange.Style.SetAllBorders() mergedRange.Style.SetAllBorders()
.Alignment.SetWrapText(true); .Alignment.SetWrapText(true);
@ -59,7 +59,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport
{ {
var row = cell.WorksheetRow(); var row = cell.WorksheetRow();
var baseHeight = row.Height; var baseHeight = row.Height;
row.Height = 0.52d * baseHeight * Math.Ceiling(1d + value.Length / maxCharsToWrap); row.Height = 0.5d * baseHeight * Math.Ceiling(1d + value.Length / maxCharsToWrap);
} }
} }
@ -80,7 +80,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport
{ {
var row = cell.WorksheetRow(); var row = cell.WorksheetRow();
var baseHeight = row.Height; var baseHeight = row.Height;
row.Height = 0.52d * baseHeight * Math.Ceiling(1d + value.Length / maxCharsToWrap); row.Height = 0.5d * baseHeight * Math.Ceiling(1d + value.Length / maxCharsToWrap);
} }
} }