Commit 17c73aecdf490c60608bd23ec9e9637517f85a50

Authored by Schwirg László
1 parent fdbdf14e

Vrh.Web.Reporting v1.3.0

Showing 32 changed files with 469 additions and 469 deletions   Show diff stats
Vrh.OneMessage/OneMessage.cs
@@ -98,7 +98,9 @@ namespace Vrh.OneMessage @@ -98,7 +98,9 @@ namespace Vrh.OneMessage
98 } 98 }
99 this.MessageId = pars.MessageId; 99 this.MessageId = pars.MessageId;
100 100
101 - var xmlc = new XmlConnection(pars.XmlConnectionString, Constants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 101 + var xmlcs = pars.XmlConnectionString;
  102 + if (string.IsNullOrWhiteSpace(xmlcs)) { xmlcs = $"config={Constants.DEFAULT_CONFIGNAME};"; }
  103 + var xmlc = new XmlConnection(xmlcs);
102 using (var omxp = new OneMessageXmlParser(xmlc, pars.AppPath, pars.LCID, pars.Parameters, pars.MessageId, pars.Delivery)) 104 using (var omxp = new OneMessageXmlParser(xmlc, pars.AppPath, pars.LCID, pars.Parameters, pars.MessageId, pars.Delivery))
103 { 105 {
104 #region Combining external parameters with xml structure 106 #region Combining external parameters with xml structure
Vrh.OneMessage/OneMessageParameters.cs
@@ -110,94 +110,38 @@ namespace Vrh.OneMessage @@ -110,94 +110,38 @@ namespace Vrh.OneMessage
110 /// <summary> 110 /// <summary>
111 /// Példány létrehozása a két szótár alapján. 111 /// Példány létrehozása a két szótár alapján.
112 /// </summary> 112 /// </summary>
113 - /// <param name="basicparameters">Alap paraméterek szótára.</param>  
114 - /// <param name="extraparameters">Egyéb paramáterek szótára.</param> 113 + /// <param name="apppath"></param>
  114 + /// <param name="firstlist">Alap paraméterek szótára.</param>
  115 + /// <param name="secondlist">Egyéb paramáterek szótára.</param>
115 /// <exception cref="System.ApplicationException"> 116 /// <exception cref="System.ApplicationException">
116 /// Ha 117 /// Ha
117 /// </exception> 118 /// </exception>
118 - public OneMessageParameters(Dictionary<string,string> basicparameters, Dictionary<string, string> extraparameters) 119 + public OneMessageParameters(List<KeyValuePair<string,string>> firstlist, List<KeyValuePair<string, string>> secondlist=null, string apppath="")
119 { 120 {
120 - if (basicparameters != null && basicparameters.Count() > 0) 121 + this.AppPath = apppath; if (string.IsNullOrEmpty(this.AppPath)) { this.AppPath = ""; }
  122 + var EMPTYLIST = new List<KeyValuePair<string, string>>();
  123 + var allparameters = (firstlist ?? EMPTYLIST).Concat(secondlist ?? EMPTYLIST);
  124 + foreach (var item in allparameters)
121 { 125 {
122 - foreach (KeyValuePair<string, string> item in basicparameters) 126 + if (string.IsNullOrWhiteSpace(item.Key)) continue;
  127 + var value = item.Value;
  128 + switch (item.Key)
123 { 129 {
124 - this.Add(item.Key, item.Value);  
125 - }  
126 - }  
127 - if (extraparameters != null && extraparameters.Count() > 0)  
128 - {  
129 - foreach (KeyValuePair<string, string> item in extraparameters)  
130 - {  
131 - this.Add(item.Key, item.Value); 130 + case Constants.UParam.XML: this.XmlConnectionString = value; break;
  131 + case Constants.UParam.LCID: this.LCID = value; break;
  132 + case Constants.UParam.MSGID: this.MessageId = value; break;
  133 + case Constants.UParam.DELIVERY: this.Delivery = value; break;
  134 + case Constants.UParam.SENDAS: this.SendAs = value; break;
  135 + case Constants.UParam.CONNSTR: this.ConnectionString = value; break;
  136 + case Constants.UParam.SENDCOPYTO: this.SendCopyTo = value; break;
  137 + case Constants.UParam.SENDTO: this.SendTo = value; break;
  138 + case Constants.UParam.SUBJECT: this.Subject = value; break;
  139 + case Constants.UParam.MSGBODY: this.MessageBody = value; break;
  140 + case Constants.UParam.ATTACHMENTS: this.Attachments = value; break;
  141 + default: if (Parameters.ContainsKey(item.Key)) { this.Parameters[item.Key] = value; } else { Parameters.Add(item.Key, value); } break;
132 } 142 }
133 } 143 }
134 } 144 }
135 #endregion Constructors 145 #endregion Constructors
136 -  
137 - #region Add public method  
138 - /// <summary>  
139 - /// Érték hozzáadása az osztályhoz. Ha <paramref name="key"/> nevű  
140 - /// tulajdonság létezik, akkor az megkapja a <paramref name="value"/>  
141 - /// értékét, ha nem létezik, akkor a <paramref name="key"/> névvel együtt  
142 - /// bekerül a Parameters gyűjteménybe, mely egy string,string típusú Dictionary.  
143 - /// Már létező paraméter vagy korábban értéket kapott tulajdonság értéke felülíródik.  
144 - /// </summary>  
145 - /// <param name="key">A tulajdonságra vagy paraméterre jellemző elnevezés.</param>  
146 - /// <param name="value">A tulajdonság vagy paraméter értéke.</param>  
147 - /// <remarks>  
148 - /// Ha key üres vagy null, akkor nem történik semmi.  
149 - /// </remarks>  
150 - public void Add(string key, string value)  
151 - {  
152 - if (string.IsNullOrWhiteSpace(key)) return;  
153 -  
154 - switch (key)  
155 - {  
156 - case Constants.UParam.XML:  
157 - this.XmlConnectionString = value;  
158 - break;  
159 - case Constants.UParam.LCID:  
160 - this.LCID = value;  
161 - break;  
162 - case Constants.UParam.MSGID:  
163 - this.MessageId= value;  
164 - break;  
165 - case Constants.UParam.DELIVERY:  
166 - this.Delivery = value;  
167 - break;  
168 - case Constants.UParam.SENDAS:  
169 - this.SendAs= value;  
170 - break;  
171 - case Constants.UParam.CONNSTR:  
172 - this.ConnectionString= value;  
173 - break;  
174 - case Constants.UParam.SENDCOPYTO:  
175 - this.SendCopyTo = value;  
176 - break;  
177 - case Constants.UParam.SENDTO:  
178 - this.SendTo= value;  
179 - break;  
180 - case Constants.UParam.SUBJECT:  
181 - this.Subject= value;  
182 - break;  
183 - case Constants.UParam.MSGBODY:  
184 - this.MessageBody = value;  
185 - break;  
186 - case Constants.UParam.ATTACHMENTS:  
187 - this.Attachments= value;  
188 - break;  
189 - default:  
190 - if (Parameters.ContainsKey(key))  
191 - {  
192 - this.Parameters[key] = value;  
193 - }  
194 - else  
195 - {  
196 - Parameters.Add(key, value);  
197 - }  
198 - break;  
199 - }  
200 - }  
201 - #endregion Add public method  
202 } 146 }
203 } 147 }
Vrh.OneMessage/Vrh.OneMessage.csproj
@@ -62,8 +62,8 @@ @@ -62,8 +62,8 @@
62 <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> 62 <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63 <HintPath>..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll</HintPath> 63 <HintPath>..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll</HintPath>
64 </Reference> 64 </Reference>
65 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
66 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 65 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  66 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
67 </Reference> 67 </Reference>
68 </ItemGroup> 68 </ItemGroup>
69 <ItemGroup> 69 <ItemGroup>
Vrh.OneMessage/packages.config
@@ -2,5 +2,5 @@ @@ -2,5 +2,5 @@
2 <packages> 2 <packages>
3 <package id="EntityFramework" version="6.4.4" targetFramework="net45" /> 3 <package id="EntityFramework" version="6.4.4" targetFramework="net45" />
4 <package id="VRH.Common" version="3.0.0" targetFramework="net45" /> 4 <package id="VRH.Common" version="3.0.0" targetFramework="net45" />
5 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 5 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
6 </packages> 6 </packages>
7 \ No newline at end of file 7 \ No newline at end of file
Vrh.OneReport/ReportService.cs
@@ -156,7 +156,8 @@ namespace Vrh.OneReport @@ -156,7 +156,8 @@ namespace Vrh.OneReport
156 checklcid = string.IsNullOrWhiteSpace(checklcid) ? lcid : checklcid.Trim(); 156 checklcid = string.IsNullOrWhiteSpace(checklcid) ? lcid : checklcid.Trim();
157 if (checklcid == "*") checklcid = ""; 157 if (checklcid == "*") checklcid = "";
158 158
159 - var xmlcDir = new XmlConnection(xml, Constants.DEFAULT_CONFIG, XmlConnection.DefaultTypes.ConfigurationName); 159 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={Constants.DEFAULT_CONFIG};"; }
  160 + var xmlcDir = new XmlConnection(xml);
