### Added

- Events can now have a range of ages, use - to separate, e.g. 14-16
ruddj · Dec 5, 2023 · 4f141ea · 4f141ea
1 parent 047280d
commit 4f141ea
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [5.3.0] - 2023-12-05
+### Added
+- Events can now have a range of ages, use - to separate, e.g. 14-16
+
 ## [5.2.2] - 2019-02-27
 ### Fixed
 - Catch errors in MeetManager export where no time was entered for event
@@ -229,7 +233,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Ordered Competitors handled differently: Table held locally.  Does not delete old but overwrites them.
 
 
-[Unreleased]: https://github.com/ruddj/SportsAdmin/compare/v5.2.2...HEAD
+[Unreleased]: https://github.com/ruddj/SportsAdmin/compare/v5.3.0...HEAD
+[5.3.0]: https://github.com/ruddj/SportsAdmin/compare/v5.2.2...v5.3.0
 [5.2.2]: https://github.com/ruddj/SportsAdmin/compare/v5.2.1...v5.2.2
 [5.2.1]: https://github.com/ruddj/SportsAdmin/compare/v5.2.0...v5.2.1
 [5.2.0]: https://github.com/ruddj/SportsAdmin/compare/v5.1.4...v5.2.0

diff --git a/License.txt b/License.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Andrew Rogers, James Rudd
+Copyright (c) 2023 Andrew Rogers, James Rudd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # <img src="https://github.com/ruddj/SportsAdmin/raw/sa-pages/images/sports.png?raw=true" height=132 alt="Sports Administrator" />
 
-[![Download Latest Release][download-badge]][DOWNLOAD] [![Current Version][version-badge]][CHANGELOG] [![license][license-badge]][LICENSE] 
+[![Download Latest Release][download-badge]][DOWNLOAD] [![Current Version][version-badge]][CHANGELOG] 
+[![license][license-badge]][LICENSE] [![Size Project][size-badge]][DOWNLOAD] 
 
 Sports Carnival Management Software 
 
@@ -78,7 +79,8 @@ For end users you can change the Sports.accdb file extension to .accdr to load i
 [CHANGELOG]: ./CHANGELOG.md
 [LICENSE]: ./License.txt
 [DOWNLOAD]: https://github.com/ruddj/SportsAdmin/releases/latest
