Changeset 756

Timestamp:

May 12, 2010, 3:05:42 PM (14 years ago)

Author:

Kevin Toppenberg

Message:

Fixed several issues with Advanced Users tab

Location:

cprs/branches/GUI-config

Files:

• AboutU.dcu (modified) ( previous)
• BDK32/Source/AddServer.dcu (modified) ( previous)
• BDK32/Source/CCOW_const.dcu (modified) ( previous)
• BDK32/Source/Hash.dcu (modified) ( previous)
• BDK32/Source/Loginfrm.dcu (modified) ( previous)
• BDK32/Source/MFunStr.dcu (modified) ( previous)
• BDK32/Source/RpcConf1.dcu (modified) ( previous)
• BDK32/Source/RpcSlogin.dcu (modified) ( previous)
• BDK32/Source/RpcbErr.dcu (modified) ( previous)
• BDK32/Source/SelDiv.dcu (modified) ( previous)
• BDK32/Source/SgnonCnf.dcu (modified) ( previous)
• BDK32/Source/TRPCB.dcu (modified) ( previous)
• BDK32/Source/VCEdit.dcu (modified) ( previous)
• BDK32/Source/VERGENCECONTEXTORLib_TLB.dcu (modified) ( previous)
• BDK32/Source/XWBRich20.dcu (modified) ( previous)
• BDK32/Source/XWBut1.dcu (modified) ( previous)
• BDK32/Source/ccowrpcbroker.dcu (modified) ( previous)
• BDK32/Source/fDebugInfo.dcu (modified) ( previous)
• BDK32/Source/fRPCBErrMsg.dcu (modified) ( previous)
• BDK32/Source/fSgnonDlg.dcu (modified) ( previous)
• BDK32/Source/frmSignonMessage.dcu (modified) ( previous)
• BDK32/Source/rpcnet.dcu (modified) ( previous)
• BDK32/Source/wsockc.dcu (modified) ( previous)
• BatchAddU.dcu (modified) ( previous)
• CPRS-Lib/ORCtrls.dcu (modified) ( previous)
• CPRS-Lib/ORFn.dcu (modified) ( previous)
• CPRS-Lib/ORNet.dcu (modified) ( previous)
• CPRS-Lib/uAccessAPI.dcu (modified) ( previous)
• CreateTemplateU.dcu (modified) ( previous)
• DebugU.dcu (modified) ( previous)
• EditTextU.dcu (modified) ( previous)
• FMErrorU.dcu (modified) ( previous)
• GUI_Config.dof (modified) (1 diff)
• GUI_Config.dsk (modified) (12 diffs)
• GUI_Config.exe (modified) ( previous)
• LookupU.dcu (modified) ( previous)
• MainU.dcu (modified) ( previous)
• MainU.dfm (modified) (10 diffs)
• MainU.pas (modified) (3 diffs)
• PleaseWaitU.dcu (modified) ( previous)
• PostU.dcu (modified) ( previous)
• SelDateTimeU.dcu (modified) ( previous)
• SetSelU.dcu (modified) ( previous)
• SkinFormU.dcu (modified) ( previous)
• SubfilesU.dcu (modified) ( previous)
• frmSplash.dcu (modified) ( previous)

cprs/branches/GUI-config/GUI_Config.dof

@@ -101 +101 @@
 UsePackages=0
 [Parameters]
-RunParams=s=127.0.0.1 p=9260 CCOW=disable
+RunParams=s=192.168.3.99 p=9260 CCOW=DISABLE
 HostApplication=
 Launcher=

cprs/branches/GUI-config/GUI_Config.dsk

@@ -2 +2 @@
 File_0=SourceModule,'P:\vista\GUI-config\PostU.pas',0,1,34,62,10,0,0
 File_1=SourceModule,'P:\vista\GUI-config\SkinFormU.pas',0,1,87,16,95,0,0
