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

Aggiunto selezione tipo report ANCHE x i dati (F-C-S)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-19 11:34:29 +01:00
parent b92439ad06
commit 5414dbee8f
8 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/DS_Applicazione.Designer.cs
Generated
+15 -2
View File
@@ -15597,13 +15597,14 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
this._commandCollection[0].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[0].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, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Lingua", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[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.Fill, true)]
public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable<int> IdxDossier, string Fase, global::System.Nullable<int> Rev, string Lingua) {
public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable<int> IdxDossier, string Fase, global::System.Nullable<int> Rev, string Lingua, string CodVisib) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((IdxDossier.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value));
@@ -15629,6 +15630,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Lingua));
}
if ((CodVisib == null)) {
this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodVisib));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -15640,7 +15647,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
[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, true)]
public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable<int> IdxDossier, string Fase, global::System.Nullable<int> Rev, string Lingua) {
public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable<int> IdxDossier, string Fase, global::System.Nullable<int> Rev, string Lingua, string CodVisib) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((IdxDossier.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value));
@@ -15666,6 +15673,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Lingua));
}
if ((CodVisib == null)) {
this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodVisib));
}
DS_Applicazione.ReportDataDataTable dataTable = new DS_Applicazione.ReportDataDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
CMS-SC-Data/DS_Applicazione.xsd
+1
View File
@@ -1184,6 +1184,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
<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" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Lingua" Precision="0" ProviderType="NVarChar" Scale="0" Size="3" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodVisib" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
CMS-SC-Data/DS_Applicazione.xss
+1 -1
View File
@@ -16,7 +16,7 @@
<Shape ID="DesignTable:ElencoDossier" ZOrder="10" X="1070" Y="325" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
<Shape ID="DesignTable:SchemaCollMacc" ZOrder="2" X="738" Y="184" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:Misure" ZOrder="8" X="735" Y="583" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:ReportData" ZOrder="1" X="407" Y="907" Height="710" Width="298" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="651" />
<Shape ID="DesignTable:ReportData" ZOrder="1" X="420" Y="920" Height="756" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="697" />
<Shape ID="DesignTable:Tags2Macchine" ZOrder="19" X="1366" Y="-8" Height="158" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:AnagTags" ZOrder="16" X="1376" Y="245" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:UserParam" ZOrder="5" X="737" Y="1365" Height="204" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs
+1 -1
View File
@@ -62,7 +62,7 @@ namespace CMS_SC.WebUserControls
// 2) caricamento tab dati
DataTable tabDati = new DataTable();
DataTable tabVoc = new DataTable();
tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev, Lingua);
tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev, Lingua, TipoReport);
tabVoc = (DataTable)DtProxy.man.taVoc.getByLinguaLemmaLike(Lingua, "SC_PRT");
// 3) inserimento dataset nel report
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/sql/Update_3.2.sql
+3 -4
View File
@@ -25,11 +25,8 @@ exec voc.stp_insNewLemma 'FiltroSearchMatr','Filtro Ricerca Matricola (elenco)'
/****** Object: StoredProcedure [dbo].[stp_rep_getDossier] Script Date: 19/03/2018 10:48:24 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
-- =============================================
-- Author: Steamware
-- Create date: 2015.06.18
@@ -41,6 +38,7 @@ ALTER PROCEDURE [dbo].[stp_rep_getDossier]
,@Fase NVARCHAR(50)
,@Rev INT = 0
,@Lingua NVARCHAR(3) = 'IT'
,@CodVisib NVARCHAR(50) ='F'
)
AS
@@ -61,7 +59,7 @@ SELECT mi.IdxDossier,
mi.CodDeroga,
dbo.f_getStringLang(mi.NomeMisura, @Lingua,0) AS NomeMisura,
mi.TipoValMisura,
dbo.f_getStringLang(mi.NomePar, @Lingua,0) AS NomePar,
dbo.f_getStringLang(mi.NomePar, @Lingua,0) AS NomePar,
mi.MinPar,
mi.MaxPar,
mi.LIVal,
@@ -80,6 +78,7 @@ FROM v_Misure AS mi INNER JOIN
WHERE ( mi.IdxDossier = @IdxDossier OR @IdxDossier = 0 ) -- mettere ISNULL su variabile x estrarre anche con NULL?
AND ( mi.Fase = @Fase OR @Fase = '' )
AND ( mi.Rev = @Rev)
AND ( mi.CodVisib LIKE '%'+@CodVisib+'%' )
ORDER BY CodScheda, Vers, NumScheda, CodMisura, NomeMisura
/*
Jenkinsfile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4238']) {
withEnv(['NEXT_BUILD_NUMBER=4240']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'CMS-SC'