refresh x ultimi fix

This commit is contained in:
Samuele E. Locatelli
2016-02-02 14:35:30 +01:00
parent 260ccfd4ed
commit 42fdd96446
10 changed files with 42 additions and 8 deletions
Binary file not shown.
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.0.091.306")]
[assembly: AssemblyFileVersion("2.0.091.306")]
[assembly: AssemblyVersion("2.0.093.307")]
[assembly: AssemblyFileVersion("2.0.093.307")]
[assembly: AssemblyCopyright("Steamware © 2015-2016")]
[assembly: AssemblyCompany("Steamware")]
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.0.091.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.091.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.0.093.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.093.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
Binary file not shown.
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="ui-field-contain" style="visibility: <%: isVisible %>; height: <%: visHeight %>;">
<div data-role="controlgroup" data-type="horizontal" data-mini="true" style="font-size: 0.9em; width: 90%;">
<asp:DropDownList runat="server" ID="ddlTipoCons" DataSourceID="odsTipoCons" DataTextField="DescrConsegna" DataValueField="CodConsegna"></asp:DropDownList>
<asp:LinkButton ID="lbAdd" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Aggiungi" OnClick="lbAdd_Click" Visible='<%# hasMatricola %>' />
<asp:LinkButton ID="lbAdd" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Aggiungi" OnClick="lbAdd_Click" Visible='<%# canAddData %>' />
</div>
</div>
<asp:ObjectDataSource runat="server" ID="odsTipoCons" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.AnagTipoConsegneTableAdapter" />
+30 -2
View File
@@ -93,8 +93,7 @@ namespace WebSCR.WebUserControls
}
protected void Page_Load(object sender, EventArgs e)
{
lblWarning.Visible = false;
lbAdd.DataBind();
doUpdate();
}
/// <summary>
/// aggiunge il task corrente all'elenco dei task...
@@ -122,6 +121,33 @@ namespace WebSCR.WebUserControls
}
}
/// <summary>
/// verifica se si possano agigungere dati: ha patricola (OP) e l'intervento ha il record usato si/no compilato
/// </summary>
public bool canAddData
{
get
{
return hasMatricola && isRitUsOk;
}
}
/// <summary>
/// verifica se il record sia OK x ritiro usato...
/// </summary>
public bool isRitUsOk
{
get
{
bool answ = false;
try
{
answ = DtProxy.man.taImp.getByKey(idxImpegno)[0].RitUsato >= 0;
}
catch
{ }
return answ;
}
}
/// <summary>
/// verifica se ci sia matricola in sessione
/// </summary>
public bool hasMatricola
@@ -198,6 +224,8 @@ namespace WebSCR.WebUserControls
}
public void doUpdate()
{
lblWarning.Visible = false;
lbAdd.DataBind();
grViewDettInt.DataBind();
}
protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e)
+1 -1
View File
@@ -265,7 +265,7 @@
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsImpegni" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.ImpegniTableAdapter" UpdateMethod="updateQuery" OnUpdating="odsImpegni_Updating" DeleteMethod="deleteQuery" OnDeleted="odsImpegni_Deleted">
<asp:ObjectDataSource ID="odsImpegni" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.ImpegniTableAdapter" UpdateMethod="updateQuery" OnUpdating="odsImpegni_Updating" DeleteMethod="deleteQuery" OnDeleted="odsImpegni_Deleted" OnUpdated="odsImpegni_Updated">
<SelectParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
</SelectParameters>
@@ -175,5 +175,10 @@ namespace WebSCR.WebUserControls
{ }
return answ;
}
protected void odsImpegni_Updated(object sender, ObjectDataSourceStatusEventArgs e)
{
raiseEventUpd();
}
}
}
@@ -45,6 +45,7 @@ namespace WebSCR.WebUserControls
mod_compSquadra.doUpdate();
mod_fileImpegno.doUpdate();
mod_fileUpload.doUpdate();
mod_dettInt.doUpdate();
}
private void Mod_impegno_eh_errUpd(object sender, EventArgs e)
Binary file not shown.