Changeset 1679 for cprs/trunk/CPRS-Chart/Orders/fODMedNVA.pas

Timestamp:

May 7, 2015, 12:34:29 PM (9 years ago)

Author:

healthsevak

Message:

Updating the working copy to CPRS version 28

File:

• cprs/trunk/CPRS-Chart/Orders/fODMedNVA.pas (modified) (9 diffs)

cprs/trunk/CPRS-Chart/Orders/fODMedNVA.pas

@@ -63 +63 @@
     procedure lblGuidelineClick(Sender: TObject);
     procedure ListViewClick(Sender: TObject);
-    procedure cboScheduleExit(Sender: TObject);
     procedure cboScheduleChange(Sender: TObject);
     procedure cboRouteChange(Sender: TObject);
@@ -70 +69 @@
     procedure cboDosageChange(Sender: TObject);
     procedure cboScheduleClick(Sender: TObject);
-    procedure cboRouteExit(Sender: TObject);
     procedure DispOrderMessage(const AMessage: string);
 
@@ -92 +90 @@
       Change: TItemChange);
     procedure FormKeyPress(Sender: TObject; var Key: Char);
+    procedure cboDosageKeyUp(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
+    procedure cboRouteKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure cboScheduleKeyUp(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
 
   private
@@ -380 +383 @@
   FRemoveText := True;
   FShrinkDrugMsg := False;
+  if ScreenReaderActive then lstQuick.TabStop := True;
 end;
 
@@ -813 +817 @@
   chunk := GetCacheChunkIndex(Item.Index);
   list := TStringList(FNVAMedCache[chunk]);
-  x := list[Item.Index mod MED_CACHE_CHUNK_SIZE];
-  Item.Caption := Piece(x, U, 2);
-  Item.Data := Pointer(StrToIntDef(Piece(x, U, 1), 0));
+  //This is to make sure that the index that is being used is not outside of the stringlist
+  If Item.Index mod MED_CACHE_CHUNK_SIZE < list.Count then begin
+   x := list[Item.Index mod MED_CACHE_CHUNK_SIZE];
+   Item.Caption := Piece(x, U, 2);
+   Item.Data := Pointer(StrToIntDef(Piece(x, U, 1), 0));
+  end;
 end;
 
@@ -1138 +1145 @@
   btnSelect.Default := False;
   cmdAccept.Visible := True;
-  cmdAccept.Default := True;
+  cmdAccept.Default := False;
   btnSelect.TabOrder := txtMed.TabOrder + 1;
   cmdAccept.TabStop := True;
@@ -1391 +1398 @@
 end;
 
+procedure TfrmODMedNVA.cboDosageKeyUp(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  inherited;
+  if (Key = VK_BACK) and (cboDosage.Text = '') then cboDosage.ItemIndex := -1;
+end;
+
 { cboRoute -------------------------------------- }
 
@@ -1407 +1421 @@
 end;
 
-procedure TfrmODMedNVA.cboRouteExit(Sender: TObject);
-begin
-  inherited;
+
+
+procedure TfrmODMedNVA.cboRouteKeyUp(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  inherited;
+  if (Key = VK_BACK) and (cboRoute.Text = '') then cboRoute.ItemIndex := -1;
 end;
 
@@ -1426 +1444 @@
 end;
 
-procedure TfrmODMedNVA.cboScheduleExit(Sender: TObject);
-begin
+
+procedure TfrmODMedNVA.cboScheduleKeyUp(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  inherited;
+  if (Key = VK_BACK) and (cboSchedule.Text = '') then cboSchedule.ItemIndex := -1;
 end;