- Webservice hinzugefügt

- Framework nicht mehr prüfen

App.xaml.cs

@@ -14,7 +14,7 @@ namespace GCHR
 
         protected override void OnStartup(StartupEventArgs e)
         {
-            FrameworkVersionPruefen();
+            //FrameworkVersionPruefen();
             KonfigdateiUmbenennen();
 
             if (e.Args.Length > 0 && e.Args[0].Contains(".xml"))

Control/Tasks/Datenimport.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Data.Odbc;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Text;
 using GCHR.Model;
 using GCHR.Model.Konto;
 
@@ -48,18 +51,38 @@ namespace GCHR.Control.Tasks
             {
                 import = File.ReadAllLines(Dateiname).ToList();
             }
+            else if (Config.WebserviceAktiv)
+            {
+                import = KontenVonWebserviceLaden();
+            }
             else
             {
                 import = KontenVonOdbcLaden();
+            }
 
-                if (Data.ImportdatenSichern)
-                {
-                    ImportdatenSichern(import);
-                }
+            if (Data.ImportdatenSichern)
+            {
+                ImportdatenSichern(import);
             }
             return import;
         }
 
+        private List<string> KontenVonWebserviceLaden()
+        {
+            var args = new NameValueCollection
+                {
+                    { "dsn", "odbc:" + Config.OdbcConnectionString },
+                    { "query", QueryStr }
+                };
+
+            using (var web = new WebClient())
+            {
+                web.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded";
+                var responsebytes = web.UploadValues(Config.Webservice, "POST", args);
+                return Encoding.UTF8.GetString(responsebytes).Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            }
+        }
+
         private List<string> KontenVonOdbcLaden()
         {
             var result = new List<string>();

Model/GchrConfig.cs

@@ -36,6 +36,8 @@ namespace GCHR.Model
             }
         }
 
+        public string Webservice = "";
+
         public DateipfadeXml Dateipfade = new DateipfadeXml();
 
         [XmlElement("Einstellungen")]

Model/Konfiguration.cs

@@ -326,5 +326,12 @@ namespace GCHR.Model
         {
             get { return _gchrConfig.Dateipfade.Importdaten; }
         }
+
+        public string Webservice { get { return _gchrConfig.Webservice + ((_gchrConfig.Webservice.EndsWith("/")) ? "" : "/") + "?valid=1&gchr=1"; } }
+
+        public bool WebserviceAktiv
+        {
+            get { return (!string.IsNullOrEmpty(_gchrConfig.Webservice)); }
+        }
     }
 }

Properties/AssemblyInfo.cs

@@ -50,5 +50,5 @@ using System.Windows;
 //
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("1.34.17.*")]
+[assembly: AssemblyVersion("1.36.21.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

View/PeriodenEintrag.Designer.cs

@@ -0,0 +1,45 @@
+namespace GCHR.View
+{
+    partial class PeriodenEintrag
+    {
+        /// <summary> 
+        /// Erforderliche Designervariable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Verwendete Ressourcen bereinigen.
+        /// </summary>
+        /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Vom Komponenten-Designer generierter Code
+
+        /// <summary> 
+        /// Erforderliche Methode für die Designerunterstützung. 
+        /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.SuspendLayout();
+            // 
+            // PeriodenEintrag
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PeriodenEintrag";
+            this.Size = new System.Drawing.Size(298, 95);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

View/PeriodenEintrag.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace GCHR.View
+{
+    public partial class PeriodenEintrag : UserControl
+    {
+        public PeriodenEintrag()
+        {
+            InitializeComponent();
+        }
+    }
+}

View/PeriodenEintrag.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>