update grafico e nuova versione (pubblicata)

This commit is contained in:
Samuele E. Locatelli
2014-02-25 15:50:47 +01:00
parent 80712f6044
commit c581783371
6 changed files with 127 additions and 106 deletions
+1 -1
View File
@@ -486,7 +486,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>53710</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.6.36.0")]
[assembly: AssemblyFileVersion("0.6.36.0")]
[assembly: AssemblyVersion("0.6.37.0")]
[assembly: AssemblyFileVersion("0.6.37.0")]
-2
View File
@@ -10,9 +10,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<uc1:mod_newQuote ID="mod_newQuote1" runat="server" />
<uc2:mod_QuoteList ID="mod_QuoteList1" runat="server" />
<br />
Elenco Offerte | Nuovo Profilo (Esistente) | Simulazione
<br />
</asp:Content>
+1
View File
@@ -828,6 +828,7 @@
<br />
<asp:Label runat="server" ID="lblP_MinPrice" Text='<%# traduci("lblP_MinPrice") %>' />:
<asp:Label ID="P_MinPriceLabel" runat="server" Text='<%# Bind("P_MinPrice") %>' />
<br />
<asp:Label runat="server" ID="lblP_PriceOff" Text='<%# traduci("lblP_PriceOff") %>' />:
<asp:Label ID="P_PriceOffLabel" runat="server" Text='<%# Bind("P_PriceOff") %>' />
<br />
+123 -101
View File
@@ -3,21 +3,29 @@
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<%} %>
<div class="float-left" style="font-size: 10pt;">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="odsQuotes" DataKeyNames="QuoteType,CodQuote,QuoteRev" OnSelectedIndexChanged="grView_SelectedIndexChanged" CellPadding="4" ForeColor="#333333" GridLines="None">
<AlternatingRowStyle BackColor="White" />
<EditRowStyle BackColor="#2461BF" />
<FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" />
<RowStyle BackColor="#EFF3FB" />
<SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" />
<SortedAscendingCellStyle BackColor="#F5F7FB" />
<SortedAscendingHeaderStyle BackColor="#6D95E1" />
<SortedDescendingCellStyle BackColor="#E9EBEF" />
<SortedDescendingHeaderStyle BackColor="#4870BE" />
<Columns>
<%--<asp:BoundField DataField="CodInco" HeaderText="IncoTerm" SortExpression="CodInco" />
<div class="row" style="font-size: 8pt;">
<div class="col-sm-6 col-xs-12">
<div class="widget stacked">
<div class="widget-header">
<i class="fa fa-briefcase"></i>
<h3>Offerte</h3>
</div>
<div class="widget-content">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="odsQuotes" DataKeyNames="QuoteType,CodQuote,QuoteRev" OnSelectedIndexChanged="grView_SelectedIndexChanged" CellPadding="4" ForeColor="#333333" GridLines="None">
<AlternatingRowStyle BackColor="White" />
<EditRowStyle BackColor="#2461BF" />
<FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
<PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" />
<RowStyle BackColor="#EFF3FB" />
<SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" />
<SortedAscendingCellStyle BackColor="#F5F7FB" />
<SortedAscendingHeaderStyle BackColor="#6D95E1" />
<SortedDescendingCellStyle BackColor="#E9EBEF" />
<SortedDescendingHeaderStyle BackColor="#4870BE" />
<Columns>
<%--<asp:BoundField DataField="CodInco" HeaderText="IncoTerm" SortExpression="CodInco" />
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" />
<asp:BoundField DataField="P_FullCost" HeaderText="P_FullCost" ReadOnly="True" SortExpression="P_FullCost" />
<asp:BoundField DataField="P_MinPrice" HeaderText="P_MinPrice" ReadOnly="True" SortExpression="P_MinPrice" />
@@ -87,95 +95,109 @@
<asp:BoundField DataField="NetMar" HeaderText="NetMar" ReadOnly="True" SortExpression="NetMar" />
<asp:BoundField DataField="FCShield" HeaderText="FCShield" ReadOnly="True" SortExpression="FCShield" />
<asp:BoundField DataField="PckSur" HeaderText="PckSur" ReadOnly="True" SortExpression="PckSur" />--%>
<asp:TemplateField>
<HeaderTemplate>
<%--<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="NEW" CssClass="btnNew" />--%>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbtLoad" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Load" CommandArgument="load" OnCommand="lbt_Command">
<asp:TemplateField>
<HeaderTemplate>
<%--<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="NEW" CssClass="btnNew" />--%>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbtLoad" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Load" CommandArgument="load" OnCommand="lbt_Command">
<i class="fa fa-arrow-circle-o-up fa-2x"></i>
<%--<i class="glyphicon glyphicon-floppy-open btn-lg"></i>--%>
</asp:LinkButton>
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Select" CommandArgument="toDetail" OnCommand="lbt_Command">
</asp:LinkButton>
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Select" CommandArgument="toDetail" OnCommand="lbt_Command">
<i class="fa fa-arrow-circle-o-right fa-2x"></i>
</asp:LinkButton>
</ItemTemplate>
<EditItemTemplate></EditItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Quote" SortExpression="CodQuote">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("CodQuote") %>' />/<asp:Label ID="Label6" runat="server" Text='<%# Eval("QuoteRev") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="ClientName" HeaderText="Client" SortExpression="ClientName" ReadOnly="true" />
<asp:BoundField DataField="CodItem" HeaderText="Item" SortExpression="CodItem" ReadOnly="true" />
<asp:BoundField DataField="RawMat" HeaderText="Mat" SortExpression="RawMat" ReadOnly="true" />
<asp:BoundField DataField="BatchQty" HeaderText="Qta" SortExpression="BatchQty" ReadOnly="true" />
<asp:TemplateField SortExpression="RawMatFullCost">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadRMFC" Text="RMFC" ToolTip="Raw Material Full Cost" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("RawMatFullCost", "{0:C3}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField SortExpression="FullCost">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadFC" Text="FC" ToolTip="Full Cost" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("FullCost", "{0:C3}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField SortExpression="MinPrice">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadMP" Text="MP" ToolTip="Minimum Price" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("MinPrice", "{0:C3}") %>' />
</ItemTemplate>
</asp:LinkButton>
</ItemTemplate>
<EditItemTemplate></EditItemTemplate>
</asp:TemplateField>
<%--<asp:TemplateField HeaderText="Quote" SortExpression="CodQuote">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("CodQuote") %>' />/<asp:Label ID="Label6" runat="server" Text='<%# Eval("QuoteRev") %>' />
</ItemTemplate>
</asp:TemplateField>--%>
<asp:BoundField DataField="ClientName" HeaderText="Client" SortExpression="ClientName" ReadOnly="true" />
<asp:BoundField DataField="CodItem" HeaderText="Item" SortExpression="CodItem" ReadOnly="true" />
<asp:BoundField DataField="RawMat" HeaderText="Mat" SortExpression="RawMat" ReadOnly="true" />
<asp:BoundField DataField="BatchQty" HeaderText="Qta" SortExpression="BatchQty" ReadOnly="true" />
<asp:TemplateField SortExpression="RawMatFullCost">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadRMFC" Text="RMFC" ToolTip="Raw Material Full Cost" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("RawMatFullCost", "{0:C3}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField SortExpression="FullCost">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadFC" Text="FC" ToolTip="Full Cost" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("FullCost", "{0:C3}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField SortExpression="MinPrice">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadMP" Text="MP" ToolTip="Minimum Price" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("MinPrice", "{0:C3}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField SortExpression="PriceOff">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadPO" Text="PO" ToolTip="Price Offeres" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Eval("PriceOff", "{0:C3}") %>' CssClass='<%# priceVsCost(Eval("FullCost"),Eval("MinPrice"),Eval("PriceOff")) %>' />
</ItemTemplate>
<EditItemTemplate>
<asp:TextBox ID="txtPriceOff" runat="server" Text='<%# Bind("PriceOff") %>' Width="5em" />
</EditItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<%--<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="NEW" CssClass="btnNew" />--%>
</HeaderTemplate>
<ItemTemplate>
<asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ImageUrl="~/images/edit_m.png" ToolTip="Edit" />
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update" ToolTip="Update" ImageUrl="~/images/apply_m.png" />
<asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" ImageUrl="~/images/cancel_m.png" />
</EditItemTemplate>
</asp:TemplateField>
</asp:TemplateField>
<asp:TemplateField SortExpression="PriceOff">
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadPO" Text="PO" ToolTip="Price Offeres" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Eval("PriceOff", "{0:C3}") %>' CssClass='<%# priceVsCost(Eval("FullCost"),Eval("MinPrice"),Eval("PriceOff")) %>' />
</ItemTemplate>
<EditItemTemplate>
<asp:TextBox ID="txtPriceOff" runat="server" Text='<%# Bind("PriceOff") %>' Width="5em" />
</EditItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<%--<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="NEW" CssClass="btnNew" />--%>
</HeaderTemplate>
<ItemTemplate>
<asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ImageUrl="~/images/edit_m.png" ToolTip="Edit" />
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update" ToolTip="Update" ImageUrl="~/images/apply_m.png" />
<asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" ImageUrl="~/images/cancel_m.png" />
</EditItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getBySearch" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" FilterExpression="ClientName LIKE '%{0}%' OR RawMat LIKE '%{0}%' OR CodItem LIKE '%{0}%'" UpdateMethod="QuoteFull_Q_update">
<FilterParameters>
<asp:SessionParameter SessionField="valoreRicerca" Type="String" DefaultValue="*" />
</FilterParameters>
<SelectParameters>
<asp:SessionParameter SessionField="CodClient" Name="CodClient" Type="String" DefaultValue="" />
<asp:SessionParameter SessionField="RawMat" Name="RawMat" Type="String" DefaultValue="" />
<asp:SessionParameter SessionField="CodItem" Name="CodItem" Type="String" DefaultValue="" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="QuoteType" Type="String" />
<asp:Parameter Name="CodQuote" Type="Int64" />
<asp:Parameter Name="QuoteRev" Type="Int32" />
<asp:Parameter Name="PriceOff" Type="Decimal" />
</UpdateParameters>
</asp:ObjectDataSource>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getBySearch" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" FilterExpression="ClientName LIKE '%{0}%' OR RawMat LIKE '%{0}%' OR CodItem LIKE '%{0}%'" UpdateMethod="QuoteFull_Q_update">
<FilterParameters>
<asp:SessionParameter SessionField="valoreRicerca" Type="String" DefaultValue="*" />
</FilterParameters>
<SelectParameters>
<asp:SessionParameter SessionField="CodClient" Name="CodClient" Type="String" DefaultValue="" />
<asp:SessionParameter SessionField="RawMat" Name="RawMat" Type="String" DefaultValue="" />
<asp:SessionParameter SessionField="CodItem" Name="CodItem" Type="String" DefaultValue="" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="QuoteType" Type="String" />
<asp:Parameter Name="CodQuote" Type="Int64" />
<asp:Parameter Name="QuoteRev" Type="Int32" />
<asp:Parameter Name="PriceOff" Type="Decimal" />
</UpdateParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
<div class="col-sm-6 col-xs-12">
<div class="widget stacked">
<div class="widget-header">
<i class="fa fa-flask"></i>
<h3>Simulazioni</h3>
</div>
<div class="widget-content">
to do...
</div>
</div>
</div>
</div>
BIN
View File
Binary file not shown.