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

COmpletata integrazione stato collaudi con Fasi + Rev

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-20 16:16:13 +01:00
parent 9c4cb24d7d
commit 14dccba8ae
10 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/DS_Applicazione.Designer.cs
Generated
+8 -1
View File
@@ -16935,6 +16935,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16965,7 +16966,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_Applicazione.StatoCollaudiDataTable getByDossFase(global::System.Nullable<int> idxDossier, string Fase) {
public virtual DS_Applicazione.StatoCollaudiDataTable getByDossFase(global::System.Nullable<int> idxDossier, string Fase, global::System.Nullable<int> Rev) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((idxDossier.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDossier.Value));
@@ -16979,6 +16980,12 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Fase));
}
if ((Rev.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(Rev.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
DS_Applicazione.StatoCollaudiDataTable dataTable = new DS_Applicazione.StatoCollaudiDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
CMS-SC-Data/DS_Applicazione.xsd
+1
View File
@@ -1479,6 +1479,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
<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="int" DbType="Int32" Direction="Input" ParameterName="@idxDossier" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Fase" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Rev" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
CMS-SC-Data/DS_Applicazione.xss
+4 -4
View File
@@ -8,20 +8,20 @@
<Shapes>
<Shape ID="DesignTable:ElencoFamMacc" ZOrder="26" X="598" Y="-22" Height="191" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:ElencoMacchineCN" ZOrder="7" X="1029" Y="-32" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:AnagFasi" ZOrder="3" X="1097" Y="812" Height="204" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:AnagFasi" ZOrder="4" X="1097" Y="812" Height="204" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:AnagSchede" ZOrder="9" X="67" Y="363" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:DettScheda" ZOrder="18" X="414" Y="444" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ValidVal" ZOrder="12" X="100" Y="649" Height="286" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:SchemaCollFamMacc" ZOrder="8" X="67" Y="-36" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ElencoDossier" ZOrder="2" X="1070" Y="325" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
<Shape ID="DesignTable:ElencoDossier" ZOrder="3" X="1070" Y="325" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
<Shape ID="DesignTable:SchemaCollMacc" ZOrder="10" X="738" Y="184" Height="345" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="176" />
<Shape ID="DesignTable:Misure" ZOrder="13" X="750" Y="562" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:ReportData" ZOrder="19" X="410" Y="783" Height="305" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Tags2Macchine" ZOrder="17" X="1366" Y="-8" Height="134" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:AnagTags" ZOrder="14" X="1376" Y="245" Height="191" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:UserParam" ZOrder="5" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
<Shape ID="DesignTable:StatoCollaudi" ZOrder="4" X="54" Y="973" Height="319" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
<Shape ID="DesignTable:DFR" ZOrder="1" X="724" Y="1065" Height="204" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
<Shape ID="DesignTable:StatoCollaudi" ZOrder="1" X="54" Y="973" Height="388" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="285" />
<Shape ID="DesignTable:DFR" ZOrder="2" X="724" Y="1065" Height="204" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_DettScheda_AnagSchede1" ZOrder="28" LineWidth="11">
CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
CMS_SC/StatoDossiers.aspx
+9 -13
View File
@@ -34,20 +34,16 @@
<span class="input-group input-group-sm mb-0">
<asp:DropDownList runat="server" ID="ddlFase" DataSourceID="odsFase" DataTextField="label" CssClass="form-control form-control-sm" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFase_SelectedIndexChanged">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter">
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter"></asp:ObjectDataSource>
<span class="input-group-append">
<%--<span class="input-group-text">--%>
<%-- OnSelectedIndexChanged="ddlRev_SelectedIndexChanged"--%>
<asp:DropDownList runat="server" ID="ddlRev" DataSourceID="odsRev" DataTextField="label" CssClass="form-control form-control-sm input-group-text" DataValueField="value" AutoPostBack="True">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsRev" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDF" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selRevTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxDossier" Name="IdxDossier" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="ddlFase" Name="Fase" PropertyName="SelectedValue" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<%--</span>--%>
<asp:DropDownList runat="server" ID="ddlRev" DataSourceID="odsRev" DataTextField="label" CssClass="form-control form-control-sm input-group-text" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlRev_SelectedIndexChanged">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsRev" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDF" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selRevTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxDossier" Name="IdxDossier" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="ddlFase" Name="Fase" PropertyName="SelectedValue" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</span>
</span>
</div>
CMS_SC/StatoDossiers.aspx.cs
+16 -1
View File
@@ -161,10 +161,25 @@ namespace CMS_SC
protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e)
{
// salvo!
savePar("ddlFase", ddlFase.SelectedValue);
// aggiorno rev e salvo...
ddlRev.DataBind();
updateFaseRev();
}
protected void ddlRev_SelectedIndexChanged(object sender, EventArgs e)
{
savePar("ddlRev", ddlRev.SelectedValue);
updateFaseRev();
}
/// <summary>
/// Salva ed aggiorna fase e rev selezionate
/// </summary>
private void updateFaseRev()
{
// salvo!
// fix visualizzazione
mod_StatoCollaudi.Fase = ddlFase.SelectedValue;
mod_StatoCollaudi.Rev = ddlRev.SelectedValue;
}
}
CMS_SC/WebUserControls/mod_StatoCollaudi.ascx
+2
View File
@@ -51,7 +51,9 @@
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxDossier" Name="IdxDossier" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfFase" Name="Fase" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfRev" Name="Rev" PropertyName="Value" Type="String" DefaultValue="0" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfIdxDossier" />
<asp:HiddenField runat="server" ID="hfFase" />
<asp:HiddenField runat="server" ID="hfRev" />
CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
+16 -1
View File
@@ -46,7 +46,7 @@ namespace CMS_SC.WebUserControls
}
}
/// <summary>
/// dossier selezionato
/// FASE selezionato
/// </summary>
public string Fase
{
@@ -60,6 +60,21 @@ namespace CMS_SC.WebUserControls
grView.DataBind();
}
}
/// <summary>
/// REV selezionata
/// </summary>
public string Rev
{
get
{
return hfRev.Value;
}
set
{
hfRev.Value = value;
grView.DataBind();
}
}
public string CodSchedaVersNum
{
CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs
Generated
+9
View File
@@ -47,5 +47,14 @@ namespace CMS_SC.WebUserControls {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfFase;
/// <summary>
/// Controllo hfRev.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfRev;
}
}
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.