Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-20 13:19:53 +02:00
parent 829bdb67f5 62c5d38764
commit f0f1a0bf64
4 changed files with 64 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/Reports/OtherPart.rdlc
+62 -79
View File
@@ -1,63 +1,5 @@
<?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">
<Author>v. 2.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
<DataSourceReference>Sauder_NKC</DataSourceReference>
<rd:DataSourceID>7e875094-37e0-46d4-8db0-d51955773fb0</rd:DataSourceID>
</DataSource>
</DataSources>
<DataSets>
<DataSet Name="stp_prt_OtherPart">
<Query>
<DataSourceName>Sauder_NKC</DataSourceName>
<QueryParameters>
<QueryParameter Name="@OtherItemID">
<Value>=Parameters!OtherItemID.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_OtherPart</CommandText>
<rd:UseGenericDesigner>true</rd:UseGenericDesigner>
</Query>
<Fields>
<Field Name="OtherItemID">
<DataField>OtherItemID</DataField>
<rd:TypeName>System.Int32</rd:TypeName>
</Field>
<Field Name="OtherItemExtCode">
<DataField>OtherItemExtCode</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemDesc">
<DataField>OtherItemDesc</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemDtmx">
<DataField>OtherItemDtmx</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemType">
<DataField>OtherItemType</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemNote">
<DataField>OtherItemNote</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
<ReportSections>
<ReportSection>
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
<Body>
<ReportItems>
<Tablix Name="List1">
@@ -243,8 +185,62 @@
<PageWidth>4.09in</PageWidth>
<Style />
</Page>
</ReportSection>
</ReportSections>
<Author>v. 2.1.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="Sauder_NKC">
<DataSourceReference>Sauder_NKC</DataSourceReference>
<rd:DataSourceID>7e875094-37e0-46d4-8db0-d51955773fb0</rd:DataSourceID>
</DataSource>
</DataSources>
<DataSets>
<DataSet Name="stp_prt_OtherPart">
<Query>
<DataSourceName>Sauder_NKC</DataSourceName>
<QueryParameters>
<QueryParameter Name="@OtherItemID">
<Value>=Parameters!OtherItemID.Value</Value>
</QueryParameter>
<QueryParameter Name="@QRCodeBaseUrl">
<Value>=Parameters!QRCodeBaseUrl.Value</Value>
</QueryParameter>
</QueryParameters>
<CommandType>StoredProcedure</CommandType>
<CommandText>prt.stp_prt_OtherPart</CommandText>
<rd:UseGenericDesigner>true</rd:UseGenericDesigner>
</Query>
<Fields>
<Field Name="OtherItemID">
<DataField>OtherItemID</DataField>
<rd:TypeName>System.Int32</rd:TypeName>
</Field>
<Field Name="OtherItemExtCode">
<DataField>OtherItemExtCode</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemDesc">
<DataField>OtherItemDesc</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemDtmx">
<DataField>OtherItemDtmx</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="QRCodeBaseUrl">
<DataField>QRCodeBaseUrl</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemType">
<DataField>OtherItemType</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="OtherItemNote">
<DataField>OtherItemNote</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
<ReportParameters>
<ReportParameter Name="QRCodeBaseUrl">
<DataType>String</DataType>
@@ -259,27 +255,14 @@
</ReportParameter>
<ReportParameter Name="OtherItemID">
<DataType>Integer</DataType>
<DefaultValue>
<Values>
<Value>1</Value>
</Values>
</DefaultValue>
<Prompt>Other Item ID</Prompt>
</ReportParameter>
</ReportParameters>
<ReportParametersLayout>
<GridLayoutDefinition>
<NumberOfColumns>2</NumberOfColumns>
<NumberOfRows>1</NumberOfRows>
<CellDefinitions>
<CellDefinition>
<ColumnIndex>0</ColumnIndex>
<RowIndex>0</RowIndex>
<ParameterName>QRCodeBaseUrl</ParameterName>
</CellDefinition>
<CellDefinition>
<ColumnIndex>1</ColumnIndex>
<RowIndex>0</RowIndex>
<ParameterName>OtherItemID</ParameterName>
</CellDefinition>
</CellDefinitions>
</GridLayoutDefinition>
</ReportParametersLayout>
<Language>en-US</Language>
<ConsumeContainerWhitespace>true</ConsumeContainerWhitespace>
<rd:ReportUnitType>Inch</rd:ReportUnitType>
NKC_WF/WebUserControls/cmp_OtherItemsDetail.ascx
-1
View File
@@ -4,7 +4,6 @@
<div class="col-2">
</div>
<div class="col-8">
<%: traduci("PressCtrlP_Print") %>
<asp:LinkButton runat="server" ID="lbtPrintAll" CssClass="btn btn-block btn-primary" OnClick="lbtPrintAll_Click"><%: traduci("PrintAll") %> <i class="fa fa-print" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="col-2">
NKC_WF/WebUserControls/cmp_homeButtons.ascx
+1 -1
View File
@@ -19,7 +19,7 @@
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server"></asp:XmlDataSource>
<asp:XmlDataSource ID="XmlMenu" runat="server" enablecaching="True" cacheduration="5"></asp:XmlDataSource>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_menuTop.ascx
+1 -1
View File
@@ -33,7 +33,7 @@
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server"></asp:XmlDataSource>
<asp:XmlDataSource ID="XmlMenu" runat="server" enablecaching="True" cacheduration="5"></asp:XmlDataSource>
<%--<li class="nav-item">
<a class="nav-link text-light" href="ForceReload"><i class="fa fa-retweet shortcut-icon"></i> <%: traduci("ForceReload") %></a>
</li>--%>