-File_2=SourceModule,'P:\vista\GUI-config\BDK32\Source\wsockc.pas',0,1,1468,71,1476,0,0
-File_3=SourceModule,'P:\Vista\GUI-config\CPRS-Lib\ORNet.pas',0,1,1,1,310,0,0
-File_4=SourceModule,'c:\program files\borland\delphi7\source\vcl\OleCtrls.pas',0,1,85,27,96,0,0
-File_5=SourceModule,'P:\vista\GUI-config\BDK32\Source\ccowrpcbroker.pas',0,1,44,29,45,0,0
-File_6=SourceModule,'P:\vista\GUI-config\BDK32\Source\VERGENCECONTEXTORLib_TLB.pas',0,1,1104,11,1110,0,0
-File_7=SourceModule,'P:\vista\GUI-config\BDK32\Source\TRPCB.pas',0,1,1045,1,1059,0,0
-File_8=SourceModule,'P:\vista\GUI-config\CreateTemplateU.pas',0,1,140,11,145,0,0
-File_9=SourceModule,'P:\vista\GUI-config\SetSelU.pas',0,1,1,1,1,1,0
+File_2=SourceModule,'P:\Vista\GUI-config\CPRS-Lib\ORNet.pas',0,1,1,1,310,0,0
+File_3=SourceModule,'c:\program files\borland\delphi7\source\vcl\OleCtrls.pas',0,1,85,27,96,0,0
+File_4=SourceModule,'P:\vista\GUI-config\BDK32\Source\ccowrpcbroker.pas',0,1,44,29,45,0,0
+File_5=SourceModule,'P:\vista\GUI-config\BDK32\Source\VERGENCECONTEXTORLib_TLB.pas',0,1,1104,11,1110,0,0
+File_6=SourceModule,'P:\vista\GUI-config\BDK32\Source\TRPCB.pas',0,1,1045,1,1059,0,0
+File_7=SourceModule,'P:\vista\GUI-config\CreateTemplateU.pas',0,1,140,11,145,0,0
+File_8=SourceModule,'P:\vista\GUI-config\SetSelU.pas',0,1,1,1,1,1,0
 
 [Modules]
-Module0=P:\vista\GUI-config\AboutU.pas
-Module1=P:\vista\GUI-config\frmSplash.pas
-Module2=P:\vista\GUI-config\MainU.pas
-Module3=P:\vista\GUI-config\GUI_Config.dpr
-Count=4
+Module0=P:\vista\GUI-config\MainU.pas
+Module1=P:\Vista\GUI-config\CPRS-Lib\ORFn.pas
+Module2=P:\vista\GUI-config\GUI_Config.dpr
+Module3=P:\vista\GUI-config\AboutU.pas
+Module4=P:\vista\GUI-config\frmSplash.pas
+Module5=P:\vista\GUI-config\BDK32\Source\wsockc.pas
+Count=6
 EditWindowCount=1
+
+[P:\vista\GUI-config\MainU.pas]
+ModuleType=SourceModule
+FormState=1
+FormOnTop=0
+
+[P:\Vista\GUI-config\CPRS-Lib\ORFn.pas]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+
+[P:\vista\GUI-config\GUI_Config.dpr]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
 
 [P:\vista\GUI-config\AboutU.pas]
@@ -29 +45 @@
 FormOnTop=0
 
-[P:\vista\GUI-config\MainU.pas]
+[P:\vista\GUI-config\BDK32\Source\wsockc.pas]
 ModuleType=SourceModule
 FormState=0
-FormOnTop=1
-
-[P:\vista\GUI-config\GUI_Config.dpr]
-ModuleType=SourceModule
-FormState=0
 FormOnTop=0
 
@@ -44 +55 @@
 
 [EditWindow0]
-ViewCount=4
-CurrentView=1
+ViewCount=6
+CurrentView=0
 View0=0
 View1=1
 View2=2
 View3=3
+View4=4
+View5=5
 CodeExplorer=CodeExplorer@EditWindow0
 MessageView=MessageView@EditWindow0
@@ -55 +68 @@
 Visible=1
 State=0
-Left=199
-Top=157
+Left=167
+Top=159
 Width=775
 Height=552
