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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-10-28 11:06:59 +01:00
parent bae378fb1a a53ddfa4af
commit ecbf39810c
46 changed files with 878 additions and 619 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
+20 -1
View File
@@ -602,7 +602,7 @@
</member>
<member name="M:SteamWare.authProxy.setupConnectionStringBase">
<summary>
effettua setup dei connection strings da web.config delal singola applicazione
effettua setup dei connection strings da web.config della singola applicazione
</summary>
</member>
<member name="M:SteamWare.authProxy.#ctor">
@@ -4667,5 +4667,24 @@
<param name="originalVal"></param>
<returns></returns>
</member>
<member name="T:SteamWare.TempiCiclo">
<summary>
gestione helper tempi ciclo
</summary>
</member>
<member name="M:SteamWare.TempiCiclo.minSec(System.Object)">
<summary>
formatta in minuti/sec partendo da min.cent
</summary>
<param name="minCent"></param>
<returns></returns>
</member>
<member name="M:SteamWare.TempiCiclo.minCent2Sec(System.Decimal)">
<summary>
conversione da tempo minuti centesimali a minuti/secondi
</summary>
<param name="valore"></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/Bootstrap.Master
+1 -1
View File
@@ -28,7 +28,7 @@
</head>
<body>
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server"> <%--EnablePartialRendering="false"--%>
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%>
<%--Framework Scripts--%>
CMS_SC/Content/Style.css
+8 -3
View File
@@ -852,10 +852,10 @@ a:focus {
/* Small devices (tablets, 768px and up) */
@media (min-width: 768px) {
.subnav-collapse.collapse {
display: block!important;
height: auto!important;
display: block !important;
height: auto !important;
padding-bottom: 0;
overflow: visible!important;
overflow: visible !important;
}
}
/* Medium devices (desktops, 992px and up) */
@@ -890,4 +890,9 @@ a:focus {
/*border-top: 1px solid #3AC0F2;
border-bottom: 1px solid #3AC0F2;*/
font-weight: bold;
}
.hiddenBtn {
height: 0;
width: 0;
visibility: hidden;
}
CMS_SC/Content/Style.less
+576 -566
View File
File diff suppressed because it is too large Load Diff
CMS_SC/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
CMS_SC/DettScheda.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="DettScheda.aspx.cs" Inherits="CMS_SC.DettScheda" EnableEventValidation = "false" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="DettScheda.aspx.cs" Inherits="CMS_SC.DettScheda" EnableEventValidation="false" %>
<%@ Register Src="~/WebUserControls/mod_DettScheda.ascx" TagPrefix="uc1" TagName="mod_DettScheda" %>
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc1" %>
CMS_SC/DettScheda.aspx.cs
+11
View File
@@ -21,7 +21,18 @@ namespace CMS_SC
}
mod_righePag.eh_newNum += mod_righePag_eh_newNum;
mod_DettScheda.eh_selezioneValore += mod_DettScheda_eh_selezioneValore;
mod_DettScheda.eh_reqSave += Mod_DettScheda_eh_reqSave;
}
/// <summary>
/// richiedo salvataggio x scheda dettaglio
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Mod_DettScheda_eh_reqSave(object sender, EventArgs e)
{
mod_validVal.trySaveEdit();
}
/// <summary>
/// se c'è selezione valore MOSTROschema parametri validazione
/// </summary>
CMS_SC/Properties/PublishProfiles/IIS02.pubxml
+6 -2
View File
@@ -46,7 +46,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)CMS_SC_Data.Properties.Settings.CMS_SCConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)SteamWare.Properties.Settings.DS_AuthConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)CMS_SC_Data.Properties.Settings.CMS_SCConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
<MSDeployParameterValue Include="$(DeployParameterPrefix)SteamWare.Properties.Settings.DS_AuthConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
</ItemGroup>
</Project>
CMS_SC/Web.config
+2
View File
@@ -178,6 +178,8 @@
<!--aggiunto mimetype x scaricamento fonts aggiuntive-->
<remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/font-woff" />
<remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/font-woff" />
<!--<mimeMap fileExtension=".woff" mimeType="APPLICATION/X-WOFF" />-->
</staticContent>
<validation validateIntegratedModeConfiguration="false" />
CMS_SC/WebUserControls/mod_DettScheda.ascx
+26 -5
View File
@@ -1,5 +1,26 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_DettScheda.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_DettScheda" %>
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="CodScheda,Vers,CodMisura" DataSourceID="ods" CssClass="table table-striped" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowDataBound="grView_RowDataBound">
<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="S" OnClick="btnSave_Click" CssClass="hiddenBtn" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="CodScheda,Vers,CodMisura" DataSourceID="ods" CssClass="table table-striped" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing" onkeydown="enter(this)" onkeyup="enter(this)">
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
@@ -21,7 +42,7 @@
<asp:LinkButton ID="lbEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Edit" CssClass="fa fa-edit fa-2x" />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="CodMisura" HeaderText="CodMisura" ReadOnly="false" SortExpression="CodMisura" ControlStyle-Width="8em" />
<asp:BoundField DataField="CodMisura" HeaderText="CodMisura" ReadOnly="false" SortExpression="CodMisura" ControlStyle-Width="6em" />
<asp:TemplateField ShowHeader="False" ItemStyle-Width="80px">
<HeaderTemplate>
<%# traduci("moveMis") %>
@@ -37,7 +58,7 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="NomeMisura" HeaderText="Nome Misura" SortExpression="NomeMisura" ControlStyle-Width="25em" />
<asp:BoundField DataField="NomeMisura" HeaderText="Nome Misura" SortExpression="NomeMisura" ControlStyle-Width="20em" />
<asp:TemplateField HeaderText="Tipo Mis." SortExpression="TipoValMisura">
<EditItemTemplate>
<asp:DropDownList ID="ddlTipoValMisura" runat="server" SelectedValue='<%# Bind("TipoValMisura") %>' DataSourceID="odsTipoVal" DataTextField="label" DataValueField="value">
@@ -47,8 +68,8 @@
<asp:Label ID="Label1" runat="server" Text='<%# Bind("TipoValMisura") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="NomePar" HeaderText="Nome Par." SortExpression="NomePar" ControlStyle-Width="20em" />
<asp:BoundField DataField="CodVisib" HeaderText="Visib." SortExpression="CodVisib" ControlStyle-Width="4em" />
<asp:BoundField DataField="NomePar" HeaderText="Nome Par." SortExpression="NomePar" ControlStyle-Width="16em" />
<asp:BoundField DataField="CodVisib" HeaderText="Visib." SortExpression="CodVisib" ControlStyle-Width="3em" />
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<asp:LinkButton ID="lbAddNew" runat="server" CausesValidation="false" ToolTip="InsNew" CssClass="fa fa-plus fa-2x" OnClick="lbAddNew_Click" />
CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
+28
View File
@@ -16,6 +16,10 @@ namespace CMS_SC.WebUserControls
/// </summary>
public event EventHandler eh_selezioneValore;
/// <summary>
/// richeista SAVE (da enter)
/// </summary>
public event EventHandler eh_reqSave;
/// <summary>
/// sollevo evento selezione
/// </summary>
protected void raiseEvent()
@@ -261,5 +265,29 @@ namespace CMS_SC.WebUserControls
resetSelezione();
}
/// <summary>
/// save del record
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
// verifico SE sia in editing...
if (grView.EditIndex >= 0)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
grView.EditIndex = -1;
grView.DataBind();
}
else
{
// sollevo evento nuovo valore...
if (eh_reqSave != null)
{
eh_reqSave(this, new EventArgs());
}
}
}
}
}
CMS_SC/WebUserControls/mod_DettScheda.ascx.designer.cs
Generated
+9
View File
@@ -12,6 +12,15 @@ namespace CMS_SC.WebUserControls {
public partial class mod_DettScheda {
/// <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/WebUserControls/mod_collaudi.ascx
+17 -29
View File
@@ -15,12 +15,12 @@
{
document.getElementById("<%=btnSave.ClientID %>").click();
}
}</script>
}
</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" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing">
<asp:Button runat="server" ID="btnSave" Text="S" 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" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing" onkeydown="enter(this)" onkeyup="enter(this)">
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
@@ -40,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") %>' onkeypress="enter(this)" />
<asp:TextBox ID="txtValoreMis" runat="server" Text='<%# Bind("ValoreMis") %>' />
</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>
@@ -51,7 +51,7 @@
<div runat="server" id="divMisura" visible='<%# Eval("TipovalMisura").ToString()!="FILE" %>'>
<asp:Label ID="lblValoreMis" runat="server" Text='<%# Eval("ValoreMis") %>' />
<br />
<asp:Label ID="lblLS_ValMis" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("LIVal"),Eval("LSVal")) %>' Visible='<%# Eval("NomePar")!="" %>' Font-Size="0.8em" ForeColor="#696969" />
<asp:Label ID="lblLS_ValMis" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("LIVal"),Eval("LSVal")) %>' Visible='<%# Eval("NomePar").ToString() != "" %>' Font-Size="0.8em" ForeColor="#696969" />
</div>
<div runat="server" id="divFile" visible='<%# Eval("TipovalMisura").ToString()=="FILE" %>'>
<asp:HyperLink runat="server" ID="hlFileMan" Target="_blank" NavigateUrl='<%# fileTarget(Eval("ValoreMis"), "false") %>'><%# contaAllegati(Eval("ValoreMis")) %></asp:HyperLink>
@@ -62,10 +62,10 @@
</asp:TemplateField>
<asp:TemplateField>
<EditItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' onkeyup="enter(this)" />
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar").ToString() != "" %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar").ToString() != "" %>' />
</ItemTemplate>
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadNomePar" Text="Param." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
@@ -73,50 +73,38 @@
</asp:TemplateField>
<asp:TemplateField>
<EditItemTemplate>
<asp:TextBox ID="txtValorePar" runat="server" Text='<%# Bind("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' onkeyup="enter(this)" />
<asp:TextBox ID="txtValorePar" runat="server" Text='<%# Bind("ValorePar") %>' Visible='<%# Eval("NomePar").ToString() != "" %>' />
</EditItemTemplate>
<ItemTemplate>
<div runat="server" id="divValPar" visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>'>
<asp:Label ID="lblValorePar" runat="server" Text='<%# Eval("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
<asp:Label ID="lblValorePar" runat="server" Text='<%# Eval("ValorePar") %>' Visible='<%# Eval("NomePar").ToString() != "" %>' />
<br />
<asp:Label ID="lblLS_ValPar" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("MinPar"),Eval("MaxPar")) %>' Visible='<%# Eval("NomePar")!="" %>' Font-Size="0.8em" ForeColor="#696969" />
<asp:Label ID="lblLS_ValPar" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("MinPar"),Eval("MaxPar")) %>' Visible='<%# Eval("NomePar").ToString() != "" %>' Font-Size="0.8em" ForeColor="#696969" />
</div>
</ItemTemplate>
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadValPar" Text="Val.Par." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</HeaderTemplate>
</asp:TemplateField>
<%--<asp:TemplateField HeaderText="Vis" SortExpression="CodVisib">
<EditItemTemplate>
<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) %>' />
</ItemTemplate>
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadVis" Text="Vis." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</HeaderTemplate>
<ControlStyle Width="4em" />
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="Oper." SortExpression="Operatore">
<EditItemTemplate>
<asp:Label ID="lblOperatore" runat="server" Text='<%# Eval("Operatore") %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblOperatore" class="fa fa-user" Font-Size="1.5em" runat="server" ToolTip='<%# string.Format("{0} - {1:yyyy/MM/dd HH:mm}", Eval("Operatore"), Eval("DataOra")) %>' Visible='<%# Eval("Operatore")!="" %>' />
<asp:Label ID="lblOperatore" class="fa fa-user" Font-Size="1.5em" runat="server" ToolTip='<%# string.Format("{0} - {1:yyyy/MM/dd HH:mm}", Eval("Operatore"), Eval("DataOra")) %>' Visible='<%# Eval("Operatore").ToString() != "" %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ok Mis." SortExpression="OkValMis">
<ItemTemplate>
<i id="iOK" runat="server" class="fa fa-check-circle" font-size="1.5em" visible='<%# Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore")!="" %>' style="color: green;"></i>
<i id="iKO" runat="server" class="fa fa-times-circle" font-size="1.5em" visible='<%# !Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore")!="" %>' style="color: red;"></i>
<i id="iOK" runat="server" class="fa fa-check-circle" font-size="1.5em" visible='<%# Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore").ToString()!="" %>' style="color: green;"></i>
<i id="iKO" runat="server" class="fa fa-times-circle" font-size="1.5em" visible='<%# !Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore").ToString()!="" %>' style="color: red;"></i>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Der." SortExpression="CodDeroga">
<ItemTemplate>
<asp:LinkButton ID="lbCodDerogaAdd" CausesValidation="False" CommandName="Select" CommandArgument="ADD" runat="server" class="fa fa-plus-circle" Font-Size="1.5em" Visible='<%# hasDeroga("ADD", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore")!="" %>' Style="color: green;"></asp:LinkButton>
<asp:Label ID="lblCodDeroga" class="fa fa-graduation-cap" Font-Size="1.5em" runat="server" ToolTip='<%# Eval("CodDeroga") %>' Visible='<%# Eval("CodDeroga")!="" %>' ForeColor="Green" />
<asp:LinkButton ID="lbCodDerogaRem" CausesValidation="False" CommandName="Select" CommandArgument="REM" runat="server" class="fa fa-minus-circle" Font-Size="1.5em" Visible='<%# hasDeroga("REM", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore")!="" && Convert.ToBoolean(hfEditEnabled.Value) %>' Style="color: red;"></asp:LinkButton>
<asp:LinkButton ID="lbCodDerogaAdd" CausesValidation="False" CommandName="Select" CommandArgument="ADD" runat="server" class="fa fa-plus-circle" Font-Size="1.5em" Visible='<%# hasDeroga("ADD", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore").ToString()!="" %>' Style="color: green;"></asp:LinkButton>
<asp:Label ID="lblCodDeroga" class="fa fa-graduation-cap" Font-Size="1.5em" runat="server" ToolTip='<%# Eval("CodDeroga") %>' Visible='<%# Eval("CodDeroga").ToString()!="" %>' ForeColor="Green" />
<asp:LinkButton ID="lbCodDerogaRem" CausesValidation="False" CommandName="Select" CommandArgument="REM" runat="server" class="fa fa-minus-circle" Font-Size="1.5em" Visible='<%# hasDeroga("REM", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore").ToString()!="" && Convert.ToBoolean(hfEditEnabled.Value) %>' Style="color: red;"></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+14 -4
View File
@@ -279,10 +279,20 @@ namespace CMS_SC.WebUserControls
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
grView.EditIndex = -1;
grView.DataBind();
//// salvo
//int idxEdit = grView.EditIndex;
//grView.UpdateRow(grView.EditIndex, false);
//grView.EditIndex = -1;
//grView.DataBind();
// verifico SE sia in editing...
if (grView.EditIndex >= 0)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
grView.EditIndex = -1;
grView.DataBind();
}
}
CMS_SC/WebUserControls/mod_validVal.ascx
+2 -1
View File
@@ -1,6 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_validVal.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_validVal" %>
<asp:Button runat="server" ID="btnNewFromEmpty" Text='<%# traduci("btnAddNewFromEmpty") %>' OnClick="btnNewFromEmpty_Click" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="CodScheda,Vers,CodMisura,MinPar" DataSourceID="ods" CssClass="table table-striped" AllowPaging="False" AllowSorting="True" OnRowDataBound="grView_RowDataBound">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="CodScheda,Vers,CodMisura,MinPar" DataSourceID="ods" CssClass="table table-striped" AllowPaging="False" AllowSorting="True" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing" onkeydown="enter(this)" onkeyup="enter(this)">
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
CMS_SC/WebUserControls/mod_validVal.ascx.cs
+21
View File
@@ -151,5 +151,26 @@ namespace CMS_SC.WebUserControls
return answ;
}
}
/// <summary>
/// save del record
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
trySaveEdit();
}
public void trySaveEdit()
{
// verifico SE sia in editing...
if (grView.EditIndex >= 0)
{
// salvo
grView.UpdateRow(grView.EditIndex, false);
grView.EditIndex = -1;
grView.DataBind();
}
}
}
}
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
+2
View File
@@ -178,6 +178,8 @@
<!--aggiunto mimetype x scaricamento fonts aggiuntive-->
<remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/font-woff" />
<remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/font-woff" />
<!--<mimeMap fileExtension=".woff" mimeType="APPLICATION/X-WOFF" />-->
</staticContent>
<validation validateIntegratedModeConfiguration="false" />
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/SteamWare.xml
+20 -1
View File
@@ -602,7 +602,7 @@
</member>
<member name="M:SteamWare.authProxy.setupConnectionStringBase">
<summary>
effettua setup dei connection strings da web.config delal singola applicazione
effettua setup dei connection strings da web.config della singola applicazione
</summary>
</member>
<member name="M:SteamWare.authProxy.#ctor">
@@ -4667,5 +4667,24 @@
<param name="originalVal"></param>
<returns></returns>
</member>
<member name="T:SteamWare.TempiCiclo">
<summary>
gestione helper tempi ciclo
</summary>
</member>
<member name="M:SteamWare.TempiCiclo.minSec(System.Object)">
<summary>
formatta in minuti/sec partendo da min.cent
</summary>
<param name="minCent"></param>
<returns></returns>
</member>
<member name="M:SteamWare.TempiCiclo.minCent2Sec(System.Decimal)">
<summary>
conversione da tempo minuti centesimali a minuti/secondi
</summary>
<param name="valore"></param>
<returns></returns>
</member>
</members>
</doc>
Release Clienti/CMS_SC.zip
BIN
View File
Binary file not shown.
VersGen/CMS_SC.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.100.354")]
[assembly: AssemblyFileVersion("1.9.100.354")]
[assembly: AssemblyVersion("1.9.103.355")]
[assembly: AssemblyFileVersion("1.9.103.355")]
[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.9.100.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.100.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.9.103.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.103.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
VersGen/bin/Debug/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.
packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg
Vendored
BIN
View File
Binary file not shown.
packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform
Vendored
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.web>
<pages>
<controls>
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
</controls>
</pages>
</system.web>
</configuration>
packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxControlToolkit.15.1.3.0/readme.txt
Vendored
+23
View File
@@ -0,0 +1,23 @@
You have downloaded the ASP.NET AJAX Control Toolkit v15.1.3 nuget package.
To learn more about this release, please read this post:
https://community.devexpress.com/blogs/aspnet/archive/2015/05/21/asp-net-ajax-control-toolkit-v15-1-2-nuget-bug-fixes-and-more.aspx
Getting Started
---------------
Please see https://www.devexpress.com/go/AjaxControlToolkit_Nuget_TextFile_CodePlex.aspx for more information on using AjaxControlToolkit.
Upgrading from earlier version
------------------------------
Please see https://ajaxcontroltoolkit.codeplex.com/wikipage?title=Upgrade%20your%20project%20to%20AjaxControlToolkit%20v15.1 for more information on how to
upgrade to version 15.1
Maintained by DevExpress
------------------------
The ASP.NET AJAX Control Toolkit is now maintained by DevExpress.
Visit http://devexpress.com/ms-act for more information.
packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets
Vendored
+38
View File
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMin" />
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMinBundleTask" />
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMinManifestTask" />
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMinManifestCleanTask" />
<PropertyGroup>
<!-- if the project has a Content folder, we want that to be the root output; otherwise just dump everything relative to the project root -->
<AjaxMinOutputFolder Condition="$(AjaxMinOutputFolder)=='' and Exists('$(ProjectDir)Content\')">$(ProjectDir)Content\</AjaxMinOutputFolder>
<AjaxMinOutputFolder Condition="$(AjaxMinOutputFolder)==''">$(ProjectDir)</AjaxMinOutputFolder>
<!-- default is to NOT treat warnings as errors -->
<AjaxMinTreatWarningsAsErrors Condition="$(AjaxMinTreatWarningsAsErrors)==''">false</AjaxMinTreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<AjaxMinManifests Include="**/*.ajaxmin"/>
</ItemGroup>
<!-- target to clean output for all ajaxmin manifest files in the project -->
<Target Name="CleanAjaxMinManifests" AfterTargets="Clean" Inputs="@AjaxMinManifests" Outputs="@(AjaxMinManifests->'%(FullPath).cleantrigger')">
<Message Text="Cleaning AjaxMin Manifests" Importance="high" />
<AjaxMinManifestCleanTask OutputFolder="$(AjaxMinOutputFolder)" Manifests="@(AjaxMinManifests)" />
</Target>
<!-- target to build all ajaxmin manifest files in the project -->
<Target Name="BuildAjaxMinManifests" AfterTargets="Build" Inputs="@AjaxMinManifests" Outputs="@(AjaxMinManifests->'%(FullPath).buildtrigger')">
<Message Text="Processing AjaxMin Manifests" Importance="high" />
<AjaxMinManifestTask ProjectDefaultSwitches="-define:$(DefineConstants) $(AjaxMinProjectDefaultSwitches)"
Configuration="$(Configuration)"
TreatWarningsAsErrors="$(AjaxMinTreatWarningsAsErrors)"
InputFolder="$(ProjectDir)"
OutputFolder="$(AjaxMinOutputFolder)"
Manifests="@(AjaxMinManifests)" />
</Target>
</Project>
packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll
Vendored
BIN
View File
Binary file not shown.
packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets
Vendored
+38
View File
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMin" />
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMinBundleTask" />
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMinManifestTask" />
<UsingTask AssemblyFile="AjaxMinTask.dll" TaskName="AjaxMinManifestCleanTask" />
<PropertyGroup>
<!-- if the project has a Content folder, we want that to be the root output; otherwise just dump everything relative to the project root -->
<AjaxMinOutputFolder Condition="$(AjaxMinOutputFolder)=='' and Exists('$(ProjectDir)Content\')">$(ProjectDir)Content\</AjaxMinOutputFolder>
<AjaxMinOutputFolder Condition="$(AjaxMinOutputFolder)==''">$(ProjectDir)</AjaxMinOutputFolder>
<!-- default is to NOT treat warnings as errors -->
<AjaxMinTreatWarningsAsErrors Condition="$(AjaxMinTreatWarningsAsErrors)==''">false</AjaxMinTreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<AjaxMinManifests Include="**/*.ajaxmin"/>
</ItemGroup>
<!-- target to clean output for all ajaxmin manifest files in the project -->
<Target Name="CleanAjaxMinManifests" AfterTargets="Clean" Inputs="@AjaxMinManifests" Outputs="@(AjaxMinManifests->'%(FullPath).cleantrigger')">
<Message Text="Cleaning AjaxMin Manifests" Importance="high" />
<AjaxMinManifestCleanTask OutputFolder="$(AjaxMinOutputFolder)" Manifests="@(AjaxMinManifests)" />
</Target>
<!-- target to build all ajaxmin manifest files in the project -->
<Target Name="BuildAjaxMinManifests" AfterTargets="Build" Inputs="@AjaxMinManifests" Outputs="@(AjaxMinManifests->'%(FullPath).buildtrigger')">
<Message Text="Processing AjaxMin Manifests" Importance="high" />
<AjaxMinManifestTask ProjectDefaultSwitches="-define:$(DefineConstants) $(AjaxMinProjectDefaultSwitches)"
Configuration="$(Configuration)"
TreatWarningsAsErrors="$(AjaxMinTreatWarningsAsErrors)"
InputFolder="$(ProjectDir)"
OutputFolder="$(AjaxMinOutputFolder)"
Manifests="@(AjaxMinManifests)" />
</Target>
</Project>
packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll
Vendored
BIN
View File
Binary file not shown.