Skip to content

Commit ab922a4

Browse files
author
Grahame Grieve
committed
form adjustmnets
1 parent cf59ddf commit ab922a4

File tree

4 files changed

+34
-35
lines changed

4 files changed

+34
-35
lines changed

ipsmanager/forms/frm_home.lfm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object IPSManagerForm: TIPSManagerForm
22
Left = 350
33
Height = 567
4-
Top = 44
4+
Top = 288
55
Width = 1197
66
Caption = 'Patient Summary Manager'
77
ClientHeight = 567

server/tx/tx_hgvs.pas

+22-23
Original file line numberDiff line numberDiff line change
@@ -228,29 +228,28 @@ function THGVSProvider.locate(code: String; altOpt : TAlternateCodeOptions; var
228228
var
229229
json, o : TJsonObject;
230230
begin
231-
raise ETerminologyError.create('HGVS is not supported at this time');
232-
//try
233-
// json := TInternetFetcher.fetchJson('https://mutalyzer.nl/json/checkSyntax?variant='+code, 5000);
234-
// try
235-
// if json.bool['valid'] then
236-
// begin
237-
// result := THGVSCode.Create;
238-
// THGVSCode(result).code := code;
239-
// end
240-
// else
241-
// begin
242-
// result := nil;
243-
// message := '';
244-
// for o in json.forceArr['messages'].asObjects.forEnum do
245-
// CommaAdd(message, o.str['message']);
246-
// end;
247-
// finally
248-
// json.free;
249-
// end;
250-
//except
251-
// on e : Exception do
252-
// raise EFHIRException.Create('Error parsing HGVS response: '+e.message);
253-
//end;
231+
result := nil;
232+
message := '';
233+
try
234+
json := TInternetFetcher.fetchJson('https://clinicaltables.nlm.nih.gov/fhir/R4/CodeSystem/hgvs/$validate-code?code='+code, 5000);
235+
try
236+
for o in json.forceArr['parameter'].asObjects.forEnum do
237+
begin
238+
if (o.str['name'] = 'result') and (o.bool['valueBoolean']) then
239+
begin
240+
result := THGVSCode.Create;
241+
THGVSCode(result).code := code;
242+
end
243+
else if (o.str['name'] = 'message') then
244+
CommaAdd(message, o.str['message']);
245+
end;
246+
finally
247+
json.free;
248+
end;
249+
except
250+
on e : Exception do
251+
raise EFHIRException.Create('Error parsing HGVS response: '+e.message);
252+
end;
254253
end;
255254

256255
function THGVSProvider.locateIsA(code, parent: String; disallowParent : boolean = false): TCodeSystemProviderContext;

toolkit2/dialogs/frm_about.lfm

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object ToolkitAboutForm: TToolkitAboutForm
22
Left = 474
33
Height = 223
4-
Top = 228
4+
Top = 472
55
Width = 530
66
BorderIcons = []
77
BorderStyle = bsNone
@@ -577,9 +577,9 @@ object ToolkitAboutForm: TToolkitAboutForm
577577
object Label1: TLabel
578578
Cursor = crHandPoint
579579
Left = 216
580-
Height = 15
580+
Height = 16
581581
Top = 152
582-
Width = 263
582+
Width = 295
583583
Caption = 'https://github.com/HealthIntersections/fhirserver'
584584
Font.Color = 10485760
585585
Font.Style = [fsUnderline]
@@ -589,9 +589,9 @@ object ToolkitAboutForm: TToolkitAboutForm
589589
object Label2: TLabel
590590
Cursor = crHandPoint
591591
Left = 216
592-
Height = 15
592+
Height = 16
593593
Top = 187
594-
Width = 77
594+
Width = 94
595595
Caption = 'License: BSD-3'
596596
Font.Color = 10485760
597597
Font.Style = [fsUnderline]
@@ -600,9 +600,9 @@ object ToolkitAboutForm: TToolkitAboutForm
600600
end
601601
object Label3: TLabel
602602
Left = 216
603-
Height = 15
603+
Height = 16
604604
Top = 168
605-
Width = 218
605+
Width = 252
606606
Caption = 'Copyright (c) Health Intersections Pty Ltd'
607607
end
608608
end

toolkit2/frames/ftk_frame_igpub.lfm

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object IgPubPageFrame: TIgPubPageFrame
77
ClientWidth = 1177
88
TabOrder = 0
99
DesignLeft = 339
10-
DesignTop = 290
10+
DesignTop = 534
1111
object Panel1: TPanel
1212
Left = 0
1313
Height = 318
@@ -179,7 +179,7 @@ object IgPubPageFrame: TIgPubPageFrame
179179
end
180180
object ToolButton2: TToolButton
181181
Left = 211
182-
Height = 8
182+
Height = 40
183183
Top = 2
184184
Caption = 'ToolButton2'
185185
Style = tbsSeparator
@@ -193,7 +193,7 @@ object IgPubPageFrame: TIgPubPageFrame
193193
end
194194
object ToolButton4: TToolButton
195195
Left = 319
196-
Height = 8
196+
Height = 40
197197
Top = 2
198198
Caption = 'ToolButton4'
199199
Style = tbsSeparator
@@ -223,7 +223,7 @@ object IgPubPageFrame: TIgPubPageFrame
223223
end
224224
object ToolButton8: TToolButton
225225
Left = 504
226-
Height = 8
226+
Height = 40
227227
Top = 2
228228
Caption = 'ToolButton8'
229229
Style = tbsSeparator

0 commit comments

Comments
 (0)