@@ -67 +80 @@
 LeftPanelData=00000400010000000C000000436F64654578706C6F726572000000000000000000000000000000000001000000000000000000000000FFFFFFFF
 RightPanelSize=0
-BottomPanelSize=0
+BottomPanelSize=155
 BottomPanelClients=MessageView@EditWindow0
-BottomPanelData=00000400010000000B0000004D65737361676556696577FF02000000000000029B00000000000000010000000000000000000000000100000000FF0200000B0000004D65737361676556696577FFFFFFFF
+BottomPanelData=0000040000000000FF02000000000000029B00000000000000010000000000000000000000000100000000FF020000000000000100000000FF0200000B0000004D65737361676556696577FFFFFFFF
 
 [View0]
 Module=P:\vista\GUI-config\MainU.pas
 CursorX=1
-CursorY=1658
-TopLine=1656
+CursorY=1588
+TopLine=1579
 LeftCol=1
 
 [View1]
+Module=P:\Vista\GUI-config\CPRS-Lib\ORFn.pas
+CursorX=1
+CursorY=623
+TopLine=613
+LeftCol=1
+
+[View2]
+Module=P:\vista\GUI-config\BDK32\Source\wsockc.pas
+CursorX=1
+CursorY=1479
+TopLine=1466
+LeftCol=1
+
+[View3]
 Module=P:\vista\GUI-config\AboutU.pas
-CursorX=21
-CursorY=110
+CursorX=1
+CursorY=109
 TopLine=98
 LeftCol=1
 
-[View2]
+[View4]
 Module=P:\vista\GUI-config\frmSplash.pas
 CursorX=1
@@ -92 +119 @@
 LeftCol=1
 
-[View3]
+[View5]
 Module=P:\vista\GUI-config\GUI_Config.dpr
 CursorX=1
@@ -100 +127 @@
 
 [Watches]
-Count=4
+Count=5
 Watch0='MainMenu.items.count',256,0,18,1,0,'Watches'
 Watch1='tempInfo',256,0,18,1,0,'Watches'
 Watch2='RPCBrokerV.Results.count',256,0,18,1,0,'Watches'
 Watch3='Strings.count',256,0,18,1,0,'Watches'
+Watch4='Self.Height',256,0,18,1,0,'Watches'
 
 [WatchWindow]
@@ -125 +153 @@
 
 [Breakpoints]
-Count=2
-Breakpoint0='P:\vista\GUI-config\MainU.pas',990,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint1='P:\vista\GUI-config\MainU.pas',1879,'',0,1,'',1,0,0,'',1,'','',''
+Count=12
+Breakpoint0='P:\vista\GUI-config\MainU.pas',1879,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint1='P:\vista\GUI-config\AboutU.pas',109,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint2='P:\vista\GUI-config\MainU.pas',2081,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint3='P:\vista\GUI-config\MainU.pas',2088,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint4='P:\vista\GUI-config\MainU.pas',2104,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint5='P:\vista\GUI-config\MainU.pas',2001,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint6='P:\vista\GUI-config\MainU.pas',2036,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint7='P:\vista\GUI-config\MainU.pas',414,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint8='P:\vista\GUI-config\MainU.pas',1295,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint9='P:\vista\GUI-config\MainU.pas',2199,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint10='P:\vista\GUI-config\MainU.pas',1586,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint11='P:\vista\GUI-config\MainU.pas',1592,'',0,1,'',1,0,0,'',1,'','',''
 
 [AddressBreakpoints]
@@ -135 +173 @@
 Create=1
 Visible=1
-State=2
+State=0
 Left=0
 Top=0
@@ -142 +180 @@
 MaxLeft=-1
 MaxTop=-1
-MaxWidth=1032
-MaxHeight=112
-ClientWidth=1024
+ClientWidth=1016
 ClientHeight=78
 
@@ -226 +262 @@
 SplitPos=73
 ArrangeBy=Name
-SelectedItem=Name
+SelectedItem=OnClick
 ExpandedItems=Anchors,Menu,Options
 HiddenCategories=Legacy
