Ignore:
Timestamp:
May 7, 2015, 12:34:29 PM (10 years ago)
Author:
healthsevak
Message:

Updating the working copy to CPRS version 28

Location:
cprs/trunk/CPRS-Chart/Options
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • cprs/trunk/CPRS-Chart/Options/fOptions.dfm

    r829 r1679  
    22  Left = 315
    33  Top = 110
    4   Width = 435
    54  Height = 397
    65  HelpContext = 9999
     
    1110  Font.Name = 'Tahoma'
    1211  HelpFile = 'CPRSWT.HLP'
    13   OldCreateOrder = True
    1412  Position = poScreenCenter
    1513  OnCreate = FormCreate
    16   OnDestroy = FormDestroy
    17   ExplicitWidth = 435
    1814  ExplicitHeight = 397
    1915  PixelsPerInch = 96
     
    13591355        end
    13601356        object memReport2: TMemo
    1361           Left = 128
    1362           Top = 213
     1357          Left = 135
     1358          Top = 212
    13631359          Width = 273
    1364           Height = 47
     1360          Height = 48
    13651361          TabStop = False
    13661362          BorderStyle = bsNone
  • cprs/trunk/CPRS-Chart/Options/fOptions.pas

    r829 r1679  
    55uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
    66  Buttons, ComCtrls, ExtCtrls, ORCtrls, OrFn, Dialogs, ORDtTmRng, fBAOptionsDiagnoses,
    7   uBAGlobals, fBase508Form, VA508AccessibilityManager;
     7  uBAGlobals, fBase508Form, VA508AccessibilityManager, fAutoSz;
    88
    99type
    10   TfrmOptions = class(TfrmBase508Form)
     10  TfrmOptions = class(TfrmAutoSz)
    1111    pnlMain: TPanel;
    1212    pnlBottom: TPanel;
  • cprs/trunk/CPRS-Chart/Options/fOptionsCombinations.pas

    r829 r1679  
    185185  if copy(valuesource, 1, 1) = '&' then
    186186    valuesource := copy(valuesource, 2, length(valuesource) - 1);
    187   valuename := Piece(lstAddBy.DisplayText[lstAddBy.ItemIndex], '-', 1);
     187 { if radAddByType.ItemIndex = 2 then
     188   valuename := Piece(lstAddBy.DisplayText[lstAddBy.ItemIndex], '-', 1)
     189  else } //Removed per PTM 274 - should not peice by the "-" at all
     190   valuename := lstAddBy.DisplayText[lstAddBy.ItemIndex];
    188191  valueien := Piece(lstAddBy.Items[lstAddBy.ItemIndex], '^', 1);
    189192  if Duplicate(valueien, valuesource) then exit; // check for duplicates
  • cprs/trunk/CPRS-Chart/Options/fOptionsLists.dfm

    r829 r1679  
    1212  OnCreate = FormCreate
    1313  OnShow = FormShow
    14   ExplicitLeft = 354
    15   ExplicitTop = 178
    16   ExplicitWidth = 415
    17   ExplicitHeight = 469
     14  ExplicitWidth = 413
     15  ExplicitHeight = 474
    1816  PixelsPerInch = 96
    1917  TextHeight = 13
     
    123121    SynonymChars = '<>'
    124122    TabOrder = 1
     123    OnChange = lstAddByChange
    125124    OnClick = lstAddByClick
    126     OnKeyPress = lstAddByKeyPress
    127125    OnNeedData = lstAddByNeedData
    128126    CharsNeedMatch = 1
  • cprs/trunk/CPRS-Chart/Options/fOptionsLists.pas

    r829 r1679  
    5858    procedure lstAddByKeyPress(Sender: TObject; var Key: Char);
    5959    procedure grpVisibilityClick(Sender: TObject);
     60    procedure lstAddByChange(Sender: TObject);
    6061  private
    6162    { Private declarations }
     
    146147    case radAddByType.ItemIndex of
    147148      0: begin
    148            ListItemsOnly := true;
     149           ListItemsOnly := false;
    149150           LongList := true;
    150151           InitLongList('');
     
    256257end;
    257258
     259procedure TfrmOptionsLists.lstAddByChange(Sender: TObject);
     260  procedure ShowMatchingPatients;
     261  begin
     262    with lstAddBy do begin
     263      if ShortCount > 0 then begin
     264        if ShortCount = 1 then begin
     265          ItemIndex := 0;
     266        end;
     267        Items.Add(LLS_LINE);
     268        Items.Add(LLS_SPACE);
     269      end;
     270      InitLongList('');
     271    end;
     272  end;
     273
     274begin
     275  inherited;
     276  if radAddByType.ItemIndex = 0 {patient} then begin
     277    with lstAddBy do
     278    if frmPtSelOptns.IsLast5(Text) then begin
     279        ListPtByLast5(Items, Text);
     280        ShowMatchingPatients;
     281      end
     282    else if frmPtSelOptns.IsFullSSN(Text) then begin
     283        ListPtByFullSSN(Items, Text);
     284        ShowMatchingPatients;
     285    end;
     286  end;
     287end;
     288
     289
    258290procedure TfrmOptionsLists.lstAddByClick(Sender: TObject);
    259291var
     
    266298  if lstAddBy.ItemIndex < 0 then exit;
    267299  ien := Piece(lstAddBy.Items[lstAddBy.ItemIndex], '^', 1);
     300  If ien = '' then exit;
    268301  case radAddByType.ItemIndex of
    269302    0:
  • cprs/trunk/CPRS-Chart/Options/fOptionsNotes.pas

    r829 r1679  
    3232    procedure cboCosignerExit(Sender: TObject);
    3333  private
     34    FStartingCosigner: Int64;
    3435    { Private declarations }
    3536  public
     
    9899  cboCosigner.InitLongList(cosignername);
    99100  cboCosigner.SelectByIEN(cosigner);
    100   cboCosigner.Tag := cosigner;
     101  FStartingCosigner := cosigner;
    101102  chkAskSubject.Checked := rpcGetSubject;
    102103  if chkAskSubject.Checked then chkAskSubject.Tag := 1;
     
    126127    rpcSetSubject(Checked);
    127128  with cboCosigner do
    128     if Tag <> ItemIEN then
     129    if FStartingCosigner <> ItemIEN then
    129130      rpcSetDefaultCosigner(ItemIEN);
    130131  ResetTIUPreferences;
  • cprs/trunk/CPRS-Chart/Options/fOptionsOther.dfm

    r829 r1679  
    1313  Position = poScreenCenter
    1414  ShowHint = True
     15  OnCloseQuery = FormCloseQuery
    1516  OnCreate = FormCreate
    1617  OnShow = FormShow
     
    9798      ModalResult = 2
    9899      TabOrder = 1
     100      OnClick = btnCancelClick
    99101    end
    100102  end
  • cprs/trunk/CPRS-Chart/Options/fOptionsOther.pas

    r829 r1679  
    4848    procedure txtEncStopExit(Sender: TObject);
    4949    procedure btnEncDefaultsClick(Sender: TObject);
     50    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     51    procedure btnCancelClick(Sender: TObject);
    5052  private
    5153    { Private declarations }
     
    5355    FstopDt: TFMDateTime;
    5456    FEncStartDays, FEncStopDays, FEncDefStartDays, FEncDefStopDays: integer;
     57    OK2Closed: boolean;
    5558    //FDefaultEvent: string;
    5659  public
     
    107110  values, tab: string;
    108111begin
     112  OK2Closed := True;
    109113  FastAssign(rpcGetOtherTabs, cboTab.Items);
    110114  if (cboTab.Items.IndexOf('Surgery') > -1) and (not ShowSurgeryTab) then
     
    142146  values, theVal: string;
    143147begin
     148  OK2Closed := True;
    144149  values := '';
    145150  if cboTab.ItemIEN <> cboTab.Tag then
     
    154159  values := values + '^^';
    155160  rpcSetOther(values);
     161   if (dtStart.Text = '') and (dtStop.Text = '') then
     162    begin
     163      if InfoBox('A date range is not set for the meds tab. Continue?', 'No Date Range Defined', MB_YESNO) = ID_NO then
     164      begin
     165         dtStart.SetFocus;
     166         OK2Closed := false;
     167         Exit;
     168      end;
     169    end
     170  else if (dtStart.Text = '') or (dtStop.Text = '') then
     171    begin
     172      ShowMsg('A complete date range needs to be set. ');
     173      if dtStart.Text = '' then dtStart.SetFocus
     174      else dtStop.SetFocus;
     175      OK2Closed := false;
     176      Exit;
     177    end;
     178  //if Pos('Y', Uppercase(dtStart.Text))>0 then
     179  if Uppercase(Copy(dtStart.Text, Length(dtStart.Text), Length(dtStart.Text))) = 'Y' then
     180
     181    begin
     182      ShowMsg('Start Date relative date cannot have a Y');
     183      OK2Closed := false;
     184      dtStart.SetFocus;
     185      Exit;
     186    end;
     187  //if Pos('Y', Uppercase(dtStop.Text))>0 then
     188  if Uppercase(Copy(dtStop.Text, Length(dtStop.Text), Length(dtStop.Text))) = 'Y' then
     189    begin
     190      ShowMsg('Stop Date relative date cannot have a Y');
     191      OK2Closed := false;
     192      dtStart.SetFocus;
     193      Exit;
     194    end;
    156195  if (dtStop.FMDateTime > 0) and (dtStart.FMDateTime > 0) then
    157196  begin
     
    161200      dtStop.FMDateTime := FMToday;
    162201      dtStop.SetFocus;
     202      OK2Closed := false;
    163203      Exit;
    164204    end;
     
    173213end;
    174214
     215procedure TfrmOptionsOther.FormCloseQuery(Sender: TObject;
     216  var CanClose: Boolean);
     217begin
     218  inherited;
     219  CanClose := OK2Closed;
     220 
     221end;
     222
    175223procedure TfrmOptionsOther.FormCreate(Sender: TObject);
    176224begin
     
    204252procedure TfrmOptionsOther.dtStartChange(Sender: TObject);
    205253begin
    206   if (dtStart.FMDateTime > FMToday) then
     254 (* if (dtStart.FMDateTime > FMToday) then
    207255  begin
    208256    ShowMsg('Start time can not greater than today.');
     
    210258    dtStart.SetFocus;
    211259    Exit;
    212   end;
     260  end;    *)
    213261end;
    214262
     
    265313end;
    266314
     315procedure TfrmOptionsOther.btnCancelClick(Sender: TObject);
     316begin
     317  inherited;
     318  OK2Closed := True;
     319end;
     320
    267321procedure TfrmOptionsOther.btnEncDefaultsClick(Sender: TObject);
    268322begin
Note: See TracChangeset for help on using the changeset viewer.