Changeset 1679 for cprs/trunk/CPRS-Lib/ORDtTm.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-Lib/ORDtTm.pas (modified) (6 diffs)

cprs/trunk/CPRS-Lib/ORDtTm.pas

@@ -99 +99 @@
     FCaption: TStaticText;
     FBlackColorMode: boolean;
+    FOnDateDialogClosed : TNotifyEvent;
     procedure ButtonClick(Sender: TObject);
     function GetFMDateTime: TFMDateTime;
@@ -115 +116 @@
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
     property DateButton: TORDateButton read FButton;
+    procedure SetEnabled(Value: Boolean); override; //wat v28  when disabling TORDateBox, button still appears active, this addresses that
   public
     constructor Create(AOwner: TComponent); override;
@@ -130 +132 @@
     property RequireTime: Boolean     read FRequireTime write SetRequireTime;
     property Caption: string read GetCaption write SetCaption;
+    property OnDateDialogClosed: TNotifyEvent read FOnDateDialogClosed write FOnDateDialogClosed;
   end;
 
@@ -646 +649 @@
   end;
   DateDialog.Free;
+  if Assigned(OnDateDialogClosed) then OnDateDialogClosed(Self);
   if Visible and Enabled then //Some events may hide the component
     SetFocus;
@@ -740 +744 @@
   if Length(Text) > 0 then
   begin
+   {
+!!!!!! THIS HAS BEEN REMOVED AS IT CAUSED PROBLEMS WITH REMINDER DIALOGS - VHAISPBELLC !!!!!!
+    //We need to make sure that there is a date entered before parse
+    if FRequireTime and ((Pos('@', Text) = 0) or (Length(Piece(Text, '@', 1)) = 0)) then
+     ErrMsg := 'Date Required';
+    }
     FFMDateTime := ServerParseFMDate(Text);
     if FFMDateTime <= 0 then Errmsg := 'Invalid Date/Time';
@@ -777 +787 @@
     end;
     FCaption.Caption := Value;
+end;
+
+procedure TORDateBox.SetEnabled(Value: Boolean);
+begin
+  FButton.Enabled := Value;
+  inherited;
 end;