diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 87212ba..d21c093 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/obj/Alumat/GIM_data.dll b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll index 836fb5a..d21c093 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_data/obj/Alumat/TempPE/DS_applicazione.Designer.cs.dll b/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_applicazione.Designer.cs.dll index 413002c..971a023 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_applicazione.Designer.cs.dll and b/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_utility.Designer.cs.dll b/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_utility.Designer.cs.dll index 59ade79..a803e71 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_utility.Designer.cs.dll and b/Projects/WebGIM/GIM_data/obj/Alumat/TempPE/DS_utility.Designer.cs.dll differ diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index 73b4822..0a3246a 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -609,6 +609,7 @@ + diff --git a/Projects/WebGIM/GIM_site/Reports/WebGIM_PivotExcel.xlsx b/Projects/WebGIM/GIM_site/Reports/WebGIM_PivotExcel.xlsx new file mode 100644 index 0000000..6350e35 Binary files /dev/null and b/Projects/WebGIM/GIM_site/Reports/WebGIM_PivotExcel.xlsx differ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx index dc28dd4..ce0ff6d 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx @@ -72,38 +72,48 @@ -
-
-
-

- -

- +
+
+
+
+

+ +

+ +
+
+

+ +

+ +
-
-

- -

- -
-
+
-
-
-

- -

- +
+
+
+

+ +

+ +
+
+

+ +

+ +
+ + + + +
+
-
-

- -

- -
-
+
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs index 9ba866a..6c55ec3 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs @@ -246,6 +246,18 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl #endregion + protected void rblFormato_SelectedIndexChanged(object sender, EventArgs e) + { + if (rblFormato.SelectedValue == "PRO") + { + hlExcelPowerPivot.NavigateUrl = "~/Reports/WebGIM_PowerPivot.xlsx"; + } + else + { + hlExcelPowerPivot.NavigateUrl = "~/Reports/WebGIM_PivotExcel.xlsx"; + } + } + #endregion diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs index 96da999..cd72342 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs @@ -218,6 +218,15 @@ public partial class mod_reportInterventi { /// protected global::System.Web.UI.WebControls.HyperLink hlExcelPowerPivot; + /// + /// rblFormato control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RadioButtonList rblFormato; + /// /// lblExcelInstruction control. /// diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 87212ba..d21c093 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 67f87ca..22a69be 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/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index bb48b56..fb1e727 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_dettaglioIntervento.ascx deleted file mode 100644 index e244586..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_dettaglioIntervento.ascx +++ /dev/null @@ -1,767 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_dettaglioIntervento" - CodeBehind="mod_dettaglioIntervento.ascx.cs" %> -<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" - TagPrefix="uc1" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %> -
-
- -
-
- - -
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - -
- -
-
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - [lblTurnoLav] - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - -
- -
-
-
-
-
- - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - - - - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - - - - - - - - - -
- - - -
-
- - - -
- - -
- -
-
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- <%----%> - - - - - - - - - - - - -
- - - - -
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_reportInterventi.ascx deleted file mode 100644 index c0adc85..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_reportInterventi.ascx +++ /dev/null @@ -1,107 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_reportInterventi" - CodeBehind="mod_reportInterventi.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" - TagPrefix="uc1" %> -
-
-
-
- -
-
-
-
- -
-
- -
-
- - - - - - -
-
-
-
- -
-
- -
-
- - - - - - -
-
-
-
-
- - - - -
-
- -
- -
-
-
-
- - - - - - - - - -
-

- -

- -
- -

- -

