20210507 Erweiterung manuelle Vereine

5 years ago · 5a7654497d
parent 6b930d93ab
commit 5a7654497d
20 changed files with 71565 additions and 41489 deletions
--- a/Administration/Upload.aspx
+++ b/Administration/Upload.aspx
@ -3,6 +3,8 @@
 <%@ Register Assembly="Syncfusion.EJ.Web, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Web" TagPrefix="ej" %>
 <%@ Register Assembly="Syncfusion.EJ, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Models" TagPrefix="ej" %>

+<%@ Register assembly="Syncfusion.EJ.Web" namespace="Syncfusion.JavaScript.Web" tagprefix="ej" %>
+
 <asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="Server">
    <asp:Label runat="server"><h4>Stammdaten aktualisieren</h4></asp:Label>
 <br />
--- a/Administration/Vereine_Manuell.aspx
+++ b/Administration/Vereine_Manuell.aspx
@ -0,0 +1,43 @@
+<%@ Page Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Vereine_Manuell.aspx.cs" Inherits="QW2021C.Administration.Vereine_Manuell" %>
+<%@ Register Assembly="Syncfusion.EJ.Web, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Web" TagPrefix="ej" %>
+<%@ Register Assembly="Syncfusion.EJ, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Models" TagPrefix="ej" %>
+<%@ Register assembly="Syncfusion.EJ" namespace="Syncfusion.JavaScript.Models" tagprefix="ej" %>
+<asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="Server">
+  <asp:Label runat="server"><h4>Anmeldung</h4></asp:Label>
+    <ej:Grid ID="Verein" runat="server" CssClass="" DataSourceCachingMode="None" DataSourceID="SqlDataSource1" EnableLoadOnDemand="False" Locale="de-DE" MinWidth="0">
+        <Columns>
+            <ej:Column DataType="string" Field="account_code" IsPrimaryKey="True">
+            </ej:Column>
+            <ej:Column DataType="string" Field="account_name">
+            </ej:Column>
+            <ej:Column DataType="string" Field="account_short">
+            </ej:Column>
+            <ej:Column DataType="string" Field="account_type">
+            </ej:Column>
+            <ej:Column DataType="string" Field="lg">
+            </ej:Column>
+        </Columns>
+        <EditSettings AllowAdding="true" AllowEditing="true" AllowDeleting="true" />
+        <ToolbarSettings ShowToolbar="true" ToolbarItems="add,edit,delete,update"></ToolbarSettings>
+    </ej:Grid>
+    <asp:SqlDataSource ID="SqlDataSource1" runat="server" ConnectionString="<%$ ConnectionStrings:QWToolConnectionstring %>" DeleteCommand="DELETE FROM [base_account_manuell] WHERE [account_code] = @account_code" InsertCommand="INSERT INTO [base_account_manuell] ([account_code], [account_name], [account_short], [account_type], [lg]) VALUES (@account_code, @account_name, @account_short, @account_type, @lg)" SelectCommand="SELECT * FROM [base_account_manuell]" UpdateCommand="UPDATE [base_account_manuell] SET [account_name] = @account_name, [account_short] = @account_short, [account_type] = @account_type, [lg] = @lg WHERE [account_code] = @account_code">
+        <DeleteParameters>
+            <asp:Parameter Name="account_code" Type="String" />
+        </DeleteParameters>
+        <InsertParameters>
+            <asp:Parameter Name="account_code" Type="String" />
+            <asp:Parameter Name="account_name" Type="String" />
+            <asp:Parameter Name="account_short" Type="String" />
+            <asp:Parameter Name="account_type" Type="String" />
+            <asp:Parameter Name="lg" Type="String" />
+        </InsertParameters>
+        <UpdateParameters>
+            <asp:Parameter Name="account_name" Type="String" />
+            <asp:Parameter Name="account_short" Type="String" />
+            <asp:Parameter Name="account_type" Type="String" />
+            <asp:Parameter Name="lg" Type="String" />
+            <asp:Parameter Name="account_code" Type="String" />
+        </UpdateParameters>
+    </asp:SqlDataSource>
+        
+</asp:Content>
--- a/Administration/Vereine_Manuell.aspx.cs
+++ b/Administration/Vereine_Manuell.aspx.cs
@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace QW2021C.Administration
+{
+    public partial class Vereine_Manuell : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
--- a/Administration/Vereine_Manuell.aspx.designer.cs
+++ b/Administration/Vereine_Manuell.aspx.designer.cs
@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <automatisch generiert>
+//     Dieser Code wurde von einem Tool generiert.
+//
+//     Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn
+//     der Code neu generiert wird.
+// </automatisch generiert>
+//------------------------------------------------------------------------------
+
+namespace QW2021C.Administration
+{
+
+
+    public partial class Vereine_Manuell
+    {
+
+        /// <summary>
+        /// Verein-Steuerelement
+        /// </summary>
+        /// <remarks>
+        /// Automatisch generiertes Feld
+        /// Zum Ändern Felddeklaration aus der Designerdatei in eine Code-Behind-Datei verschieben.
+        /// </remarks>
+        protected global::Syncfusion.JavaScript.Web.Grid Verein;
+
+        /// <summary>
+        /// SqlDataSource1-Steuerelement
+        /// </summary>
+        /// <remarks>
+        /// Automatisch generiertes Feld
+        /// Zum Ändern Felddeklaration aus der Designerdatei in eine Code-Behind-Datei verschieben.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.SqlDataSource SqlDataSource1;
+    }
+}
--- a/Database/clsdb.cs
+++ b/Database/clsdb.cs
@ -474,10 +474,10 @@ public class clsDB
    }
    public void update_verein(string targetfolder)
    {
-        truncate_table("base_account");
+        truncate_table("base_account_import");
        String Filter = ConfigurationSettings.AppSettings["VereinFilter"];
        string[] filters = Filter.Split(',');
-        Get_Tabeldata_for_Update ("Select * from base_account",false,true);
+        Get_Tabeldata_for_Update ("Select * from base_account_import",false,true);
        DataSet verein = new DataSet();
        verein.ReadXml(targetfolder + "\\verein.xml");
        foreach (DataRow r in verein.Tables[0].Rows)
--- a/Downloads/070520210954SS_Anmeldungen.xlsx
+++ b/Downloads/070520210954SS_Anmeldungen.xlsx
--- a/Downloads/070520211008SS_Anmeldungen.xlsx
+++ b/Downloads/070520211008SS_Anmeldungen.xlsx
--- a/Downloads/070520211916SS_Anmeldungen.xlsx
+++ b/Downloads/070520211916SS_Anmeldungen.xlsx
--- a/QW2021C.csproj
+++ b/QW2021C.csproj
@ -166,6 +166,7 @@
    <Content Include="Administration\Kategorien.aspx" />
    <Content Include="Administration\Upload.aspx" />
    <Content Include="Administration\Verein.aspx" />
+    <Content Include="Administration\Vereine_Manuell.aspx" />
    <Content Include="Administration\Wettkampfeinteilung.aspx" />
    <Content Include="Administration\Wettkampfort.aspx" />
    <Content Include="Bilder\ZALogo.jpg" />
@ -606,6 +607,13 @@
    <Compile Include="Administration\Verein.aspx.designer.cs">
      <DependentUpon>Verein.aspx</DependentUpon>
    </Compile>
+    <Compile Include="Administration\Vereine_Manuell.aspx.cs">
+      <DependentUpon>Vereine_Manuell.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Administration\Vereine_Manuell.aspx.designer.cs">
+      <DependentUpon>Vereine_Manuell.aspx</DependentUpon>
+    </Compile>
    <Compile Include="Administration\Wettkampfeinteilung.aspx.cs">
      <DependentUpon>Wettkampfeinteilung.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/QW2021C.sln
+++ b/QW2021C.sln
@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.28407.52
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QW2021C", "QW2021C.csproj", "{1FC10A94-F028-4DB2-AD48-F0F18234A4A2}"
 EndProject
+Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "QWDB2021", "..\QWDB2021\QWDB2021.sqlproj", "{462FDF0F-C822-41D2-AFD5-40629F20B7B9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -15,6 +17,12 @@ Global
 		{1FC10A94-F028-4DB2-AD48-F0F18234A4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1FC10A94-F028-4DB2-AD48-F0F18234A4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FC10A94-F028-4DB2-AD48-F0F18234A4A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{462FDF0F-C822-41D2-AFD5-40629F20B7B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{462FDF0F-C822-41D2-AFD5-40629F20B7B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{462FDF0F-C822-41D2-AFD5-40629F20B7B9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{462FDF0F-C822-41D2-AFD5-40629F20B7B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{462FDF0F-C822-41D2-AFD5-40629F20B7B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{462FDF0F-C822-41D2-AFD5-40629F20B7B9}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Resultate/KategoriençKUKC.aspx
+++ b/Resultate/KategoriençKUKC.aspx
@ -5,7 +5,7 @@
 <%@ Register Assembly="Syncfusion.EJ, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Models" TagPrefix="ej" %>
 <%@ Register assembly="Syncfusion.EJ" namespace="Syncfusion.JavaScript.Models" tagprefix="ej" %>
 <asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="Server">
-    <asp:Label runat="server"><h4>Kategorien 4-Kampf / UKC</h4></asp:Label>
+    <asp:Label runat="server"><h4>Kategorien 4-Kampf / UKC / Bestenliste</h4></asp:Label>
    <ej:Grid ID="GridDaten" runat="server" AllowFiltering="True" CssClass="" DataSourceCachingMode="None" DataSourceID="SqlDataSource1" 
        EnableLoadOnDemand="False" Locale="de-DE" MinWidth="0" AllowSorting="True" OnServerBatchEditRow="GridDaten_ServerBatchEditRow" Width="600px">
        <Columns>
--- a/Resultate/Reports/Rpt_Auswertung_Gesamt.rpt
+++ b/Resultate/Reports/Rpt_Auswertung_Gesamt.rpt
--- a/Resultate/Resultat_Orte.aspx
+++ b/Resultate/Resultat_Orte.aspx
@ -3,7 +3,7 @@
 <%@ Register Assembly="Syncfusion.EJ.Web, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Web" TagPrefix="ej" %>
 <%@ Register Assembly="Syncfusion.EJ, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Models" TagPrefix="ej" %>
 <asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="Server">
-    <asp:Label runat="server"><h4>Resultat_Orte</h4></asp:Label>
+    <asp:Label runat="server"><h4>Wettkampforte</h4></asp:Label>
    <ej:Grid ID="GridResultatOrte" Width="300px" runat="server" CssClass="" DataSourceCachingMode="None" DataSourceID="SqlDataSource1" EnableLoadOnDemand="False" Locale="de-DE" MinWidth="0" EnableToolbarItems="True">
        <Columns>
            <ej:Column AllowEditing="False" DataType="number" Field="OrtNr" IsIdentity="True" IsPrimaryKey="True">
--- a/Upload/AlabusBase
+++ b/Upload/AlabusBase
--- a/Upload/AlabusBase.gz
+++ b/Upload/AlabusBase.gz
--- a/Upload/athlete.xml
+++ b/Upload/athlete.xml
--- a/Upload/verein.xml
+++ b/Upload/verein.xml
@ -1502,7 +1502,7 @@
    <accountCode>1.BE.0218</accountCode>
    <accountName>Lakeland Track Club</accountName>
    <accountShort />
-    <accountType>Verein spezial</accountType>
+    <accountType>Verein</accountType>
    <lg />
  </account>
  <account>
@ -1607,7 +1607,7 @@
    <accountCode>1.GE.0430</accountCode>
    <accountName>Perform-CBS</accountName>
    <accountShort>Genève Perform-CBS</accountShort>
-    <accountType>Verein spezial</accountType>
+    <accountType>Verein</accountType>
    <lg />
  </account>
  <account>
@ -1708,6 +1708,27 @@
    <accountType>Verein polysportiv - STV</accountType>
    <lg />
  </account>
+  <account>
+    <accountCode>1.TI.1543</accountCode>
+    <accountName>Walking Mendrisio</accountName>
+    <accountShort>Mendrisio Walking</accountShort>
+    <accountType>Wettkampf-Organisator</accountType>
+    <lg />
+  </account>
+  <account>
+    <accountCode>1.FR.0342</accountCode>
+    <accountName>Association Swiss Canyon Trail</accountName>
+    <accountShort>Association Swiss Canyon Trail</accountShort>
+    <accountType>Wettkampf-Organisator</accountType>
+    <lg />
+  </account>
+  <account>
+    <accountCode>1.BE.0223</accountCode>
+    <accountName>Stockhorn Halbmarathon</accountName>
+    <accountShort>Stockhorn Halbmarathon</accountShort>
+    <accountType>Wettkampf-Organisator</accountType>
+    <lg />
+  </account>
  <account>
    <accountCode>1.VS.1739</accountCode>
    <accountName>Mattmark Memorial 1965</accountName>
@ -1736,6 +1757,13 @@
    <accountType>Wettkampf-Organisator</accountType>
    <lg />
  </account>
+  <account>
+    <accountCode>1.ZH.1897</accountCode>
+    <accountName>SC Bassersdorf</accountName>
+    <accountShort>Bassersdorf SC</accountShort>
+    <accountType>Verein polysportiv - andere</accountType>
+    <lg />
+  </account>
  <account>
    <accountCode>1.FR.0341</accountCode>
    <accountName>Course "A Travers Sâles"-FSG Sâles</accountName>
@ -1827,6 +1855,13 @@
    <accountType>Wettkampf-Organisator</accountType>
    <lg />
  </account>
+  <account>
+    <accountCode>1.BSBL.0254</accountCode>
+    <accountName>LV FrenkeFortuna</accountName>
+    <accountShort>LV FrenkeFortuna</accountShort>
+    <accountType>Verein</accountType>
+    <lg />
+  </account>
  <account>
    <accountCode>253494</accountCode>
    <accountName>ST Luzern</accountName>
--- a/UserFunktionen/Anmeldung.aspx
+++ b/UserFunktionen/Anmeldung.aspx
@ -4,6 +4,7 @@
 <%@ Register Assembly="Syncfusion.EJ, Version=18.3460.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" Namespace="Syncfusion.JavaScript.Models" TagPrefix="ej" %>
 <%@ Register assembly="Syncfusion.EJ" namespace="Syncfusion.JavaScript.Models" tagprefix="ej" %>
 <asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="Server">
+   
    <asp:Label runat="server"><h4>Anmeldung</h4></asp:Label>
    <br />
    <asp:Label runat="server" Font-Bold="true">Verfügbare Athleten</asp:Label>
@ -82,8 +83,9 @@

    <asp:Label ID="Label1" runat="server" ForeColor="Red"></asp:Label>

-
-    <ej:Grid runat="server" ID="Anmeldegrid" EnableAltRow="true" CssClass="e-grid1" DataSourceCachingMode="None" DataSourceID="SqlDataSource3" EnableLoadOnDemand="False" Locale="de-DE"
+    <%-- <asp:UpdatePanel ID="UpdatePanel2" runat="server" UpdateMode="Conditional">
+        <ContentTemplate>    --%>
+    <ej:Grid runat="server" ID="Anmeldegrid" EnableAltRow="true" CssClass="e-grid1" DataSourceCachingMode="None" DataSourceID="SqlDataSource3" EnableLoadOnDemand="True" Locale="de-DE"
        MinWidth="0" AllowPaging="true" OnServerCommandButtonClick="onclick" OnServerBatchEditRow="OnServer_Batcheditrow_Anmeldung" 
        OnServerExcelExporting="FlatGrid_ServerExcelExporting" AllowSelection="False">
        <ClientSideEvents QueryCellInfo="queryCellInfo" Create="create" />
@ -172,6 +174,7 @@
        <SelectionSettings EnableToggle="false" />
        <ToolbarSettings ShowToolbar="true" ToolbarItems="update" />
    </ej:Grid>
+             </asp:UpdatePanel>
    <br />
    <table>
        <tr>
@ -266,4 +269,7 @@

        <%--<Position XValue="20px" YValue="20px" />--%>
    </ej:Dialog>
+   <%-- </ContentTemplate>
+        </asp:UpdatePanel>--%>
+
 </asp:Content>
--- a/Workdir/01052021181048_Rpt.xml
+++ b/Workdir/01052021181048_Rpt.xml
--- a/Workdir/01052021184041_Rpt.xml
+++ b/Workdir/01052021184041_Rpt.xml