@@ -430 +466 @@
 [MessageView@EditWindow0]
 Create=1
-Visible=0
+Visible=1
 State=0
 Left=12

cprs/branches/GUI-config/MainU.dfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = -750
-  Top = 194
+  Left = 269
+  Top = 153
   Width = 673
   Height = 552
@@ -48 +48 @@
     Width = 665
     Height = 498
-    ActivePage = tsPatients
+    ActivePage = tsUsers
     Align = alClient
     OwnerDraw = True
@@ -221 +221 @@
               Left = 0
               Top = 0
-              Width = 468
-              Height = 410
+              Width = 469
+              Height = 411
               Cursor = crHandPoint
               Hint = 'Edit User Fields Here'
@@ -246 +246 @@
               Left = 0
               Top = 0
-              Width = 468
-              Height = 412
+              Width = 469
+              Height = 411
               Cursor = crHandPoint
               Hint = 'Edit User Fields Here'
@@ -388 +388 @@
             Width = 477
             Height = 439
-            ActivePage = tsBasicSettings
+            ActivePage = tsAdvancedSettings
             Align = alClient
             OwnerDraw = True
@@ -400 +400 @@
                 Left = 0
                 Top = 0
-                Width = 468
-                Height = 410
+                Width = 469
+                Height = 411
                 Cursor = crHandPoint
                 Hint = 'Edit User Fields Here'
@@ -425 +425 @@
                 Left = 0
                 Top = 0
-                Width = 492
-                Height = 339
+                Width = 469
+                Height = 411
                 Cursor = crHandPoint
                 Hint = 'Edit User Fields Here'
@@ -612 +612 @@
             Width = 477
             Height = 439
-            ActivePage = tsAdvancedPatients
+            ActivePage = tsBasicPatients
             Align = alClient
             OwnerDraw = True
@@ -624 +624 @@
                 Left = 0
                 Top = 0
-                Width = 468
-                Height = 410
+                Width = 469
+                Height = 411
                 Cursor = crHandPoint
                 Hint = 'Edit User Fields Here'
@@ -940 +940 @@
                 Left = 0
                 Top = 0
-                Width = 468
-                Height = 410
+                Width = 469
+                Height = 411
                 Cursor = crHandPoint
                 Hint = 'Edit User Fields Here'

cprs/branches/GUI-config/MainU.pas

@@ -1037 +1037 @@
   
   procedure TMainForm.ClearGrid(Grid : TStringGrid);
-  begin
-    Grid.Cells[0,1] := '';
-    Grid.Cells[1,1] := '';
-    Grid.Cells[2,1] := '';
+  var i:integer;
+  begin
+    for i := 1 to 23 do begin    //elh added to clear all data as some residual remained
+       Grid.Cells[0,i] := '';
+       Grid.Cells[1,i] := '';
+       Grid.Cells[2,i] := '';
+    end;
     Grid.RowCount :=2;
   end;
@@ -1478 +1481 @@
       //Reject any value containing a "^" , ":" , ";"
       //Do we need an @ here as well?
-      if (AnsiPos('^',Entry.newvalue) > 0) or (AnsiPos(':',Entry.newvalue) > 0) or
+      if (AnsiPos('^',Entry.newvalue) > 0) or //(AnsiPos(':',Entry.newvalue) > 0) or   //elh Taken out because : used in time
          (AnsiPos(';',Entry.newvalue) > 0)then begin
          messagedlg('Invalid value entered for ' + Entry.Fieldname + #13 + #10
@@ -1912 +1915 @@
   procedure TMainForm.UserPageControlChange(Sender: TObject);
   begin
-    if SettingsPageControl.ActivePage = tsBasicSettings then begin
-      SetVisibleGridIdx(BasicUsersGrid);        
+    if UserPageControl.ActivePage = tsBasicPage then begin
+      SetVisibleGridIdx(BasicUsersGrid);
     end else begin
       SetVisibleGridIdx(AdvancedUsersGrid);