diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 3cd1d77c..53aa7d7f 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx index f72c5880..f85ff2ef 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx @@ -110,12 +110,16 @@ -
-
-
-
+
+
+ +
+
+ +
+
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 85f92005..a38ab583 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 87e1f693..ff16f1da 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index ad391132..643f65b6 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 85f92005..a38ab583 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 26d5e616..09851787 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index 921131c3..bc5ab504 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -330,14 +330,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" - "ProductCode" = "8:{6F58C3C6-A8A1-46CE-A78D-BFFC4B2B394F}" - "PackageCode" = "8:{59C457F8-BB0C-4C19-955E-18723FEA1F67}" + "ProductCode" = "8:{0002F6D7-B175-44CF-BBAB-48486502FF8E}" + "PackageCode" = "8:{30D9ECA7-F24B-49DF-B303-334CF7F6D4DD}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.310" + "ProductVersion" = "8:1.0.315" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -810,7 +810,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -838,7 +838,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" diff --git a/GMW/GMW_data/SqlScripts/GMW_00315.sql b/GMW/GMW_data/SqlScripts/GMW_00315.sql new file mode 100644 index 00000000..8d4ecc77 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/GMW_00315.sql @@ -0,0 +1,32 @@ +alter table PosizioneUdcStorico drop + constraint FK_PosizioneUdcStorico_ElencoCartellini +go + +alter table StoricoCartellini drop + constraint FK_StoricoEventi_ElencoCartellini +go + +set xact_abort on +go + +begin transaction +go + +UPDATE dbo.TabTranPosizEventi SET + IdxPosizioneTo=-84 + WHERE CodEvento=N'MagPreFus' and IdxPosizione=84 +go + +commit transaction +go + + + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(315, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 6e418bf0..ff16f1da 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 6e418bf0..ff16f1da 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