VRH / Vrh.Web.Reporting

Commit 9833a0cdf775181d8cc3f9ce5f23f45edf70a383

Authored by Schwirg László
1 parent 674b4422

- beépülők frissítése

Showing 11 changed files with 34 additions and 31 deletions   Show diff stats
Inline Side-by-side
Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj
  Show/Hide comments   View file @9833a0c
... ... @@ -111,8 +111,8 @@
111 111 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
112 112 <Private>True</Private>
113 113 </Reference>
114   - <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL">
115   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  114 + <Reference Include="Vrh.Web.Common.Lib, Version=2.22.0.0, Culture=neutral, processorArchitecture=MSIL">
  115 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
116 116 </Reference>
117 117 <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
118 118 <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
... ...
Vrh.Web.OneReport.Lib/packages.config
  Show/Hide comments   View file @9833a0c
... ... @@ -11,6 +11,6 @@
11 11 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" />
12 12 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
13 13 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
14   - <package id="Vrh.Web.Common.Lib" version="2.21.2" targetFramework="net462" />
  14 + <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" />
15 15 <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" />
16 16 </packages>
17 17 \ No newline at end of file
... ...
Vrh.Web.Reporting/Areas/iScheduler/Views/Shared/ValidationSummary.cshtml
  Show/Hide comments   View file @9833a0c
1 1 @using Vrh.Web.Common.Lib;
  2 +@using VRH.Log4Pro.WebTools;
