1maksim1/ISEbd-21_Koscheev.M.S.SoftwareInstallation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Koscheev.M. S. Lab work 4 Hard #13

Closed
1maksim1 wants to merge 5 commits from Lab4_Hard into Lab3_Hard
pull from: Lab4_Hard
merge into: 1maksim1:Lab3_Hard
Conversation 0 Commits 5 Files Changed 52 +11 -3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 789e0f79c1 - Show all commits

2
SoftwareInstallation/SoftwareInstallationBusinessLogic/ShopLogic.cs
View File

@ -133,7 +133,7 @@ namespace SoftwareInstallationBusinessLogic
_logger.LogInformation("AddPackageInShop. ShopName:{ShopName}.Id:{ Id}",
model.Name, model.Id);
var element = _shopStorage.GetElement(model);
int currCount = element.Packages.Values.First().Item2;
int currCount = element.Packages.Values.FirstOrDefault().Item2;
if (element == null)
{
_logger.LogWarning("AddPackageInShop element not found");

3
SoftwareInstallation/SoftwareInstallationView/ReportOrders.rdlc
View File

@ -424,7 +424,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@ -484,7 +483,7 @@
<Top>2.48391cm</Top>
<Left>0.55245cm</Left>
<Height>1.2cm</Height>
<Width>19.84713cm</Width>
<Width>19.84714cm</Width>
<ZIndex>2</ZIndex>
<Style>
<Border>

9
SoftwareInstallation/SoftwareInstallationView/SoftwareInstallationView.csproj
View File

@ -28,4 +28,13 @@
<ProjectReference Include="..\SoftwareInstallationListImplement\SoftwareInstallationListImplement.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="ReportGroupOrders.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="ReportOrders.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>