diff --git a/.vs/WebGIM.sqlite b/.vs/WebGIM.sqlite new file mode 100644 index 0000000..0b41f2d Binary files /dev/null and b/.vs/WebGIM.sqlite differ diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 2520e0c..c644d81 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -162,7 +162,7 @@ - + diff --git a/GIM_dataLayer/bin/Release/ADODB.dll b/GIM_dataLayer/bin/Release/ADODB.dll index 82860b2..95d2688 100644 Binary files a/GIM_dataLayer/bin/Release/ADODB.dll and b/GIM_dataLayer/bin/Release/ADODB.dll differ diff --git a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll index a3eab2b..9fa7717 100644 Binary files a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll and b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll differ diff --git a/GIM_dataLayer/bin/Release/SteamWare.dll b/GIM_dataLayer/bin/Release/SteamWare.dll index f300908..4ff1761 100644 Binary files a/GIM_dataLayer/bin/Release/SteamWare.dll and b/GIM_dataLayer/bin/Release/SteamWare.dll differ diff --git a/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 3f081c5..3ccf4d4 100644 Binary files a/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.csproj.FileListAbsolute.txt b/GIM_dataLayer/obj/Release/GIM_dataLayer.csproj.FileListAbsolute.txt index 380cd9a..c1365f3 100644 --- a/GIM_dataLayer/obj/Release/GIM_dataLayer.csproj.FileListAbsolute.txt +++ b/GIM_dataLayer/obj/Release/GIM_dataLayer.csproj.FileListAbsolute.txt @@ -14,3 +14,19 @@ C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_d C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_dataLayer\obj\Release\GIM_dataLayer.dll C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_dataLayer\obj\Release\GIM_dataLayer.pdb C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\WebGIM\GIM_dataLayer\bin\Release\SteamWare.dll.config +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\GIM_dataLayer.dll.config +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\GIM_dataLayer.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\GIM_dataLayer.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\Microsoft.ReportViewer.WinForms.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\SteamWare.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\Flesk.ViewState.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\ICSharpCode.SharpZipLib.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\Microsoft.ReportViewer.Common.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\Microsoft.Build.Utilities.v3.5.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\ADODB.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\SteamWare.dll.config +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\Microsoft.Build.Utilities.v3.5.xml +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\bin\Release\it\Microsoft.Build.Utilities.v3.5.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\obj\Release\GIM_dataLayer.csprojResolveAssemblyReference.cache +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\obj\Release\GIM_dataLayer.dll +C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM_old\WebGIM\GIM_dataLayer\obj\Release\GIM_dataLayer.pdb diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache index 62d57e5..75b2289 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache and b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll index a3eab2b..9fa7717 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll and b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll differ diff --git a/GIM_site/GIM_site.csproj b/GIM_site/GIM_site.csproj index b83780b..3ece020 100644 --- a/GIM_site/GIM_site.csproj +++ b/GIM_site/GIM_site.csproj @@ -168,9 +168,8 @@ false - - ..\packages\AjaxControlToolkit.16.1.1.0\lib\net40\AjaxControlToolkit.dll - True + + ..\packages\AjaxControlToolkit.17.1.0.0\lib\net40\AjaxControlToolkit.dll ..\packages\AjaxMin.5.14.5506.26202\lib\net40\AjaxMin.dll diff --git a/GIM_site/Reports/EN/MacchineReparti.rdlc b/GIM_site/Reports/EN/MacchineReparti.rdlc index d9ff266..c2b7f91 100644 --- a/GIM_site/Reports/EN/MacchineReparti.rdlc +++ b/GIM_site/Reports/EN/MacchineReparti.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/GIM_site/Reports/EN/ReportInterventi.rdlc b/GIM_site/Reports/EN/ReportInterventi.rdlc index 352b65f..4e73438 100644 --- a/GIM_site/Reports/EN/ReportInterventi.rdlc +++ b/GIM_site/Reports/EN/ReportInterventi.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc b/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc index d574675..53651d7 100644 --- a/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc +++ b/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc @@ -17,7 +17,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/GIM_site/Reports/EN/RichiestaIntervento.rdlc b/GIM_site/Reports/EN/RichiestaIntervento.rdlc index 7a90d9c..a2531e3 100644 --- a/GIM_site/Reports/EN/RichiestaIntervento.rdlc +++ b/GIM_site/Reports/EN/RichiestaIntervento.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true @@ -21,7 +21,7 @@ String - File:\C:\inetpub\WebGIM\alumat\Reports\EN\ + File:\C:\inetpub\wwwroot\WebGIM\Reports\ true diff --git a/GIM_site/Reports/IT/MacchineReparti.rdlc b/GIM_site/Reports/IT/MacchineReparti.rdlc index d8fad51..5f43847 100644 --- a/GIM_site/Reports/IT/MacchineReparti.rdlc +++ b/GIM_site/Reports/IT/MacchineReparti.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/GIM_site/Reports/IT/ReportInterventi.rdlc b/GIM_site/Reports/IT/ReportInterventi.rdlc index 05937cc..497efc0 100644 --- a/GIM_site/Reports/IT/ReportInterventi.rdlc +++ b/GIM_site/Reports/IT/ReportInterventi.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc b/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc index 080eafd..dc74144 100644 --- a/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc +++ b/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc @@ -17,7 +17,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/GIM_site/Reports/IT/RichiestaIntervento.rdlc b/GIM_site/Reports/IT/RichiestaIntervento.rdlc index fd3c05f..dd8c6f2 100644 --- a/GIM_site/Reports/IT/RichiestaIntervento.rdlc +++ b/GIM_site/Reports/IT/RichiestaIntervento.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true @@ -21,7 +21,7 @@ String - File:\C:\inetpub\WebGIM\alumat\Reports\IT\ + File:\C:\inetpub\wwwroot\WebGIM\Reports\ true diff --git a/GIM_site/Reports/WebGIM_PivotExcel.xlsx b/GIM_site/Reports/WebGIM_PivotExcel.xlsx index 9659965..6320393 100644 Binary files a/GIM_site/Reports/WebGIM_PivotExcel.xlsx and b/GIM_site/Reports/WebGIM_PivotExcel.xlsx differ diff --git a/GIM_site/Reports/WebGIM_PowerPivot.xlsx b/GIM_site/Reports/WebGIM_PowerPivot.xlsx index fbda89f..6320393 100644 Binary files a/GIM_site/Reports/WebGIM_PowerPivot.xlsx and b/GIM_site/Reports/WebGIM_PowerPivot.xlsx differ diff --git a/GIM_site/Reports/logo.png b/GIM_site/Reports/logo.png index 131b722..7daf8a5 100644 Binary files a/GIM_site/Reports/logo.png and b/GIM_site/Reports/logo.png differ diff --git a/GIM_site/Web.config b/GIM_site/Web.config index c0a8187..6bfe760 100644 --- a/GIM_site/Web.config +++ b/GIM_site/Web.config @@ -42,8 +42,8 @@ - - + + diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index f300908..4ff1761 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/images/LogoCli.png b/GIM_site/images/LogoCli.png index 7877e1f..6e1bdcb 100644 Binary files a/GIM_site/images/LogoCli.png and b/GIM_site/images/LogoCli.png differ diff --git a/GIM_site/packages.config b/GIM_site/packages.config index 19ff486..2be8606 100644 --- a/GIM_site/packages.config +++ b/GIM_site/packages.config @@ -1,6 +1,6 @@  - + diff --git a/WebGIM.sln b/WebGIM.sln index 8b04919..4e9e670 100644 --- a/WebGIM.sln +++ b/WebGIM.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GIM_site", "GIM_site\GIM_site.csproj", "{02C16B9B-9E89-42A7-A59C-E85A21E102F3}" EndProject diff --git a/packages/AjaxControlToolkit.16.1.1.0/AjaxControlToolkit.16.1.1.0.nupkg b/packages/AjaxControlToolkit.16.1.1.0/AjaxControlToolkit.16.1.1.0.nupkg deleted file mode 100644 index e786a6e..0000000 Binary files a/packages/AjaxControlToolkit.16.1.1.0/AjaxControlToolkit.16.1.1.0.nupkg and /dev/null differ diff --git a/packages/AjaxControlToolkit.17.1.0.0/AjaxControlToolkit.17.1.0.0.nupkg b/packages/AjaxControlToolkit.17.1.0.0/AjaxControlToolkit.17.1.0.0.nupkg new file mode 100644 index 0000000..0d3f2bc Binary files /dev/null and b/packages/AjaxControlToolkit.17.1.0.0/AjaxControlToolkit.17.1.0.0.nupkg differ diff --git a/packages/AjaxControlToolkit.16.1.1.0/Content/Web.config.transform b/packages/AjaxControlToolkit.17.1.0.0/Content/Web.config.transform similarity index 100% rename from packages/AjaxControlToolkit.16.1.1.0/Content/Web.config.transform rename to packages/AjaxControlToolkit.17.1.0.0/Content/Web.config.transform diff --git a/packages/AjaxControlToolkit.16.1.1.0/lib/net40/AjaxControlToolkit.dll b/packages/AjaxControlToolkit.17.1.0.0/lib/net40/AjaxControlToolkit.dll similarity index 71% rename from packages/AjaxControlToolkit.16.1.1.0/lib/net40/AjaxControlToolkit.dll rename to packages/AjaxControlToolkit.17.1.0.0/lib/net40/AjaxControlToolkit.dll index 4fbcfc9..699c505 100644 Binary files a/packages/AjaxControlToolkit.16.1.1.0/lib/net40/AjaxControlToolkit.dll and b/packages/AjaxControlToolkit.17.1.0.0/lib/net40/AjaxControlToolkit.dll differ diff --git a/packages/AjaxControlToolkit.16.1.1.0/readme.txt b/packages/AjaxControlToolkit.17.1.0.0/readme.txt similarity index 95% rename from packages/AjaxControlToolkit.16.1.1.0/readme.txt rename to packages/AjaxControlToolkit.17.1.0.0/readme.txt index 5ae166f..cd0ee0a 100644 Binary files a/packages/AjaxControlToolkit.16.1.1.0/readme.txt and b/packages/AjaxControlToolkit.17.1.0.0/readme.txt differ