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

fix problema autocompletamento ricerca matricole x nuovo dossier

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-10-19 12:03:19 +02:00
parent d315f2fdd6
commit 74a9ea997a
24 changed files with 101 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Debug/SteamWare.xml
-14
View File
@@ -4667,19 +4667,5 @@
<param name="originalVal"></param>
<returns></returns>
</member>
<member name="M:SteamWare.WebUserControl.grView_RowDataBound(System.Object,System.Web.UI.WebControls.GridViewRowEventArgs)">
<summary>
evento standard agganciabile da grView x aggiunta doppio click e singolo click (x edit e select)
</summary>
<param name="sender"></param>
<param name="e"></param>
</member>
<member name="M:SteamWare.WebUserControl.traduci(System.String)">
<summary>
effettua traduzione del lemma
</summary>
<param name="lemma"></param>
<returns></returns>
</member>
</members>
</doc>
CMS-SC-Data/bin/Release/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Release/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
CMS_SC/Collaudi.aspx
+4 -3
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Collaudi.aspx.cs" Inherits="CMS_SC.Collaudi" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Collaudi.aspx.cs" Inherits="CMS_SC.Collaudi" EnableEventValidation="false" %>
<%@ Register Src="~/WebUserControls/mod_collaudi.ascx" TagPrefix="uc1" TagName="mod_collaudi" %>
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %>
@@ -18,14 +18,15 @@
<div class="row">
<div class="col-xs-8">
<h3 class="panel-title"><%: traduci("CollaudiAttivi") %></h3>
<asp:Button runat="server" ID="btnEmpty" Text="Empty" Width="0" Height="0" />
</div>
<div class="col-xs-2">
<asp:Button runat="server" ID="btnAddNewSetMis" CssClass="btn btn-success" Text='<%# traduci("btnAddNewSetMis") %>' OnClick="btnAddNewSetMis_click" Font-Size="0.9em" Width="100%" />
<asp:Button runat="server" ID="btnRemSetMis" CssClass="btn btn-danger" Text='<%# traduci("btnRemSetMis") %>' OnClick="btnRemSetMis_click" Font-Size="0.9em" Width="100%" />
<asp:Button runat="server" ID="btnRemSetMis" CssClass="btn btn-danger" Text='<%# traduci("btnRemSetMis") %>' OnClick="btnRemSetMis_click" Font-Size="0.9em" Width="100%" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>' />
</div>
<div class="col-xs-2">
<asp:Button runat="server" ID="btnShowHideHist" CssClass="btn btn-warning" Text='<%# traduci("btnShowHist") %>' Font-Size="0.8em" Width="100%" OnClick="btnShowHideHist_Click" />
</div>
</div>
<div class="row" style="font-size: 0.8em;">
CMS_SC/Collaudi.aspx.designer.cs
Generated
+9
View File
@@ -21,6 +21,15 @@ namespace CMS_SC {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain;
/// <summary>
/// btnEmpty control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnEmpty;
/// <summary>
/// btnAddNewSetMis control.
/// </summary>
CMS_SC/SchemaCollMacc.aspx.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace CMS_SC
/// </summary>
public string serviceUrl(string method)
{
return string.Format("/{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method);
return string.Format("{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method);
}
/// <summary>
/// wrapper traduzione
CMS_SC/Web.CMS.config
+1
View File
@@ -18,6 +18,7 @@
<add key="baseUrl" value="http://10.69.33.57/CMS-SC" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="defaultDomain" value="SQL-AUTOMAZIONE" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="reportsUrl" value="http://10.69.33.57/CMS_SC_Report" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="serviceUrl" value="http://10.69.33.57/CMS-SC/Services" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="defaultDomain" value="SQL-AUTOMAZIONE" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="_fromEmail" value="cmssc@cms.it" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="_smtpCli" value="10.69.33.50" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
CMS_SC/Web.config
+1 -1
View File
@@ -41,7 +41,7 @@
<add key="sqlLongCommandTimeout" value="600" />
<!--area suggerimenti-->
<add key="maxNumSuggest" value="30" />
<add key="serviceUrl" value="Services" />
<add key="serviceUrl" value="/Services" />
<!--area logger-->
<add key="_logDir" value="~/logs/" />
<add key="doShrinkFolder" value="true" />
CMS_SC/WebUserControls/mod_collaudi.ascx
+23 -5
View File
@@ -1,8 +1,26 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_collaudi.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_collaudi" %>
<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %>
<script type="text/javascript">
function enter(obj) {
<%--if (event.keyCode == 40) //Down
{
document.getElementById("<%=btnDown.ClientID %>").click();
}
if (event.keyCode == 38) //Up
{
document.getElementById("<%=btnUp.ClientID %>").click();
}--%>
if (event.keyCode == 13) // Enter
{
document.getElementById("<%=btnSave.ClientID %>").click();
}
}</script>
<%--<asp:Button runat="server" ID="btnUp" Text="UP" OnClick="btnUp_Click" Width="0" Height="0" />
<asp:Button runat="server" ID="btnDown" Text="DOWN" OnClick="btnDown_Click" Width="0" Height="0" />--%>
<asp:Button runat="server" ID="btnSave" Text="UP" OnClick="btnSave_Click" Width="0" Height="0" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="IdxDossier,CodScheda,Vers,NumScheda,CodMisura,Fase" DataSourceID="ods" CssClass="table table-striped" AllowPaging="True" AllowSorting="True" OnRowCommand="grView_RowCommand" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="IdxDossier,CodScheda,Vers,NumScheda,CodMisura,Fase" DataSourceID="ods" CssClass="table table-striped" AllowPaging="True" AllowSorting="True" OnRowCommand="grView_RowCommand" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing">
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
@@ -22,7 +40,7 @@
<asp:TemplateField HeaderText="Val. Misura" SortExpression="ValoreMis">
<EditItemTemplate>
<div runat="server" id="divMisura" visible='<%# Eval("TipovalMisura").ToString()!="FILE" %>'>
<asp:TextBox ID="txtValoreMis" runat="server" Text='<%# Bind("ValoreMis") %>' />
<asp:TextBox ID="txtValoreMis" runat="server" Text='<%# Bind("ValoreMis") %>' onkeypress="enter(this)" />
</div>
<div runat="server" id="divFile" visible='<%# Eval("TipovalMisura").ToString()=="FILE" %>'>
<asp:HyperLink runat="server" ID="hlFileMan" Target="_blank" NavigateUrl='<%# fileTarget(Eval("ValoreMis"), "true") %>'><%# contaAllegati(Eval("ValoreMis")) %></asp:HyperLink>
@@ -44,7 +62,7 @@
</asp:TemplateField>
<asp:TemplateField>
<EditItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' onkeyup="enter(this)" />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
@@ -55,7 +73,7 @@
</asp:TemplateField>
<asp:TemplateField>
<EditItemTemplate>
<asp:TextBox ID="txtValorePar" runat="server" Text='<%# Bind("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
<asp:TextBox ID="txtValorePar" runat="server" Text='<%# Bind("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' onkeyup="enter(this)" />
</EditItemTemplate>
<ItemTemplate>
<div runat="server" id="divValPar" visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>'>
@@ -70,7 +88,7 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Vis" SortExpression="CodVisib">
<EditItemTemplate>
<asp:TextBox ID="txtCodVisib" runat="server" Text='<%# Bind("CodVisib") %>' />
<asp:TextBox ID="txtCodVisib" runat="server" Text='<%# Bind("CodVisib") %>' onkeyup="enter(this)" />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblCodVisib" runat="server" Text='<%# Bind("CodVisib") %>' Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+48 -10
View File
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
namespace CMS_SC.WebUserControls
{
public partial class mod_collaudi : System.Web.UI.UserControl
public partial class mod_collaudi : SteamWare.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
@@ -208,15 +208,6 @@ namespace CMS_SC.WebUserControls
}
}
/// <summary>
/// wrapper traduzione
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(string lemma)
{
return user_std.UtSn.Traduci(lemma);
}
/// <summary>
/// formatta URL x mostrare i file associati al record
/// </summary>
@@ -247,6 +238,53 @@ namespace CMS_SC.WebUserControls
{ }
return answ;
}
#if false
/// <summary>
/// save + edit del record precedente (se possibile)
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUp_Click(object sender, EventArgs e)
{
if (grView.EditIndex > 0)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
// seleziono nuovo record x edit
grView.EditIndex = grView.EditIndex - 1;
//grView.FindControl("txtValoreMis").Focus();
}
}
/// <summary>
/// save + edit del record successivo (se possibile)
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnDown_Click(object sender, EventArgs e)
{
if (grView.EditIndex < pageSize - 1)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
// seleziono nuovo record x edit
grView.EditIndex = grView.EditIndex + 1;
//grView.FindControl("txtValoreMis").Focus();
}
}
#endif
/// <summary>
/// save del record
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
grView.EditIndex = -1;
grView.DataBind();
}
#if false
protected void lbFileMan_DataBinding(object sender, EventArgs e)
CMS_SC/WebUserControls/mod_collaudi.ascx.designer.cs
Generated
+9
View File
@@ -12,6 +12,15 @@ namespace CMS_SC.WebUserControls {
public partial class mod_collaudi {
/// <summary>
/// btnSave control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSave;
/// <summary>
/// grView control.
/// </summary>
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll.config
+1 -1
View File
@@ -41,7 +41,7 @@
<add key="sqlLongCommandTimeout" value="600" />
<!--area suggerimenti-->
<add key="maxNumSuggest" value="30" />
<add key="serviceUrl" value="Services" />
<add key="serviceUrl" value="~/Services" />
<!--area logger-->
<add key="_logDir" value="~/logs/" />
<add key="doShrinkFolder" value="true" />
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/SteamWare.xml
-14
View File
@@ -4667,19 +4667,5 @@
<param name="originalVal"></param>
<returns></returns>
</member>
<member name="M:SteamWare.WebUserControl.grView_RowDataBound(System.Object,System.Web.UI.WebControls.GridViewRowEventArgs)">
<summary>
evento standard agganciabile da grView x aggiunta doppio click e singolo click (x edit e select)
</summary>
<param name="sender"></param>
<param name="e"></param>
</member>
<member name="M:SteamWare.WebUserControl.traduci(System.String)">
<summary>
effettua traduzione del lemma
</summary>
<param name="lemma"></param>
<returns></returns>
</member>
</members>
</doc>
VersGen/CMS_SC.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.8.093.354")]
[assembly: AssemblyFileVersion("1.8.093.354")]
[assembly: AssemblyVersion("1.8.095.354")]
[assembly: AssemblyFileVersion("1.8.095.354")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/CMS_SC.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.8.093.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.8.093.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.8.095.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.8.095.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
VersGen/bin/Debug/VersGen.dll
BIN
View File
Binary file not shown.