From 5b8489764c4038acba47836442dca9d78d7b06cb Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 16 Oct 2015 19:09:51 +0200 Subject: [PATCH] v 1.8.082 aggiunto controllo btn ins abilitato SOLO SE ho selezionato famiglia e scheda --- CMS-SC-Data/bin/Debug/CMS-SC-Data.dll | Bin 365056 -> 365056 bytes CMS-SC-Data/bin/Debug/SteamWare.dll | Bin 619520 -> 619520 bytes CMS-SC-Data/obj/Debug/CMS-SC-Data.dll | Bin 365056 -> 365056 bytes CMS_SC/SchemaCollFamMacc.aspx | 2 ++ CMS_SC/SchemaCollFamMacc.aspx.cs | 3 ++- CMS_SC/SchemaCollFamMacc.aspx.designer.cs | 9 +++++++++ CMS_SC/bin/CMS-SC-Data.dll | Bin 365056 -> 365056 bytes CMS_SC/bin/CMS_SC.dll | Bin 353792 -> 353792 bytes CMS_SC/bin/SteamWare.dll | Bin 619520 -> 619520 bytes VersGen/CMS_SC.cs | 4 ++-- VersGen/CMS_SC.tt | 4 ++-- VersGen/bin/Debug/VersGen.dll | Bin 4096 -> 4096 bytes 12 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index 7dd5f700e11e74dd9183df5fd461fd63a7bdecf9..9e1453f007f33d02ba173ff9609c1276a19fdce0 100644 GIT binary patch delta 84 zcmV-a0IUCiq!xgr7LbSntuBFzg^B@%iUNg-1BHqNwTcB=VGyw(#1*<@?@EkDXD}h(zis41-u8j+9LS? delta 84 zcmV-a0IUCiq!xgr7LbSn3oC(&g^B@%iUNg-1BHqNwTcB=VGz?{#(xxJvrL90k({Vu qIbgT+VFe^80t+jb8j1xP5Ix-0WU9$oPPw~?!$dbMsJBFl1-u7nh#^w| diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index f57518a7de30f74c27904804bc8670de418c7713..c25bdfe7627c762a7def1fd0eb932edabc5084ec 100644 GIT binary patch delta 116 zcmZp8q1y05bwUTz8okD@)-J}@E~eHl=GHEj)-Kl8F1FS#_SPDgwR2Y}q|N zVLsCr&6p*(WN+2>J1U$jTy@syDTXls0TU2+0P&m-PKG&IoD4z1F2VCmFE5XOlkeR+ Rf0wDJvX0aC4OyH4oB+|;DFFZg delta 116 zcmZp8q1y05bwURdmv&=UYZqf{7gK8&b88n%YZq&47h7u=dutcR)-Fyb6#<+4iBnTU zzd22|NV)s-54->NJ1U$jTy?m#6~h>SfC-2@fOt*^C&Qd9PKKahmteOkg`2L;-084> RkEy7MVPnbm4OyH4oB+MaDHi|$ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index 7dd5f700e11e74dd9183df5fd461fd63a7bdecf9..9e1453f007f33d02ba173ff9609c1276a19fdce0 100644 GIT binary patch delta 84 zcmV-a0IUCiq!xgr7LbSntuBFzg^B@%iUNg-1BHqNwTcB=VGyw(#1*<@?@EkDXD}h(zis41-u8j+9LS? delta 84 zcmV-a0IUCiq!xgr7LbSn3oC(&g^B@%iUNg-1BHqNwTcB=VGz?{#(xxJvrL90k({Vu qIbgT+VFe^80t+jb8j1xP5Ix-0WU9$oPPw~?!$dbMsJBFl1-u7nh#^w| diff --git a/CMS_SC/SchemaCollFamMacc.aspx b/CMS_SC/SchemaCollFamMacc.aspx index ac70545..73fdce0 100644 --- a/CMS_SC/SchemaCollFamMacc.aspx +++ b/CMS_SC/SchemaCollFamMacc.aspx @@ -28,6 +28,8 @@
+
+ <%: traduci("SelectFM_CSV_2ins") %>
diff --git a/CMS_SC/SchemaCollFamMacc.aspx.cs b/CMS_SC/SchemaCollFamMacc.aspx.cs index c06557d..096a612 100644 --- a/CMS_SC/SchemaCollFamMacc.aspx.cs +++ b/CMS_SC/SchemaCollFamMacc.aspx.cs @@ -65,7 +65,8 @@ namespace CMS_SC memLayer.ML.setSessionVal("filtByScheda", chkFiltCodSchedaVers.Checked); mod_selFamMaccUrl.Visible = chkFilFamMacc.Checked; mod_selSchedaUrl.Visible = chkFiltCodSchedaVers.Checked; - btnAddNew.Visible = addNewEnabled; + btnAddNew.Enabled= addNewEnabled; + //btnAddNew.Visible = addNewEnabled; mod_SchemaCollFamMacc.doUpdate(); // mostro clona SE sto guardando una famiglia...! diff --git a/CMS_SC/SchemaCollFamMacc.aspx.designer.cs b/CMS_SC/SchemaCollFamMacc.aspx.designer.cs index 0dc1ef9..494627d 100644 --- a/CMS_SC/SchemaCollFamMacc.aspx.designer.cs +++ b/CMS_SC/SchemaCollFamMacc.aspx.designer.cs @@ -57,6 +57,15 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.Button btnAddNew; + /// + /// lblHelp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblHelp; + /// /// btnClonaConfFamMacch control. /// diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 7dd5f700e11e74dd9183df5fd461fd63a7bdecf9..9e1453f007f33d02ba173ff9609c1276a19fdce0 100644 GIT binary patch delta 84 zcmV-a0IUCiq!xgr7LbSntuBFzg^B@%iUNg-1BHqNwTcB=VGyw(#1*<@?@EkDXD}h(zis41-u8j+9LS? delta 84 zcmV-a0IUCiq!xgr7LbSn3oC(&g^B@%iUNg-1BHqNwTcB=VGz?{#(xxJvrL90k({Vu qIbgT+VFe^80t+jb8j1xP5Ix-0WU9$oPPw~?!$dbMsJBFl1-u7nh#^w| diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 490b31a788a60481ad6315dbd775dfe2d80a29db..10f7b77db04cd801eb3c87c481994320992e96ab 100644 GIT binary patch delta 3499 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 diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index f57518a7de30f74c27904804bc8670de418c7713..c25bdfe7627c762a7def1fd0eb932edabc5084ec 100644 GIT binary patch delta 116 zcmZp8q1y05bwUTz8okD@)-J}@E~eHl=GHEj)-Kl8F1FS#_SPDgwR2Y}q|N zVLsCr&6p*(WN+2>J1U$jTy@syDTXls0TU2+0P&m-PKG&IoD4z1F2VCmFE5XOlkeR+ Rf0wDJvX0aC4OyH4oB+|;DFFZg delta 116 zcmZp8q1y05bwURdmv&=UYZqf{7gK8&b88n%YZq&47h7u=dutcR)-Fyb6#<+4iBnTU zzd22|NV)s-54->NJ1U$jTy?m#6~h>SfC-2@fOt*^C&Qd9PKKahmteOkg`2L;-084> RkEy7MVPnbm4OyH4oB+MaDHi|$ diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs index 704e567..65afa21 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.081.354")] -[assembly: AssemblyFileVersion("1.8.081.354")] +[assembly: AssemblyVersion("1.8.082.354")] +[assembly: AssemblyFileVersion("1.8.082.354")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index 02ba206..477fef2 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.081.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.8.081.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.8.082.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.8.082.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 926eaf45bd19b95047b58afbe7f3b9d3daa13a67..8750a8a159a53735a7ad3fb57c0b664f2dca58c2 100644 GIT binary patch delta 154 zcmZorXi%8Y!L(X$V^;?=b09;~W>FS*CIMFl-)-soRUU2U3y*%Yx^Fu*xM3_yDGbS{5J mZVLuO20aF222%!;%^$f#Q3NIj@){#6nB2%ww3(6bKO+FiaV~EF delta 154 zcmZorXi%8Y!Sr5rV^;?=vp+-pW>FS*CV`d9buYvRFYxYs?d6_)ci+v)Ic%|P=9YTK zriPQxv+V?`pWMYRC9pbLzUsxgRh~_$c6BFb&Dpkj3;PWw?s!Ij1`Y;B1|Yq8I+s5q mw>g6)gC2u1gDHdI=8xQ=C<2oMd5w`3Om5^T+RVuJpAi5?JTDRe