Merge pull request #10 from Artanemus/buildv1.7.1.0

Exception errors on Bind Sources fixed
Artanemus · Sep 3, 2024 · 1da92cb · 1da92cb
2 parents 3f78740 + 68406fd
commit 1da92cb
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 38 deletions.
diff --git a/MEMBERS/frmManageMember.dfm b/MEMBERS/frmManageMember.dfm
@@ -138,7 +138,7 @@ object ManageMember: TManageMember
     Top = 74
     Width = 1363
     Height = 702
-    ActivePage = TabSheet3
+    ActivePage = TabSheet1
     Align = alClient
     MultiLine = True
     TabHeight = 40

diff --git a/SwimClubMeet.dproj b/SwimClubMeet.dproj
@@ -110,9 +110,9 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_MinorVer>7</VerInfo_MinorVer>
-        <VerInfo_Keys>CompanyName=Artanemus;FileDescription=$(MSBuildProjectName) - Manage club members and run your club nights.;FileVersion=1.7.0.9;InternalName=SwimClubMeet;LegalCopyright=Copyright (C) 2019-2024 Artanemus.  All rights reserved.;LegalTrademarks=;OriginalFilename=SwimClubMeet.exe;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.7;Comments=Manage club members and run your club nights.</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Artanemus;FileDescription=$(MSBuildProjectName) - Manage club members and run your club nights.;FileVersion=1.7.1.0;InternalName=SwimClubMeet;LegalCopyright=Copyright (C) 2019-2024 Artanemus.  All rights reserved.;LegalTrademarks=;OriginalFilename=SwimClubMeet.exe;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.7;Comments=Manage club members and run your club nights.</VerInfo_Keys>
         <Icon_MainIcon>SwimClubMeet.ico</Icon_MainIcon>
-        <VerInfo_Build>9</VerInfo_Build>
+        <VerInfo_Release>1</VerInfo_Release>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -476,6 +476,38 @@
                     <Source Name="MainSource">SwimClubMeet.dpr</Source>
                 </Source>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\BPL\JclDebugExpert290.bpl">JCL Debug IDE extension</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\BPL\JclProjectAnalysisExpert290.bpl">JCL Project Analyzer</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\BPL\JclFavoriteFoldersExpert290.bpl">JCL Open and Save IDE dialogs with favorite folders</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\BPL\JclRepositoryExpert290.bpl">JCL Package containing repository wizards</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\BPL\JclSIMDViewExpert290.bpl">JCL Debug Window of XMM registers</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\BPL\JclStackTraceViewerExpert290.bpl">JCL Stack Trace Viewer</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvAppFrmDesign290.bpl">JVCL Application and Form Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvBandsDesign290.bpl">JVCL Band Objects</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvCmpDesign290.bpl">JVCL Non-Visual Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvControlsDesign290.bpl">JVCL Visual Controls</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvCryptDesign290.bpl">JVCL Encryption and Compression</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvCustomDesign290.bpl">JVCL Custom Controls</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvDBDesign290.bpl">JVCL Database Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvDlgsDesign290.bpl">JVCL Dialog Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvDockingDesign290.bpl">JVCL Docking Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvDotNetCtrlsDesign290.bpl">JVCL DotNet Controls</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvGlobusDesign290.bpl">JVCL Globus Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvHMIDesign290.bpl">JVCL HMI Controls</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvJansDesign290.bpl">JVCL Jans Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvManagedThreadsDesign290.bpl">JVCL Managed Threads</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvMMDesign290.bpl">JVCL Multimedia and Image Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvNetDesign290.bpl">JVCL Network Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvPageCompsDesign290.bpl">JVCL Page Style Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvPascalInterpreterDesign290.bpl">JVCL Interpreter Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvPluginSystemDesign290.bpl">JVCL Plugin Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvPrintPreviewDesign290.bpl">JVCL Print Preview Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvRuntimeDesignDesign290.bpl">JVCL Runtime Design Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvStdCtrlsDesign290.bpl">JVCL Standard Controls</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvSystemDesign290.bpl">JVCL System Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvTimeFrameworkDesign290.bpl">JVCL Time Framework</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvWizardsDesign290.bpl">JVCL Wizard</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\JvXPCtrlsDesign290.bpl">JVCL XP Controls</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

diff --git a/SwimClubMeet.res b/SwimClubMeet.res
diff --git a/dmSCM.pas b/dmSCM.pas
@@ -2155,7 +2155,10 @@ procedure TSCM.qryEventAfterPost(DataSet: TDataSet);
   end;
 
   // ADD A DEFAULT CAPTION
