Fix inserimento lingua x report embeddati da quella utente
Sistemata scheda costi con label calcolate da tipo di valori (item/gruppo, incoterms...)
This commit is contained in:
@@ -18,7 +18,7 @@ namespace C2P
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
// imposto iframe!
|
||||
repView.Src = string.Format(@"{0}/ReportViewer.aspx?ticket={1}", memLayer.ML.confReadString("reportsUrl"), Request.QueryString["ticket"]);
|
||||
repView.Src = string.Format(@"{0}/ReportViewer.aspx?ticket={1}&lingua={2}", memLayer.ML.confReadString("reportsUrl"), Request.QueryString["ticket"], user_std.UtSn.lingua);
|
||||
#if false
|
||||
if (memLayer.ML.confReadBool("ReportRemoteRender"))
|
||||
{
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Indicare con variabile se Ref / Sell</span>
|
||||
<asp:Label runat="server" ID="lblRefusion" CssClass="didascalia" Visible='<%# firstIsGrt(Eval("RefCost01"), Eval("SellCost01")) %>'><%: traduci("costByRefusion") %></asp:Label>
|
||||
<asp:Label runat="server" ID="lblSell" CssClass="didascalia" Visible='<%# firstIsGrt(Eval("SellCost01"), Eval("RefCost01")) %>'><%: traduci("costBySell") %></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -41,7 +42,8 @@
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Note su selezione articolo/classe x DIES (da variabile)</span>
|
||||
<asp:Label runat="server" ID="lblDiesCostByItem" CssClass="didascalia" Visible='<%# !Convert.ToBoolean(Eval("DiesByClass")) %>'><%: traduci("DiesCostByItem") %></asp:Label>
|
||||
<asp:Label runat="server" ID="lblDiesCostByClass" CssClass="didascalia" Visible='<%# Convert.ToBoolean(Eval("DiesByClass")) %>'><%: traduci("DiesCostByClass") %></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -53,7 +55,8 @@
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Indicare con variabile se Ref / Sell</span>
|
||||
<asp:Label runat="server" ID="lblRefusion2" CssClass="didascalia" Visible='<%# firstIsGrt(Eval("RefCost01"), Eval("SellCost01")) %>'><%: traduci("costByRefusion") %></asp:Label>
|
||||
<asp:Label runat="server" ID="lblSell2" CssClass="didascalia" Visible='<%# firstIsGrt(Eval("SellCost01"), Eval("RefCost01")) %>'><%: traduci("costBySell") %></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -79,7 +82,8 @@
|
||||
<div class="col-xs-6 text-left">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-xs-offset-1 text-left">
|
||||
<span class="didascalia">Indicazione Incoterms + dest da variabile</span>
|
||||
<asp:Label runat="server" ID="lblCodInco" CssClass="didascalia" Text='<%# Eval("CodInco") %>' /> -
|
||||
<asp:Label runat="server" ID="lblTranspZone" CssClass="didascalia" Text='<%# Eval("TranspZone") %>' />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -46,6 +46,20 @@ namespace C2P.WebUserControls
|
||||
{ }
|
||||
return answ;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// calcola se il primo valore sia superiore al secondo
|
||||
/// </summary>
|
||||
/// <param name="val1"></param>
|
||||
/// <param name="val2"></param>
|
||||
/// <returns></returns>
|
||||
public bool firstIsGrt(object val1, object val2)
|
||||
{
|
||||
bool answ = false;
|
||||
if (Convert.ToDecimal(val1) >= Convert.ToDecimal(val2))
|
||||
{
|
||||
answ = true;
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,16 +26,30 @@
|
||||
<asp:HyperLink runat="server" ID="hlRevHist" Target="_blank">
|
||||
<asp:Label runat="server" ID="lblQuoteType" />
|
||||
<asp:Label runat="server" ID="lblCodQuote" /><span style="color: #dedede; font-size: 0.8em;">.<asp:Label runat="server" ID="lblQuoteRev" /></span>
|
||||
</asp:HyperLink></div></div></div></div><div class="container">
|
||||
<div class="row" style="min-height: 402px;">
|
||||
</asp:HyperLink>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="row" style="min-height: 322px;">
|
||||
<div class="panel panel-default">
|
||||
<%--<div class="panel-heading">--%>
|
||||
<div class="btn-group btn-group-justified">
|
||||
<div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Header"><i class="fa fa-tasks"></i> <%: traduci("HEADER") %></asp:LinkButton></div><div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbCosts" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i> <%: traduci("COSTS") %></asp:LinkButton></div><div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-default" OnClick="lbt_Click" CommandArgument="ExtrPar"><i class="fa fa-tasks"></i> <%: traduci("EXTRUS-PARAM") %></asp:LinkButton></div><div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbPackPar" class="btn btn-default" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i> <%: traduci("PACK-PARAM") %></asp:LinkButton></div></div><%--</div>--%><div class="panel-body">
|
||||
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Header"><i class="fa fa-tasks"></i> <%: traduci("HEADER") %></asp:LinkButton>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbCosts" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i> <%: traduci("COSTS") %></asp:LinkButton>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-default" OnClick="lbt_Click" CommandArgument="ExtrPar"><i class="fa fa-tasks"></i> <%: traduci("EXTRUS-PARAM") %></asp:LinkButton>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbPackPar" class="btn btn-default" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i> <%: traduci("PACK-PARAM") %></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
<%--</div>--%><div class="panel-body">
|
||||
<uc1:mod_Q_Costs ID="mod_Q_Costs1" runat="server" />
|
||||
<uc2:mod_Q_ExtrPar ID="mod_Q_ExtrPar1" runat="server" />
|
||||
<uc3:mod_Q_Header ID="mod_Q_Header1" runat="server" />
|
||||
@@ -46,21 +60,39 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="panel panel-default">
|
||||
<%--<div class="panel-heading">--%>
|
||||
<div class="btn-group btn-group-justified">
|
||||
<div class="btn-group">
|
||||
<asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i> <%: traduci("QUOTATION") %></asp:LinkButton></div></div><%--</div>--%><div class="panel-body">
|
||||
<asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i> <%: traduci("QUOTATION") %></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<uc5:mod_Q_Quot ID="mod_Q_Quot1" runat="server" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="divStato0" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
<asp:LinkButton runat="server" ID="lbCreateOffer" class="btn btn-success" Width="100%" OnClick="lnkCreateOffer_Click"><i class="fa fa-check"></i> <%: traduci("nextIdxQState-01") %></asp:LinkButton></div></div><div id="divStato1" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-2">
|
||||
<asp:LinkButton runat="server" ID="lbReject" class="btn btn-danger" Width="100%" OnClick="lbReject_Click"><i class="fa fa-thumbs-o-down"></i> <%: traduci("nextIdxQState-00") %></asp:LinkButton></div><div class="col-xs-4">
|
||||
<asp:LinkButton runat="server" ID="lbApprove" class="btn btn-success" Width="100%" OnClick="lbApprove_Click"><i class="fa fa-thumbs-o-up"></i> <%: traduci("nextIdxQState-02") %></asp:LinkButton></div></div><div id="divStato2" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
<asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i> <%: traduci("nextIdxQState-03") %></asp:LinkButton></div></div><div id="divStato3" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
<asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i> <%: traduci("createNewRev") %></asp:LinkButton></div></div></div>
|
||||
<div style="margin-bottom: 30px;">
|
||||
<div id="divStato0" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
<asp:LinkButton runat="server" ID="lbCreateOffer" class="btn btn-success" Width="100%" OnClick="lnkCreateOffer_Click"><i class="fa fa-check"></i> <%: traduci("nextIdxQState-01") %></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
<div id="divStato1" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-2">
|
||||
<asp:LinkButton runat="server" ID="lbReject" class="btn btn-danger" Width="100%" OnClick="lbReject_Click"><i class="fa fa-thumbs-o-down"></i> <%: traduci("nextIdxQState-00") %></asp:LinkButton>
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
<asp:LinkButton runat="server" ID="lbApprove" class="btn btn-success" Width="100%" OnClick="lbApprove_Click"><i class="fa fa-thumbs-o-up"></i> <%: traduci("nextIdxQState-02") %></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
<div id="divStato2" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
<asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i> <%: traduci("nextIdxQState-03") %></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
<div id="divStato3" runat="server" class="row">
|
||||
<div class="col-xs-4 col-xs-offset-4">
|
||||
<asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i> <%: traduci("createNewRev") %></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Generated
+131
-2
@@ -3576,6 +3576,14 @@ namespace C2P_Data {
|
||||
|
||||
private global::System.Data.DataColumn columnIdxQState;
|
||||
|
||||
private global::System.Data.DataColumn columnDiesByClass;
|
||||
|
||||
private global::System.Data.DataColumn columnvalid;
|
||||
|
||||
private global::System.Data.DataColumn columnerrorScore;
|
||||
|
||||
private global::System.Data.DataColumn columnTranspZone;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public QuoteFull_QDataTable() {
|
||||
@@ -4257,6 +4265,38 @@ namespace C2P_Data {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public global::System.Data.DataColumn DiesByClassColumn {
|
||||
get {
|
||||
return this.columnDiesByClass;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public global::System.Data.DataColumn validColumn {
|
||||
get {
|
||||
return this.columnvalid;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public global::System.Data.DataColumn errorScoreColumn {
|
||||
get {
|
||||
return this.columnerrorScore;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public global::System.Data.DataColumn TranspZoneColumn {
|
||||
get {
|
||||
return this.columnTranspZone;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
[global::System.ComponentModel.Browsable(false)]
|
||||
@@ -4375,7 +4415,11 @@ namespace C2P_Data {
|
||||
decimal NetMar,
|
||||
decimal FCShield,
|
||||
decimal PckSur,
|
||||
int IdxQState) {
|
||||
int IdxQState,
|
||||
bool DiesByClass,
|
||||
bool valid,
|
||||
int errorScore,
|
||||
string TranspZone) {
|
||||
QuoteFull_QRow rowQuoteFull_QRow = ((QuoteFull_QRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
Vers,
|
||||
@@ -4458,7 +4502,11 @@ namespace C2P_Data {
|
||||
NetMar,
|
||||
FCShield,
|
||||
PckSur,
|
||||
IdxQState};
|
||||
IdxQState,
|
||||
DiesByClass,
|
||||
valid,
|
||||
errorScore,
|
||||
TranspZone};
|
||||
rowQuoteFull_QRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowQuoteFull_QRow);
|
||||
return rowQuoteFull_QRow;
|
||||
@@ -4571,6 +4619,10 @@ namespace C2P_Data {
|
||||
this.columnFCShield = base.Columns["FCShield"];
|
||||
this.columnPckSur = base.Columns["PckSur"];
|
||||
this.columnIdxQState = base.Columns["IdxQState"];
|
||||
this.columnDiesByClass = base.Columns["DiesByClass"];
|
||||
this.columnvalid = base.Columns["valid"];
|
||||
this.columnerrorScore = base.Columns["errorScore"];
|
||||
this.columnTranspZone = base.Columns["TranspZone"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -4738,6 +4790,14 @@ namespace C2P_Data {
|
||||
base.Columns.Add(this.columnPckSur);
|
||||
this.columnIdxQState = new global::System.Data.DataColumn("IdxQState", typeof(int), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnIdxQState);
|
||||
this.columnDiesByClass = new global::System.Data.DataColumn("DiesByClass", typeof(bool), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnDiesByClass);
|
||||
this.columnvalid = new global::System.Data.DataColumn("valid", typeof(bool), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnvalid);
|
||||
this.columnerrorScore = new global::System.Data.DataColumn("errorScore", typeof(int), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnerrorScore);
|
||||
this.columnTranspZone = new global::System.Data.DataColumn("TranspZone", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnTranspZone);
|
||||
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
|
||||
this.columnQuoteType,
|
||||
this.columnCodQuote,
|
||||
@@ -4817,6 +4877,10 @@ namespace C2P_Data {
|
||||
this.columnFCShield.ReadOnly = true;
|
||||
this.columnPckSur.ReadOnly = true;
|
||||
this.columnIdxQState.AllowDBNull = false;
|
||||
this.columnvalid.AllowDBNull = false;
|
||||
this.columnerrorScore.AllowDBNull = false;
|
||||
this.columnTranspZone.AllowDBNull = false;
|
||||
this.columnTranspZone.MaxLength = 50;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -7386,6 +7450,55 @@ namespace C2P_Data {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public bool DiesByClass {
|
||||
get {
|
||||
try {
|
||||
return ((bool)(this[this.tableQuoteFull_Q.DiesByClassColumn]));
|
||||
}
|
||||
catch (global::System.InvalidCastException e) {
|
||||
throw new global::System.Data.StrongTypingException("The value for column \'DiesByClass\' in table \'QuoteFull_Q\' is DBNull.", e);
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tableQuoteFull_Q.DiesByClassColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public bool valid {
|
||||
get {
|
||||
return ((bool)(this[this.tableQuoteFull_Q.validColumn]));
|
||||
}
|
||||
set {
|
||||
this[this.tableQuoteFull_Q.validColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public int errorScore {
|
||||
get {
|
||||
return ((int)(this[this.tableQuoteFull_Q.errorScoreColumn]));
|
||||
}
|
||||
set {
|
||||
this[this.tableQuoteFull_Q.errorScoreColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public string TranspZone {
|
||||
get {
|
||||
return ((string)(this[this.tableQuoteFull_Q.TranspZoneColumn]));
|
||||
}
|
||||
set {
|
||||
this[this.tableQuoteFull_Q.TranspZoneColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public bool IsCodClientAssocNull() {
|
||||
@@ -7877,6 +7990,18 @@ namespace C2P_Data {
|
||||
public void SetPckSurNull() {
|
||||
this[this.tableQuoteFull_Q.PckSurColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public bool IsDiesByClassNull() {
|
||||
return this.IsNull(this.tableQuoteFull_Q.DiesByClassColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
|
||||
public void SetDiesByClassNull() {
|
||||
this[this.tableQuoteFull_Q.DiesByClassColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -12258,6 +12383,10 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
|
||||
tableMapping.ColumnMappings.Add("FCShield", "FCShield");
|
||||
tableMapping.ColumnMappings.Add("PckSur", "PckSur");
|
||||
tableMapping.ColumnMappings.Add("IdxQState", "IdxQState");
|
||||
tableMapping.ColumnMappings.Add("DiesByClass", "DiesByClass");
|
||||
tableMapping.ColumnMappings.Add("valid", "valid");
|
||||
tableMapping.ColumnMappings.Add("errorScore", "errorScore");
|
||||
tableMapping.ColumnMappings.Add("TranspZone", "TranspZone");
|
||||
this._adapter.TableMappings.Add(tableMapping);
|
||||
}
|
||||
|
||||
|
||||
@@ -847,6 +847,10 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
|
||||
<Mapping SourceColumn="FCShield" DataSetColumn="FCShield" />
|
||||
<Mapping SourceColumn="PckSur" DataSetColumn="PckSur" />
|
||||
<Mapping SourceColumn="IdxQState" DataSetColumn="IdxQState" />
|
||||
<Mapping SourceColumn="DiesByClass" DataSetColumn="DiesByClass" />
|
||||
<Mapping SourceColumn="valid" DataSetColumn="valid" />
|
||||
<Mapping SourceColumn="errorScore" DataSetColumn="errorScore" />
|
||||
<Mapping SourceColumn="TranspZone" DataSetColumn="TranspZone" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QL_fullData" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByKey" GetMethodModifier="Public" GetMethodName="getByKey" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByKey" UserSourceName="getByKey">
|
||||
@@ -1571,6 +1575,16 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
|
||||
<xs:element name="FCShield" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnFCShield" msprop:Generator_ColumnPropNameInRow="FCShield" msprop:Generator_ColumnPropNameInTable="FCShieldColumn" msprop:Generator_UserColumnName="FCShield" type="xs:decimal" minOccurs="0" />
|
||||
<xs:element name="PckSur" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnPckSur" msprop:Generator_ColumnPropNameInRow="PckSur" msprop:Generator_ColumnPropNameInTable="PckSurColumn" msprop:Generator_UserColumnName="PckSur" type="xs:decimal" minOccurs="0" />
|
||||
<xs:element name="IdxQState" msprop:Generator_ColumnVarNameInTable="columnIdxQState" msprop:Generator_ColumnPropNameInRow="IdxQState" msprop:Generator_ColumnPropNameInTable="IdxQStateColumn" msprop:Generator_UserColumnName="IdxQState" type="xs:int" />
|
||||
<xs:element name="DiesByClass" msprop:Generator_ColumnVarNameInTable="columnDiesByClass" msprop:Generator_ColumnPropNameInRow="DiesByClass" msprop:Generator_ColumnPropNameInTable="DiesByClassColumn" msprop:Generator_UserColumnName="DiesByClass" type="xs:boolean" minOccurs="0" />
|
||||
<xs:element name="valid" msprop:Generator_ColumnVarNameInTable="columnvalid" msprop:Generator_ColumnPropNameInRow="valid" msprop:Generator_ColumnPropNameInTable="validColumn" msprop:Generator_UserColumnName="valid" type="xs:boolean" />
|
||||
<xs:element name="errorScore" msprop:Generator_ColumnVarNameInTable="columnerrorScore" msprop:Generator_ColumnPropNameInRow="errorScore" msprop:Generator_ColumnPropNameInTable="errorScoreColumn" msprop:Generator_UserColumnName="errorScore" type="xs:int" />
|
||||
<xs:element name="TranspZone" msprop:Generator_ColumnVarNameInTable="columnTranspZone" msprop:Generator_ColumnPropNameInRow="TranspZone" msprop:Generator_ColumnPropNameInTable="TranspZoneColumn" msprop:Generator_UserColumnName="TranspZone">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2
-2
@@ -5,7 +5,7 @@
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("0.6.60.150")]
|
||||
[assembly: AssemblyFileVersion("0.6.60.150")]
|
||||
[assembly: AssemblyVersion("0.6.61.162")]
|
||||
[assembly: AssemblyFileVersion("0.6.61.162")]
|
||||
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
|
||||
[assembly: AssemblyCompany("Steamware")]
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("0.6.60.<#= this.RevisionNumber #>")]
|
||||
[assembly: AssemblyFileVersion("0.6.60.<#= this.RevisionNumber #>")]
|
||||
[assembly: AssemblyVersion("0.6.61.<#= this.RevisionNumber #>")]
|
||||
[assembly: AssemblyFileVersion("0.6.61.<#= this.RevisionNumber #>")]
|
||||
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
|
||||
[assembly: AssemblyCompany("Steamware")]
|
||||
<#+
|
||||
|
||||
Reference in New Issue
Block a user