diff --git a/FoodOrders/FoodOrders/ReportOrders.rdlc.bak b/FoodOrders/FoodOrders/ReportOrders.rdlc.bak deleted file mode 100644 index 889babc..0000000 --- a/FoodOrders/FoodOrders/ReportOrders.rdlc.bak +++ /dev/null @@ -1,529 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner"> - <AutoRefresh>0</AutoRefresh> - <DataSources> - <DataSource Name="FoodOrdersContractsViewModels"> - <ConnectionProperties> - <DataProvider>System.Data.DataSet</DataProvider> - <ConnectString>/* Local Connection */</ConnectString> - </ConnectionProperties> - <rd:DataSourceID>10791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID> - </DataSource> - </DataSources> - <DataSets> - <DataSet Name="DataSetOrders"> - <Query> - <DataSourceName>FoodOrdersContractsViewModels</DataSourceName> - <CommandText>/* Local Query */</CommandText> - </Query> - <Fields> - <Field Name="Id"> - <DataField>Id</DataField> - <rd:TypeName>System.Int32</rd:TypeName> - </Field> - <Field Name="DateCreate"> - <DataField>DateCreate</DataField> - <rd:TypeName>System.DateTime</rd:TypeName> - </Field> - <Field Name="DishName"> - <DataField>DishName</DataField> - <rd:TypeName>System.String</rd:TypeName> - </Field> - <Field Name="Sum"> - <DataField>Sum</DataField> - <rd:TypeName>System.Decimal</rd:TypeName> - </Field> - </Fields> - <rd:DataSetInfo> - <rd:DataSetName>FoodOrdersContracts.ViewModels</rd:DataSetName> - <rd:TableName>ReportOrdersViewModel</rd:TableName> - <rd:ObjectDataSourceType>FoodOrdersContracts.ViewModels.ReportOrdersViewModel, FoodOrdersContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType> - </rd:DataSetInfo> - </DataSet> - </DataSets> - <ReportSections> - <ReportSection> - <Body> - <ReportItems> - <Textbox Name="ReportParameterPeriod"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>=Parameters!ReportParameterPeriod.Value</Value> - <Style> - <FontSize>14pt</FontSize> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style> - <TextAlign>Center</TextAlign> - </Style> - </Paragraph> - </Paragraphs> - <rd:DefaultName>ReportParameterPeriod</rd:DefaultName> - <Top>1cm</Top> - <Height>1cm</Height> - <Width>21cm</Width> - <Style> - <Border> - <Style>None</Style> - </Border> - <VerticalAlign>Middle</VerticalAlign> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - <Textbox Name="TextboxTitle"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>Заказы</Value> - <Style> - <FontSize>16pt</FontSize> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style> - <TextAlign>Center</TextAlign> - </Style> - </Paragraph> - </Paragraphs> - <Height>1cm</Height> - <Width>21cm</Width> - <ZIndex>1</ZIndex> - <Style> - <Border> - <Style>None</Style> - </Border> - <VerticalAlign>Middle</VerticalAlign> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - <Tablix Name="Tablix1"> - <TablixBody> - <TablixColumns> - <TablixColumn> - <Width>2.5cm</Width> - </TablixColumn> - <TablixColumn> - <Width>3.21438cm</Width> - </TablixColumn> - <TablixColumn> - <Width>8.23317cm</Width> - </TablixColumn> - <TablixColumn> - <Width>2.5cm</Width> - </TablixColumn> - </TablixColumns> - <TablixRows> - <TablixRow> - <Height>0.6cm</Height> - <TablixCells> - <TablixCell> - <CellContents> - <Textbox Name="Textbox5"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>Номер</Value> - <Style> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>Textbox5</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - <TablixCell> - <CellContents> - <Textbox Name="Textbox1"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>Дата создания</Value> - <Style> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>Textbox1</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - <TablixCell> - <CellContents> - <Textbox Name="Textbox3"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>Блюдо</Value> - <Style> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>Textbox3</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - <TablixCell> - <CellContents> - <Textbox Name="Textbox7"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>Сумма</Value> - <Style> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>Textbox7</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - </TablixCells> - </TablixRow> - <TablixRow> - <Height>0.6cm</Height> - <TablixCells> - <TablixCell> - <CellContents> - <Textbox Name="Id"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>=Fields!Id.Value</Value> - <Style /> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>Id</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - <TablixCell> - <CellContents> - <Textbox Name="DateCreate"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>=Fields!DateCreate.Value</Value> - <Style> - <Format>d</Format> - </Style> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>DateCreate</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - <TablixCell> - <CellContents> - <Textbox Name="DishName"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>=Fields!DishName.Value</Value> - <Style /> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>DishName</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - <TablixCell> - <CellContents> - <Textbox Name="Sum"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>=Fields!Sum.Value</Value> - <Style /> - </TextRun> - </TextRuns> - <Style /> - </Paragraph> - </Paragraphs> - <rd:DefaultName>Sum</rd:DefaultName> - <Style> - <Border> - <Color>LightGrey</Color> - <Style>Solid</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </CellContents> - </TablixCell> - </TablixCells> - </TablixRow> - </TablixRows> - </TablixBody> - <TablixColumnHierarchy> - <TablixMembers> - <TablixMember /> - <TablixMember /> - <TablixMember /> - <TablixMember /> - </TablixMembers> - </TablixColumnHierarchy> - <TablixRowHierarchy> - <TablixMembers> - <TablixMember> - <KeepWithGroup>After</KeepWithGroup> - </TablixMember> - <TablixMember> - <Group Name="Подробности" /> - </TablixMember> - </TablixMembers> - </TablixRowHierarchy> - <DataSetName>DataSetOrders</DataSetName> - <Top>2.48391cm</Top> - <Left>0.55245cm</Left> - <Height>1.2cm</Height> - <Width>16.44755cm</Width> - <ZIndex>2</ZIndex> - <Style> - <Border> - <Style>Double</Style> - </Border> - </Style> - </Tablix> - <Textbox Name="TextboxTotalSum"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>Итого:</Value> - <Style> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style> - <TextAlign>Right</TextAlign> - </Style> - </Paragraph> - </Paragraphs> - <Top>4cm</Top> - <Left>12cm</Left> - <Height>0.6cm</Height> - <Width>2.5cm</Width> - <ZIndex>3</ZIndex> - <Style> - <Border> - <Style>None</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - <Textbox Name="SumTotal"> - <CanGrow>true</CanGrow> - <KeepTogether>true</KeepTogether> - <Paragraphs> - <Paragraph> - <TextRuns> - <TextRun> - <Value>=Sum(Fields!Sum.Value, "DataSetOrders")</Value> - <Style> - <FontWeight>Bold</FontWeight> - </Style> - </TextRun> - </TextRuns> - <Style> - <TextAlign>Right</TextAlign> - </Style> - </Paragraph> - </Paragraphs> - <Top>4cm</Top> - <Left>14.5cm</Left> - <Height>0.6cm</Height> - <Width>2.5cm</Width> - <ZIndex>4</ZIndex> - <Style> - <Border> - <Style>None</Style> - </Border> - <PaddingLeft>2pt</PaddingLeft> - <PaddingRight>2pt</PaddingRight> - <PaddingTop>2pt</PaddingTop> - <PaddingBottom>2pt</PaddingBottom> - </Style> - </Textbox> - </ReportItems> - <Height>5.72875cm</Height> - <Style /> - </Body> - <Width>21cm</Width> - <Page> - <PageHeight>29.7cm</PageHeight> - <PageWidth>21cm</PageWidth> - <LeftMargin>2cm</LeftMargin> - <RightMargin>2cm</RightMargin> - <TopMargin>2cm</TopMargin> - <BottomMargin>2cm</BottomMargin> - <ColumnSpacing>0.13cm</ColumnSpacing> - <Style /> - </Page> - </ReportSection> - </ReportSections> - <ReportParameters> - <ReportParameter Name="ReportParameterPeriod"> - <DataType>String</DataType> - <Nullable>true</Nullable> - <Prompt>ReportParameter1</Prompt> - </ReportParameter> - </ReportParameters> - <ReportParametersLayout> - <GridLayoutDefinition> - <NumberOfColumns>4</NumberOfColumns> - <NumberOfRows>2</NumberOfRows> - <CellDefinitions> - <CellDefinition> - <ColumnIndex>0</ColumnIndex> - <RowIndex>0</RowIndex> - <ParameterName>ReportParameterPeriod</ParameterName> - </CellDefinition> - </CellDefinitions> - </GridLayoutDefinition> - </ReportParametersLayout> - <rd:ReportUnitType>Cm</rd:ReportUnitType> - <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID> -</Report> \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ReportOrdersViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ReportOrdersViewModel.cs index 2228a48..682da1f 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/ReportOrdersViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/ReportOrdersViewModel.cs @@ -17,6 +17,6 @@ namespace FoodOrdersContracts.ViewModels public double Sum { get; set; } - public string OrderStatus { get; set; } + public string OrderStatus { get; set; } = string.Empty; } }