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

cprs/trunk/CPRS-Chart/Templates/uTemplateFields.pas

@@ -601 +601 @@
           begin
             NewTxt := Entry.GetControlText(CtrlID, TRUE, FoundEntry, FALSE);
-            if FoundEntry and (NewTxt = '') then
+            if FoundEntry and (NewTxt = '') then{(Trim(NewTxt) = '') then //CODE ADDED BACK IN - VHAISPBELLC}
               Result := TRUE;
           end;
@@ -1160 +1160 @@
           cbo.SelectByID(StripEmbedded(FItemDefault));
           cbo.Tag := CtrlID;
-          cbo.OnClick := Entry.DoChange;
+          cbo.OnChange := Entry.DoChange;
 
           if cbo.Items.Count > 12 then
@@ -1295 +1295 @@
           pnl.Width := pnl.Edit.Width + pnl.UpDown.Width;
           UpdateColorsFor508Compliance(pnl, TRUE);
+          //CQ 17597 wat
+          pnl.Edit.Align := alLeft;
+          pnl.UpDown.Align := alLeft;
+          //end 17597
           ctrl := pnl;
         end;
@@ -1932 +1936 @@
       end
       else
+      //!!!!!! CODE ADDED BACK IN - VHAISPBELLC !!!!!!
       if(Ctrl is TEdit) then
         Result := TEdit(Ctrl).Text
@@ -1945 +1950 @@
         Result := TORDateCombo(Ctrl).Text + ':' + FloatToStr(TORDateCombo(Ctrl).FMDate)
       else
+     {!!!!!! THIS HAS BEEN REMOVED AS IT CAUSED PROBLEMS WITH REMINDER DIALOGS - VHAISPBELLC !!!!!!
+      if(Ctrl is TORDateBox) then begin
+        if TORDateBox(Ctrl).IsValid then
+         Result := TORDateBox(Ctrl).Text
+        else
+         Result := '';
+      end else
+      }
+      //!!!!!! CODE ADDED BACK IN - VHAISPBELLC !!!!!!
       if(Ctrl is TORDateBox) then
         Result := TORDateBox(Ctrl).Text
@@ -1973 +1987 @@
       end
       else
+     {!!!!!! THIS HAS BEEN REMOVED AS IT CAUSED PROBLEMS WITH REMINDER DIALOGS - VHAISPBELLC !!!!!!
+      if(Ctrl is TEdit) then
+        Result := TEdit(Ctrl).Text
+      else }
       if(Ctrl is TORCheckBox) then
       begin