2 3  
3 4 @if (!ViewData.ModelState.IsValid && !string.IsNullOrEmpty(Html.ValidationSummaryMessage(true)))
4 5 {
... ...
Vrh.Web.Reporting/Areas/iSchedulerReport/Views/Shared/ValidationSummary.cshtml
  Show/Hide comments   View file @9833a0c
1 1 @using Vrh.Web.Common.Lib;
  2 +@using VRH.Log4Pro.WebTools;
2 3  
3 4 @if (!ViewData.ModelState.IsValid && !string.IsNullOrEmpty(Html.ValidationSummaryMessage(true)))
4 5 {
... ...
Vrh.Web.Reporting/Areas/iSchedulerReport/Views/iSchedulerReport/Manager.cshtml
  Show/Hide comments   View file @9833a0c
... ... @@ -5,6 +5,7 @@
5 5 *@
6 6 @using VRH.Log4Pro.MultiLanguageManager
7 7 @using Vrh.Web.Common.Lib
  8 +@using VRH.Log4Pro.WebTools;
8 9 @using Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
9 10  
10 11 @model ManagerViewModel
... ...
Vrh.Web.Reporting/Vrh.Web.Reporting.csproj
  Show/Hide comments   View file @9833a0c
... ... @@ -290,8 +290,8 @@
290 290 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
291 291 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
292 292 </Reference>
293   - <Reference Include="VRH.Log4Pro.WebTools, Version=1.14.0.0, Culture=neutral, processorArchitecture=MSIL">
294   - <HintPath>..\packages\VRH.Log4Pro.WebTools.1.14.0\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath>
  293 + <Reference Include="VRH.Log4Pro.WebTools, Version=1.15.0.0, Culture=neutral, processorArchitecture=MSIL">
  294 + <HintPath>..\packages\VRH.Log4Pro.WebTools.1.15.0\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath>
295 295 </Reference>
296 296 <Reference Include="Vrh.Logger, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
297 297 <HintPath>..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll</HintPath>
... ... @@ -299,20 +299,20 @@
299 299 <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL">
300 300 <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath>
301 301 </Reference>
302   - <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL">
303   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  302 + <Reference Include="Vrh.Web.Common.Lib, Version=2.22.0.0, Culture=neutral, processorArchitecture=MSIL">
  303 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
304 304 </Reference>
305 305 <Reference Include="Vrh.Web.FileManager.Lib, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
306 306 <HintPath>..\packages\Vrh.Web.FileManager.1.7.0\lib\net462\Vrh.Web.FileManager.Lib.dll</HintPath>
307 307 </Reference>
308   - <Reference Include="Vrh.Web.Menu.Lib, Version=1.29.0.0, Culture=neutral, processorArchitecture=MSIL">
309   - <HintPath>..\packages\Vrh.Web.Menu.1.29.0\lib\net451\Vrh.Web.Menu.Lib.dll</HintPath>
  308 + <Reference Include="Vrh.Web.Menu.Lib, Version=1.29.1.0, Culture=neutral, processorArchitecture=MSIL">
  309 + <HintPath>..\packages\Vrh.Web.Menu.1.29.1\lib\net451\Vrh.Web.Menu.Lib.dll</HintPath>
310 310 </Reference>
311 311 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
312 312 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
313 313 </Reference>
314   - <Reference Include="Vrh.WebForm.Lib, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
315   - <HintPath>..\packages\Vrh.WebForm.2.9.0\lib\net462\Vrh.WebForm.Lib.dll</HintPath>
  314 + <Reference Include="Vrh.WebForm.Lib, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL">
  315 + <HintPath>..\packages\Vrh.WebForm.2.10.0\lib\net462\Vrh.WebForm.Lib.dll</HintPath>
316 316 </Reference>
317 317 <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
318 318 <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
... ... @@ -667,6 +667,14 @@
667 667 <Content Include="Images\ajax-loader_black.gif" />
668 668 <Content Include="Images\log4pro_cube.png" />
669 669 <Content Include="Images\userlogo.jpg" />
  670 + <Content Include="Areas\FileManager\Views\_ViewStart.cshtml" />
  671 + <Content Include="Areas\FileManager\Views\web.config" />
  672 + <Content Include="Areas\FileManager\Views\FileManager\Index.cshtml" />
  673 + <Content Include="Areas\FileManager\Views\FileManager\Error.cshtml" />
  674 + <Content Include="Areas\WebTools\Views\_ViewStart.cshtml" />
  675 + <Content Include="Areas\WebTools\Views\_LayoutNoMenu.cshtml" />
  676 + <Content Include="Areas\WebTools\Views\web.config" />
  677 + <Content Include="Areas\WebTools\Views\UserIsNotAuthenticated.cshtml" />
670 678 <Content Include="Areas\Menu\Views\_ViewStart.cshtml" />
671 679 <Content Include="Areas\Menu\Views\web.config" />
672 680 <Content Include="Areas\Menu\Views\Shared\ErrorList.cshtml" />
... ... @@ -685,14 +693,6 @@
685 693 <Content Include="Areas\Menu\Views\Layout\_Layout.cshtml" />
686 694 <Content Include="Areas\Menu\Views\Layout\LanguageSelection.cshtml" />
687 695 <Content Include="Areas\Menu\Views\Layout\About.cshtml" />
688   - <Content Include="Areas\FileManager\Views\_ViewStart.cshtml" />
689   - <Content Include="Areas\FileManager\Views\web.config" />
690   - <Content Include="Areas\FileManager\Views\FileManager\Index.cshtml" />
691   - <Content Include="Areas\FileManager\Views\FileManager\Error.cshtml" />
692   - <Content Include="Areas\WebTools\Views\_ViewStart.cshtml" />
693   - <Content Include="Areas\WebTools\Views\_LayoutNoMenu.cshtml" />
694   - <Content Include="Areas\WebTools\Views\web.config" />
695   - <Content Include="Areas\WebTools\Views\UserIsNotAuthenticated.cshtml" />
696 696 <Content Include="Areas\WebForm\Views\WebForm\WebForm.cshtml" />
697 697 <Content Include="Areas\WebForm\Views\WebForm\Inputs.cshtml" />
698 698 <Content Include="Areas\WebForm\Views\WebForm\Index.cshtml" />
... ... @@ -888,9 +888,11 @@
888 888 <Content Include="Scripts\vrh.commontools.js" />
889 889 <Content Include="Scripts\vrh.commontools.min.js" />
890 890 <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" />
  891 + <Content Include="Views\_ViewStart.cshtml" />
891 892 <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" />
892 893 <Content Include="Scripts\bootstrap4-toggle.min.js.map" />
893 894 <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Common.Lib\ReadMe.md" />
  895 + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" />
894 896 <None Include="Vrh.NugetModuls.Documentations\Vrh.WebForm\ReadMe.md" />
895 897 <None Include="XmlParser.xml">
896 898 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
... ... @@ -898,7 +900,6 @@
898 900 <None Include="system.web.authentication.config" />
899 901 <None Include="system.web.membership.config" />
900 902 <None Include="system.web.rolemanager.config" />
901   - <Content Include="Views\_ViewStart.cshtml" />
902 903 <None Include="Vrh.NugetModuls.Documentations\VRH.Common\ReadMe.md" />
903 904 <Content Include="SqlServerTypes\readme.htm" />
904 905 <Content Include="Scripts\jquery-ui-1.13.2.js" />
... ... @@ -1159,7 +1160,6 @@
1159 1160 <Content Include="webfonts\fa-brands-400.ttf" />
1160 1161 <Content Include="webfonts\fa-brands-400.eot" />
1161 1162 <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.FileManager\ReadMe.md" />
1162   - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" />
1163 1163 <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" />
1164 1164 <Content Include="_CreateNewNuGetPackage\RunMeToUploadNuGetPackage.cmd" />
1165 1165 <Content Include="_CreateNewNuGetPackage\DoNotModify\UploadNuGetPackage.ps1" />
... ...
Vrh.Web.Reporting/packages.config
  Show/Hide comments   View file @9833a0c
... ... @@ -104,14 +104,14 @@
104 104 <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net462" />
105 105 <package id="VRH.Common" version="3.0.0" targetFramework="net472" />
106 106 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" />
107   - <package id="VRH.Log4Pro.WebTools" version="1.14.0" targetFramework="net462" />
  107 + <package id="VRH.Log4Pro.WebTools" version="1.15.0" targetFramework="net462" />
108 108 <package id="Vrh.Logger" version="3.3.1" targetFramework="net462" />
109 109 <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" />
110   - <package id="Vrh.Web.Common.Lib" version="2.21.2" targetFramework="net462" />
  110 + <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" />
111 111 <package id="Vrh.Web.FileManager" version="1.7.0" targetFramework="net462" />
112   - <package id="Vrh.Web.Menu" version="1.29.0" targetFramework="net462" />
  112 + <package id="Vrh.Web.Menu" version="1.29.1" targetFramework="net462" />
113 113 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
114   - <package id="Vrh.WebForm" version="2.9.0" targetFramework="net462" />
  114 + <package id="Vrh.WebForm" version="2.10.0" targetFramework="net462" />
115 115 <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" />
116 116 <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" />
117 117 <package id="WebGrease" version="1.6.0" targetFramework="net451" />
... ...
Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj
  Show/Hide comments   View file @9833a0c
... ... @@ -262,8 +262,8 @@
262 262 <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL">
263 263 <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath>
264 264 </Reference>
265   - <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL">
266   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  265 + <Reference Include="Vrh.Web.Common.Lib, Version=2.22.0.0, Culture=neutral, processorArchitecture=MSIL">
  266 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
267 267 </Reference>
268 268 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
269 269 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
... ...
Vrh.Web.iScheduler.Lib/packages.config
  Show/Hide comments   View file @9833a0c
... ... @@ -60,7 +60,7 @@
60 60 <package id="VRH.Common" version="3.0.0" targetFramework="net461" />
61 61 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" />
62 62 <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" />
63   - <package id="Vrh.Web.Common.Lib" version="2.21.2" targetFramework="net462" />
  63 + <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" />
64 64 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
65 65 <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" />
66 66 <package id="WebGrease" version="1.6.0" targetFramework="net45" />
... ...
Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj
  Show/Hide comments   View file @9833a0c
... ... @@ -116,8 +116,8 @@
116 116 <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL">
117 117 <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath>
118 118 </Reference>
119   - <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL">
120   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  119 + <Reference Include="Vrh.Web.Common.Lib, Version=2.22.0.0, Culture=neutral, processorArchitecture=MSIL">
  120 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
121 121 </Reference>
122 122 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
123 123 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
... ...
Vrh.Web.iScheduler.Report.Lib/packages.config
  Show/Hide comments   View file @9833a0c
... ... @@ -15,7 +15,7 @@
15 15 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
16 16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
17 17 <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" />
18   - <package id="Vrh.Web.Common.Lib" version="2.21.2" targetFramework="net462" />
  18 + <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" />
19 19 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
20 20 <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" />
21 21 </packages>
22 22 \ No newline at end of file
... ...