-[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
 
+[license-badge]: https://img.shields.io/github/license/ruddj/SportsAdmin?color=blue
 [download-badge]: https://img.shields.io/badge/download-latest-blue.svg
-[version-badge]: https://img.shields.io/badge/version-5.2.2-blue.svg
+[version-badge]: https://img.shields.io/github/v/release/ruddj/SportsAdmin?color=blue
+[size-badge]: https://img.shields.io/github/languages/code-size/ruddj/SportsAdmin
diff --git a/Source/forms/About.bas b/Source/forms/About.bas
@@ -1,4 +1,4 @@
-Version =20
+Version =21
 VersionRequired =20
 Begin Form
     PopUp = NotDefault
@@ -107,7 +107,7 @@ Begin Form
                         0xffffffff52006f006f007400200045006e007400720079000000000000000000 ,
                         0x0000000000000000000000000000000000000000000000000000000000000000 ,
                         0x0000000016000500ffffffffffffffff020000000a00030000000000c0000000 ,
-                        0x00000046000000000000000000000000d0fb8f490305d3010300000000010000 ,
+                        0x0000004600000000000000000000000000cc61731027da010300000000010000 ,
                         0x0000000001004f006c0065000000000000000000000000000000000000000000 ,
                         0x0000000000000000000000000000000000000000000000000000000000000000 ,
                         0x000000000a000201ffffffffffffffffffffffff000000000000000000000000 ,
@@ -1094,7 +1094,7 @@ Begin Form
                     Height =2475
                     FontSize =9
                     Name ="Text2"
-                    Caption ="Copyright (c) 2017 Andrew Rogers, James Rudd\012\015\012\015\012Permission is he"
+                    Caption ="Copyright (c) 2023 Andrew Rogers, James Rudd\012\015\012\015\012Permission is he"
                         "reby granted, free of charge, to any person obtaining a copy\015\012of this soft"
                         "ware and associated documentation files (the \"Software\"), to deal\015\012in th"
                         "e Software without restriction, including without limitation the rights\015\012t"

diff --git a/Source/forms/EventTypeSub1.bas b/Source/forms/EventTypeSub1.bas
@@ -1,4 +1,4 @@
-Version =20
+Version =21
 VersionRequired =20
 Begin Form
     NavigationButtons = NotDefault
@@ -9,10 +9,10 @@ Begin Form
     GridY =20
     Width =5782
     ItemSuffix =50
-    Left =1020
-    Top =4695
-    Right =4155
-    Bottom =8655
+    Left =1215
+    Top =4560
+    Right =4350
+    Bottom =8520
     OrderBy ="EventTypeSub1.Age"
     RecSrcDt = Begin
         0xa54ca5b911cde140
@@ -131,7 +131,7 @@ Begin Form
                     ControlSource ="Age"
                     AfterUpdate ="[Event Procedure]"
                     FontName ="Tahoma"
-                    ControlTipText ="Age Division (eg. 13_U, 14, 15, 16, 17_U, OPEN)"
+                    ControlTipText ="Age Division (eg. 13_U, 14, 15, 16, 15-16, 17_U, OPEN)"
 
                 End
                 Begin CheckBox

diff --git a/Source/installs/Setup.nsi b/Source/installs/Setup.nsi
@@ -12,7 +12,7 @@
 !include "..\NsisMultiUser\Demos\Common\Utils.nsh"
 
 !define PRODUCT_NAME "Sports Administrator" ; name of the application as displayed to the user
-!define VERSION "5.2.2" ; main version of the application (may be 0.1, alpha, beta, etc.)
+!define VERSION "5.3.0" ; main version of the application (may be 0.1, alpha, beta, etc.)
 !define PROGEXE "Sports.accdr" ; main application filename
 !define COMPANY_NAME "Sports Administrator" ; company, used for registry tree hierarchy
 !define PRODUCT_FOLDER "SportsAdmin"

diff --git a/Source/modules/Globals.bas b/Source/modules/Globals.bas
@@ -90,6 +90,15 @@ On Error GoTo AgeFilter_Err
 
     ElseIf HeatAge = "OPEN" Then
         AgeFilter = " Like """ & "*"""
+
+    ' Logic to Support Ranges
+    ElseIf InStr(2, HeatAge, "-") > 0 Then
+      Dim iRange, iLow, iHigh As Integer
+      iRange = InStr(2, HeatAge, "-")
+      iLow = Int(Left(HeatAge, iRange - 1))
+      iHigh = Int(Right(HeatAge, Len(HeatAge) - iRange))
+
+      AgeFilter = "Between " & iLow & " And " & iHigh
 
     Else
         AgeFilter = "=" & Val(HeatAge)
@@ -1689,6 +1698,16 @@ On Error GoTo CompAgeSatisfiesEventAge_Err
 
   ElseIf Eage = "OPEN" Then
     CompAgeSatisfiesEventAge = True
+
+  ' Logic to Support Ranges
+  ElseIf InStr(2, Eage, "-") > 0 Then
+    Dim iRange, iLow, iHigh As Integer
+    iRange = InStr(2, Eage, "-")
+    iLow = Int(Left(Eage, iRange - 1))
+    iHigh = Int(Right(Eage, Len(Eage) - iRange))
+
+    If Cage >= iLow And Cage <= iHigh Then CompAgeSatisfiesEventAge = True
+
   Else
     If Cage = Val(Eage) Then CompAgeSatisfiesEventAge = True
   End If

diff --git a/Source/modules/VersionDetails.bas b/Source/modules/VersionDetails.bas
@@ -2,8 +2,11 @@ Option Compare Database
 Option Explicit
 
 
-Global Const VersionNumber = "5.2.2"
-Global Const VersionDate = "(27/Feb/2019)"
+Global Const VersionNumber = "5.3.0"
+Global Const VersionDate = "(5/Dec/2023)"
+
+' Version 5.3.0 - 2019-02-27
+' Added support for Age Ranges in events
 
 ' Version 5.2.2 - 2019-02-27
 ' Catch errors in MeetManager export where no time was entered for event

diff --git a/Source/queries/EnterCompetitorsSF.bas b/Source/queries/EnterCompetitorsSF.bas
@@ -67,53 +67,58 @@ dbBoolean "TotalsRow" ="0"
 Begin
     Begin
         dbText "Name" ="join"
+        dbLong "AggregateType" ="-1"
+    End
+    Begin
+        dbText "Name" ="Competitors.H_Code"
+        dbLong "AggregateType" ="-1"
     End
 End
 Begin
     State =0
     Left =106
     Top =10
-    Right =1002
-    Bottom =315
+    Right =1180
+    Bottom =477
     Left =-1
     Top =-1
-    Right =878
-    Bottom =127
+    Right =1050
+    Bottom =311
     Left =0
     Top =0
     ColumnsShown =539
     Begin
         Left =38
         Top =6
         Right =134
-        Bottom =113
+        Bottom =312
         Top =0
         Name ="Heats"
         Name =""
     End
     Begin
-        Left =172
-        Top =6
-        Right =268
-        Bottom =113
+        Left =396
+        Top =12
+        Right =492
+        Bottom =285
         Top =0
         Name ="Competitors"
         Name =""
     End
     Begin
-        Left =306
-        Top =6
-        Right =402
-        Bottom =113
+        Left =236
+        Top =7
+        Right =332
+        Bottom =286
         Top =0
         Name ="CompEvents"
         Name =""
     End
     Begin
-        Left =440
-        Top =6
-        Right =536
-        Bottom =113
+        Left =574
+        Top =0
+        Right =670
+        Bottom =258
         Top =0
         Name ="House"
         Name =""

diff --git a/Source/reports/Competitor List1.pv b/Source/reports/Competitor List1.pv
diff --git a/Source/reports/CompetitorEvents1.pv b/Source/reports/CompetitorEvents1.pv
diff --git a/Sports.accdb b/Sports.accdb
diff --git a/carnival/Demo-Sec Athletics.accdb b/carnival/Demo-Sec Athletics.accdb