Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move builtInTemplates source code one level up #7611

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/docs/asciidoc/images/SoftwareArchitecture-UI.drawio
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0" version="24.9.1">
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0" version="24.9.3">
<diagram id="z6Yjpe6HvQgAe8unCV71" name="Page-1">
<mxGraphModel dx="1434" dy="793" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
Expand All @@ -7,7 +7,7 @@
<mxCell id="FSSSU1nTyY8xmhBLleuj-13" value="&lt;div align=&quot;right&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="whiteSpace=wrap;html=1;aspect=fixed;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fillColor=#dae8fc;strokeColor=#6c8ebf;rounded=1;gradientColor=#7ea6e0;" parent="1" vertex="1">
<mxGeometry x="194" y="90" width="480" height="480" as="geometry" />
</mxCell>
<mxCell id="fpFChmSEyJDjpxVGa_st-11" value="&lt;div&gt;..app/business/builtinTemplates&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cce5ff;strokeWidth=0;strokeColor=#36393d;align=left;" parent="1" vertex="1">
<mxCell id="fpFChmSEyJDjpxVGa_st-11" value="&lt;div&gt;..app/builtinTemplates&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cce5ff;strokeWidth=0;strokeColor=#36393d;align=left;" parent="1" vertex="1">
<mxGeometry x="384" y="390.5" width="174" height="129" as="geometry" />
</mxCell>
<mxCell id="fpFChmSEyJDjpxVGa_st-8" value="&lt;div&gt;..app/api &lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cce5ff;strokeWidth=0;strokeColor=#36393d;align=left;" parent="1" vertex="1">
Expand Down
Binary file modified src/docs/asciidoc/images/SoftwareArchitecture-UI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file is part of the OperatorFabric project.
*/

import {LoggerService as logger} from '../services/logs/logger.service';
import {LoggerService as logger} from '../business/services/logs/logger.service';

declare const opfab;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file is part of the OperatorFabric project.
*/

import {DateTimeFormatterService} from '../../../services/date-time-formatter.service';
import {DateTimeFormatterService} from 'app/business/services/date-time-formatter.service';

declare const opfab;

Expand Down
2 changes: 0 additions & 2 deletions ui/main/src/app/business/application-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {RemoteLoggerService} from './services/logs/remote-logger.service';
import {I18nService} from './services/translation/i18n.service';
import {UserService} from './services/users/user.service';
import {OpfabAPI} from '../api/opfab.api';
import {loadBuiltInTemplates} from './builtInTemplates/templatesLoader';
import {GlobalStyleService} from './services/global-style.service';
import {EntitiesService} from './services/users/entities.service';
import {GroupsService} from './services/users/groups.service';
Expand Down Expand Up @@ -124,7 +123,6 @@ export class ApplicationLoader {
this.initOpfabAPI();
await this.loadCustomScripts();
this.initServices();
loadBuiltInTemplates();
await this.waitForStreamInitDone();
logger.info('Card stream connection established');
RealtimeDomainService.init(); // important to be after the stream init done
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {NgIf} from '@angular/common';
import {LoadingInProgressComponent} from './loading-in-progress/loading-in-progress.component';
import {LoginComponent} from './login/login.component';
import {TranslateModule} from '@ngx-translate/core';
import {loadBuiltInTemplates} from 'app/builtInTemplates/templatesLoader';

declare const opfab: any;
@Component({
Expand Down Expand Up @@ -125,6 +126,7 @@ export class ApplicationLoadingComponent implements OnInit {
this.applicationLoader.setAppLoadedInAnotherTabComponent(this.appLoadedInAnotherTabComponent);
this.applicationLoader.setActivityAreaChoiceAfterLoginComponent(this.activityAreaChoiceAfterLoginComponent);
this.applicationLoader.setMethodToAuthenticate(this.authenticate.bind(this));
loadBuiltInTemplates();
const success = await this.applicationLoader.startOpfab();
if (success) {
this.applicationLoadedDone.next(true);
Expand Down