From b7acbf5093ad2e7ca2a6ad0db1e423289ebd4e2f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 5 Jul 2018 14:01:23 +0200 Subject: [PATCH] Fix selezione cartellino anime KIT --- ...{CartellinoKitAnime.rdlc => CartellinoALANkit.rdlc} | 0 ...{CartellinoKitAnime.rdlc => CartellinoALANkit.rdlc} | 0 ...{CartellinoKitAnime.rdlc => CartellinoALANkit.rdlc} | 0 GMW_data/MagClass.cs | 6 +++++- GMW_data/reportPrinter.cs | 10 +++++----- GMW_data/utils.cs | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) rename GMW/Reports/{CartellinoKitAnime.rdlc => CartellinoALANkit.rdlc} (100%) rename GMW/Reports/SP/{CartellinoKitAnime.rdlc => CartellinoALANkit.rdlc} (100%) rename GMW/Reports/TK/{CartellinoKitAnime.rdlc => CartellinoALANkit.rdlc} (100%) diff --git a/GMW/Reports/CartellinoKitAnime.rdlc b/GMW/Reports/CartellinoALANkit.rdlc similarity index 100% rename from GMW/Reports/CartellinoKitAnime.rdlc rename to GMW/Reports/CartellinoALANkit.rdlc diff --git a/GMW/Reports/SP/CartellinoKitAnime.rdlc b/GMW/Reports/SP/CartellinoALANkit.rdlc similarity index 100% rename from GMW/Reports/SP/CartellinoKitAnime.rdlc rename to GMW/Reports/SP/CartellinoALANkit.rdlc diff --git a/GMW/Reports/TK/CartellinoKitAnime.rdlc b/GMW/Reports/TK/CartellinoALANkit.rdlc similarity index 100% rename from GMW/Reports/TK/CartellinoKitAnime.rdlc rename to GMW/Reports/TK/CartellinoALANkit.rdlc diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index 065b3928..0f115409 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -607,7 +607,7 @@ namespace GMW_data switch (verificaTipoAl(AL)) { case tipoAL.AL_KitAnime: - tipoCart = tipoCartellino.cartKitAnime; + tipoCart = tipoCartellino.cartALANkit; break; case tipoAL.AL_RX: case tipoAL.AL_RxDt: @@ -652,6 +652,10 @@ namespace GMW_data { answ = tipoAL.AL_LI; } + else if (AL.StartsWith("ALA")) + { + answ = tipoAL.AL_KitAnime; + } else { answ = tipoAL.ND; diff --git a/GMW_data/reportPrinter.cs b/GMW_data/reportPrinter.cs index 3011ecfd..d3477189 100644 --- a/GMW_data/reportPrinter.cs +++ b/GMW_data/reportPrinter.cs @@ -166,7 +166,7 @@ public class reportPrinter case reportRichiesto.CartellinoFusi: tab = (DataTable)DataProxy.obj.taPrtCartFusi.GetData(UDC); break; - case reportRichiesto.CartellinoKitAnime: + case reportRichiesto.CartellinoALANkit: tab = (DataTable)DataProxy.obj.taPrtCartKitAnime.GetData(UDC); break; case reportRichiesto.CartellinoLiquidiF10: @@ -227,7 +227,7 @@ public class reportPrinter report.ReportPath = string.Format(@"{0}\CartellinoAnime.rdlc", memLayer.ML.cdv("ReportBasePath")); report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDatasourceAnime"), caricaDati(tipoReport, UDC))); break; - case reportRichiesto.CartellinoKitAnime: + case reportRichiesto.CartellinoALANkit: report.ReportPath = string.Format(@"{0}\CartellinoKitAnime.rdlc", memLayer.ML.cdv("ReportBasePath")); report.DataSources.Add(new ReportDataSource(memLayer.ML.cdv("ReportDatasourceKitAnime"), caricaDati(tipoReport, UDC))); break; @@ -430,9 +430,9 @@ public class reportPrinter tipo = "CartAnime"; report = reportRichiesto.CartellinoAnime; break; - case tipoCartellino.cartKitAnime: + case tipoCartellino.cartALANkit: tipo = "CartKitAnime"; - report = reportRichiesto.CartellinoKitAnime; + report = reportRichiesto.CartellinoALANkit; break; case tipoCartellino.cartFiniti: tipo = "CartFiniti"; @@ -603,6 +603,7 @@ public class reportPrinter public enum reportRichiesto { CartellinoAL, + CartellinoALANkit, CartellinoALRX, CartellinoALTT, CartellinoAnime, @@ -610,7 +611,6 @@ public enum reportRichiesto CartellinoFinitiRxSP, CartellinoFinitiSP, CartellinoFusi, - CartellinoKitAnime, CartellinoLiquidiF10, CartellinoLiquidiF18, CartellinoMP, diff --git a/GMW_data/utils.cs b/GMW_data/utils.cs index 1379e581..15786151 100644 --- a/GMW_data/utils.cs +++ b/GMW_data/utils.cs @@ -339,6 +339,7 @@ namespace GMW_data public enum tipoCartellino { cartAL, + cartALANkit, cartALRX, cartALTT, cartAnime, @@ -346,7 +347,6 @@ public enum tipoCartellino cartFinitiRxSP, cartFinitiSP, cartFusi, - cartKitAnime, cartLiquidiF10, cartLiquidiF18, cartOdette,