|
@@ -204,7 +204,7 @@ type
|
|
|
procedure UpdateProgressBar(APosition: Integer);
|
|
|
procedure UpdateProgressHint(const AHint: string);
|
|
|
|
|
|
- procedure CreateProjectView(ARec: TsdDataRecord);
|
|
|
+ function CreateProjectView(ARec: TsdDataRecord): TProjectFrame;
|
|
|
|
|
|
procedure LocateProjectView(AIndex: Integer);
|
|
|
procedure DeleteProjectView(AIndex: Integer);
|
|
@@ -217,7 +217,7 @@ type
|
|
|
procedure UpdateProgress(APos: Integer; const AHint: string);
|
|
|
procedure LocateProject(AProjectID: Integer);
|
|
|
function HasOpened(AProjectID: Integer): Boolean;
|
|
|
- procedure OpenProject(ARec: TsdDataRecord);
|
|
|
+ function OpenProject(ARec: TsdDataRecord): TProjectFrame;
|
|
|
|
|
|
property CurProjectFrame: TProjectFrame read GetCurProjectFrame;
|
|
|
property ProjectManagerFrame: TProjectManagerFrame read FProjectManagerFrame;
|
|
@@ -361,12 +361,15 @@ begin
|
|
|
FProjectManagerFrame.Free;
|
|
|
end;
|
|
|
|
|
|
-procedure TMainForm.OpenProject(ARec: TsdDataRecord);
|
|
|
+function TMainForm.OpenProject(ARec: TsdDataRecord): TProjectFrame;
|
|
|
begin
|
|
|
if not HasOpened(ARec.ValueByName('ID').AsInteger) then
|
|
|
- CreateProjectView(ARec)
|
|
|
+ Result := CreateProjectView(ARec)
|
|
|
else
|
|
|
+ begin
|
|
|
LocateProject(ARec.ValueByName('ID').AsInteger);
|
|
|
+ Result := CurProjectFrame;
|
|
|
+ end;
|
|
|
end;
|
|
|
|
|
|
function TMainForm.HasOpened(AProjectID: Integer): Boolean;
|
|
@@ -381,7 +384,7 @@ begin
|
|
|
jpsMain.ActivePage := jpsMainProjects;
|
|
|
end;
|
|
|
|
|
|
-procedure TMainForm.CreateProjectView(ARec: TsdDataRecord);
|
|
|
+function TMainForm.CreateProjectView(ARec: TsdDataRecord): TProjectFrame;
|
|
|
|
|
|
function CreateNewProjectPage: TJimPage;
|
|
|
begin
|
|
@@ -396,7 +399,7 @@ procedure TMainForm.CreateProjectView(ARec: TsdDataRecord);
|
|
|
jtsProjects.TabIndex := Result;
|
|
|
end;
|
|
|
|
|
|
- procedure CreateProjectFrame(AProjectData: TProjectData; APage: TJimPage);
|
|
|
+ function CreateProjectFrame(AProjectData: TProjectData; APage: TJimPage): TProjectFrame;
|
|
|
var
|
|
|
ProjectFrame: TProjectFrame;
|
|
|
begin
|
|
@@ -404,6 +407,7 @@ procedure TMainForm.CreateProjectView(ARec: TsdDataRecord);
|
|
|
FProjectFrames.Add(ProjectFrame);
|
|
|
ProjectFrame.Parent := APage;
|
|
|
ProjectFrame.Align := alClient;
|
|
|
+ Result := ProjectFrame;
|
|
|
end;
|
|
|
|
|
|
var
|
|
@@ -412,7 +416,7 @@ begin
|
|
|
jpsMain.ActivePage := jpsMainProjects;
|
|
|
jimPage := CreateNewProjectPage;
|
|
|
CreateNewProjectTab(ARec.ValueByName('Name').AsString, jimPage);
|
|
|
- CreateProjectFrame(OpenProjectManager.Open(ARec), jimPage);
|
|
|
+ Result := CreateProjectFrame(OpenProjectManager.Open(ARec), jimPage);
|
|
|
ProjectManager.AddOpenTenderBackup(ARec.ValueByName('ID').AsInteger);
|
|
|
end;
|
|
|
|