- -
-
- -
-
-
-
-
diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_vocabolario.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_vocabolario.ascx deleted file mode 100644 index 7534b8d..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/Source/WebUserControls/mod_vocabolario.ascx +++ /dev/null @@ -1,105 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_vocabolario" Codebehind="mod_vocabolario.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_dettaglioIntervento.ascx deleted file mode 100644 index e244586..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_dettaglioIntervento.ascx +++ /dev/null @@ -1,767 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_dettaglioIntervento" - CodeBehind="mod_dettaglioIntervento.ascx.cs" %> -<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" - TagPrefix="uc1" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %> -
-
- -
-
- - -
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - -
- -
-
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - [lblTurnoLav] - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - -
- -
-
-
-
-
- - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - - - - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - - - - - - - - - -
- - - -
-
- - - -
- - -
- -
-
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- <%----%> - - - - - - - - - - - - -
- - - - -
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_reportInterventi.ascx deleted file mode 100644 index c0adc85..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_reportInterventi.ascx +++ /dev/null @@ -1,107 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_reportInterventi" - CodeBehind="mod_reportInterventi.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" - TagPrefix="uc1" %> -
-
-
-
- -
-
-
-
- -
-
- -
-
- - - - - - -
-
-
-
- -
-
- -
-
- - - - - - -
-
-
-
-
- - - - -
-
- -
- -
-
-
-
- - - - - - - - - -
-

- -

- -
- -

- -

- -
-
- -
-
-
-
-
diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_vocabolario.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_vocabolario.ascx deleted file mode 100644 index 7534b8d..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/AspnetCompileMerge/TempBuildDir/WebUserControls/mod_vocabolario.ascx +++ /dev/null @@ -1,105 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_vocabolario" Codebehind="mod_vocabolario.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac b/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac deleted file mode 100644 index 7b0655f..0000000 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIMConnectionString_IncrementalSchemaOnly.dacpac and /dev/null 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 deleted file mode 100644 index 39f915a..0000000 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/AutoScripts/GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac and /dev/null 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 deleted file mode 100644 index 0a59e22..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/original/Web.config +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config deleted file mode 100644 index e666705..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/CSAutoParameterize/transformed/Web.config +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/DesignTimeResolveAssemblyReferencesInput.cache b/Projects/WebGIM/GIM_site/obj/Alumat/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index c1db677..0000000 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache deleted file mode 100644 index 3034df0..0000000 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll deleted file mode 100644 index 11aa8aa..0000000 Binary files a/Projects/WebGIM/GIM_site/obj/Alumat/GIM_site.dll and /dev/null differ diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_dettaglioIntervento.ascx deleted file mode 100644 index e244586..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_dettaglioIntervento.ascx +++ /dev/null @@ -1,767 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_dettaglioIntervento" - CodeBehind="mod_dettaglioIntervento.ascx.cs" %> -<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" - TagPrefix="uc1" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %> -
-
- -
-
- - -
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - -
- -
-
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - [lblTurnoLav] - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - -
- -
-
-
-
-
- - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - - - - - -
- - - - - - -
- - - - - <%-- - - - - --%> - - -
- - - - - - - - - - - -
- - - -
-
- - - -
- - -
- -
-
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- <%----%> - - - - - - - - - - - - -
- - - - -
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_reportInterventi.ascx deleted file mode 100644 index c0adc85..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_reportInterventi.ascx +++ /dev/null @@ -1,107 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_reportInterventi" - CodeBehind="mod_reportInterventi.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" - TagPrefix="uc1" %> -
-
-
-
- -
-
-
-
- -
-
- -
-
- - - - - - -
-
-
-
- -
-
- -
-
- - - - - - -
-
-
-
-
- - - - -
-
- -
- -
-
-
-
- - - - - - - - - -
-

- -

- -
- -

- -

- -
-
- -
-
-
-
-
diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_vocabolario.ascx b/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_vocabolario.ascx deleted file mode 100644 index 7534b8d..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/Package/PackageTmp/WebUserControls/mod_vocabolario.ascx +++ /dev/null @@ -1,105 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_vocabolario" Codebehind="mod_vocabolario.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config deleted file mode 100644 index 09c0887..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/original/Web.config +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config b/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config deleted file mode 100644 index 0a59e22..0000000 --- a/Projects/WebGIM/GIM_site/obj/Alumat/TransformWebConfig/transformed/Web.config +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index 0d8a20f..15494f8 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.245.480")] -[assembly: AssemblyFileVersion("1.4.245.480")] +[assembly: AssemblyVersion("1.4.246.480")] +[assembly: AssemblyFileVersion("1.4.246.480")] [assembly: AssemblyCopyright("Steamware © 2006-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index 66fc251..4335e60 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.245.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.4.245.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.4.246.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.4.246.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll index bb48b56..fb1e727 100644 Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