-  if DataSet.FieldByName('Caption').IsNull then
+  EventType := GetEventTypeByDistanceID(DistanceID);
+  Caption := DataSet.FieldByName('Caption').AsString;
+
+  if Caption.IsEmpty then
   begin
     if (prefGenerateEventDescription) then
     begin
@@ -2165,33 +2168,39 @@ procedure TSCM.qryEventAfterPost(DataSet: TDataSet);
         DataSet.FieldByName('Caption').AsString := prefGenerateEventDescStr;
         DataSet.Post;
       end;
+    end
+    else
+    begin
+      DataSet.Edit;
+      case EventType of
+        etINDV:
+          DataSet.FieldByName('Caption').AsString := 'INDV';
+        etTEAM:
+          DataSet.FieldByName('Caption').AsString := 'RELAY';
+      end;
+      DataSet.Post;
     end;
-  end;
-
-  EventType := GetEventTypeByDistanceID(DistanceID);
-  Caption := DataSet.FieldByName('Caption').AsString;
-  if (Length(Caption) = 0) then
+  end
+  else
   begin
-    DataSet.Edit;
-    case EventType of
-      etINDV:
-        DataSet.FieldByName('Caption').AsString := 'INDV';
-      etTEAM:
-        DataSet.FieldByName('Caption').AsString := 'RELAY';
+    if ((Caption = 'INDV') and (EventType = etTEAM)) or
+      ((Caption = 'TEAM') and (EventType = etINDV)) then
+    begin
+      DataSet.Edit;
+      if EventType = etTEAM then
+        DataSet.FieldByName('Caption').AsString := 'RELAY'
       else
-        ;
+        DataSet.FieldByName('Caption').AsString := 'INDV';
+      DataSet.Post;
     end;
-    DataSet.Post;
   end;
 
-
-
-// BSA FIX ....
-//  if Owner is TForm then
-//  begin
-//    PostMessage(TForm(Owner).Handle, SCM_UPDATEINDVTEAM, 0, 0);
-//    PostMessage(TForm(Owner).Handle, SCM_TABSHEETDISPLAYSTATE, 1, 0);
-//  end;
+  // BSA FIX .... 2024.09.02 commented out this section
+  //  if Owner is TForm then
+  //  begin
+  //    PostMessage(TForm(Owner).Handle, SCM_UPDATEINDVTEAM, 0, 0);
+  //    PostMessage(TForm(Owner).Handle, SCM_TABSHEETDISPLAYSTATE, 1, 0);
+  //  end;
 
 end;
 

diff --git a/frmMain.pas b/frmMain.pas
@@ -3422,18 +3422,17 @@ procedure TMain.Nominate_Scroll(var Msg: TMessage);
   success: boolean;
 begin
   if not AssertConnection then exit;
+  if not Assigned(BindSourceDB1.DataSet) then exit;
   if not Assigned(BindSourceDB1.DataSource.DataSet) then exit;
 
-  begin
-    MemberID := SCM.dsNominateMembers.DataSet.FieldByName('MemberID').AsInteger;
-    success := SCM.Nominate_UpdateControlList(SCM.Session_ID, MemberID);
-    // Close, prepare and open - the binding source must be reactivated.
-    // -------------------------------------------------------------------
-    if not BindSourceDB1.DataSet.Active then
-        BindSourceDB1.DataSet.Active := true;
-
-    if success then Nominate_ControlList.Invalidate;
-  end;
+  MemberID := SCM.dsNominateMembers.DataSet.FieldByName('MemberID').AsInteger;
+  success := SCM.Nominate_UpdateControlList(SCM.Session_ID, MemberID);
+  // Close, prepare and open - the binding source must be reactivated.
+  // -------------------------------------------------------------------
+  if not BindSourceDB1.DataSet.Active then
+      BindSourceDB1.DataSet.Active := true;
+
+  if success then Nominate_ControlList.Invalidate;
 end;
 
 procedure TMain.Nominate_SortMembersExecute(Sender: TObject);
@@ -3744,9 +3743,11 @@ procedure TMain.SCM_ManageMembersExecute(Sender: TObject);
   Refresh_Nominate;
   // count the number of members in DB prior to PostMessage
   fCountOfMembers := SCM.Members_Count;
-  // 'No Members' Caption maybe visible in TLabel lblNomWarning
-  if lblNomWarning.Visible then
-    PostMessage(Self.Handle, SCM_TABSHEETDISPLAYSTATE, 0, 0);
+  // Assert the 'No Members' Caption in TLabel lblNomWarning
+  // refresh all controls and labels on active tabsheet
+  // via page control - it also actions SCM_TABSHEETDISPLAYSTATE
+  PageControl1Change(PageControl1);
+
 end;
 
 procedure TMain.SCM_ManageMembersUpdate(Sender: TObject);