New Version (1.1.1)

- Fixes #30. Added support for new TCG+ CSV file format (deck recipe links and SMS Auth columns). - Changed Version Number on Splash Screen to read the one in the assembly info instead of hard-coding it - Prevents any member with number 0000000986 from being added to the master list of players. - Rearranged Player Name and Member Name fields so that the player name is first. - Fixed Team ID# and made it not editable. (Had no effect on the save file.) - Fixed #29 : "DELETE" button to instead change a pre-registered player status to "Absent on Day of Event", will still prompt an information screen. Additionally, the Tournament List will now always refresh after hitting the DELETE button. - Resolves #31: Program will now reuse the last used directory by saving it into the registry. - Resolves #28: Extraneous penalty removed.
retched · Apr 1, 2023 · 0eb6a7a · 0eb6a7a
1 parent 786367d
commit 0eb6a7a
Show file tree

Hide file tree

Showing 22 changed files with 637 additions and 294 deletions.
diff --git a/TCG+ Registration Helper/App.config b/TCG+ Registration Helper/App.config
@@ -13,6 +13,9 @@
             <setting name="PlayerNameFull" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="LastUsedDirectory" serializeAs="String">
+                <value />
+            </setting>
         </retched.TCGRegManager.My.MySettings>
     </userSettings>
 </configuration>
diff --git a/TCG+ Registration Helper/File Handling.vb b/TCG+ Registration Helper/File Handling.vb
@@ -25,7 +25,8 @@
                     .MembershipNumber = player.Descendants("MemberNumber").Value,
                     .FirstName = player.Descendants("PlayerFirstName").Value,
                     .LastName = player.Descendants("PlayerLastName").Value,
-                    .SeatOrder = player.Descendants("SeatOrder").Value}
+                    .SeatOrder = player.Descendants("SeatOrder").Value,
+                    .DeckRecipe = player.Descendants("DeckRecipe").Value}
                 tpPlayer.FormatNumber()
 
                 Select Case tpPlayer.SeatOrder
@@ -186,11 +187,13 @@
                                                    .PlayerA = New PlayerInfo With {
                                                         .MembershipNumber = currentRow(5),
                                                         .MembershipName = currentRow(6),
-                                                        .SeatOrder = currentRow(7)
+                                                        .SeatOrder = currentRow(7),
+                                                        .DeckRecipe = currentRow(9)
                                                     },
                                                    .PlayerB = New PlayerInfo,
                                                    .PlayerC = New PlayerInfo,
-                                                   .Memo = currentRow(8)})
+                                                   .Memo = currentRow(8),
+                                                   .SMSAuth = currentRow(10)})
                         End Select
                     End If
 
@@ -212,7 +215,10 @@
 
         Dim target As XElement = xdoc.Descendants("Player").FirstOrDefault(Function(x) x.Element("MembershipNo").Value = strMemberID)
 
-        If strMemberID <> "GUEST99999" And Not String.IsNullOrWhiteSpace(strMemberID) Then
+        ' 0000000986 is an INVALID Member ID. Some TCG+ created files contain this number.
+        ' This number SHOULD NOT BE ALLOWED to be saved as a regular player. (It will causes an error message when imported.)
+
+        If (strMemberID <> "GUEST99999" And strMemberID <> "0000000986") And Not String.IsNullOrWhiteSpace(strMemberID) Then
             If IsNothing(target) Then
                 ' This should mean we have a NEW element.
                 Dim newPlayer As XElement = New XElement("Player")
@@ -243,7 +249,7 @@
 
         Dim target As XElement = xdoc.Descendants("Player").FirstOrDefault(Function(x) x.Element("MembershipNo").Value = strMemberID)
 
-        If strMemberID <> "GUEST99999" And Not String.IsNullOrWhiteSpace(strMemberID) Then
+        If (strMemberID <> "GUEST99999" And strMemberID <> "0000000986") And Not String.IsNullOrWhiteSpace(strMemberID) Then
             If IsNothing(target) Then
                 ' This should mean we have a NEW element.
                 Dim newPlayer As XElement = New XElement("Player")

diff --git a/TCG+ Registration Helper/My Project/AssemblyInfo.vb b/TCG+ Registration Helper/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.1.0.0")>
-<Assembly: AssemblyFileVersion("1.1.0.0")>
+<Assembly: AssemblyVersion("1.1.1.0")>
+<Assembly: AssemblyFileVersion("1.1.1.0")>
diff --git a/TCG+ Registration Helper/My Project/Resources.Designer.vb b/TCG+ Registration Helper/My Project/Resources.Designer.vb
diff --git a/TCG+ Registration Helper/My Project/Resources.resx b/TCG+ Registration Helper/My Project/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : 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">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <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">
@@ -85,9 +87,10 @@
                 <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" msdata:Ordinal="1" />
+              <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">
@@ -109,9 +112,16 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="green_check_mark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\green-check-mark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="red_cross_mark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\red-cross-mark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/TCG+ Registration Helper/My Project/Settings.Designer.vb b/TCG+ Registration Helper/My Project/Settings.Designer.vb
diff --git a/TCG+ Registration Helper/My Project/Settings.settings b/TCG+ Registration Helper/My Project/Settings.settings
@@ -5,5 +5,8 @@
     <Setting Name="PlayerNameFull" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="LastUsedDirectory" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/TCG+ Registration Helper/PlayerInfo.vb b/TCG+ Registration Helper/PlayerInfo.vb
@@ -4,6 +4,7 @@
     Public Property MembershipNumber As String
     Public Property MembershipName As String = ""
     Public Property SeatOrder As String = "A"
+    Public Property DeckRecipe As String = ""
 
     Public Property SearchHelper As String
         Get
@@ -88,7 +89,7 @@ Public Class TournamentPlayer
     Public Property Status As Integer = 0
     Public Property ByeRounds As Integer
 #If DEBUG Then
-    Public Property TeamID As Integer = 0
+    Public Property TeamID As Integer = 10
 #Else
     Public Property TeamID As Integer = 0
 #End If
@@ -101,6 +102,7 @@ Public Class TournamentTeam : Inherits TournamentPlayer
     Public PlayerA As PlayerInfo
     Public PlayerB As PlayerInfo
     Public PlayerC As PlayerInfo
+    Public SMSAuth As String = ""
 
     ' Okay, I need to check each member of this team to make sure that the number checked, isn't already in a team.