Changeset 830 for cprs/trunk/CPRS-Chart/fAllgyFind.pas

Timestamp:

Jul 7, 2010, 4:51:54 PM (14 years ago)

Author:

Kevin Toppenberg

Message:

Upgrading to version 27

File:

• cprs/trunk/CPRS-Chart/fAllgyFind.pas (modified) (5 diffs)

cprs/trunk/CPRS-Chart/fAllgyFind.pas

@@ -5 +5 @@
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  fAutoSz, StdCtrls, ORFn, ORCtrls, ComCtrls, ImgList;
+  fAutoSz, StdCtrls, ORFn, ORCtrls, ComCtrls, ImgList, VA508AccessibilityManager,
+  VA508ImageListLabeler;
 
 type
@@ -21 +22 @@
     lblDetail: TLabel;
     lblSearchCaption: TLabel;
+    imgLblAllgyFindTree: TVA508ImageListLabeler;
     procedure cmdSearchClick(Sender: TObject);
     procedure cmdCancelClick(Sender: TObject);
@@ -133 +135 @@
   try
     if tvAgent.Items <> nil then tvAgent.Items.Clear;
-    AList.Assign(SearchForAllergies(UpperCase(txtSearch.Text)));
+    FastAssign(SearchForAllergies(UpperCase(txtSearch.Text)), AList);
     uFileCount := 0;
     for i := 0 to AList.Count - 1 do
@@ -204 +206 @@
 procedure TfrmAllgyFind.cmdOKClick(Sender: TObject);
 var
-  x: string;
+  x, AGlobal: string;
   tmpList: TStringList;
   OKtoContinue: boolean ;
@@ -272 +274 @@
       FAllergy := TORTreeNode(tvAgent.Selected).StringData;
       x := Piece(FAllergy, U, 2);
-      x := Trim(Piece(x, '<', 1));
+      AGlobal := Piece(FAllergy, U, 3);
+      if ((Pos('GMRD', AGlobal) > 0) or (Pos('PSDRUG', AGlobal) > 0)) and (Pos('<', x) > 0) then
+        //x := Trim(Piece(x, '<', 1));
+        x := Copy(x, 1, Length(Piece(x, '<', 1)) - 1);
       SetPiece(FAllergy, U, 2, x);
       Close;