v 1.8.081

fix eliminazione a cascata famiglie macchine
Aggiunta cloning schede in tab machcine da altra famiglia esistente
This commit is contained in:
Samuele E. Locatelli
2015-10-16 19:04:54 +02:00
parent 82222b538f
commit cb00a8de43
25 changed files with 7764 additions and 4613 deletions
+1 -1
View File
@@ -74,7 +74,7 @@
<None Include="DS_Applicazione.xsd">
<SubType>Designer</SubType>
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>DS_Applicazione.Designer.cs</LastGenOutput>
<LastGenOutput>DS_Applicazione1.Designer.cs</LastGenOutput>
</None>
<None Include="DS_Applicazione.xss">
<DependentUpon>DS_Applicazione.xsd</DependentUpon>
+7655 -4592
View File
File diff suppressed because it is too large Load Diff
+15 -3
View File
@@ -728,7 +728,19 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
<Mapping SourceColumn="opz" DataSetColumn="opz" />
</Mappings>
<Sources>
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_deleteQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteQuery">
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_clonaFamMacc" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="clonaFamMacc" Modifier="Public" Name="clonaFamMacc" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="clonaFamMacc">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_SCFM_clonaFamMacc</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodFamFrom" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodFamTo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_deleteQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="deleteQuery">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_SCFM_deleteQuery</CommandText>
@@ -776,7 +788,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_insertQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="insertQuery">
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_insertQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="insertQuery">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_SCFM_insertQuery</CommandText>
@@ -788,7 +800,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_updateQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="updateQuery">
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_SCFM_updateQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="updateQuery">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_SCFM_updateQuery</CommandText>
+5 -5
View File
@@ -4,17 +4,17 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="50" ViewPortY="-32" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="50" ViewPortY="-36" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:ElencoFamMacc" ZOrder="23" X="602" Y="-11" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ElencoMacchineCN" ZOrder="12" X="1029" Y="-32" Height="267" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:AnagFasi" ZOrder="17" X="1096" Y="741" Height="172" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:AnagSchede" ZOrder="1" X="67" Y="363" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:AnagSchede" ZOrder="2" X="67" Y="363" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:DettScheda" ZOrder="13" X="414" Y="444" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ValidVal" ZOrder="5" X="100" Y="649" Height="286" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:SchemaCollFamMacc" ZOrder="4" X="67" Y="-36" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:SchemaCollFamMacc" ZOrder="1" X="67" Y="-36" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ElencoDossier" ZOrder="6" X="1061" Y="261" Height="343" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:SchemaCollMacc" ZOrder="2" X="738" Y="184" Height="345" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="176" />
<Shape ID="DesignTable:SchemaCollMacc" ZOrder="3" X="738" Y="184" Height="345" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="176" />
<Shape ID="DesignTable:Misure" ZOrder="7" X="750" Y="562" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:ReportData" ZOrder="14" X="410" Y="783" Height="305" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Tags2Macchine" ZOrder="11" X="1366" Y="-8" Height="134" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -93,7 +93,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_SchemaCollMacc_AnagSchede" ZOrder="3" LineWidth="11">
<Connector ID="DesignRelation:FK_SchemaCollMacc_AnagSchede" ZOrder="4" LineWidth="11">
<RoutePoints>
<Point>
<X>367</X>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -10,7 +10,6 @@ C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\De
C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.csprojResolveAssemblyReference.cache
C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.dll
C:\Users\samuele\Documents\Visual Studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.pdb
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\bin\Debug\NLog.config
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\bin\Debug\CMS-SC-Data.dll.config
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\bin\Debug\CMS-SC-Data.dll
@@ -21,4 +20,5 @@ C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\bin\Debug\SteamWare.pdb
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\bin\Debug\SteamWare.xml
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.csprojResolveAssemblyReference.cache
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.pdb
Binary file not shown.
Binary file not shown.
+10 -1
View File
@@ -22,13 +22,22 @@
<asp:CheckBox runat="server" ID="chkFilFamMacc" AutoPostBack="True" OnCheckedChanged="chkFilFamMacc_CheckedChanged" />
<uc1:mod_selFamMaccUrl runat="server" ID="mod_selFamMaccUrl" />
</div>
<div class="col-xs-7">
<div class="col-xs-4">
<asp:CheckBox runat="server" ID="chkFiltCodSchedaVers" AutoPostBack="True" OnCheckedChanged="chkFiltCodSchedaVers_CheckedChanged" />
<uc1:mod_selSchedaUrl runat="server" ID="mod_selSchedaUrl" showLinkDoc="False" />
</div>
<div class="col-xs-2">
<asp:Button runat="server" ID="btnAddNew" CssClass="btn btn-success" Text='<%# traduci("btnAddNewFromEmpty") %>' OnClick="btnAddNew_Click" />
</div>
<div class="col-xs-3">
<asp:Button runat="server" ID="btnClonaConfFamMacch" CssClass="btn btn-warning" Text='<%# traduci("btnClonaConfFamMacch") %>' OnClick="btnClonaConfFamMacch_Click" />
<div runat="server" id="divFamMaccFrom">
<div style="float: left;">
<asp:DropDownList runat="server" ID="ddlSelFamMacc" DataSourceID="odsFamMacc" DataTextField="label" DataValueField="value"></asp:DropDownList>
<asp:ObjectDataSource ID="odsFamMacc" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFamMaccTableAdapter"></asp:ObjectDataSource>
</div>
</div>
</div>
</div>
</div>
<div class="col-xs-12">
+16 -1
View File
@@ -20,6 +20,7 @@ namespace CMS_SC
presetChk();
fixChkFilt();
btnAddNew.DataBind();
btnClonaConfFamMacch.DataBind();
}
mod_righePag.eh_newNum += mod_righePag_eh_newNum;
}
@@ -66,6 +67,10 @@ namespace CMS_SC
mod_selSchedaUrl.Visible = chkFiltCodSchedaVers.Checked;
btnAddNew.Visible = addNewEnabled;
mod_SchemaCollFamMacc.doUpdate();
// mostro clona SE sto guardando una famiglia...!
btnClonaConfFamMacch.Visible = chkFilFamMacc.Checked;
divFamMaccFrom.Visible = chkFilFamMacc.Checked;
}
void mod_righePag_eh_newNum(object sender, EventArgs e)
@@ -99,10 +104,20 @@ namespace CMS_SC
return answ;
}
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAddNew_Click(object sender, EventArgs e)
{
mod_SchemaCollFamMacc.addNewFromSel(memLayer.ML.QSS("CodSchedaVers"), memLayer.ML.QSS("CodFam"));
}
protected void btnClonaConfFamMacch_Click(object sender, EventArgs e)
{
mod_SchemaCollFamMacc.clonaFamMacc(ddlSelFamMacc.SelectedValue, memLayer.ML.QSS("CodFam"));
}
}
}
+36
View File
@@ -57,6 +57,42 @@ namespace CMS_SC {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnAddNew;
/// <summary>
/// btnClonaConfFamMacch 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 btnClonaConfFamMacch;
/// <summary>
/// divFamMaccFrom control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFamMaccFrom;
/// <summary>
/// ddlSelFamMacc 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.DropDownList ddlSelFamMacc;
/// <summary>
/// odsFamMacc 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.ObjectDataSource odsFamMacc;
/// <summary>
/// mod_SchemaCollFamMacc control.
/// </summary>
@@ -40,6 +40,18 @@ namespace CMS_SC.WebUserControls
// update!
grView.DataBind();
}
/// <summary>
/// clona una combinazione schede famiglia ad un altra
/// </summary>
/// <param name="codFamSrc"></param>
/// <param name="codFamDest"></param>
public void clonaFamMacc(string codFamSrc, string codFamDest)
{
// inserisco nuovo record
DtProxy.man.taSCFM.clonaFamMacc(codFamSrc, codFamDest);
// update!
grView.DataBind();
}
internal void doUpdate()
{
@@ -11,14 +11,18 @@ namespace CMS_SC.WebUserControls
{
public partial class mod_selFamMaccUrl : System.Web.UI.UserControl
{
/// <summary>
/// valore QueryString x parametro selezionato...
/// </summary>
protected string QSName = "CodFam";
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
// cerco in URL cod scheda, se c'è seleziono...
if (memLayer.ML.QSS("CodFam") != "")
if (memLayer.ML.QSS(QSName) != "")
{
ddlSelFamMacc.SelectedValue = memLayer.ML.QSS("CodFam");
ddlSelFamMacc.SelectedValue = memLayer.ML.QSS(QSName);
}
else
{
@@ -26,7 +30,7 @@ namespace CMS_SC.WebUserControls
{
ddlSelFamMacc.DataBind();
ddlSelFamMacc.SelectedIndex = 0;
Response.Redirect(string.Format("{0}?CodFam={1}&CodSchedaVers={2}", devicesAuthProxy.pagCorrente, ddlSelFamMacc.SelectedValue, memLayer.ML.QSS("CodSchedaVers")));
Response.Redirect(string.Format("{0}?{3}={1}&CodSchedaVers={2}", devicesAuthProxy.pagCorrente, ddlSelFamMacc.SelectedValue, memLayer.ML.QSS("CodSchedaVers"), QSName));
}
catch
{ }
@@ -43,7 +47,7 @@ namespace CMS_SC.WebUserControls
string answ = "";
try
{
answ = DtProxy.man.taASC.getByCodScheda(memLayer.ML.QSS("CodFam"))[0].Path;
answ = DtProxy.man.taASC.getByCodScheda(memLayer.ML.QSS(QSName))[0].Path;
}
catch
{ }
@@ -57,7 +61,7 @@ namespace CMS_SC.WebUserControls
/// <param name="e"></param>
protected void ddlSelFamMacc_SelectedIndexChanged(object sender, EventArgs e)
{
Response.Redirect(string.Format("{0}?CodFam={1}&CodSchedaVers={2}", devicesAuthProxy.pagCorrente, ddlSelFamMacc.SelectedValue, memLayer.ML.QSS("CodSchedaVers")));
Response.Redirect(string.Format("{0}?{3}={1}&CodSchedaVers={2}", devicesAuthProxy.pagCorrente, ddlSelFamMacc.SelectedValue, memLayer.ML.QSS("CodSchedaVers"), QSName));
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.8.079.351")]
[assembly: AssemblyFileVersion("1.8.079.351")]
[assembly: AssemblyVersion("1.8.081.354")]
[assembly: AssemblyFileVersion("1.8.081.354")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.8.079.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.8.079.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.8.081.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.8.081.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
Binary file not shown.
Binary file not shown.