diff --git a/Projects/WebGIM/GIM_data/WebGimUtils.cs b/Projects/WebGIM/GIM_data/WebGimUtils.cs index 721079d..18cf565 100644 --- a/Projects/WebGIM/GIM_data/WebGimUtils.cs +++ b/Projects/WebGIM/GIM_data/WebGimUtils.cs @@ -36,16 +36,33 @@ public class WebGimUtils /// /// /// + /// /// - public static DateTime convDate(string dataOra, string formato, string cultura) + public static DateTime convDate(string dataOra, string formato, string cultura, bool doLog) { DateTime answ = DateTime.Now; CultureInfo culture = new CultureInfo(cultura); - //logger.lg.scriviLog(string.Format("Valore txt:{1}", Environment.NewLine, dataOra), tipoLog.INFO); - DateTime.TryParseExact(dataOra, formato, culture, DateTimeStyles.None, out answ); - //logger.lg.scriviLog(string.Format("Valore txt:{1}{0}Valore conv:{2}", Environment.NewLine, dataOra, answ), tipoLog.INFO); + if(doLog) logger.lg.scriviLog(string.Format("Valore txt:{1}", Environment.NewLine, dataOra), tipoLog.INFO); + bool fatto = false; + fatto = DateTime.TryParseExact(dataOra, formato, culture, DateTimeStyles.None, out answ); + if (doLog) logger.lg.scriviLog(string.Format("{0}Valore txt:{1}{0}Valore conv:{2}", Environment.NewLine, dataOra, answ), tipoLog.INFO); + if (!fatto) + { + answ = Convert.ToDateTime(dataOra); + } + if (doLog) logger.lg.scriviLog(string.Format("{0}Valore txt:{1}{0}Valore conv BIS:{2}", Environment.NewLine, dataOra, answ), tipoLog.INFO); return answ; } - + /// + /// converte in datetime un valore formattato con una culture generica ed un formato generico + /// + /// + /// + /// + /// + public static DateTime convDate(string dataOra, string formato, string cultura) + { + return convDate(dataOra, formato, cultura, false); + } public static WebGimUtils obj = new WebGimUtils(); } \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 75f1114..50793fb 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/NLog.dll b/Projects/WebGIM/GIM_data/bin/NLog.dll new file mode 100644 index 0000000..11a5469 Binary files /dev/null and b/Projects/WebGIM/GIM_data/bin/NLog.dll differ diff --git a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll index 75f1114..50793fb 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll and b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index 8144532..50184f3 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -624,6 +624,7 @@ Web.config + Designer Web.config diff --git a/Projects/WebGIM/GIM_site/Web.Alumat.config b/Projects/WebGIM/GIM_site/Web.Alumat.config index f8ca6db..2716846 100644 --- a/Projects/WebGIM/GIM_site/Web.Alumat.config +++ b/Projects/WebGIM/GIM_site/Web.Alumat.config @@ -3,7 +3,7 @@ - + @@ -13,18 +13,10 @@ - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config b/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config index ac4847e..67a23d3 100644 --- a/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config +++ b/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config @@ -3,117 +3,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index 790e998..9850238 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -24,8 +24,12 @@ - - + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dataOra.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dataOra.ascx.cs index 134b685..5389b0a 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dataOra.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dataOra.ascx.cs @@ -159,6 +159,7 @@ public partial class mod_dataOra : System.Web.UI.UserControl min = Convert.ToDateTime(txtTime.Text).Minute; break; } + DateTime valore = WebGimUtils.convDate(txtData.Text, memLayer.ML.CRS("ddMMyyyy"), memLayer.ML.CRS("culture")); #if false string formato = memLayer.ML.CRS("ddMMyyyy"); diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx.cs index da892c7..b29ea99 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx.cs @@ -132,11 +132,22 @@ public partial class mod_insertRichiesta : System.Web.UI.UserControl try { // sistemo i valori - DateTime richiesta = Convert.ToDateTime(txtDataOra.Text.Trim()); - DateTime dataLav = Convert.ToDateTime(txtDataLav.Text.Trim()); + // 2015.02.16 fix datetime!!! + //DateTime richiesta = Convert.ToDateTime(txtDataOra.Text.Trim()); + //DateTime dataLav = Convert.ToDateTime(txtDataLav.Text.Trim()); + + DateTime richiesta = WebGimUtils.convDate(txtDataOra.Text.Trim(), memLayer.ML.CRS("ddMMyyyy"), memLayer.ML.CRS("culture"), true); + DateTime dataLav = WebGimUtils.convDate(txtDataLav.Text.Trim(), memLayer.ML.CRS("ddMMyyyy"), memLayer.ML.CRS("culture")); + + DateTime inizioGuasto = mod_dataOra1.valore; + if (memLayer.ML.confReadInt("_logLevel") > 5) + { + logger.lg.scriviLog(string.Format("richiesta: {0} -> {1}", txtDataOra.Text, richiesta)); + logger.lg.scriviLog(string.Format("dataLav: {0} -> {1}", txtDataLav.Text, dataLav)); + logger.lg.scriviLog(string.Format("inizioGuasto: {0}", mod_dataOra1.valore)); + } int turno = Convert.ToInt32(txtTurnoLav.Text); string matr = txtMatr.Text.Trim(); - DateTime inizioGuasto = mod_dataOra1.valore; int idxAmbito = Convert.ToInt32(ddlAmbito.SelectedValue); int idxPrior = Convert.ToInt32(ddlPrior.SelectedValue); bool isFermo = chkImpFermo.Checked; @@ -152,6 +163,10 @@ public partial class mod_insertRichiesta : System.Web.UI.UserControl } catch { } + if (memLayer.ML.confReadInt("_logLevel") > 5) + { + logger.lg.scriviLog(string.Format("sp_insRichiesta, valori: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13}", richiesta, dataLav, turno, matr, inizioGuasto, idxAmbito, idxPrior, isFermo, idxTipo, idxImpianto, idxMacchina, descrizione, idxCausale, false)); + } // stored inserimento! TA_app.obj.taInterventiMtz.sp_insRichiesta(richiesta, dataLav, turno, matr, inizioGuasto, idxAmbito, idxPrior, isFermo, idxTipo, idxImpianto, idxMacchina, descrizione, idxCausale, false, ref numReq); } diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 75f1114..50793fb 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 6677fc0..15ab068 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/NLog.dll b/Projects/WebGIM/GIM_site/bin/NLog.dll new file mode 100644 index 0000000..11a5469 Binary files /dev/null and b/Projects/WebGIM/GIM_site/bin/NLog.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/Web.config index daac72c..e8d8c90 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/Web.config @@ -24,8 +24,12 @@ - - + + + + @@ -93,7 +97,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_data.dll index 75f1114..50793fb 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_site.dll index 6677fc0..15ab068 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/Web.config index daac72c..e8d8c90 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/Web.config @@ -24,8 +24,12 @@ - - + + + + @@ -93,7 +97,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_data.dll index 75f1114..50793fb 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_site.dll index 6677fc0..15ab068 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac b/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac index 9430c28..0307584 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac and b/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac b/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac index 8d4fd71..493473f 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac and b/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/original/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/original/Web.config index daac72c..e8d8c90 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/original/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/original/Web.config @@ -24,8 +24,12 @@ - - + + + + @@ -93,7 +97,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config index feb2af9..8bc49f6 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config @@ -24,8 +24,12 @@ - - + + + + @@ -93,7 +97,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache index 872629e..7f0ba43 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll index 6677fc0..15ab068 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/Web.config index feb2af9..8bc49f6 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/Web.config @@ -24,8 +24,12 @@ - - + + + + @@ -93,7 +97,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_data.dll index 75f1114..50793fb 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_site.dll index 6677fc0..15ab068 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/assist/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/assist/Web.config index f8ca6db..2716846 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/assist/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/assist/Web.config @@ -3,7 +3,7 @@ - + @@ -13,18 +13,10 @@ - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config index 790e998..9850238 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config @@ -24,8 +24,12 @@ - - + + + + diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config index daac72c..e8d8c90 100644 --- a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config @@ -24,8 +24,12 @@ - - + + + + @@ -93,7 +97,7 @@ - +