Changeset 1679 for cprs/trunk/CPRS-Chart/fEncnt.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/fEncnt.pas (modified) (5 diffs)

cprs/trunk/CPRS-Chart/fEncnt.pas

@@ -82 +82 @@
     FOldHintEvent: TShowHintEvent;
     OKPressed: Boolean;
+    DoNotNeedLocation: Boolean;     //AGP This is used to not force a location when writing a delayed order
     procedure AppShowHint(var HintStr: string; var CanShow: Boolean;
                           var HintInfo: THintInfo);
@@ -90 +91 @@
   end;
 
-procedure UpdateEncounter(PersonFilter: Int64; ADate: TFMDateTime = 0; TIULocation: integer = 0);
+procedure UpdateEncounter(PersonFilter: Int64; ADate: TFMDateTime = 0; TIULocation: integer = 0; DelayedOrder: Boolean = False);
 procedure UpdateVisit(FontSize: Integer); overload;
 procedure UpdateVisit(FontSize: Integer; TIULocation: integer); overload;
@@ -124 +125 @@
 end;
 
-procedure UpdateEncounter(PersonFilter: Int64; ADate: TFMDateTime = 0;  TIULocation: integer = 0);
+procedure UpdateEncounter(PersonFilter: Int64; ADate: TFMDateTime = 0;  TIULocation: integer = 0; DelayedOrder: Boolean = False);
 const
   UP_SHIFT = 85;
@@ -136 +137 @@
   frmEncounter := TfrmEncounter.Create(Application);
   try
+    if DelayedOrder = True then frmEncounter.DoNotNeedLocation := True
+    else frmEncounter.DoNotNeedLocation := False;
     TimedOut := False;
     ResizeAnchoredFormToFont(frmEncounter);
@@ -397 +400 @@
   inherited;
   msg := '';
-  if FLocation = 0 then msg := TX_NO_LOC;
-  if FDateTime <= 0 then msg := msg + CRLF + TX_NO_DATE
-  else if(pos('.',FloatToStr(FDateTime)) = 0) then msg := msg + CRLF + TX_NO_TIME;
-  if(msg <> '') then
-  begin
-    InfoBox(msg, TC_MISSING, MB_OK);
-    Exit;
-  end
-  else
-  begin
-    ADate := FMDateTimeToDateTime(Trunc(FDateTime));
-    AMaxDate := FMDateTimeToDateTime(FMToday) + StrToIntDef(FEncFutureLimit, 0);
-    if ADate > AMaxDate then
-      if InfoBox(TX_FUTURE_WARNING, TC_FUTURE_WARNING, MB_YESNO or MB_ICONQUESTION) = MRNO then exit;
-  end;
+  if DoNotNeedLocation = False then
+    begin
+      if FLocation = 0 then msg := TX_NO_LOC;
+      if FDateTime <= 0 then msg := msg + CRLF + TX_NO_DATE
+      else if(pos('.',FloatToStr(FDateTime)) = 0) then msg := msg + CRLF + TX_NO_TIME;
+      if(msg <> '') then
+        begin
+          InfoBox(msg, TC_MISSING, MB_OK);
+          Exit;
+        end
+      else
+        begin
+          ADate := FMDateTimeToDateTime(Trunc(FDateTime));
+          AMaxDate := FMDateTimeToDateTime(FMToday) + StrToIntDef(FEncFutureLimit, 0);
+          if ADate > AMaxDate then
+              if InfoBox(TX_FUTURE_WARNING, TC_FUTURE_WARNING, MB_YESNO or MB_ICONQUESTION) = MRNO then exit;
+        end;
+    end;
   if FFilter <> NPF_SUPPRESS then FProvider := cboPtProvider.ItemIEN;
   OKPressed := True;