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

vers 0.7.77

Browse Source 
- ciorrezione condizioni IN/OUT modalità editing x Q
- inizio correzione modalità IN/OUT editing x SIM
This commit is contained in:
Samuele E. Locatelli
2014-05-21 18:33:44 +02:00
parent dd651392d4
commit a74f865aee
23 changed files with 211 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/WebUserControls/mod_Q_Header.ascx
+1 -1
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
C2P/WebUserControls/mod_Q_Header.ascx.cs
+15
View File
@@ -170,5 +170,20 @@ namespace C2P.WebUserControls
lista.SelectedIndex = lista.Items.IndexOf(lista.Items.FindByValue(RawMat));
}
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_Q_Quot.ascx
+1 -1
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em; padding-top: 4px;">
<div class="col-xs-6 text-left">
C2P/WebUserControls/mod_Q_Quot.ascx.cs
+15
View File
@@ -59,6 +59,21 @@ namespace C2P.WebUserControls
if (Math.Round(Convert.ToDecimal(val1), 3) < Math.Round(Convert.ToDecimal(val2), 3)) answ = "text-danger";
return answ;
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_S_Dies.ascx
+2 -2
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left didascalia">
@@ -108,7 +108,7 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateDiesPar">
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateDiesPar" OnUpdated="odsQuotes_Updated">
<SelectParameters>
<asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
C2P/WebUserControls/mod_S_Dies.ascx.cs
+23 -1
View File
@@ -13,7 +13,7 @@ namespace C2P.WebUserControls
{
}
public event EventHandler eh_update;
/// <summary>
/// fa toggle tra modo edit e read/item
/// </summary>
@@ -38,5 +38,27 @@ namespace C2P.WebUserControls
return (frmView.CurrentMode == FormViewMode.Edit);
}
}
protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_S_ExtrPar.ascx
+2 -2
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
@@ -181,7 +181,7 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateExtrParSim">
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateExtrParSim" OnUpdated="odsQuotes_Updated">
<SelectParameters>
<asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
C2P/WebUserControls/mod_S_ExtrPar.ascx.cs
+23 -1
View File
@@ -13,7 +13,7 @@ namespace C2P.WebUserControls
{
}
public event EventHandler eh_update;
/// <summary>
/// fa toggle tra modo edit e read/item
/// </summary>
@@ -39,5 +39,27 @@ namespace C2P.WebUserControls
return (frmView.CurrentMode == FormViewMode.Edit);
}
}
protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_S_Header.ascx
+1 -1
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
C2P/WebUserControls/mod_S_Header.ascx.cs
+15 -1
View File
@@ -168,6 +168,20 @@ namespace C2P.WebUserControls
lista.SelectedIndex = lista.Items.IndexOf(lista.Items.FindByValue(RawMat));
}
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_S_PackPar.ascx
+2 -2
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left didascalia">
@@ -111,7 +111,7 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updatePackPar">
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updatePackPar" OnUpdated="odsQuotes_Updated">
<SelectParameters>
<asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
C2P/WebUserControls/mod_S_PackPar.ascx.cs
+23 -1
View File
@@ -13,7 +13,7 @@ namespace C2P.WebUserControls
{
}
public event EventHandler eh_update;
/// <summary>
/// fa toggle tra modo edit e read/item
/// </summary>
@@ -39,5 +39,27 @@ namespace C2P.WebUserControls
return (frmView.CurrentMode == FormViewMode.Edit);
}
}
protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_S_Quot.ascx
+1 -1
View File
@@ -6,7 +6,7 @@
<%} %>
<%@ Register Src="~/WebUserControls/mod_displayHor.ascx" TagName="mod_displayHor" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine bg-info" style="font-size: 1.2em; line-height: 1.4em; padding-top: 4px;">
<div class="col-xs-6 text-left">
C2P/WebUserControls/mod_S_Quot.ascx.cs
+15 -1
View File
@@ -60,6 +60,20 @@ namespace C2P.WebUserControls
if (Math.Round(Convert.ToDecimal(val1), 3) < Math.Round(Convert.ToDecimal(val2), 3)) answ = "text-danger";
return answ;
}
/// <summary>
/// controllo se inviare evento refresh al cambio di modo della formview
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void frmView_ModeChanged(object sender, EventArgs e)
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
if (eh_update != null)
{
eh_update(this, new EventArgs());
}
}
}
}
}
C2P/WebUserControls/mod_newProduct.ascx.cs
+68 -24
View File
@@ -135,12 +135,59 @@ namespace C2P.WebUserControls
hlGetPdf.NavigateUrl = string.Format("~/RepOffers?ticket={0}", 4); // va fatta con altra pagina che dia direttamente SINGOLO REPORT?!?
hlRevHist.ToolTip = traduci("RevisionHistory");
prevReq = "";
editActive = false;
setModVisibility("Header");
}
mod_S_Dies1.eh_update += mod_S_Dies1_eh_update;
mod_S_ExtrPar1.eh_update += mod_S_ExtrPar1_eh_update;
mod_S_Header1.eh_update += mod_S_Header1_eh_update;
#if false
mod_S_Quot1.eh_update += mod_S_Quot1_eh_update;
#endif
mod_S_PackPar1.eh_update += mod_S_PackPar1_eh_update;
mod_S_Quot1.eh_update += mod_S_Quot1_eh_update;
}
/// <summary>
/// aggiorna info base dell'offerta
/// </summary>
void mod_S_Dies1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// aggiorna info base dell'offerta
/// </summary>
void mod_S_ExtrPar1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// richiesto update x cambiamento valori costs
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_S_Header1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// aggiorna info base dell'offerta
/// </summary>
void mod_S_PackPar1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// richiesto update x cambiamento valori header
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_S_Quot1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// aggiorna info base dell'offerta
@@ -164,26 +211,6 @@ namespace C2P.WebUserControls
setBtnVisibility();
}
/// <summary>
/// richiesto update x cambiamento valori header
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_S_Quot1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// richiesto update x cambiamento valori costs
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_S_Header1_eh_update(object sender, EventArgs e)
{
updateBaseData();
setModVisibility("");
}
/// <summary>
/// Calcola css dato valore prezzo offerto vs importi full cost e min price
/// </summary>
/// <param name="FullCost"></param>
@@ -240,6 +267,7 @@ namespace C2P.WebUserControls
// se NON HO dati x una richiesta specifica vado in modalità INSERT..
{
// mostro solo controllo header in modalità INSERT
editActive = true;
mod_S_Header1.setInsertMode();
mod_S_Costs1.Visible = false;
mod_S_ExtrPar1.Visible = false;
@@ -300,6 +328,7 @@ namespace C2P.WebUserControls
mod_S_Header1.Visible = true;
mod_S_PackPar1.Visible = false;
mod_S_Dies1.Visible = false;
editActive = false;
break;
}
// verifica se sia attivo editing
@@ -322,7 +351,7 @@ namespace C2P.WebUserControls
// fix visibilità button creazione offerta
lbCreateOffer.Visible = okCreate;
// fix altri button x edit..
if (!showEdit)
if (!showEdit || editActive)
{
lbHeader.CssClass = "btn btn-warning disabled";
lbExtrPar.CssClass = "btn btn-warning disabled";
@@ -330,6 +359,21 @@ namespace C2P.WebUserControls
lbDiesPar.CssClass = "btn btn-warning disabled";
lbCosts.CssClass = "btn btn-warning disabled";
lbQuotation.CssClass = "btn btn-warning disabled";
// riabilito controlli in edit...
if (mod_S_Header1.isEditing) lbHeader.CssClass = "btn btn-warning";
if (mod_S_ExtrPar1.isEditing) lbExtrPar.CssClass = "btn btn-warning";
if (mod_S_PackPar1.isEditing) lbPackPar.CssClass = "btn btn-warning";
if (mod_S_Dies1.isEditing) lbDiesPar.CssClass = "btn btn-warning";
if (mod_S_Quot1.isEditing) lbQuotation.CssClass = "btn btn-warning";
}
else
{
lbHeader.CssClass = "btn btn-warning";
lbExtrPar.CssClass = "btn btn-warning";
lbPackPar.CssClass = "btn btn-warning";
lbDiesPar.CssClass = "btn btn-warning";
lbCosts.CssClass = "btn btn-warning";
lbQuotation.CssClass = "btn btn-warning";
}
}
/// <summary>
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("0.7.75.171")]
[assembly: AssemblyFileVersion("0.7.75.171")]
[assembly: AssemblyVersion("0.7.77.171")]
[assembly: AssemblyFileVersion("0.7.77.171")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("0.7.75.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.7.75.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.7.77.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.7.77.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+