160 using (var directory = new DirectoryXmlParser(xmlcDir, m_BasePath, lcid, otherVars)) 161 using (var directory = new DirectoryXmlParser(xmlcDir, m_BasePath, lcid, otherVars))
161 { 162 {
162 var reportNamesArray = reportNames.Split(','); 163 var reportNamesArray = reportNames.Split(',');
@@ -218,7 +219,8 @@ namespace Vrh.OneReport @@ -218,7 +219,8 @@ namespace Vrh.OneReport
218 listlcid = string.IsNullOrWhiteSpace(listlcid) ? lcid : listlcid.Trim(); 219 listlcid = string.IsNullOrWhiteSpace(listlcid) ? lcid : listlcid.Trim();
219 if (listlcid == "*") listlcid = null; 220 if (listlcid == "*") listlcid = null;
220 221
221 - var xmlcDir = new XmlConnection(xml, Constants.DEFAULT_CONFIG, XmlConnection.DefaultTypes.ConfigurationName); 222 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={Constants.DEFAULT_CONFIG};"; }
  223 + var xmlcDir = new XmlConnection(xml);
222 using (var directory = new DirectoryXmlParser(xmlcDir, m_BasePath, lcid, otherVars)) 224 using (var directory = new DirectoryXmlParser(xmlcDir, m_BasePath, lcid, otherVars))
223 { 225 {
224 return directory.List(listmode, listlcid, reportId); 226 return directory.List(listmode, listlcid, reportId);
@@ -274,10 +276,8 @@ namespace Vrh.OneReport @@ -274,10 +276,8 @@ namespace Vrh.OneReport
274 { 276 {
275 try 277 try
276 { 278 {
277 - var xmlc = new XmlConnection(  
278 - xmlConnectionString,  
279 - Constants.DEFAULT_CONFIG,  
280 - XmlConnection.DefaultTypes.ConfigurationName); 279 + if (string.IsNullOrWhiteSpace(xmlConnectionString)) { xmlConnectionString = $"config={Constants.DEFAULT_CONFIG};"; }
  280 + var xmlc = new XmlConnection(xmlConnectionString);
281 if (string.IsNullOrWhiteSpace(xmlc.ConfigurationName)) { throw new Exception(ERR_CONFIGITEMREQUIRED); } 281 if (string.IsNullOrWhiteSpace(xmlc.ConfigurationName)) { throw new Exception(ERR_CONFIGITEMREQUIRED); }
282 this.Report = new OneReportXmlParser(xmlc, m_BasePath, lcid, otherVars); 282 this.Report = new OneReportXmlParser(xmlc, m_BasePath, lcid, otherVars);
283 } 283 }
Vrh.OneReport/Vrh.OneReport.csproj
@@ -103,8 +103,8 @@ @@ -103,8 +103,8 @@
103 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> 103 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
104 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> 104 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
105 </Reference> 105 </Reference>
106 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
107 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 106 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  107 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
108 </Reference> 108 </Reference>
109 </ItemGroup> 109 </ItemGroup>
110 <ItemGroup> 110 <ItemGroup>
Vrh.OneReport/packages.config
@@ -10,5 +10,5 @@ @@ -10,5 +10,5 @@
10 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" /> 10 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" />
11 <package id="VRH.Common" version="3.0.0" targetFramework="net45" /> 11 <package id="VRH.Common" version="3.0.0" targetFramework="net45" />
12 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net45" /> 12 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net45" />
13 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 13 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
14 </packages> 14 </packages>
15 \ No newline at end of file 15 \ No newline at end of file
Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj
@@ -111,11 +111,11 @@ @@ -111,11 +111,11 @@
111 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> 111 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
112 <Private>True</Private> 112 <Private>True</Private>
113 </Reference> 113 </Reference>
114 - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.2.0, Culture=neutral, processorArchitecture=MSIL">  
115 - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> 114 + <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL">
  115 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
116 </Reference> 116 </Reference>
117 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
118 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 117 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  118 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
119 </Reference> 119 </Reference>
120 </ItemGroup> 120 </ItemGroup>
121 <ItemGroup> 121 <ItemGroup>
Vrh.Web.OneReport.Lib/packages.config
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
11 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> 11 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" />
12 <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> 12 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
13 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> 13 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
14 - <package id="Vrh.Web.Common.Lib" version="2.20.2" targetFramework="net462" />  
15 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 14 + <package id="Vrh.Web.Common.Lib" version="2.20.3" targetFramework="net462" />
  15 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
16 </packages> 16 </packages>
17 \ No newline at end of file 17 \ No newline at end of file
Vrh.Web.Reporting/Areas/OneMessage/Controllers/OneMessageController.cs deleted
@@ -1,76 +0,0 @@ @@ -1,76 +0,0 @@
1 -using System;  
2 -using System.Collections.Generic;  
3 -using System.Linq;  
4 -using System.Web;  
5 -using System.Web.Mvc;  
6 -using System.Collections;  
7 -  
8 -using VRH.Common;  
9 -using Vrh.Web.Common.Lib;  
10 -using Vrh.OneMessage;  
11 -  
12 -namespace Vrh.Web.OneMessage.Areas.OneMessage.Controllers  
13 -{  
14 - public class OneMessageController : BaseController  
15 - {  
16 - #region SendSMTPMessage action  
17 - /// <summary>  
18 - /// Vrh.OneMessage SMTP küldés belépési pontja.  
19 - /// </summary>  
20 - /// <returns></returns>  
21 - [HttpPost]  
22 - public ActionResult SendSMTPMessage(string[][] paramlist = null)  
23 - {  
24 - var rij = new ReturnInfoJSON();  
25 - try  
26 - {  
27 - base.ParameterSeparating(typeof(Constants.UParam));  
28 - base.ParameterSeparating(paramlist, typeof(Constants.UParam));  
29 -  
30 - #region LCID beállítása  
31 - if (String.IsNullOrWhiteSpace(base.RequestedParameters[Constants.UParam.LCID]))  
32 - { // A ForcedLanguageCode a BaseController konstruktorában megkapja a MultiLanguageManager.RelevantLanguageCode-ot  
33 - base.RequestedParameters[Constants.UParam.LCID] = base.ForcedLanguageCode;  
34 - }  
35 - else  
36 - {  
37 - base.ForcedLanguageCode = base.RequestedParameters[Constants.UParam.LCID];  
38 - }  
39 - #endregion LCID beállítása  
40 -  
41 - #region MessageId meglétének ellenőrzése  
42 - if (string.IsNullOrWhiteSpace(base.RequestedParameters[Constants.UParam.MSGID]))  
43 - {  
44 - throw new Exception($"Az '{Constants.UParam.MSGID}' URL paraméter hiányzik!");  
45 - }  
46 - #endregion MessageId meglétének ellenőrzése  
47 -  
48 - var parameters = new OneMessageParameters(base.RequestedParameters, base.OtherParameters)  
49 - {  
50 - AppPath = Server.MapPath(WebCommon.SIGN_RELATIVE)  
51 - };  
52 -  
53 - var om = new Vrh.OneMessage.OneMessage(parameters);  
54 -  
55 - if (om.ErrorList.Count == 0)  
56 - { //ha nem volt hiba a feldolgozás közben, következhet a küldés  
57 - om.SendMessage();  
58 - rij.ReturnValue = 0;  
59 - rij.ReturnMessage = "Az üzenet elküldése sikeresen megtörtént.";  
60 - }  
61 - else  
62 - {  
63 - rij.ReturnValue = -1;  
64 - rij.ReturnMessage = string.Join(WebCommon.HTML_NEWLINE, om.ErrorList);  
65 - }  
66 - }  
67 - catch (Exception ex)  
68 - {  
69 - rij.ReturnValue = -1;  
70 - rij.ReturnMessage = string.Join(WebCommon.HTML_NEWLINE, WebCommon.ErrorListBuilder(ex));  
71 - }  
72 - return Json(rij, JsonRequestBehavior.AllowGet);  
73 - }  
74 - #endregion SendSMTPMessage action  
75 - }  
76 -}  
Vrh.Web.Reporting/Areas/OneMessage/OneMessageAreaRegistration.cs deleted
@@ -1,24 +0,0 @@ @@ -1,24 +0,0 @@
1 -using System.Web.Mvc;  
2 -  
3 -namespace Vrh.Web.OneMessage.Areas.OneMessage  
4 -{  
5 - public class OneMessageAreaRegistration : AreaRegistration  
6 - {  
7 - public override string AreaName  
8 - {  
9 - get  
10 - {  
11 - return "OneMessage";  
12 - }  
13 - }  
14 -  
15 - public override void RegisterArea(AreaRegistrationContext context)  
16 - {  
17 - context.MapRoute(  
18 - "OneMessage_default",  
19 - "OneMessage/{controller}/{action}/{id}",  
20 - new { action = "Index", id = UrlParameter.Optional }  
21 - );  
22 - }  
23 - }  
24 -}  
25 \ No newline at end of file 0 \ No newline at end of file
Vrh.Web.Reporting/Properties/AssemblyInfo.cs
@@ -36,6 +36,6 @@ using System.Runtime.InteropServices; @@ -36,6 +36,6 @@ using System.Runtime.InteropServices;
36 // You can specify all the values or you can default the Build and Revision Numbers 36 // You can specify all the values or you can default the Build and Revision Numbers
37 // by using the '*' as shown below: 37 // by using the '*' as shown below:
38 // [assembly: AssemblyVersion("1.0.*")] 38 // [assembly: AssemblyVersion("1.0.*")]
39 -[assembly: AssemblyVersion("1.2.1.0")]  
40 -[assembly: AssemblyFileVersion("1.2.1.0")]  
41 -[assembly: AssemblyInformationalVersion("1.2.1")] 39 +[assembly: AssemblyVersion("1.3.0.0")]
  40 +[assembly: AssemblyFileVersion("1.3.0.0")]
  41 +[assembly: AssemblyInformationalVersion("1.3.0")]
Vrh.Web.Reporting/Vrh.Web.Reporting.csproj
@@ -293,32 +293,32 @@ @@ -293,32 +293,32 @@
293 <Reference Include="VRH.Log4Pro.WebTools, Version=1.12.5.0, Culture=neutral, processorArchitecture=MSIL"> 293 <Reference Include="VRH.Log4Pro.WebTools, Version=1.12.5.0, Culture=neutral, processorArchitecture=MSIL">
294 <HintPath>..\packages\VRH.Log4Pro.WebTools.1.12.5\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath> 294 <HintPath>..\packages\VRH.Log4Pro.WebTools.1.12.5\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath>
295 </Reference> 295 </Reference>
296 - <Reference Include="Vrh.Logger, Version=3.0.9.0, Culture=neutral, processorArchitecture=MSIL">  
297 - <HintPath>..\packages\Vrh.Logger.3.0.9\lib\net451\Vrh.Logger.dll</HintPath> 296 + <Reference Include="Vrh.Logger, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
  297 + <HintPath>..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll</HintPath>
298 </Reference> 298 </Reference>
299 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL"> 299 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
300 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath> 300 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath>
301 </Reference> 301 </Reference>
302 - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.2.0, Culture=neutral, processorArchitecture=MSIL">  
303 - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> 302 + <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL">
  303 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
304 </Reference> 304 </Reference>
305 - <Reference Include="Vrh.Web.FileManager.Lib, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">  
306 - <HintPath>..\packages\Vrh.Web.FileManager.1.5.1\lib\net462\Vrh.Web.FileManager.Lib.dll</HintPath> 305 + <Reference Include="Vrh.Web.FileManager.Lib, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
  306 + <HintPath>..\packages\Vrh.Web.FileManager.1.6.0\lib\net462\Vrh.Web.FileManager.Lib.dll</HintPath>
307 </Reference> 307 </Reference>
308 - <Reference Include="Vrh.Web.Membership.Lib, Version=4.10.0.0, Culture=neutral, processorArchitecture=MSIL">  
309 - <HintPath>..\packages\Vrh.Web.Membership.4.10.0\lib\net451\Vrh.Web.Membership.Lib.dll</HintPath> 308 + <Reference Include="Vrh.Web.Membership.Lib, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
  309 + <HintPath>..\packages\Vrh.Web.Membership.4.11.0\lib\net451\Vrh.Web.Membership.Lib.dll</HintPath>
310 </Reference> 310 </Reference>
311 - <Reference Include="Vrh.Web.Menu.Lib, Version=1.28.5.0, Culture=neutral, processorArchitecture=MSIL">  
312 - <HintPath>..\packages\Vrh.Web.Menu.1.28.5\lib\net451\Vrh.Web.Menu.Lib.dll</HintPath> 311 + <Reference Include="Vrh.Web.Menu.Lib, Version=1.29.0.0, Culture=neutral, processorArchitecture=MSIL">
  312 + <HintPath>..\packages\Vrh.Web.Menu.1.29.0\lib\net451\Vrh.Web.Menu.Lib.dll</HintPath>
313 </Reference> 313 </Reference>
314 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> 314 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
315 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> 315 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
316 </Reference> 316 </Reference>
317 - <Reference Include="Vrh.WebForm.Lib, Version=2.7.1.0, Culture=neutral, processorArchitecture=MSIL">  
318 - <HintPath>..\packages\Vrh.WebForm.2.7.1\lib\net462\Vrh.WebForm.Lib.dll</HintPath> 317 + <Reference Include="Vrh.WebForm.Lib, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL">
  318 + <HintPath>..\packages\Vrh.WebForm.2.8.0\lib\net462\Vrh.WebForm.Lib.dll</HintPath>
319 </Reference> 319 </Reference>
320 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
321 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 320 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  321 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
322 </Reference> 322 </Reference>
323 <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL"> 323 <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
324 <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath> 324 <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>
@@ -338,8 +338,6 @@ @@ -338,8 +338,6 @@
338 <Compile Include="App_Start\FilterConfig.cs" /> 338 <Compile Include="App_Start\FilterConfig.cs" />
339 <Compile Include="App_Start\RegisterClientValidationExtensions.cs" /> 339 <Compile Include="App_Start\RegisterClientValidationExtensions.cs" />
340 <Compile Include="App_Start\RouteConfig.cs" /> 340 <Compile Include="App_Start\RouteConfig.cs" />
341 - <Compile Include="Areas\OneMessage\Controllers\OneMessageController.cs" />  
342 - <Compile Include="Areas\OneMessage\OneMessageAreaRegistration.cs" />  
343 <Compile Include="Controllers\HomeController.cs" /> 341 <Compile Include="Controllers\HomeController.cs" />
344 <Compile Include="Global.asax.cs"> 342 <Compile Include="Global.asax.cs">
345 <DependentUpon>Global.asax</DependentUpon> 343 <DependentUpon>Global.asax</DependentUpon>
@@ -689,6 +687,10 @@ @@ -689,6 +687,10 @@
689 <Content Include="Areas\WebTools\Views\_LayoutNoMenu.cshtml" /> 687 <Content Include="Areas\WebTools\Views\_LayoutNoMenu.cshtml" />
690 <Content Include="Areas\WebTools\Views\web.config" /> 688 <Content Include="Areas\WebTools\Views\web.config" />
691 <Content Include="Areas\WebTools\Views\UserIsNotAuthenticated.cshtml" /> 689 <Content Include="Areas\WebTools\Views\UserIsNotAuthenticated.cshtml" />
  690 + <Content Include="Areas\FileManager\Views\_ViewStart.cshtml" />
  691 + <Content Include="Areas\FileManager\Views\web.config" />
  692 + <Content Include="Areas\FileManager\Views\FileManager\Index.cshtml" />
  693 + <Content Include="Areas\FileManager\Views\FileManager\Error.cshtml" />
692 <Content Include="Areas\UserAdministration\Views\_ViewStart.cshtml" /> 694 <Content Include="Areas\UserAdministration\Views\_ViewStart.cshtml" />
693 <Content Include="Areas\UserAdministration\Views\web.config" /> 695 <Content Include="Areas\UserAdministration\Views\web.config" />
694 <Content Include="Areas\UserAdministration\Views\User\Roles.cshtml" /> 696 <Content Include="Areas\UserAdministration\Views\User\Roles.cshtml" />
@@ -736,6 +738,30 @@ @@ -736,6 +738,30 @@
736 <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_MultiSelectLists.cshtml" /> 738 <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_MultiSelectLists.cshtml" />
737 <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_Main.cshtml" /> 739 <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_Main.cshtml" />
738 <Content Include="Areas\UAManyToMany\Views\UAManyToMany\ManyToMany.cshtml" /> 740 <Content Include="Areas\UAManyToMany\Views\UAManyToMany\ManyToMany.cshtml" />
  741 + <Content Include="Areas\Menu\Views\_ViewStart.cshtml" />
  742 + <Content Include="Areas\Menu\Views\web.config" />
  743 + <Content Include="Areas\Menu\Views\Shared\ErrorList.cshtml" />
  744 + <Content Include="Areas\Menu\Views\Shared\ErrorEx.cshtml" />
  745 + <Content Include="Areas\Menu\Views\Menu\TouchScreenSample.cshtml" />
  746 + <Content Include="Areas\Menu\Views\Menu\TouchScreen.cshtml" />
  747 + <Content Include="Areas\Menu\Views\Menu\PermissionMessage.cshtml" />
  748 + <Content Include="Areas\Menu\Views\Menu\IFrame.cshtml" />
  749 + <Content Include="Areas\Menu\Views\Menu\DesktopDown.cshtml" />
  750 + <Content Include="Areas\Menu\Views\Menu\Desktop.cshtml" />
  751 + <Content Include="Areas\Menu\Views\MenuPage\OpenRightSample.cshtml" />
  752 + <Content Include="Areas\Menu\Views\MenuPage\OpenRight.cshtml" />
  753 + <Content Include="Areas\Menu\Views\MenuPage\AccordionSample.cshtml" />
  754 + <Content Include="Areas\Menu\Views\MenuPage\Accordion.cshtml" />
  755 + <Content Include="Areas\Menu\Views\Layout\_LayoutNoMenu.cshtml" />
  756 + <Content Include="Areas\Menu\Views\Layout\_Layout.cshtml" />
  757 + <Content Include="Areas\Menu\Views\Layout\LanguageSelection.cshtml" />
  758 + <Content Include="Areas\Menu\Views\Layout\About.cshtml" />
  759 + <Content Include="Areas\WebForm\Views\WebForm\WebForm.cshtml" />
  760 + <Content Include="Areas\WebForm\Views\WebForm\Inputs.cshtml" />
  761 + <Content Include="Areas\WebForm\Views\WebForm\Index.cshtml" />
  762 + <Content Include="Areas\WebForm\Views\WebForm\CurrentInput.cshtml" />
  763 + <Content Include="Areas\WebForm\Views\web.config" />
  764 + <Content Include="Areas\WebForm\Views\Shared\WebFormError.cshtml" />
739 <None Include="LogConfig.xml"> 765 <None Include="LogConfig.xml">
740 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 766 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
741 </None> 767 </None>
@@ -868,16 +894,6 @@ @@ -868,16 +894,6 @@
868 <Content Include="Content\bootstrap-reboot.css.map" /> 894 <Content Include="Content\bootstrap-reboot.css.map" />
869 <Content Include="Content\bootstrap-grid.min.css.map" /> 895 <Content Include="Content\bootstrap-grid.min.css.map" />
870 <Content Include="Content\bootstrap-grid.css.map" /> 896 <Content Include="Content\bootstrap-grid.css.map" />
871 - <Content Include="Areas\WebForm\Views\WebForm\WebForm.cshtml" />  
872 - <Content Include="Areas\WebForm\Views\WebForm\Inputs.cshtml" />  
873 - <Content Include="Areas\WebForm\Views\WebForm\Index.cshtml" />  
874 - <Content Include="Areas\WebForm\Views\WebForm\CurrentInput.cshtml" />  
875 - <Content Include="Areas\WebForm\Views\web.config" />  
876 - <Content Include="Areas\WebForm\Views\Shared\WebFormError.cshtml" />  
877 - <Content Include="Areas\FileManager\Views\_ViewStart.cshtml" />  
878 - <Content Include="Areas\FileManager\Views\web.config" />  
879 - <Content Include="Areas\FileManager\Views\FileManager\Index.cshtml" />  
880 - <Content Include="Areas\FileManager\Views\FileManager\Error.cshtml" />  
881 <Content Include="Areas\iSchedulerReport\Views\iSchedulerReport\Editor.cshtml" /> 897 <Content Include="Areas\iSchedulerReport\Views\iSchedulerReport\Editor.cshtml" />
882 <Content Include="Areas\iSchedulerReport\Views\iSchedulerReport\Manager.cshtml" /> 898 <Content Include="Areas\iSchedulerReport\Views\iSchedulerReport\Manager.cshtml" />
883 <Content Include="Areas\iSchedulerReport\Views\Shared\ErrorList.cshtml" /> 899 <Content Include="Areas\iSchedulerReport\Views\Shared\ErrorList.cshtml" />
@@ -934,6 +950,7 @@ @@ -934,6 +950,7 @@
934 <None Include="system.web.authentication.config" /> 950 <None Include="system.web.authentication.config" />
935 <None Include="system.web.membership.config" /> 951 <None Include="system.web.membership.config" />
936 <None Include="system.web.rolemanager.config" /> 952 <None Include="system.web.rolemanager.config" />
  953 + <Content Include="Views\_ViewStart.cshtml" />
937 <None Include="Vrh.NugetModuls.Documentations\VRH.Common\ReadMe.md" /> 954 <None Include="Vrh.NugetModuls.Documentations\VRH.Common\ReadMe.md" />
938 <Content Include="Scripts\vrh.bootstrap-datetimepicker.js" /> 955 <Content Include="Scripts\vrh.bootstrap-datetimepicker.js" />
939 <Content Include="Scripts\vrh.bootstrap-datetimepicker.min.js" /> 956 <Content Include="Scripts\vrh.bootstrap-datetimepicker.min.js" />
@@ -941,11 +958,6 @@ @@ -941,11 +958,6 @@
941 <Content Include="Scripts\vrh.commontools.min.js" /> 958 <Content Include="Scripts\vrh.commontools.min.js" />
942 <Content Include="SqlServerTypes\readme.htm" /> 959 <Content Include="SqlServerTypes\readme.htm" />
943 <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" /> 960 <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" />
944 - <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" />  
945 - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Common.Lib\ReadMe.md" />  
946 - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.FileManager\ReadMe.md" />  
947 - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Membership\ReadMe.md" />  
948 - <None Include="Vrh.NugetModuls.Documentations\Vrh.WebForm\ReadMe.md" />  
949 <Content Include="Scripts\jquery-ui-1.13.2.js" /> 961 <Content Include="Scripts\jquery-ui-1.13.2.js" />
950 <Content Include="Scripts\jquery-ui-1.13.2.min.js" /> 962 <Content Include="Scripts\jquery-ui-1.13.2.min.js" />
951 <Content Include="WCFBehaviors.config" /> 963 <Content Include="WCFBehaviors.config" />
@@ -958,29 +970,9 @@ @@ -958,29 +970,9 @@
958 <Content Include="Scripts\jquery-3.6.4.min.js" /> 970 <Content Include="Scripts\jquery-3.6.4.min.js" />
959 <Content Include="Scripts\jquery-3.6.4.slim.js" /> 971 <Content Include="Scripts\jquery-3.6.4.slim.js" />
960 <Content Include="Scripts\jquery-3.6.4.slim.min.js" /> 972 <Content Include="Scripts\jquery-3.6.4.slim.min.js" />
961 - <Content Include="Views\_ViewStart.cshtml" />  
962 - <Content Include="Areas\Menu\Views\_ViewStart.cshtml" />  
963 - <Content Include="Areas\Menu\Views\web.config" />  
964 - <Content Include="Areas\Menu\Views\Shared\ErrorList.cshtml" />  
965 - <Content Include="Areas\Menu\Views\Shared\ErrorEx.cshtml" />  
966 - <Content Include="Areas\Menu\Views\Menu\TouchScreenSample.cshtml" />  
967 - <Content Include="Areas\Menu\Views\Menu\TouchScreen.cshtml" />  
968 - <Content Include="Areas\Menu\Views\Menu\PermissionMessage.cshtml" />  
969 - <Content Include="Areas\Menu\Views\Menu\IFrame.cshtml" />  
970 - <Content Include="Areas\Menu\Views\Menu\DesktopDown.cshtml" />  
971 - <Content Include="Areas\Menu\Views\Menu\Desktop.cshtml" />  
972 - <Content Include="Areas\Menu\Views\MenuPage\OpenRightSample.cshtml" />  
973 - <Content Include="Areas\Menu\Views\MenuPage\OpenRight.cshtml" />  
974 - <Content Include="Areas\Menu\Views\MenuPage\AccordionSample.cshtml" />  
975 - <Content Include="Areas\Menu\Views\MenuPage\Accordion.cshtml" />  
976 - <Content Include="Areas\Menu\Views\Layout\_LayoutNoMenu.cshtml" />  
977 - <Content Include="Areas\Menu\Views\Layout\_Layout.cshtml" />  
978 - <Content Include="Areas\Menu\Views\Layout\LanguageSelection.cshtml" />  
979 - <Content Include="Areas\Menu\Views\Layout\About.cshtml" />  
980 <Content Include="Scripts\jquery-3.6.4.slim.min.map" /> 973 <Content Include="Scripts\jquery-3.6.4.slim.min.map" />
981 <Content Include="Scripts\jquery-3.6.4.min.map" /> 974 <Content Include="Scripts\jquery-3.6.4.min.map" />
982 <None Include="Vrh.NugetModuls.Documentations\Vrh.Log4Pro.MultiLanguageManager\ReadMe.md" /> 975 <None Include="Vrh.NugetModuls.Documentations\Vrh.Log4Pro.MultiLanguageManager\ReadMe.md" />
983 - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" />  
984 <None Include="Scripts\jquery.validate-vsdoc.js" /> 976 <None Include="Scripts\jquery.validate-vsdoc.js" />
985 <Content Include="Scripts\jquery.validate.js" /> 977 <Content Include="Scripts\jquery.validate.js" />
986 <Content Include="Scripts\jquery.validate.min.js" /> 978 <Content Include="Scripts\jquery.validate.min.js" />
@@ -1223,6 +1215,12 @@ @@ -1223,6 +1215,12 @@
1223 <Content Include="webfonts\fa-brands-400.woff" /> 1215 <Content Include="webfonts\fa-brands-400.woff" />
1224 <Content Include="webfonts\fa-brands-400.ttf" /> 1216 <Content Include="webfonts\fa-brands-400.ttf" />
1225 <Content Include="webfonts\fa-brands-400.eot" /> 1217 <Content Include="webfonts\fa-brands-400.eot" />
  1218 + <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" />
  1219 + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Common.Lib\ReadMe.md" />
  1220 + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.FileManager\ReadMe.md" />
  1221 + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Membership\ReadMe.md" />
  1222 + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" />
  1223 + <None Include="Vrh.NugetModuls.Documentations\Vrh.WebForm\ReadMe.md" />
1226 <None Include="XmlParser.xml"> 1224 <None Include="XmlParser.xml">
1227 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 1225 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
1228 </None> 1226 </None>
Vrh.Web.Reporting/Web.config
@@ -41,10 +41,10 @@ @@ -41,10 +41,10 @@
41 <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" /> 41 <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
42 </providers> 42 </providers>
43 </sessionState> 43 </sessionState>
44 - <membership configSource="system.web.membership.config"></membership>  
45 - <roleManager configSource="system.web.roleManager.config"></roleManager>  
46 - <identity configSource="WebIdentity.config" />  
47 - <authentication configSource="system.web.authentication.config"></authentication> 44 + <membership configSource="system.web.membership.config"/>
  45 + <roleManager configSource="system.web.roleManager.config"/>
  46 + <identity configSource="WebIdentity.config"/>
  47 + <authentication configSource="system.web.authentication.config"/>
48 </system.web> 48 </system.web>
49 <runtime> 49 <runtime>
50 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> 50 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Vrh.Web.Reporting/packages.config
@@ -105,15 +105,15 @@ @@ -105,15 +105,15 @@
105 <package id="VRH.Common" version="3.0.0" targetFramework="net472" /> 105 <package id="VRH.Common" version="3.0.0" targetFramework="net472" />
106 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> 106 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" />
107 <package id="VRH.Log4Pro.WebTools" version="1.12.5" targetFramework="net462" /> 107 <package id="VRH.Log4Pro.WebTools" version="1.12.5" targetFramework="net462" />
108 - <package id="Vrh.Logger" version="3.0.9" targetFramework="net462" /> 108 + <package id="Vrh.Logger" version="3.1.0" targetFramework="net462" />
109 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" /> 109 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" />
110 - <package id="Vrh.Web.Common.Lib" version="2.20.2" targetFramework="net462" />  
111 - <package id="Vrh.Web.FileManager" version="1.5.1" targetFramework="net472" />  
112 - <package id="Vrh.Web.Membership" version="4.10.0" targetFramework="net462" />  
113 - <package id="Vrh.Web.Menu" version="1.28.5" targetFramework="net461" /> 110 + <package id="Vrh.Web.Common.Lib" version="2.20.3" targetFramework="net462" />
  111 + <package id="Vrh.Web.FileManager" version="1.6.0" targetFramework="net462" />
  112 + <package id="Vrh.Web.Membership" version="4.11.0" targetFramework="net462" />
  113 + <package id="Vrh.Web.Menu" version="1.29.0" targetFramework="net462" />
114 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> 114 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
115 - <package id="Vrh.WebForm" version="2.7.1" targetFramework="net472" />  
116 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 115 + <package id="Vrh.WebForm" version="2.8.0" targetFramework="net462" />
  116 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
117 <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" /> 117 <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" />
118 <package id="WebGrease" version="1.6.0" targetFramework="net451" /> 118 <package id="WebGrease" version="1.6.0" targetFramework="net451" />
119 </packages> 119 </packages>
120 \ No newline at end of file 120 \ No newline at end of file
Vrh.Web.iScheduler.Lib/Areas/iScheduler/Controllers/iSchedulerController.cs
@@ -147,11 +147,9 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers @@ -147,11 +147,9 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers
147 #endif 147 #endif
148 #endregion DEBUG 148 #endregion DEBUG
149 base.ParameterSeparating(typeof(MandatoryUrlParams_ManagerAction)); 149 base.ParameterSeparating(typeof(MandatoryUrlParams_ManagerAction));
150 - var xmlc = new XmlConnection(  
151 - base.RequestedParameters[MandatoryUrlParams_ManagerAction.XML],  
152 - SchConst.DEFAULT_XMLCONFIGNAME,  
153 - XmlConnection.DefaultTypes.ConfigurationName  
154 - ); 150 + var xmlcs = base.RequestedParameters[MandatoryUrlParams_ManagerAction.XML];
  151 + if (string.IsNullOrWhiteSpace(xmlcs)) { xmlcs = $"config={SchConst.DEFAULT_XMLCONFIGNAME};"; }
  152 + var xmlc = new XmlConnection(xmlcs);
155 var x = Server.MapPath(""); 153 var x = Server.MapPath("");
156 var isxp = new SchedulerXmlParser( 154 var isxp = new SchedulerXmlParser(
157 xmlc, 155 xmlc,
@@ -483,6 +481,81 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers @@ -483,6 +481,81 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers
483 } 481 }
484 #endregion ShowStateMessage action 482 #endregion ShowStateMessage action
485 483
  484 + #region ScheduleExecute action
  485 +
  486 + //http://192.168.64.122/Log4ProIS-REPORTING/iScheduler/iScheduler/ScheduleExecute?xml=config%3dALMiSchedulerReport%3b&scheduleid=1
  487 + [HttpGet]
  488 + //[ValidateAntiForgeryToken]
  489 + public ActionResult ScheduleExecuteGet(string xml, int scheduleid, bool formatreturnmessage = false) { return _ScheduleExecute(xml, scheduleid, formatreturnmessage); }
  490 + [HttpPost]
  491 + public ActionResult ScheduleExecute(string xml, int scheduleid, bool formatreturnmessage = false) { return _ScheduleExecute(xml, scheduleid, formatreturnmessage); }
  492 + private ActionResult _ScheduleExecute(string xml, int scheduleid, bool formatreturnmessage = false)
  493 + {
  494 + string thisfn = "iScheduler.ScheduleExecute POST: ";
  495 + System.Diagnostics.Debug.WriteLine($"{thisfn} PING");
  496 + base.ParameterSeparating(typeof(MandatoryUrlParams_EditorAction));
  497 +
  498 + ReturnInfoJSON rijson = new ReturnInfoJSON();
  499 + string message = "";
  500 + try
  501 + {
  502 + using (var se = new ScheduleExecute(xml, base.BaseFolder, base.ForcedLanguageCode)) { se.Run(scheduleid, true); }
  503 + rijson.ReturnValue = 0;
  504 + }
  505 + catch (Exception ex)
  506 + {
  507 + rijson.ReturnValue = -1;
  508 + message = BuildResultMessage(String.Join(WebCommon.HTML_NEWLINE, WebCommon.ErrorListBuilder(ex)));
  509 + //dialogSize = "xl";
  510 + }
  511 + SchedulerModel ism = SchedulerModel.LoadModel(LoadSQLConnectionString(xml), scheduleid);
  512 + if (ism == null) { base.ThrEx(typeof(SchedulerWordCodes.iScheduler.Error.NotFoundSchedule), scheduleid); }
  513 +
  514 + string header = base.Mlmgt(typeof(SchedulerWordCodes.iScheduler.Execute.ActionIsCompleted));
  515 + string headerformatted = $"{header}<br/><table>";
  516 + string firstrowtemplate = $"<tr><th>{base.Mlmgt(typeof(SchedulerWordCodes.iScheduler.Execute.ColName))}</th>" +
  517 + $"<th>{base.Mlmgt(typeof(SchedulerWordCodes.iScheduler.Execute.ColVal))}</th></tr>";
  518 + string onerowtemplate = "<tr><td>{0}</td><td>{1}</td></tr>";
  519 + string footer = "</table>";
  520 + rijson.ReturnMessage = String.Join(
  521 + headerformatted, firstrowtemplate,
  522 + string.Format(onerowtemplate, "xml", xml),
  523 + string.Format(onerowtemplate, "GroupId", ism.ObjectGroupId),
  524 + string.Format(onerowtemplate, "ObjectId", $"{ism.ObjectIdText}(id={ism.ObjectIdValue})"),
  525 + string.Format(onerowtemplate, "TimeStamp", ism.OperationTime),
  526 + string.Format(onerowtemplate, "Message", ism.IsExistReturnMessage? ism.ReturnMessage: "-"),
  527 + (string.IsNullOrWhiteSpace(message)?"":string.Format(onerowtemplate, "E X C E P T I O N", message)),
  528 + footer
  529 + );
  530 + if (!formatreturnmessage)
  531 + {
  532 + rijson.ReturnMessage = rijson.ReturnMessage
  533 + .Replace("<br/>", ";").Replace("<br />", ";").Replace("<table>", "").Replace("</table>", "").Replace("<tr>", "")
  534 + .Replace("</td><td>", "=").Replace("</th><th>", "=")
  535 + .Replace("</td></tr>", ",").Replace("</th></tr>", ",")
  536 + .Replace("<td>", "").Replace("<th>", "").Replace("<tr>", "");
  537 + }
  538 + return Json(rijson, JsonRequestBehavior.AllowGet);
  539 + }
  540 + private string LoadSQLConnectionString(string xmlcs)
  541 + {
  542 + if (string.IsNullOrWhiteSpace((string)xmlcs)) { xmlcs = $"config={SchConst.DEFAULT_XMLCONFIGNAME};"; }
  543 + var xmlc = new XmlConnection(xmlcs);
  544 + using (var isxp = new SchedulerXmlParser(
  545 + xmlc, HttpContext.Server.MapPath(WebCommon.SIGN_RELATIVE),
  546 + base.ForcedLanguageCode, base.OtherParameters,
  547 + base.RequestedParameters[MandatoryUrlParams_EditorAction.GROUPID]))
  548 + {
  549 + var ism = new SchedulerModel(isxp)
  550 + { //ObjectType és ObjectGroupId a példányosításkor értéket kap. És az Id=0.
  551 + BootboxId = base.RequestedParameters[MandatoryUrlParams_EditorAction.BOOTBOXID],
  552 + StateFilterList = m_States.FilterList
  553 + };
  554 + return ism.ConnectionString;
  555 + }
  556 + }
  557 + #endregion ScheduleExecute action
  558 +
486 #region Editor action 559 #region Editor action
487 560
488 #region Editor GET 561 #region Editor GET
@@ -513,8 +586,9 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers @@ -513,8 +586,9 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers
513 { 586 {
514 base.ThrEx(typeof(SchedulerWordCodes.iScheduler.Error.BootboxIdEmpty)); 587 base.ThrEx(typeof(SchedulerWordCodes.iScheduler.Error.BootboxIdEmpty));
515 } 588 }
516 - var xmlc = new XmlConnection(base.RequestedParameters[MandatoryUrlParams_EditorAction.XML],  
517 - SchConst.DEFAULT_XMLCONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 589 + var xmlcs = base.RequestedParameters[MandatoryUrlParams_EditorAction.XML];
  590 + if (string.IsNullOrWhiteSpace(xmlcs)) { xmlcs = $"config={SchConst.DEFAULT_XMLCONFIGNAME};"; }
  591 + var xmlc = new XmlConnection(xmlcs);
518 using (var isxp = new SchedulerXmlParser( 592 using (var isxp = new SchedulerXmlParser(
519 xmlc, HttpContext.Server.MapPath(WebCommon.SIGN_RELATIVE), 593 xmlc, HttpContext.Server.MapPath(WebCommon.SIGN_RELATIVE),
520 base.ForcedLanguageCode, base.OtherParameters, 594 base.ForcedLanguageCode, base.OtherParameters,
@@ -549,36 +623,7 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers @@ -549,36 +623,7 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers
549 ism.ScheduleType = SchConst.ScheduleTypes.Single; 623 ism.ScheduleType = SchConst.ScheduleTypes.Single;
550 ism.State = ScheduleStates.Active; 624 ism.State = ScheduleStates.Active;
551 } 625 }
552 - else //módosítás  
553 - {  
554 - using (var db = new SchedulerDB(ism.ConnectionString))  
555 - {  
556 - Schedule schdl = db.Schedules.FirstOrDefault(x => x.Id == ism.Id);  
557 - if (schdl == null)  
558 - {  
559 - base.ThrEx(typeof(SchedulerWordCodes.iScheduler.Error.NotFoundSchedule), id);  
560 - }  
561 -  
562 - ism.ObjectIdValue = schdl.ScheduleObject.ObjectId;  
563 - ism.ObjectIdText = schdl.ScheduleObject.ObjectName;  
564 - ism.OperationIdValue = schdl.ScheduleOperation.OperationId;  
565 - ism.OperationIdText = schdl.ScheduleOperation.OperationName;  
566 - ism.OperationTime = schdl.OperationTime;  
567 - ism.State = schdl.State;  
568 - ism.IsExistReturnMessage = !string.IsNullOrWhiteSpace(schdl.ReturnMessage);  
569 - ism.SeriesId = schdl.ScheduleSeriesId;  
570 - if (schdl.ScheduleSeriesOne == null)  
571 - {  
572 - ism.ScheduleType = SchConst.ScheduleTypes.Single;  
573 - }  
574 - else  
575 - {  
576 - ism.ScheduleType = schdl.ScheduleSeriesOne.SeriesType;  
577 - ism.SeriesName = schdl.ScheduleSeriesOne.SeriesName;  
578 - ism.SeriesColor = schdl.ScheduleSeriesOne.SeriesColor;  
579 - }  
580 - }  
581 - } 626 + else { ism = ism.LoadModel(); }//módosítás
582 ism.StateTranslate = m_States.GetName(ism.State); 627 ism.StateTranslate = m_States.GetName(ism.State);
583 ism.PreviousScheduleType = ism.ScheduleType; 628 ism.PreviousScheduleType = ism.ScheduleType;
584 return PartialView(SchConst.Views.EDITOR, ism); 629 return PartialView(SchConst.Views.EDITOR, ism);
@@ -919,8 +964,9 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers @@ -919,8 +964,9 @@ namespace Vrh.Web.iScheduler.Areas.iScheduler.Controllers
919 { 964 {
920 System.Diagnostics.Debug.WriteLine("Vrh.iScheduler.iSchedulerController.CheckSchedule: START"); 965 System.Diagnostics.Debug.WriteLine("Vrh.iScheduler.iSchedulerController.CheckSchedule: START");
921 base.ParameterSeparating(typeof(MandatoryUrlParams_CheckSchedule)); 966 base.ParameterSeparating(typeof(MandatoryUrlParams_CheckSchedule));
922 - var xmlc = new XmlConnection(base.RequestedParameters[MandatoryUrlParams_CheckSchedule.XML],  
923 - SchConst.DEFAULT_XMLCONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 967 + var xmlcs = base.RequestedParameters[MandatoryUrlParams_CheckSchedule.XML];
  968 + if (string.IsNullOrWhiteSpace(xmlcs)) { xmlcs = $"config={SchConst.DEFAULT_XMLCONFIGNAME};"; }
  969 + var xmlc = new XmlConnection(xmlcs);
924 using (var isxp = new SchedulerXmlParser( 970 using (var isxp = new SchedulerXmlParser(
925 xmlc, HttpContext.Server.MapPath(WebCommon.SIGN_RELATIVE), 971 xmlc, HttpContext.Server.MapPath(WebCommon.SIGN_RELATIVE),
926 base.ForcedLanguageCode, base.OtherParameters)) 972 base.ForcedLanguageCode, base.OtherParameters))
Vrh.Web.iScheduler.Lib/Areas/iScheduler/Models/iSchedulerModel.cs
@@ -99,6 +99,11 @@ namespace Vrh.Web.iScheduler @@ -99,6 +99,11 @@ namespace Vrh.Web.iScheduler
99 public bool IsExistReturnMessage { get; set; } = false; 99 public bool IsExistReturnMessage { get; set; } = false;
100 100
101 /// <summary> 101 /// <summary>
  102 + /// Az ütemezésben rögzített visszatérő üzenet, akkor annak megjelenítése.
  103 + /// </summary>
  104 + public string ReturnMessage { get; set; } = "";
  105 +
  106 + /// <summary>
102 /// Ha az ütemezés egy sorozat tagja, akkor annak azonosítója. 107 /// Ha az ütemezés egy sorozat tagja, akkor annak azonosítója.
103 /// </summary> 108 /// </summary>
104 [DisplayNameWithTrueWordCodes(typeof(SchedulerWordCodes.iScheduler.Manager.Label.SeriesId))] 109 [DisplayNameWithTrueWordCodes(typeof(SchedulerWordCodes.iScheduler.Manager.Label.SeriesId))]
@@ -310,6 +315,39 @@ namespace Vrh.Web.iScheduler @@ -310,6 +315,39 @@ namespace Vrh.Web.iScheduler
310 #endregion Constructor 315 #endregion Constructor
311 316
312 #region Public methods 317 #region Public methods
  318 + public SchedulerModel LoadModel() { return _LoadModel(null, 0, this); }
  319 + public static SchedulerModel LoadModel(string sqlconnectionstring, int scheduleid) { return _LoadModel(sqlconnectionstring, scheduleid,null); }
  320 + private static SchedulerModel _LoadModel(string sqlconnectionstring, int scheduleid, SchedulerModel existingmodel)
  321 + {
  322 + if (existingmodel == null) { existingmodel = new SchedulerModel(); }
  323 + else { sqlconnectionstring = existingmodel.ConnectionString; scheduleid = existingmodel.Id; }
  324 + if (string.IsNullOrWhiteSpace(sqlconnectionstring) || scheduleid<=0) return null;
  325 + using (var db = new SchedulerDB(sqlconnectionstring))
  326 + {
  327 + Schedule schdl = db.Schedules.FirstOrDefault(x => x.Id == scheduleid);
  328 + if (schdl == null) return null;
  329 +
  330 + existingmodel.ObjectIdValue = schdl.ScheduleObject.ObjectId;
  331 + existingmodel.ObjectIdText = schdl.ScheduleObject.ObjectName;
  332 + existingmodel.OperationIdValue = schdl.ScheduleOperation.OperationId;
  333 + existingmodel.OperationIdText = schdl.ScheduleOperation.OperationName;
  334 + existingmodel.OperationTime = schdl.OperationTime;
  335 + existingmodel.State = schdl.State;
  336 + existingmodel.IsExistReturnMessage = !string.IsNullOrWhiteSpace(schdl.ReturnMessage);
  337 + existingmodel.ReturnMessage = schdl.ReturnMessage;
  338 + existingmodel.SeriesId = schdl.ScheduleSeriesId;
  339 + existingmodel.ObjectGroupId = schdl.ScheduleObject.ObjectGroupId;
  340 +
  341 + if (schdl.ScheduleSeriesOne == null) { existingmodel.ScheduleType = SchConst.ScheduleTypes.Single; }
  342 + else
  343 + {
  344 + existingmodel.ScheduleType = schdl.ScheduleSeriesOne.SeriesType;
  345 + existingmodel.SeriesName = schdl.ScheduleSeriesOne.SeriesName;
  346 + existingmodel.SeriesColor = schdl.ScheduleSeriesOne.SeriesColor;
  347 + }
  348 + }
  349 + return existingmodel;
  350 + }
313 /// <summary> 351 /// <summary>
314 /// Kötelező kitöltésre figyelmeztető üzenetet ad vissza. 352 /// Kötelező kitöltésre figyelmeztető üzenetet ad vissza.
315 /// </summary> 353 /// </summary>
Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj
@@ -262,14 +262,14 @@ @@ -262,14 +262,14 @@
262 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL"> 262 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
263 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath> 263 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath>
264 </Reference> 264 </Reference>
265 - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.2.0, Culture=neutral, processorArchitecture=MSIL">  
266 - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> 265 + <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL">
  266 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
267 </Reference> 267 </Reference>
268 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> 268 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
269 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> 269 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
270 </Reference> 270 </Reference>
271 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
272 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 271 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  272 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
273 </Reference> 273 </Reference>
274 <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> 274 <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
275 <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> 275 <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
Vrh.Web.iScheduler.Lib/packages.config
@@ -60,8 +60,8 @@ @@ -60,8 +60,8 @@
60 <package id="VRH.Common" version="3.0.0" targetFramework="net461" /> 60 <package id="VRH.Common" version="3.0.0" targetFramework="net461" />
61 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> 61 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" />
62 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" /> 62 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" />
63 - <package id="Vrh.Web.Common.Lib" version="2.20.2" targetFramework="net462" /> 63 + <package id="Vrh.Web.Common.Lib" version="2.20.3" targetFramework="net462" />
64 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> 64 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
65 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 65 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
66 <package id="WebGrease" version="1.6.0" targetFramework="net45" /> 66 <package id="WebGrease" version="1.6.0" targetFramework="net45" />
67 </packages> 67 </packages>
68 \ No newline at end of file 68 \ No newline at end of file
Vrh.Web.iScheduler.Report.Lib/Areas/iSchedulerReport/Controllers/iSchedulerReportController.cs
@@ -20,6 +20,7 @@ using VRH.Log4Pro.MultiLanguageManager; @@ -20,6 +20,7 @@ using VRH.Log4Pro.MultiLanguageManager;
20 using Vrh.Web.Common.Lib; 20 using Vrh.Web.Common.Lib;
21 21
22 using Vrh.iScheduler.Report; 22 using Vrh.iScheduler.Report;
  23 +using Vrh.OneMessage;
23 24
24 namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers 25 namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
25 { 26 {
@@ -48,7 +49,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers @@ -48,7 +49,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
48 System.Diagnostics.Debug.WriteLine($"{thisfn}xml={xml}, list={list}, groupId={groupId}"); 49 System.Diagnostics.Debug.WriteLine($"{thisfn}xml={xml}, list={list}, groupId={groupId}");
49 #endif 50 #endif
50 #endregion DEBUG 51 #endregion DEBUG
51 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 52 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  53 + var xmlc = new XmlConnection(xml);
52 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId)) 54 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId))
53 { 55 {
54 using (var dbc = new SchedulerReportDbContext(srxp.ConnectionString)) 56 using (var dbc = new SchedulerReportDbContext(srxp.ConnectionString))
@@ -213,7 +215,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers @@ -213,7 +215,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
213 #endif 215 #endif
214 #endregion DEBUG 216 #endregion DEBUG
215 var pem = new PackageEditorModel(); 217 var pem = new PackageEditorModel();
216 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 218 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  219 + var xmlc = new XmlConnection(xml);
217 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId)) 220 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId))
218 { 221 {
219 if (srxp.ErrorList.Any()) 222 if (srxp.ErrorList.Any())
@@ -737,9 +740,53 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers @@ -737,9 +740,53 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
737 } 740 }
738 return Json(rijson, JsonRequestBehavior.AllowGet); 741 return Json(rijson, JsonRequestBehavior.AllowGet);
739 } 742 }
740 -  
741 #endregion Execute action 743 #endregion Execute action
742 744
  745 + #region SendSMTPMessage action
  746 + /// <summary>
  747 + /// Vrh.OneMessage SMTP küldés belépési pontja.
  748 + /// </summary>
  749 + /// <returns></returns>
  750 + [HttpPost]
  751 + public ActionResult SendSMTPMessage(string[][] paramlist = null)
  752 + {
  753 + var rij = new ReturnInfoJSON();
  754 + try
  755 + {
  756 + base.ParameterSeparating(typeof(Constants.UParam));
  757 + base.ParameterSeparating(paramlist, typeof(Constants.UParam));
  758 +
  759 + if (String.IsNullOrWhiteSpace(base.RequestedParameters[Constants.UParam.LCID])) { base.RequestedParameters[Constants.UParam.LCID] = base.ForcedLanguageCode; }
  760 + else { base.ForcedLanguageCode = base.RequestedParameters[Constants.UParam.LCID]; }
  761 +
  762 + if (string.IsNullOrWhiteSpace(base.RequestedParameters[Constants.UParam.MSGID])) { throw new Exception($"Az '{Constants.UParam.MSGID}' URL paraméter hiányzik!"); }
  763 +
  764 + var omp = new OneMessageParameters(base.RequestedParameters.ToList(), base.OtherParameters.ToList(), Server.MapPath(WebCommon.SIGN_RELATIVE));
  765 +
  766 + var om = new Vrh.OneMessage.OneMessage(omp);
  767 +
  768 + if (om.ErrorList.Count == 0)
  769 + { //ha nem volt hiba a feldolgozás közben, következhet a küldés
  770 + om.SendMessage();
  771 + rij.ReturnValue = 0;
  772 + rij.ReturnMessage = "Az üzenet elküldése sikeresen megtörtént.";
  773 + }
  774 + else
  775 + {
  776 + rij.ReturnValue = -1;
  777 + rij.ReturnMessage = string.Join(WebCommon.HTML_NEWLINE, om.ErrorList);
  778 + }
  779 + }
  780 + catch (Exception ex)
  781 + {
  782 + rij.ReturnValue = -1;
  783 + rij.ReturnMessage = string.Join(WebCommon.HTML_NEWLINE, WebCommon.ErrorListBuilder(ex));
  784 + }
  785 + return Json(rij, JsonRequestBehavior.AllowGet);
  786 + }
  787 + #endregion SendSMTPMessage action
  788 +
  789 +
743 #region Manager action 790 #region Manager action
744 /// <summary> 791 /// <summary>
745 /// A riport csomagok kilistázását eredményező nézet előkészítése. 792 /// A riport csomagok kilistázását eredményező nézet előkészítése.
@@ -761,7 +808,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers @@ -761,7 +808,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
761 System.Diagnostics.Debug.WriteLine($"{thisfn}START xml={xml}; groupId={groupId}"); 808 System.Diagnostics.Debug.WriteLine($"{thisfn}START xml={xml}; groupId={groupId}");
762 #endif 809 #endif
763 #endregion DEBUG 810 #endregion DEBUG
764 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 811 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  812 + var xmlc = new XmlConnection(xml);
765 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId)) 813 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId))
766 { 814 {
767 if (srxp.ErrorList.Any()) 815 if (srxp.ErrorList.Any())
@@ -809,7 +857,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers @@ -809,7 +857,8 @@ namespace Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers
809 System.Diagnostics.Debug.WriteLine($"{thisfn}query={query}, GroupId={groupId}, xml={xml}, ActiveOnly={activeOnly}"); 857 System.Diagnostics.Debug.WriteLine($"{thisfn}query={query}, GroupId={groupId}, xml={xml}, ActiveOnly={activeOnly}");
810 #endif 858 #endif
811 #endregion DEBUG 859 #endregion DEBUG
812 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 860 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  861 + var xmlc = new XmlConnection(xml);
813 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId)) 862 using (var srxp = new SchedulerReportXmlParser(xmlc, base.BaseFolder, base.ForcedLanguageCode, null, groupId))
814 { 863 {
815 bool allPackage = true; 864 bool allPackage = true;
Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj
@@ -116,14 +116,14 @@ @@ -116,14 +116,14 @@
116 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL"> 116 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
117 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath> 117 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath>
118 </Reference> 118 </Reference>
119 - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.2.0, Culture=neutral, processorArchitecture=MSIL">  
120 - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> 119 + <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL">
  120 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
121 </Reference> 121 </Reference>
122 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> 122 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
123 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> 123 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
124 </Reference> 124 </Reference>
125 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
126 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 125 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  126 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
127 </Reference> 127 </Reference>
128 </ItemGroup> 128 </ItemGroup>
129 <ItemGroup> 129 <ItemGroup>
Vrh.Web.iScheduler.Report.Lib/packages.config
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> 15 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> 16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
17 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" /> 17 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" />
18 - <package id="Vrh.Web.Common.Lib" version="2.20.2" targetFramework="net462" /> 18 + <package id="Vrh.Web.Common.Lib" version="2.20.3" targetFramework="net462" />
19 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> 19 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
20 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 20 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
21 </packages> 21 </packages>
22 \ No newline at end of file 22 \ No newline at end of file
Vrh.iScheduler.Report/SchedulerPlugin.cs
@@ -80,7 +80,8 @@ namespace Vrh.iScheduler.Report @@ -80,7 +80,8 @@ namespace Vrh.iScheduler.Report
80 //ha mégsincs ellenőrzendő, akkor üres listával tér vissza, nem hiba 80 //ha mégsincs ellenőrzendő, akkor üres listával tér vissza, nem hiba
81 if (!string.IsNullOrWhiteSpace(objectList)) 81 if (!string.IsNullOrWhiteSpace(objectList))
82 { 82 {
83 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 83 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  84 + var xmlc = new XmlConnection(xml);
84 using (var srxp = new SchedulerReportXmlParser(xmlc, "", null, null, groupId)) 85 using (var srxp = new SchedulerReportXmlParser(xmlc, "", null, null, groupId))
85 { 86 {
86 if (srxp.ErrorList.Any()) 87 if (srxp.ErrorList.Any())
@@ -149,7 +150,8 @@ namespace Vrh.iScheduler.Report @@ -149,7 +150,8 @@ namespace Vrh.iScheduler.Report
149 #endregion Paraméterek ellenőrzése 150 #endregion Paraméterek ellenőrzése
150 151
151 var resultlist = new List<SelectListJSON>(); 152 var resultlist = new List<SelectListJSON>();
152 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 153 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  154 + var xmlc = new XmlConnection(xml);
153 using (var srxp = new SchedulerReportXmlParser(xmlc, "", null, null, groupId)) 155 using (var srxp = new SchedulerReportXmlParser(xmlc, "", null, null, groupId))
154 { 156 {
155 if (srxp.ErrorList.Any()) 157 if (srxp.ErrorList.Any())
@@ -281,7 +283,8 @@ namespace Vrh.iScheduler.Report @@ -281,7 +283,8 @@ namespace Vrh.iScheduler.Report
281 #endregion xml paraméter ürességének ellenőrzése 283 #endregion xml paraméter ürességének ellenőrzése
282 284
283 var rijson = new ReturnInfoJSON(); 285 var rijson = new ReturnInfoJSON();
284 - var xmlc = new XmlConnection(xml, SRConstants.DEFAULT_CONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 286 + if (string.IsNullOrWhiteSpace(xml)) { xml = $"config={SRConstants.DEFAULT_CONFIGNAME};"; }
  287 + var xmlc = new XmlConnection(xml);
285 using (var srxp = new SchedulerReportXmlParser(xmlc, null, lcid, null, groupId)) 288 using (var srxp = new SchedulerReportXmlParser(xmlc, null, lcid, null, groupId))
286 { 289 {
287 this.LogEntries.Add($"Xml processing OK. XmlConnectionString/lcid/groupId=<{xml}/{lcid}/{groupId}>"); 290 this.LogEntries.Add($"Xml processing OK. XmlConnectionString/lcid/groupId=<{xml}/{lcid}/{groupId}>");
@@ -573,10 +576,10 @@ namespace Vrh.iScheduler.Report @@ -573,10 +576,10 @@ namespace Vrh.iScheduler.Report
573 576
574 #region Paraméterek összeszedése és behelyettesítése 577 #region Paraméterek összeszedése és behelyettesítése
575 var onp = new OneMessage.OneMessageParameters { AppPath = "" }; 578 var onp = new OneMessage.OneMessageParameters { AppPath = "" };
576 - foreach (var par in srxp.PackageExecute.SendMessageUrl.UrlParameters)  
577 - {  
578 - onp.Add(par.Name, isrvars.Substitution(par.Value));  
579 - } 579 + var parameterdictionary = srxp.PackageExecute.SendMessageUrl.UrlParameters
  580 + .Select(par=>new KeyValuePair<string,string>(par.Name, isrvars.Substitution(par.Value)))
  581 + .ToList();
  582 + onp = new OneMessage.OneMessageParameters(parameterdictionary); ;
580 this.LogEntries.Add($"OneMessage: Parameter processing is OK!"); 583 this.LogEntries.Add($"OneMessage: Parameter processing is OK!");
581 #endregion Paraméterek összeszedése és behelyettesítése 584 #endregion Paraméterek összeszedése és behelyettesítése
582 585
Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj
@@ -117,8 +117,8 @@ @@ -117,8 +117,8 @@
117 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> 117 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
118 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> 118 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
119 </Reference> 119 </Reference>
120 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
121 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 120 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  121 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
122 </Reference> 122 </Reference>
123 </ItemGroup> 123 </ItemGroup>
124 <ItemGroup> 124 <ItemGroup>
Vrh.iScheduler.Report/packages.config
@@ -16,5 +16,5 @@ @@ -16,5 +16,5 @@
16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> 16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
17 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" /> 17 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" />
18 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> 18 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
19 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 19 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
20 </packages> 20 </packages>
21 \ No newline at end of file 21 \ No newline at end of file
Vrh.iScheduler/ScheduleExecute.cs
@@ -60,7 +60,8 @@ namespace Vrh.iScheduler @@ -60,7 +60,8 @@ namespace Vrh.iScheduler
60 System.Diagnostics.Debug.WriteLine($"{dpx} START: xmlConnectionString='{xmlConnectionString}'"); 60 System.Diagnostics.Debug.WriteLine($"{dpx} START: xmlConnectionString='{xmlConnectionString}'");
61 61
62 #region Xml parser 62 #region Xml parser
63 - var xmlc = new XmlConnection(xmlConnectionString, SchConst.DEFAULT_XMLCONFIGNAME, XmlConnection.DefaultTypes.ConfigurationName); 63 + if (string.IsNullOrWhiteSpace(xmlConnectionString)) { xmlConnectionString = $"config={SchConst.DEFAULT_XMLCONFIGNAME};"; }
  64 + var xmlc = new XmlConnection(xmlConnectionString);
64 this.Scheduler = new SchedulerXmlParser(xmlc, baseFolder, lcid, null); 65 this.Scheduler = new SchedulerXmlParser(xmlc, baseFolder, lcid, null);
65 if (this.Scheduler.ErrorList.Any()) 66 if (this.Scheduler.ErrorList.Any())
66 { 67 {
Vrh.iScheduler/SchedulerWordCodes.cs
1 -using VRH.Log4Pro.MultiLanguageManager; 1 +using VRH.Log4Pro.MultiLanguageManager;
2 2
3 namespace Vrh.iScheduler 3 namespace Vrh.iScheduler
4 { 4 {
5 /// <summary> 5 /// <summary>
6 - /// Az iScheduler-ben használatos szókódok. 6 + /// Az iScheduler-ben használatos szókódok.
7 /// </summary> 7 /// </summary>
8 [TranslationModule(MODULNAME)] 8 [TranslationModule(MODULNAME)]
9 public static class SchedulerWordCodes 9 public static class SchedulerWordCodes
@@ -13,86 +13,86 @@ namespace Vrh.iScheduler @@ -13,86 +13,86 @@ namespace Vrh.iScheduler
13 13
14 public const string MODULNAME = "ISCHEDULER"; 14 public const string MODULNAME = "ISCHEDULER";
15 /// <summary> 15 /// <summary>
16 - /// Az iScheduler-ben használatos szókódok. 16 + /// Az iScheduler-ben használatos szókódok.
17 /// </summary> 17 /// </summary>
18 public static class iScheduler 18 public static class iScheduler
19 { 19 {
20 #region Error 20 #region Error
21 /// <summary> 21 /// <summary>
22 - /// Hibaüzenetek szókódjai. 22 + /// Hibaüzenetek szókódjai.
23 /// </summary> 23 /// </summary>
24 public static class Error 24 public static class Error
25 { 25 {
26 /// <summary> 26 /// <summary>
27 - /// "A fájl nem létezik! Fájlnév={0}" / "The file does not exist! Filename={0}" 27 + /// "A fájl nem létezik! Fájlnév={0}" / "The file does not exist! Filename={0}"
28 /// </summary> 28 /// </summary>
29 - [InitializeTranslation("A fájl nem létezik! Fájlnév={0}", huhu)] 29 + [InitializeTranslation("A fájl nem létezik! Fájlnév={0}", huhu)]
30 [InitializeTranslation("The file does not exist! Filename={0}", enus)] 30 [InitializeTranslation("The file does not exist! Filename={0}", enus)]
31 public static class FileDoesNotExists { } 31 public static class FileDoesNotExists { }
32 32
33 /// <summary> 33 /// <summary>
34 - /// "Hiba történt az XML fájl feldolgozása közben!" / 34 + /// "Hiba történt az XML fájl feldolgozása közben!" /
35 /// "Error occured when processing XML file!" 35 /// "Error occured when processing XML file!"
36 /// </summary> 36 /// </summary>
37 - [InitializeTranslation("Hiba történt az XML fájl feldolgozása közben!", huhu)] 37 + [InitializeTranslation("Hiba történt az XML fájl feldolgozása közben!", huhu)]
38 [InitializeTranslation("Error occured when processing XML file!", enus)] 38 [InitializeTranslation("Error occured when processing XML file!", enus)]
39 public static class ErrorOccuredWhileXMLParsing { } 39 public static class ErrorOccuredWhileXMLParsing { }
40 40
41 /// <summary> 41 /// <summary>
42 - /// "Nem található a megadott ütemezés! Azonosító = {0}" 42 + /// "Nem található a megadott ütemezés! Azonosító = {0}"
43 /// "The specified schedule could not be found! ID = {0}" 43 /// "The specified schedule could not be found! ID = {0}"
44 /// </summary> 44 /// </summary>
45 - [InitializeTranslation("Nem található a megadott ütemezés! Azonosító = {0}", huhu)] 45 + [InitializeTranslation("Nem található a megadott ütemezés! Azonosító = {0}", huhu)]
46 [InitializeTranslation("The specified schedule could not be found! ID = {0}", enus)] 46 [InitializeTranslation("The specified schedule could not be found! ID = {0}", enus)]
47 public static class NotFoundSchedule { } 47 public static class NotFoundSchedule { }
48 48
49 /// <summary> 49 /// <summary>
50 - /// "A \"bootboxid\" paraméter nincs vagy üres! Az iScheduler.Editor számára szükséges a \"bootboxid\" paraméter!" / 50 + /// "A \"bootboxid\" paraméter nincs vagy üres! Az iScheduler.Editor számára szükséges a \"bootboxid\" paraméter!" /
51 /// "The \"bootboxid\" parameter is missing or empty! The iScheduler.Editor requires the \"bootboxid\" parameter!" 51 /// "The \"bootboxid\" parameter is missing or empty! The iScheduler.Editor requires the \"bootboxid\" parameter!"
52 /// </summary> 52 /// </summary>
53 - [InitializeTranslation("A \"bootboxid\" paraméter nincs vagy üres! Az iScheduler.Editor számára szükséges a \"bootboxid\" paraméter!", huhu)] 53 + [InitializeTranslation("A \"bootboxid\" paraméter nincs vagy üres! Az iScheduler.Editor számára szükséges a \"bootboxid\" paraméter!", huhu)]
54 [InitializeTranslation("The \"bootboxid\" parameter is missing or empty! The iScheduler.Editor requires the \"bootboxid\" parameter!", enus)] 54 [InitializeTranslation("The \"bootboxid\" parameter is missing or empty! The iScheduler.Editor requires the \"bootboxid\" parameter!", enus)]
55 public static class BootboxIdEmpty { } 55 public static class BootboxIdEmpty { }
56 56
57 /// <summary> 57 /// <summary>
58 - /// "Az 'id' paraméter típusa rossz! id={0}" 58 + /// "Az 'id' paraméter típusa rossz! id={0}"
59 /// </summary> 59 /// </summary>
60 - [InitializeTranslation("Az 'id' paraméter típusa rossz! id={0}", huhu)] 60 + [InitializeTranslation("Az 'id' paraméter típusa rossz! id={0}", huhu)]
61 [InitializeTranslation("Type of 'id' parameter is incorrect! id={0}", enus)] 61 [InitializeTranslation("Type of 'id' parameter is incorrect! id={0}", enus)]
62 public static class TypeOfIdIsWrong { } 62 public static class TypeOfIdIsWrong { }
63 63
64 /// <summary> 64 /// <summary>
65 - /// "Az ütemezés nem egy sorozat tagja, pedig annak törlését kezdeményezte!" 65 + /// "Az ütemezés nem egy sorozat tagja, pedig annak törlését kezdeményezte!"
66 /// </summary> 66 /// </summary>
67 - [InitializeTranslation("Az ütemezés nem egy sorozat tagja, pedig annak törlését kezdeményezte!", huhu)] 67 + [InitializeTranslation("Az ütemezés nem egy sorozat tagja, pedig annak törlését kezdeményezte!", huhu)]
68 [InitializeTranslation("Schedule is not a member of a schedule series, but you initiated the deletion of a series!", enus)] 68 [InitializeTranslation("Schedule is not a member of a schedule series, but you initiated the deletion of a series!", enus)]
69 public static class ScheduleIsNotAMemberOfTheSeries { } 69 public static class ScheduleIsNotAMemberOfTheSeries { }
70 70
71 /// <summary> 71 /// <summary>
72 - /// "Konzisztencia ellenõrzés nem lehetséges, mert még nincs ütemezés az adatbázisban!" 72 + /// "Konzisztencia ellenõrzés nem lehetséges, mert még nincs ütemezés az adatbázisban!"
73 /// </summary> 73 /// </summary>
74 - [InitializeTranslation("Konzisztencia ellenõrzés nem lehetséges, mert még nincs ütemezés az adatbázisban!", huhu)] 74 + [InitializeTranslation("Konzisztencia ellenõrzés nem lehetséges, mert még nincs ütemezés az adatbázisban!", huhu)]
75 [InitializeTranslation("No consistency check is possibile, as there are no schedules in the database", enus)] 75 [InitializeTranslation("No consistency check is possibile, as there are no schedules in the database", enus)]
76 public static class ThereAreNoSchedules { } 76 public static class ThereAreNoSchedules { }
77 77
78 /// <summary> 78 /// <summary>
79 - /// "Ez a nézet még fejlesztés alatt! Nézet kódja={0}" 79 + /// "Ez a nézet még fejlesztés alatt! Nézet kódja={0}"
80 /// </summary> 80 /// </summary>
81 - [InitializeTranslation("Ez a nézet még fejlesztés alatt! Nézet kódja={0}", huhu)] 81 + [InitializeTranslation("Ez a nézet még fejlesztés alatt! Nézet kódja={0}", huhu)]
82 [InitializeTranslation("Under development. View code ={0}", enus)] 82 [InitializeTranslation("Under development. View code ={0}", enus)]
83 public static class ThisViewIsUnderDeveloped { } 83 public static class ThisViewIsUnderDeveloped { }
84 84
85 /// <summary> 85 /// <summary>
86 - /// "A nézet kódja nem létezik! Nézet kódja={0}" 86 + /// "A nézet kódja nem létezik! Nézet kódja={0}"
87 /// </summary> 87 /// </summary>
88 - [InitializeTranslation("A nézet kódja nem létezik! Nézet kódja={0}", huhu)] 88 + [InitializeTranslation("A nézet kódja nem létezik! Nézet kódja={0}", huhu)]
89 [InitializeTranslation("View does not exist! View code={0}", enus)] 89 [InitializeTranslation("View does not exist! View code={0}", enus)]
90 public static class ThisViewIsNotExists { } 90 public static class ThisViewIsNotExists { }
91 91
92 /// <summary> 92 /// <summary>
93 - /// "Az ütemezett feladat idõpontja nem lehet korábbi a módosítás idõpontjánál!" 93 + /// "Az ütemezett feladat idõpontja nem lehet korábbi a módosítás idõpontjánál!"
94 /// </summary> 94 /// </summary>
95 - [InitializeTranslation("Az ütemezett feladat idõpontja nem lehet korábbi a módosítás idõpontjánál!", huhu)] 95 + [InitializeTranslation("Az ütemezett feladat idõpontja nem lehet korábbi a módosítás idõpontjánál!", huhu)]
96 [InitializeTranslation("Schedule time can not be before current time!", enus)] 96 [InitializeTranslation("Schedule time can not be before current time!", enus)]
97 public static class TimeOfTheScheduledTaskCannotBeErlier { } 97 public static class TimeOfTheScheduledTaskCannotBeErlier { }
98 } 98 }
@@ -100,88 +100,88 @@ namespace Vrh.iScheduler @@ -100,88 +100,88 @@ namespace Vrh.iScheduler
100 100
101 #region Manager 101 #region Manager
102 /// <summary> 102 /// <summary>
103 - /// Az iScheduler.Manager-rel kapcsolatos szókódok 103 + /// Az iScheduler.Manager-rel kapcsolatos szókódok
104 /// </summary> 104 /// </summary>
105 public static class Manager 105 public static class Manager
106 { 106 {
107 /// <summary> 107 /// <summary>
108 - /// "Ütemezés kezelõ" 108 + /// "Ütemezés kezelõ"
109 /// </summary> 109 /// </summary>
110 - [InitializeTranslation("Ütemezés kezelõ", huhu)] 110 + [InitializeTranslation("Ütemezés kezelõ", huhu)]
111 [InitializeTranslation("Schedule Manager", enus)] 111 [InitializeTranslation("Schedule Manager", enus)]
112 public static class Title { } 112 public static class Title { }
113 113
114 /// <summary> 114 /// <summary>
115 - /// "Katt a módosításhoz!" 115 + /// "Katt a módosításhoz!"
116 /// </summary> 116 /// </summary>
117 - [InitializeTranslation("Katt a módosításhoz!", huhu)] 117 + [InitializeTranslation("Katt a módosításhoz!", huhu)]
118 [InitializeTranslation("Click for modification!", enus)] 118 [InitializeTranslation("Click for modification!", enus)]
119 public static class MakeEditableToolTip { } 119 public static class MakeEditableToolTip { }
120 120
121 /// <summary> 121 /// <summary>
122 - /// "Kérem várjon ..." 122 + /// "Kérem várjon ..."
123 /// </summary> 123 /// </summary>
124 - [InitializeTranslation("Kérem várjon ...", huhu)] 124 + [InitializeTranslation("Kérem várjon ...", huhu)]
125 [InitializeTranslation("Please wait ...", enus)] 125 [InitializeTranslation("Please wait ...", enus)]
126 public static class WaitMessage { } 126 public static class WaitMessage { }
127 127
128 /// <summary> 128 /// <summary>
129 - /// "Biztos benne, hogy törli az ütemezést?" 129 + /// "Biztos benne, hogy törli az ütemezést?"
130 /// </summary> 130 /// </summary>
131 - [InitializeTranslation("Biztos benne, hogy törli az ütemezést?", huhu)] 131 + [InitializeTranslation("Biztos benne, hogy törli az ütemezést?", huhu)]
132 [InitializeTranslation("Are You sure to delete the schedule?", enus)] 132 [InitializeTranslation("Are You sure to delete the schedule?", enus)]
133 public static class ConfirmDelete { } 133 public static class ConfirmDelete { }
134 134
135 /// <summary> 135 /// <summary>
136 - /// "Biztos benne, hogy az ütemezést kitörli a sorozatból?" 136 + /// "Biztos benne, hogy az ütemezést kitörli a sorozatból?"
137 /// </summary> 137 /// </summary>
138 - [InitializeTranslation("Biztos benne, hogy az ütemezést kitörli a sorozatból?", huhu)] 138 + [InitializeTranslation("Biztos benne, hogy az ütemezést kitörli a sorozatból?", huhu)]
139 [InitializeTranslation("Are you sure to remove schedule from this series?", enus)] 139 [InitializeTranslation("Are you sure to remove schedule from this series?", enus)]
140 public static class ConfirmDeleteFromSeries { } 140 public static class ConfirmDeleteFromSeries { }
141 141
142 /// <summary> 142 /// <summary>
143 - /// "Az összes olyan ütemezés törlését kezdeményezte, amelyhez jelen ütemezési is tartozik. Az ütemezések törlése után, a sorozatazonosító is törlésre kerül! \n\nBiztos benne, hogy törli a sorozatot és a sorozathoz tartozó összes ütemezést?" 143 + /// "Az összes olyan ütemezés törlését kezdeményezte, amelyhez jelen ütemezési is tartozik. Az ütemezések törlése után, a sorozatazonosító is törlésre kerül! \n\nBiztos benne, hogy törli a sorozatot és a sorozathoz tartozó összes ütemezést?"
144 /// </summary> 144 /// </summary>
145 - [InitializeTranslation("Az összes olyan ütemezés törlését kezdeményezte, amelyhez jelen ütemezési is tartozik. Az ütemezések törlése után, a sorozatazonosító is törlésre kerül!"  
146 - + " Biztos benne, hogy törli a sorozatot és a sorozathoz tartozó összes ütemezést?", huhu)] 145 + [InitializeTranslation("Az összes olyan ütemezés törlését kezdeményezte, amelyhez jelen ütemezési is tartozik. Az ütemezések törlése után, a sorozatazonosító is törlésre kerül!"
  146 + + " Biztos benne, hogy törli a sorozatot és a sorozathoz tartozó összes ütemezést?", huhu)]
147 [InitializeTranslation("You initiated the removal of all the schedules of the series where this schedule belongs to. After removal of all schedules, the series will be removed!" 147 [InitializeTranslation("You initiated the removal of all the schedules of the series where this schedule belongs to. After removal of all schedules, the series will be removed!"
148 + " Are You sure to remove the series with all the schedules in it?", enus)] 148 + " Are You sure to remove the series with all the schedules in it?", enus)]
149 public static class ConfirmDeleteSeries { } 149 public static class ConfirmDeleteSeries { }
150 150
151 /// <summary> 151 /// <summary>
152 - /// "Konzisztencia vizsgálat folyamatban ..." 152 + /// "Konzisztencia vizsgálat folyamatban ..."
153 /// </summary> 153 /// </summary>
154 - [InitializeTranslation("Konzisztencia vizsgálat folyamatban ...", huhu)] 154 + [InitializeTranslation("Konzisztencia vizsgálat folyamatban ...", huhu)]
155 [InitializeTranslation("Consistency check is running...", enus)] 155 [InitializeTranslation("Consistency check is running...", enus)]
156 public static class ConsistencyWaitMessage { } 156 public static class ConsistencyWaitMessage { }
157 157
158 /// <summary> 158 /// <summary>
159 - /// "Azok az ütemezések, melyek objektuma már nem létezik." 159 + /// "Azok az ütemezések, melyek objektuma már nem létezik."
160 /// </summary> 160 /// </summary>
161 - [InitializeTranslation("Azok az ütemezések, melyek objektuma már nem létezik.", huhu)] 161 + [InitializeTranslation("Azok az ütemezések, melyek objektuma már nem létezik.", huhu)]
162 [InitializeTranslation("These are the schedules, that refer to objects, that do not exist anymore.", enus)] 162 [InitializeTranslation("These are the schedules, that refer to objects, that do not exist anymore.", enus)]
163 public static class ConsistencyTitle { } 163 public static class ConsistencyTitle { }
164 164
165 #region Button 165 #region Button
166 public static class Button 166 public static class Button
167 { 167 {
168 - [InitializeTranslation("Hónap nézet", huhu)] 168 + [InitializeTranslation("Hónap nézet", huhu)]
169 [InitializeTranslation("Month view", enus)] 169 [InitializeTranslation("Month view", enus)]
170 public static class GoToMonthView { } 170 public static class GoToMonthView { }
171 171
172 - [InitializeTranslation("Lista nézet", huhu)] 172 + [InitializeTranslation("Lista nézet", huhu)]
173 [InitializeTranslation("List view", enus)] 173 [InitializeTranslation("List view", enus)]
174 public static class GoToListView { } 174 public static class GoToListView { }
175 175
176 - [InitializeTranslation("Konzisztencia ellenõrzés KI", huhu)] 176 + [InitializeTranslation("Konzisztencia ellenõrzés KI", huhu)]
177 [InitializeTranslation("Consistency check OFF", enus)] 177 [InitializeTranslation("Consistency check OFF", enus)]
178 public static class ConsistencyCheckOff { } 178 public static class ConsistencyCheckOff { }
179 179
180 - [InitializeTranslation("Konzisztencia ellenõrzés BE", huhu)] 180 + [InitializeTranslation("Konzisztencia ellenõrzés BE", huhu)]
181 [InitializeTranslation("Consistency check ON", enus)] 181 [InitializeTranslation("Consistency check ON", enus)]
182 public static class ConsistencyCheckOn { } 182 public static class ConsistencyCheckOn { }
183 183
184 - [InitializeTranslation("Új ütemezés", huhu)] 184 + [InitializeTranslation("Új ütemezés", huhu)]
185 [InitializeTranslation("Create new schedule", enus)] 185 [InitializeTranslation("Create new schedule", enus)]
186 public static class NewSchedule { } 186 public static class NewSchedule { }
187 187
@@ -193,7 +193,7 @@ namespace Vrh.iScheduler @@ -193,7 +193,7 @@ namespace Vrh.iScheduler
193 193
194 #region Label 194 #region Label
195 /// <summary> 195 /// <summary>
196 - /// Manager-ben használatos címkék. 196 + /// Manager-ben használatos címkék.
197 /// </summary> 197 /// </summary>
198 public static class Label 198 public static class Label
199 { 199 {
@@ -212,30 +212,30 @@ namespace Vrh.iScheduler @@ -212,30 +212,30 @@ namespace Vrh.iScheduler
212 public static class ObjectId { } 212 public static class ObjectId { }
213 213
214 /// <summary> 214 /// <summary>
215 - /// "Mûvelet" / "Operation" 215 + /// "Mûvelet" / "Operation"
216 /// </summary> 216 /// </summary>
217 - [InitializeTranslation("Mûvelet", huhu)] 217 + [InitializeTranslation("Mûvelet", huhu)]
218 [InitializeTranslation("Operation", enus)] 218 [InitializeTranslation("Operation", enus)]
219 public static class OperationId { } 219 public static class OperationId { }
220 220
221 /// <summary> 221 /// <summary>
222 - /// "Idõpont" / "Timestamp" 222 + /// "Idõpont" / "Timestamp"
223 /// </summary> 223 /// </summary>
224 - [InitializeTranslation("Idõpont", huhu)] 224 + [InitializeTranslation("Idõpont", huhu)]
225 [InitializeTranslation("Timestamp", enus)] 225 [InitializeTranslation("Timestamp", enus)]
226 public static class OperationTime { } 226 public static class OperationTime { }
227 227
228 /// <summary> 228 /// <summary>
229 - /// "Állapot" / "Status" 229 + /// "Ãllapot" / "Status"
230 /// </summary> 230 /// </summary>
231 - [InitializeTranslation("Állapot", huhu)] 231 + [InitializeTranslation("Ãllapot", huhu)]
232 [InitializeTranslation("Status", enus)] 232 [InitializeTranslation("Status", enus)]
233 public static class State { } 233 public static class State { }
234 234
235 /// <summary> 235 /// <summary>
236 - /// "Típus" / "Type" 236 + /// "Típus" / "Type"
237 /// </summary> 237 /// </summary>
238 - [InitializeTranslation("Típus", huhu)] 238 + [InitializeTranslation("Típus", huhu)]
239 [InitializeTranslation("Type", enus)] 239 [InitializeTranslation("Type", enus)]
240 public static class ObjectTpye { } 240 public static class ObjectTpye { }
241 241
@@ -247,9 +247,9 @@ namespace Vrh.iScheduler @@ -247,9 +247,9 @@ namespace Vrh.iScheduler
247 public static class ObjectGroupId { } 247 public static class ObjectGroupId { }
248 248
249 /// <summary> 249 /// <summary>
250 - /// "Visszatérési érték:" / "Return value:" 250 + /// "Visszatérési érték:" / "Return value:"
251 /// </summary> 251 /// </summary>
252 - [InitializeTranslation("Visszatérési érték:", huhu)] 252 + [InitializeTranslation("Visszatérési érték:", huhu)]
253 [InitializeTranslation("Return value:", enus)] 253 [InitializeTranslation("Return value:", enus)]
254 public static class ReturnValue { } 254 public static class ReturnValue { }
255 255
@@ -261,9 +261,9 @@ namespace Vrh.iScheduler @@ -261,9 +261,9 @@ namespace Vrh.iScheduler
261 public static class SeriesType { } 261 public static class SeriesType { }
262 262
263 /// <summary> 263 /// <summary>
264 - /// "Sorozatazonosító" / "Series ID" 264 + /// "Sorozatazonosító" / "Series ID"
265 /// </summary> 265 /// </summary>
266 - [InitializeTranslation("Sorozatazonosító", huhu)] 266 + [InitializeTranslation("Sorozatazonosító", huhu)]
267 [InitializeTranslation("Series ID", enus)] 267 [InitializeTranslation("Series ID", enus)]
268 public static class SeriesId { } 268 public static class SeriesId { }
269 } 269 }
@@ -271,14 +271,14 @@ namespace Vrh.iScheduler @@ -271,14 +271,14 @@ namespace Vrh.iScheduler
271 271
272 #region State 272 #region State
273 /// <summary> 273 /// <summary>
274 - /// Idõzítés állapotainak fordításai. 274 + /// Idõzítés állapotainak fordításai.
275 /// </summary> 275 /// </summary>
276 public static class State 276 public static class State
277 { 277 {
278 /// <summary> 278 /// <summary>
279 - /// "Aktív" / "Active" 279 + /// "Aktív" / "Active"
280 /// </summary> 280 /// </summary>
281 - [InitializeTranslation("Aktív", huhu)] 281 + [InitializeTranslation("Aktív", huhu)]
282 [InitializeTranslation("Active", enus)] 282 [InitializeTranslation("Active", enus)]
283 public static class Active { } 283 public static class Active { }
284 284
@@ -290,9 +290,9 @@ namespace Vrh.iScheduler @@ -290,9 +290,9 @@ namespace Vrh.iScheduler
290 public static class Success { } 290 public static class Success { }
291 291
292 /// <summary> 292 /// <summary>
293 - /// "Hibás" / "Failed" 293 + /// "Hibás" / "Failed"
294 /// </summary> 294 /// </summary>
295 - [InitializeTranslation("Hibás", huhu)] 295 + [InitializeTranslation("Hibás", huhu)]
296 [InitializeTranslation("Failed", enus)] 296 [InitializeTranslation("Failed", enus)]
297 public static class Failed { } 297 public static class Failed { }
298 } 298 }
@@ -302,49 +302,49 @@ namespace Vrh.iScheduler @@ -302,49 +302,49 @@ namespace Vrh.iScheduler
302 302
303 #region Editor 303 #region Editor
304 /// <summary> 304 /// <summary>
305 - /// Az iScheduler.Editor-ral kapcsolatos szókódok 305 + /// Az iScheduler.Editor-ral kapcsolatos szókódok
306 /// </summary> 306 /// </summary>
307 public static class Editor 307 public static class Editor
308 { 308 {
309 /// <summary> 309 /// <summary>
310 - /// "Új ütemezés" / "New schedule" 310 + /// "Új ütemezés" / "New schedule"
311 /// </summary> 311 /// </summary>
312 - [InitializeTranslation("Új ütemezés", huhu)] 312 + [InitializeTranslation("Új ütemezés", huhu)]
313 [InitializeTranslation("New schedule", enus)] 313 [InitializeTranslation("New schedule", enus)]
314 public static class TitleAdd { } 314 public static class TitleAdd { }
315 315
316 /// <summary> 316 /// <summary>
317 - /// "Ütemezés módosítása" / "Schedule change" 317 + /// "Ütemezés módosítása" / "Schedule change"
318 /// </summary> 318 /// </summary>
319 - [InitializeTranslation("Ütemezés módosítása", huhu)] 319 + [InitializeTranslation("Ütemezés módosítása", huhu)]
320 [InitializeTranslation("Schedule change", enus)] 320 [InitializeTranslation("Schedule change", enus)]
321 public static class TitleUpdate { } 321 public static class TitleUpdate { }
322 322
323 /// <summary> 323 /// <summary>
324 - /// "Az ütemezés már nem egy sorozat tagja." / "Scheduling is no longer part of a series." 324 + /// "Az ütemezés már nem egy sorozat tagja." / "Scheduling is no longer part of a series."
325 /// </summary> 325 /// </summary>
326 - [InitializeTranslation("Az ütemezés már nem egy sorozat tagja.", huhu)] 326 + [InitializeTranslation("Az ütemezés már nem egy sorozat tagja.", huhu)]
327 [InitializeTranslation("Scheduling is no longer part of a series.", enus)] 327 [InitializeTranslation("Scheduling is no longer part of a series.", enus)]
328 public static class ScheduleIsNotAMemberOfASeries { } 328 public static class ScheduleIsNotAMemberOfASeries { }
329 329
330 /// <summary> 330 /// <summary>
331 - /// "Több kijelölése Ctrl + Click" / "Select more Ctrl + Click" 331 + /// "Több kijelölése Ctrl + Click" / "Select more Ctrl + Click"
332 /// </summary> 332 /// </summary>
333 - [InitializeTranslation("Több kijelölése Ctrl + Click", huhu)] 333 + [InitializeTranslation("Több kijelölése Ctrl + Click", huhu)]
334 [InitializeTranslation("Select more Ctrl + Click", enus)] 334 [InitializeTranslation("Select more Ctrl + Click", enus)]
335 public static class FootnoteOfDays { } 335 public static class FootnoteOfDays { }
336 336
337 /// <summary> 337 /// <summary>
338 - /// "Kérem, várjon a mûvelet végrehajtására !" / "Please wait for the operation to complete!" 338 + /// "Kérem, várjon a mûvelet végrehajtására !" / "Please wait for the operation to complete!"
339 /// </summary> 339 /// </summary>
340 - [InitializeTranslation("Kérem, várjon a mûvelet végrehajtására !", huhu)] 340 + [InitializeTranslation("Kérem, várjon a mûvelet végrehajtására !", huhu)]
341 [InitializeTranslation("Please wait for the operation to complete!", enus)] 341 [InitializeTranslation("Please wait for the operation to complete!", enus)]
342 public static class ExecuteWaitMessage { } 342 public static class ExecuteWaitMessage { }
343 343
344 /// <summary> 344 /// <summary>
345 - /// "A mûvelet eredménye !" / "Result of the operation !" 345 + /// "A mûvelet eredménye !" / "Result of the operation !"
346 /// </summary> 346 /// </summary>
347 - [InitializeTranslation("A mûvelet eredménye !", huhu)] 347 + [InitializeTranslation("A mûvelet eredménye !", huhu)]
348 [InitializeTranslation("Result of the operation !", enus)] 348 [InitializeTranslation("Result of the operation !", enus)]
349 public static class ResultOfTheOperation { } 349 public static class ResultOfTheOperation { }
350 350
@@ -355,44 +355,44 @@ namespace Vrh.iScheduler @@ -355,44 +355,44 @@ namespace Vrh.iScheduler
355 public static class Button 355 public static class Button
356 { 356 {
357 /// <summary> 357 /// <summary>
358 - /// "Kilépés" / "Exit" 358 + /// "Kilépés" / "Exit"
359 /// </summary> 359 /// </summary>
360 - [InitializeTranslation("Kilépés", huhu)] 360 + [InitializeTranslation("Kilépés", huhu)]
361 [InitializeTranslation("Exit", enus)] 361 [InitializeTranslation("Exit", enus)]
362 public static class Exit { } 362 public static class Exit { }
363 363
364 /// <summary> 364 /// <summary>
365 - /// "Mentés" / "Save" 365 + /// "Mentés" / "Save"
366 /// </summary> 366 /// </summary>
367 - [InitializeTranslation("Mentés", huhu)] 367 + [InitializeTranslation("Mentés", huhu)]
368 [InitializeTranslation("Save", enus)] 368 [InitializeTranslation("Save", enus)]
369 public static class Save { } 369 public static class Save { }
370 370
371 /// <summary> 371 /// <summary>
372 - /// "Törlés" / "Remove" 372 + /// "Törlés" / "Remove"
373 /// </summary> 373 /// </summary>
374 - [InitializeTranslation("Törlés", huhu)] 374 + [InitializeTranslation("Törlés", huhu)]
375 [InitializeTranslation("Remove", enus)] 375 [InitializeTranslation("Remove", enus)]
376 public static class Remove { } 376 public static class Remove { }
377 377
378 /// <summary> 378 /// <summary>
379 - /// "Objektum szerkesztése" / "v" 379 + /// "Objektum szerkesztése" / "v"
380 /// </summary> 380 /// </summary>
381 - [InitializeTranslation("Objektum szerkesztése", huhu)] 381 + [InitializeTranslation("Objektum szerkesztése", huhu)]
382 [InitializeTranslation("Object editing", enus)] 382 [InitializeTranslation("Object editing", enus)]
383 public static class ObjectEditor { } 383 public static class ObjectEditor { }
384 384
385 /// <summary> 385 /// <summary>
386 - /// "Törlés a sorozatból" / "Remove from the series" 386 + /// "Törlés a sorozatból" / "Remove from the series"
387 /// </summary> 387 /// </summary>
388 - [InitializeTranslation("Törlés a sorozatból", huhu)] 388 + [InitializeTranslation("Törlés a sorozatból", huhu)]
389 [InitializeTranslation("Remove from the series", enus)] 389 [InitializeTranslation("Remove from the series", enus)]
390 public static class DeleteFromSeries { } 390 public static class DeleteFromSeries { }
391 391
392 /// <summary> 392 /// <summary>
393 - /// "Sorozat törlése" / "Remove series" 393 + /// "Sorozat törlése" / "Remove series"
394 /// </summary> 394 /// </summary>
395 - [InitializeTranslation("Sorozat törlése", huhu)] 395 + [InitializeTranslation("Sorozat törlése", huhu)]
396 [InitializeTranslation("Remove series", enus)] 396 [InitializeTranslation("Remove series", enus)]
397 public static class DeleteTheSeries { } 397 public static class DeleteTheSeries { }
398 } 398 }
@@ -400,57 +400,57 @@ namespace Vrh.iScheduler @@ -400,57 +400,57 @@ namespace Vrh.iScheduler
400 400
401 #region Label 401 #region Label
402 /// <summary> 402 /// <summary>
403 - /// Editorban használatos címkék fordításai. 403 + /// Editorban használatos címkék fordításai.
404 /// </summary> 404 /// </summary>
405 public static class Label 405 public static class Label
406 { 406 {
407 407
408 /// <summary> 408 /// <summary>
409 - /// "Mûvelet végrehajtása mentés után" / "Perform operation after saving" 409 + /// "Mûvelet végrehajtása mentés után" / "Perform operation after saving"
410 /// </summary> 410 /// </summary>
411 - [InitializeTranslation("Mûvelet végrehajtása mentés után", huhu)] 411 + [InitializeTranslation("Mûvelet végrehajtása mentés után", huhu)]
412 [InitializeTranslation("Perform operation after saving", enus)] 412 [InitializeTranslation("Perform operation after saving", enus)]
413 public static class ScheduleExecute { } 413 public static class ScheduleExecute { }
414 414
415 /// <summary> 415 /// <summary>
416 - /// "Ütemezés típusa" / "Schedule type" 416 + /// "Ütemezés típusa" / "Schedule type"
417 /// </summary> 417 /// </summary>
418 - [InitializeTranslation("Ütemezés típusa", huhu)] 418 + [InitializeTranslation("Ütemezés típusa", huhu)]
419 [InitializeTranslation("Schedule type", enus)] 419 [InitializeTranslation("Schedule type", enus)]
420 public static class ScheduleType { } 420 public static class ScheduleType { }
421 421
422 /// <summary> 422 /// <summary>
423 - /// "Elsõ alkalom" / "First time" 423 + /// "Elsõ alkalom" / "First time"
424 /// </summary> 424 /// </summary>
425 - [InitializeTranslation("Elsõ alkalom", huhu)] 425 + [InitializeTranslation("Elsõ alkalom", huhu)]
426 [InitializeTranslation("First time", enus)] 426 [InitializeTranslation("First time", enus)]
427 public static class FirstTime { } 427 public static class FirstTime { }
428 428
429 /// <summary> 429 /// <summary>
430 - /// "Hetek száma" / "Number of weeks" 430 + /// "Hetek száma" / "Number of weeks"
431 /// </summary> 431 /// </summary>
432 - [InitializeTranslation("Hetek száma", huhu)] 432 + [InitializeTranslation("Hetek száma", huhu)]
433 [InitializeTranslation("Number of weeks", enus)] 433 [InitializeTranslation("Number of weeks", enus)]
434 public static class NumberOfWeeks { } 434 public static class NumberOfWeeks { }
435 435
436 /// <summary> 436 /// <summary>
437 - /// "Hónapok száma" / "Number of months" 437 + /// "Hónapok száma" / "Number of months"
438 /// </summary> 438 /// </summary>
439 - [InitializeTranslation("Hónapok száma", huhu)] 439 + [InitializeTranslation("Hónapok száma", huhu)]
440 [InitializeTranslation("Number of months", enus)] 440 [InitializeTranslation("Number of months", enus)]
441 public static class NumberOfMonths { } 441 public static class NumberOfMonths { }
442 442
443 /// <summary> 443 /// <summary>
444 - /// "Sorozat megnevezése" / "Series name" 444 + /// "Sorozat megnevezése" / "Series name"
445 /// </summary> 445 /// </summary>
446 - [InitializeTranslation("Sorozat megnevezése", huhu)] 446 + [InitializeTranslation("Sorozat megnevezése", huhu)]
447 [InitializeTranslation("Series name", enus)] 447 [InitializeTranslation("Series name", enus)]
448 public static class SeriesName { } 448 public static class SeriesName { }
449 449
450 /// <summary> 450 /// <summary>
451 - /// "Sorozat színe" / "Series color" 451 + /// "Sorozat színe" / "Series color"
452 /// </summary> 452 /// </summary>
453 - [InitializeTranslation("Sorozat színe", huhu)] 453 + [InitializeTranslation("Sorozat színe", huhu)]
454 [InitializeTranslation("Series color", enus)] 454 [InitializeTranslation("Series color", enus)]
455 public static class SeriesColor { } 455 public static class SeriesColor { }
456 456
@@ -461,12 +461,12 @@ namespace Vrh.iScheduler @@ -461,12 +461,12 @@ namespace Vrh.iScheduler
461 [InitializeTranslation("Days", enus)] 461 [InitializeTranslation("Days", enus)]
462 public static class Days { } 462 public static class Days { }
463 463
464 - #region A hét napjai 464 + #region A hét napjai
465 465
466 /// <summary> 466 /// <summary>
467 /// "" / "" 467 /// "" / ""
468 /// </summary> 468 /// </summary>
469 - [InitializeTranslation("Hétfõ", huhu)] 469 + [InitializeTranslation("Hétfõ", huhu)]
470 [InitializeTranslation("Monday", enus)] 470 [InitializeTranslation("Monday", enus)]
471 public static class Monday { } 471 public static class Monday { }
472 472
@@ -485,16 +485,16 @@ namespace Vrh.iScheduler @@ -485,16 +485,16 @@ namespace Vrh.iScheduler
485 public static class Wednesday { } 485 public static class Wednesday { }
486 486
487 /// <summary> 487 /// <summary>
488 - /// "Csütörtök" / "Thursday" 488 + /// "Csütörtök" / "Thursday"
489 /// </summary> 489 /// </summary>
490 - [InitializeTranslation("Csütörtök", huhu)] 490 + [InitializeTranslation("Csütörtök", huhu)]
491 [InitializeTranslation("Thursday", enus)] 491 [InitializeTranslation("Thursday", enus)]
492 public static class Thursday { } 492 public static class Thursday { }
493 493
494 /// <summary> 494 /// <summary>
495 - /// "Péntek" / "Friday" 495 + /// "Péntek" / "Friday"
496 /// </summary> 496 /// </summary>
497 - [InitializeTranslation("Péntek", huhu)] 497 + [InitializeTranslation("Péntek", huhu)]
498 [InitializeTranslation("Friday", enus)] 498 [InitializeTranslation("Friday", enus)]
499 public static class Friday { } 499 public static class Friday { }
500 500
@@ -506,19 +506,19 @@ namespace Vrh.iScheduler @@ -506,19 +506,19 @@ namespace Vrh.iScheduler
506 public static class Saturday { } 506 public static class Saturday { }
507 507
508 /// <summary> 508 /// <summary>
509 - /// "Vasárnap" / "Sunday" 509 + /// "Vasárnap" / "Sunday"
510 /// </summary> 510 /// </summary>
511 - [InitializeTranslation("Vasárnap", huhu)] 511 + [InitializeTranslation("Vasárnap", huhu)]
512 [InitializeTranslation("Sunday", enus)] 512 [InitializeTranslation("Sunday", enus)]
513 public static class Sunday { } 513 public static class Sunday { }
514 514
515 - #endregion A hét napjai 515 + #endregion A hét napjai
516 } 516 }
517 #endregion Label 517 #endregion Label
518 518
519 #region Wizard 519 #region Wizard
520 /// <summary> 520 /// <summary>
521 - /// Az Editor-ban a radió buttonok elnevezéséhez használjuk. 521 + /// Az Editor-ban a radió buttonok elnevezéséhez használjuk.
522 /// </summary> 522 /// </summary>
523 public static class Wizard 523 public static class Wizard
524 { 524 {
@@ -545,7 +545,24 @@ namespace Vrh.iScheduler @@ -545,7 +545,24 @@ namespace Vrh.iScheduler
545 } 545 }
546 #endregion Wizard 546 #endregion Wizard
547 } 547 }
548 - #endregion Editor 548 + #endregion Editor
  549 +
  550 + #region Execute
  551 + public static class Execute
  552 + {
  553 + [InitializeTranslation("Az ütemezés végrehajtása befejezÅ‘dött.", huhu)]
  554 + [InitializeTranslation("Execution of schedule finished.", enus)]
  555 + public static class ActionIsCompleted { }
  556 +
  557 + [InitializeTranslation("Név", huhu)]
  558 + [InitializeTranslation("Name", enus)]
  559 + public static class ColName { }
  560 +
  561 + [InitializeTranslation("Érték", huhu)]
  562 + [InitializeTranslation("Value", enus)]
  563 + public static class ColVal { }
  564 + }
  565 + #endregion Execute
549 } 566 }
550 } 567 }
551 } 568 }
552 \ No newline at end of file 569 \ No newline at end of file
Vrh.iScheduler/Vrh.iScheduler.csproj
@@ -124,8 +124,8 @@ @@ -124,8 +124,8 @@
124 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> 124 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
125 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> 125 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
126 </Reference> 126 </Reference>
127 - <Reference Include="Vrh.Logger, Version=3.0.9.0, Culture=neutral, processorArchitecture=MSIL">  
128 - <HintPath>..\packages\Vrh.Logger.3.0.9\lib\net451\Vrh.Logger.dll</HintPath> 127 + <Reference Include="Vrh.Logger, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
  128 + <HintPath>..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll</HintPath>
129 </Reference> 129 </Reference>
130 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL"> 130 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
131 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath> 131 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath>
@@ -133,8 +133,8 @@ @@ -133,8 +133,8 @@
133 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> 133 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
134 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> 134 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
135 </Reference> 135 </Reference>
136 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
137 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 136 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  137 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
138 </Reference> 138 </Reference>
139 </ItemGroup> 139 </ItemGroup>
140 <ItemGroup> 140 <ItemGroup>
Vrh.iScheduler/packages.config
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
20 <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> 20 <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" />
21 <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> 21 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
22 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> 22 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
23 - <package id="Vrh.Logger" version="3.0.9" targetFramework="net462" /> 23 + <package id="Vrh.Logger" version="3.1.0" targetFramework="net462" />
24 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" /> 24 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" />
25 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> 25 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
26 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 26 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
27 </packages> 27 </packages>
28 \ No newline at end of file 28 \ No newline at end of file
iSchedulerMonitor/Plugins.Config.xml
@@ -3,4 +3,6 @@ @@ -3,4 +3,6 @@
3 3
4 <Plugin Assembly="iSchedulerMonitor.dll" Type="iSchedulerMonitor.iSchedulerMonitorPlugin" Version="1.0.0" Singletone="false" AutoStart="true" PluginDirectory=""> 4 <Plugin Assembly="iSchedulerMonitor.dll" Type="iSchedulerMonitor.iSchedulerMonitorPlugin" Version="1.0.0" Singletone="false" AutoStart="true" PluginDirectory="">
5 <Instance Id="instance1" Name="iSchedulerMonitorPlugin instance 1" /> 5 <Instance Id="instance1" Name="iSchedulerMonitorPlugin instance 1" />
  6 + </Plugin><Plugin Assembly="iSchedulerMonitor.dll" Type="iSchedulerMonitor.iSchedulerMonitor.ACPluginPlugin" Version="1.0.0" Singletone="false" AutoStart="true" PluginDirectory="">
  7 + <Instance Id="instance1" Name="iSchedulerMonitor.ACPluginPlugin instance 1" />
6 </Plugin></Plugins> 8 </Plugin></Plugins>
7 \ No newline at end of file 9 \ No newline at end of file
iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj
@@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
40 <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> 40 <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
41 <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath> 41 <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
42 </Reference> 42 </Reference>
43 - <Reference Include="InstanceFactory.FromXML, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">  
44 - <HintPath>..\packages\Vrh.ApplicationContainer.4.3.1\lib\net451\InstanceFactory.FromXML.dll</HintPath> 43 + <Reference Include="InstanceFactory.FromXML, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
  44 + <HintPath>..\packages\Vrh.ApplicationContainer.4.4.1\lib\net451\InstanceFactory.FromXML.dll</HintPath>
45 </Reference> 45 </Reference>
46 <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> 46 <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
47 <HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll</HintPath> 47 <HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll</HintPath>
@@ -100,8 +100,8 @@ @@ -100,8 +100,8 @@
100 <Reference Include="System.Data" /> 100 <Reference Include="System.Data" />
101 <Reference Include="System.Net.Http" /> 101 <Reference Include="System.Net.Http" />
102 <Reference Include="System.Xml" /> 102 <Reference Include="System.Xml" />
103 - <Reference Include="Vrh.ApplicationContainer, Version=4.3.1.0, Culture=neutral, processorArchitecture=MSIL">  
104 - <HintPath>..\packages\Vrh.ApplicationContainer.4.3.1\lib\net451\Vrh.ApplicationContainer.dll</HintPath> 103 + <Reference Include="Vrh.ApplicationContainer, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL">
  104 + <HintPath>..\packages\Vrh.ApplicationContainer.4.4.1\lib\net451\Vrh.ApplicationContainer.dll</HintPath>
105 </Reference> 105 </Reference>
106 <Reference Include="Vrh.ApplicationContainer.Control.Contract, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL"> 106 <Reference Include="Vrh.ApplicationContainer.Control.Contract, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
107 <HintPath>..\packages\Vrh.ApplicationContainer.Control.Contract.0.1.0\lib\net451\Vrh.ApplicationContainer.Control.Contract.dll</HintPath> 107 <HintPath>..\packages\Vrh.ApplicationContainer.Control.Contract.0.1.0\lib\net451\Vrh.ApplicationContainer.Control.Contract.dll</HintPath>
@@ -118,8 +118,8 @@ @@ -118,8 +118,8 @@
118 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> 118 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
119 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> 119 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
120 </Reference> 120 </Reference>
121 - <Reference Include="Vrh.Logger, Version=3.0.9.0, Culture=neutral, processorArchitecture=MSIL">  
122 - <HintPath>..\packages\Vrh.Logger.3.0.9\lib\net451\Vrh.Logger.dll</HintPath> 121 + <Reference Include="Vrh.Logger, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
  122 + <HintPath>..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll</HintPath>
123 </Reference> 123 </Reference>
124 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL"> 124 <Reference Include="Vrh.Membership, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
125 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath> 125 <HintPath>..\packages\Vrh.Membership.4.13.0\lib\net451\Vrh.Membership.dll</HintPath>
@@ -133,8 +133,8 @@ @@ -133,8 +133,8 @@
133 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> 133 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
134 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> 134 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
135 </Reference> 135 </Reference>
136 - <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">  
137 - <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> 136 + <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
  137 + <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath>
138 </Reference> 138 </Reference>
139 </ItemGroup> 139 </ItemGroup>
140 <ItemGroup> 140 <ItemGroup>
@@ -157,12 +157,6 @@ @@ -157,12 +157,6 @@
157 <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" /> 157 <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" />
158 </ItemGroup> 158 </ItemGroup>
159 <ItemGroup> 159 <ItemGroup>
160 - <None Include="XmlParser.xml">  
161 - <CopyToOutputDirectory>Always</CopyToOutputDirectory>  
162 - </None>  
163 - <None Include="ApplicationContainer.Config.xml">  
164 - <CopyToOutputDirectory>Always</CopyToOutputDirectory>  
165 - </None>  
166 <Content Include="..\packages\Microsoft.SqlServer.Types.11.0.2\nativeBinaries\x64\msvcr100.dll"> 160 <Content Include="..\packages\Microsoft.SqlServer.Types.11.0.2\nativeBinaries\x64\msvcr100.dll">
167 <Link>SqlServerTypes\x64\msvcr100.dll</Link> 161 <Link>SqlServerTypes\x64\msvcr100.dll</Link>
168 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 162 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -174,10 +168,16 @@ @@ -174,10 +168,16 @@
174 <None Include="LogConfig.xml"> 168 <None Include="LogConfig.xml">
175 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 169 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
176 </None> 170 </None>
  171 + <None Include="ApplicationContainer.Config.xml">
  172 + <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  173 + </None>
177 <Content Include="SqlServerTypes\readme.htm" /> 174 <Content Include="SqlServerTypes\readme.htm" />
178 <Content Include="SqlServerTypes\x64\SqlServerSpatial110.dll" /> 175 <Content Include="SqlServerTypes\x64\SqlServerSpatial110.dll" />
179 <Content Include="SqlServerTypes\x86\SqlServerSpatial110.dll" /> 176 <Content Include="SqlServerTypes\x86\SqlServerSpatial110.dll" />
180 <Content Include="iSchedulerMonitor.Config.xml" /> 177 <Content Include="iSchedulerMonitor.Config.xml" />
  178 + <None Include="XmlParser.xml">
  179 + <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  180 + </None>
181 <None Include="Plugins.Config.xml"> 181 <None Include="Plugins.Config.xml">
182 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 182 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
183 </None> 183 </None>
iSchedulerMonitor/packages.config
@@ -12,13 +12,13 @@ @@ -12,13 +12,13 @@
12 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> 12 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" />
13 <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> 13 <package id="PagedList" version="1.17.0.0" targetFramework="net451" />
14 <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> 14 <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" />
15 - <package id="Vrh.ApplicationContainer" version="4.3.1" targetFramework="net451" /> 15 + <package id="Vrh.ApplicationContainer" version="4.4.1" targetFramework="net462" />
16 <package id="Vrh.ApplicationContainer.Control.Contract" version="0.1.0" targetFramework="net451" /> 16 <package id="Vrh.ApplicationContainer.Control.Contract" version="0.1.0" targetFramework="net451" />
17 <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> 17 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
18 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> 18 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
19 - <package id="Vrh.Logger" version="3.0.9" targetFramework="net462" /> 19 + <package id="Vrh.Logger" version="3.1.0" targetFramework="net462" />
20 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" /> 20 <package id="Vrh.Membership" version="4.13.0" targetFramework="net462" />
21 <package id="VRH.Mockable.TimeProvider" version="1.0.0" targetFramework="net45" /> 21 <package id="VRH.Mockable.TimeProvider" version="1.0.0" targetFramework="net45" />
22 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> 22 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
23 - <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" /> 23 + <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" />
24 </packages> 24 </packages>
25 \ No newline at end of file 25 \ No newline at end of file