Changeset 1692

Timestamp:

May 8, 2015, 7:26:56 AM (10 years ago)

Author:

healthsevak

Message:

Committing the files for first time to this new branch

File:

• cprs/branches/HealthSevak-CPRS/CPRS-Chart/uReminders.pas (modified) (7 diffs)

cprs/branches/HealthSevak-CPRS/CPRS-Chart/uReminders.pas

@@ -42 +42 @@
     function Processing: boolean;
     procedure AddText(Lst: TStrings);
-    procedure ClearMHTest(RIEN: String);
     property PrintName: string read GetPrintName;
     property IEN: string read GetIEN;
@@ -2088 +2087 @@
   MHRes := False;
   tmpText := '';
-  if Pos('~', AText)>0 then MHLoop := 2;
+  if (MHTest = True) and (Pos('~', AText)>0) then MHLoop := 2;
   for j := 1 to MHLoop do
   begin
@@ -2640 +2639 @@
     end;
   end;
-end;
-
-procedure TReminderDialog.ClearMHTest(RIEN: String);
-var
-i,j: integer;
-TestName: string;
-begin
-  if (self.MHTestArray <> nil) and (self.MHTestArray.Count > 0) then
-    begin
-      i := self.MHTestArray.IndexOfPiece(RIEN, U, 2, -1);
-      while i > -1 do
-        begin
-          TestName := Piece(self.MHTestArray.Strings[i], U, 1);
-          self.MHTestArray.Delete(i);
-          j := self.MHTestArray.IndexOfPiece(TestName, U, 1, -1);
-          if j = -1 then RemoveMHTest(TestName);
-          i := self.MHTestArray.IndexOfPiece(RIEN, U, 2, -1);
-        end;
-    end;
 end;
 
@@ -3517 +3497 @@
     // Element.FFieldValues.
     Entry.OnChange := FieldPanelChange;
+    //AGP BACKED OUT THE CHANGE CAUSE A PROBLEM WITH TEMPLATE WORD PROCESSING FIELDS WHEN RESIZING
+    //FieldPanelChange(Entry); // to accomodate fields with default values - CQ#15960
+    //AGP END BACKED OUT
     // Calls TTemplateDialogEntry.SetFieldValues which calls
     // TTemplateDialogEntry.SetControlText to reset the template field default
@@ -4650 +4633 @@
           Prompt := TRemPrompt(FPrompts[i]);
           if(not Prompt.FIsShared) then
-            WordWrap(Prompt.NoteText, Lst, ilvl);
+            begin
+               if Prompt.PromptType = ptMHTest then  WordWrap(Prompt.NoteText, Lst, ilvl, 4, true)
+               else WordWrap(Prompt.NoteText, Lst, ilvl);
+            end;
+
         end;
       end;
@@ -6695 +6682 @@
   TestComp := 0;
   try
-  if (sender is TCPRSDialogButton) then
-     (Sender as TCPRSDialogButton).Enabled := false;
+  if (Sender is TCPRSDialogButton) then
+    (Sender as TCPRSDialogButton).Enabled := false;
   if FParent.FReminder.MHTestArray = nil then FParent.FReminder.MHTestArray := TORStringList.Create;
   if(MHTestAuthorized(FData.Narrative)) then
@@ -6798 +6785 @@
                    'Insufficient Authorization', MB_OK + MB_ICONERROR);
   finally
-     (Sender as TCPRSDialogButton).Enabled := true;
+    if (Sender is TCPRSDialogButton) then
+      begin
+        (Sender as TCPRSDialogButton).Enabled := true;
+        (Sender as TCPRSDialogButton).SetFocus;
+      end;
+
   end;
 end;