Changeset 873 for cprs/branches

Timestamp:

Jul 15, 2010, 9:21:26 AM (14 years ago)

Author:

Kevin Toppenberg

Message:

Corrected Issue: Applying phantom changes

Location:

cprs/branches/GUI-config

Files:

• GUI_Config.exe (modified) ( previous)
• MainU.dcu (modified) ( previous)
• MainU.pas (modified) (1 diff)

cprs/branches/GUI-config/MainU.pas

@@ -1486 +1486 @@
                      'Ignoring Value.',mtError,[mbOK],0);
       end else begin
-      if Entry.newValue = ' ' then Entry.newValue := '';
-      if Entry.oldValue = ' ' then Entry.oldValue := '';
-         if Entry.oldValue <> Entry.newValue then begin
-           if (Entry.newValue <> CLICK_FOR_SUBS) and
-              (Entry.newValue <> COMPUTED_FIELD) and
-              (Entry.newValue <> CLICK_TO_EDIT) then begin
-             oneEntry := Entry.FileNum + '^' + Entry.IENS + '^' + Entry.Field + '^' + Entry.FieldName;
-             //Test to see if change is an AV Code (2 or 11) or ES Code (20.4) in User File (200)
-             //If so, make it uppercase.       8/12/09   elh
-             if Entry.FileNum = '200' then begin
-                if ((Entry.Field = '2') and (UCaseOnly = true)) or
-                   ((Entry.Field = '11') and (UCaseOnly = true)) or
-                   ((Entry.Field = '20.4') and (UCaseOnly = true)) then begin
-                   messagedlg('Converting ' + Entry.Fieldname + ' to uppercase for VistA interactivity.' +#13 +#10 +
-                              #13 +#10 +
-                              'Old Value: ' + Entry.newvalue + '  ' + 'New Value: ' + Uppercase(Entry.newvalue),
-                              mtinformation,[mbOK],0);
-                   Entry.newValue := Uppercase(Entry.newValue);
-                end;
-             end;
-             oneEntry := oneEntry + '^' + Entry.newValue + '^' + Entry.oldValue;
-             Changes.Add(oneEntry);
+        //if Entry.newValue = ' ' then Entry.newValue := '';
+        Entry.newValue := Trim(Entry.newvalue);
+        if Entry.oldValue <> Entry.newValue then begin
+          if (Entry.newValue <> CLICK_FOR_SUBS) and
+            (Entry.newValue <> COMPUTED_FIELD) and
+            (Entry.newValue <> CLICK_TO_EDIT) then begin
+           oneEntry := Entry.FileNum + '^' + Entry.IENS + '^' + Entry.Field + '^' + Entry.FieldName;
+           //Test to see if change is an AV Code (2 or 11) or ES Code (20.4) in User File (200)
+           //If so, make it uppercase.       8/12/09   elh
+           if Entry.FileNum = '200' then begin
+              if ((Entry.Field = '2') and (UCaseOnly = true)) or
+                 ((Entry.Field = '11') and (UCaseOnly = true)) or
+                 ((Entry.Field = '20.4') and (UCaseOnly = true)) then begin
+                 messagedlg('Converting ' + Entry.Fieldname + ' to uppercase for VistA interactivity.' +#13 +#10 +
+                            #13 +#10 +
+                            'Old Value: ' + Entry.newvalue + '  ' + 'New Value: ' + Uppercase(Entry.newvalue),
+                            mtinformation,[mbOK],0);
+                 Entry.newValue := Uppercase(Entry.newValue);
+              end;
            end;
-         end;
+           oneEntry := oneEntry + '^' + Entry.newValue + '^' + Entry.oldValue;
+           Changes.Add(oneEntry);
+          end;
+        end;
       end;
     end;