Merge pull request #36 from RapidScada/develop

Merge Develop to Master

Author: 2mik

Base/data/ScadaBase_4.2_en.sdf

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017 Mikhail Shiryaev
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ * Product  : Rapid SCADA
+ * Module   : Log
+ * Summary  : Log interface
+ * 
+ * Author   : Mikhail Shiryaev
+ * Created  : 2017
+ * Modified : 2017
+ */
+
+using System;
+
+namespace Utils
+{
+    /// <summary>
+    /// Log interface
+    /// <para>Интерфейс журнала</para>
+    /// </summary>
+    public interface ILog
+    {
+        /// <summary>
+        /// Записать действие определённого типа в журнал
+        /// </summary>
+        void WriteAction(string text, Log.ActTypes actType);
+
+        /// <summary>
+        /// Записать информационное действие в журнал
+        /// </summary>
+        void WriteInfo(string text);
+
+        /// <summary>
+        /// Записать обычное действие в журнал
+        /// </summary>
+        void WriteAction(string text);
+
+        /// <summary>
+        /// Записать ошибку в журнал
+        /// </summary>
+        void WriteError(string text);
+
+        /// <summary>
+        /// Записать исключение в журнал
+        /// </summary>
+        void WriteException(Exception ex, string errMsg = "", params object[] args);
+
+        /// <summary>
+        /// Записать строку в журнал
+        /// </summary>
+        void WriteLine(string text = "");
+
+        /// <summary>
+        /// Записать разделитель в журнал
+        /// </summary>
+        void WriteBreak();
+    }
+}

Base/data/ScadaBase_4.2_ru.sdf

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Mikhail Shiryaev
+ * Copyright 2017 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2005
- * Modified : 2016
+ * Modified : 2017
  */
 
 using System;
@@ -35,7 +35,7 @@ namespace Utils
     /// Log file implementation
     /// <para>Реализация файла журнала</para>
     /// </summary>
-    public class Log
+    public class Log : ILog
     {
         /// <summary>
         /// Типы действий, записываемые в журнал

Log/ILog.cs

@@ -8,7 +8,7 @@
     <ProjectGuid>{A05EA084-E509-4025-9241-6A5BE5C2B328}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Log</RootNamespace>
+    <RootNamespace>Utils</RootNamespace>
     <AssemblyName>Log</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -42,7 +42,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ILog.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="LogStub.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

Log/Log.cs

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2017 Mikhail Shiryaev
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * 
+ * Product  : Rapid SCADA
+ * Module   : Log
+ * Summary  : Log stub
+ * 
+ * Author   : Mikhail Shiryaev
+ * Created  : 2017
+ * Modified : 2017
+ */
+
+using System;
+
+namespace Utils
+{
+    /// <summary>
+    /// Log stub
+    /// <para>Заглушка журнала</para>
+    /// </summary>
+    public class LogStub : ILog
+    {
+        /// <summary>
+        /// Записать действие определённого типа в журнал
+        /// </summary>
+        public void WriteAction(string text, Log.ActTypes actType)
+        {
+        }
+
+        /// <summary>
+        /// Записать информационное действие в журнал
+        /// </summary>
+        public void WriteInfo(string text)
+        {
+        }
+
+        /// <summary>
+        /// Записать обычное действие в журнал
+        /// </summary>
+        public void WriteAction(string text)
+        {
+        }
+
+        /// <summary>
+        /// Записать ошибку в журнал
+        /// </summary>
+        public void WriteError(string text)
+        {
+        }
+
+        /// <summary>
+        /// Записать исключение в журнал
+        /// </summary>
+        public void WriteException(Exception ex, string errMsg = "", params object[] args)
+        {
+        }
+
+        /// <summary>
+        /// Записать строку в журнал
+        /// </summary>
+        public void WriteLine(string text = "")
+        {
+        }
+
+        /// <summary>
+        /// Записать разделитель в журнал
+        /// </summary>
+        public void WriteBreak()
+        {
+        }
+    }
+}

Log/Log.csproj

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Mikhail Shiryaev
+ * Copyright 2017 Mikhail Shiryaev
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,12 @@
  * 
  * Author   : Mikhail Shiryaev
  * Created  : 2006
- * Modified : 2016
+ * Modified : 2017
  */
 
+using System;
 using System.IO;
+using System.Web;
 using System.Windows.Forms;
 
 namespace Utils.Report
@@ -142,5 +144,34 @@ public virtual void Make(string outFileName, string templateDir)
                 outStream.Close();
             }
         }
+
+        /// <summary>
+        /// Генерировать отчёт для загрузки через браузер
+        /// </summary>
+        public virtual void Generate(object[] repParams, string templateDir, string fileName, HttpResponse response)
+        {
+            if (response == null)
+                throw new ArgumentNullException("response");
+
+            try
+            {
+                response.ClearHeaders();
+                response.ClearContent();
+
+                response.ContentType = "application/octet-stream";
+                if (!string.IsNullOrEmpty(fileName))
+                    response.AppendHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
+
+                SetParams(repParams);
+                Make(response.OutputStream, templateDir);
+            }
+            catch
+            {
+                response.ClearHeaders();
+                response.ClearContent();
+                response.ContentType = "text/html";
+                throw;
+            }
+        }
     }
 }

Log/LogStub.cs

@@ -82,6 +82,7 @@
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml">
       <Name>System.XML</Name>

Report/RepBuilder/RepBuilder.cs

@@ -32,13 +32,13 @@
 namespace ScadaAdmin
 {
     /// <summary>
-    /// Настройки приложения
+    /// Application settings
+    /// <para>Настройки приложения</para>
     /// </summary>
     public class Settings
     {
         /// <summary>
-        /// Application settings
-        /// <para>Настройки приложения</para>
+        /// Настройки приложения
         /// </summary>
         public class AppSettings
         {

Report/RepBuilder/RepBuilder.csproj

@@ -254,6 +254,10 @@
       <Link>Lang\ScadaData.en-GB.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="..\..\ScadaData\ScadaData\Lang\ScadaData.ru-RU.xml">
+      <Link>Lang\ScadaData.ru-RU.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="database.ico" />
     <Content Include="Lang\ScadaAdmin.en-GB.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>