Changeset 873 for cprs


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • cprs/branches/GUI-config/MainU.pas

    r872 r873  
    14861486                     'Ignoring Value.',mtError,[mbOK],0);
    14871487      end else begin
    1488       if Entry.newValue = ' ' then Entry.newValue := '';
    1489       if Entry.oldValue = ' ' then Entry.oldValue := '';
    1490          if Entry.oldValue <> Entry.newValue then begin
    1491            if (Entry.newValue <> CLICK_FOR_SUBS) and
    1492               (Entry.newValue <> COMPUTED_FIELD) and
    1493               (Entry.newValue <> CLICK_TO_EDIT) then begin
    1494              oneEntry := Entry.FileNum + '^' + Entry.IENS + '^' + Entry.Field + '^' + Entry.FieldName;
    1495              //Test to see if change is an AV Code (2 or 11) or ES Code (20.4) in User File (200)
    1496              //If so, make it uppercase.       8/12/09   elh
    1497              if Entry.FileNum = '200' then begin
    1498                 if ((Entry.Field = '2') and (UCaseOnly = true)) or
    1499                    ((Entry.Field = '11') and (UCaseOnly = true)) or
    1500                    ((Entry.Field = '20.4') and (UCaseOnly = true)) then begin
    1501                    messagedlg('Converting ' + Entry.Fieldname + ' to uppercase for VistA interactivity.' +#13 +#10 +
    1502                               #13 +#10 +
    1503                               'Old Value: ' + Entry.newvalue + '  ' + 'New Value: ' + Uppercase(Entry.newvalue),
    1504                               mtinformation,[mbOK],0);
    1505                    Entry.newValue := Uppercase(Entry.newValue);
    1506                 end;
    1507              end;
    1508              oneEntry := oneEntry + '^' + Entry.newValue + '^' + Entry.oldValue;
    1509              Changes.Add(oneEntry);
     1488        //if Entry.newValue = ' ' then Entry.newValue := '';
     1489        Entry.newValue := Trim(Entry.newvalue);
     1490        if Entry.oldValue <> Entry.newValue then begin
     1491          if (Entry.newValue <> CLICK_FOR_SUBS) and
     1492            (Entry.newValue <> COMPUTED_FIELD) and
     1493            (Entry.newValue <> CLICK_TO_EDIT) then begin
     1494           oneEntry := Entry.FileNum + '^' + Entry.IENS + '^' + Entry.Field + '^' + Entry.FieldName;
     1495           //Test to see if change is an AV Code (2 or 11) or ES Code (20.4) in User File (200)
     1496           //If so, make it uppercase.       8/12/09   elh
     1497           if Entry.FileNum = '200' then begin
     1498              if ((Entry.Field = '2') and (UCaseOnly = true)) or
     1499                 ((Entry.Field = '11') and (UCaseOnly = true)) or
     1500                 ((Entry.Field = '20.4') and (UCaseOnly = true)) then begin
     1501                 messagedlg('Converting ' + Entry.Fieldname + ' to uppercase for VistA interactivity.' +#13 +#10 +
     1502                            #13 +#10 +
     1503                            'Old Value: ' + Entry.newvalue + '  ' + 'New Value: ' + Uppercase(Entry.newvalue),
     1504                            mtinformation,[mbOK],0);
     1505                 Entry.newValue := Uppercase(Entry.newValue);
     1506              end;
    15101507           end;
    1511          end;
     1508           oneEntry := oneEntry + '^' + Entry.newValue + '^' + Entry.oldValue;
     1509           Changes.Add(oneEntry);
     1510          end;
     1511        end;
    15121512      end;
    15131513    end;
Note: See TracChangeset for help on using the changeset viewer.