micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
#	config/local.env
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
This commit is contained in:
gulnaz 2025-02-17 12:58:14 +03:00
commit 0069dcfa5a
22 changed files with 357 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/resources/template/app/component/app_header.html
View file

@ -1,7 +1,7 @@
<nav class="header" id="webbpm-header" [ngClass]="{'header-landing': isLanding}">
<div *ngIf="isLanding">
<div class="header-logo"></div>
<div class="header-title">Реестр повесток юридических лиц</div>
<div class="header-title">Реестр повесток физических лиц</div>
</div>
<div *ngIf="!isLanding" class="header-logo">
<div class="logo"><a routerLink="/"></a></div>

2
frontend/src/ts/ervu/component/button/ExtractLoadService.ts
View file

@ -26,7 +26,9 @@ export class ExtractLoadService extends Behavior {
super.initialize();
this.button = this.getScript(AbstractButton);
this.httpClient = this.injector.get(HttpClient);
this.errorEvent.subscribe(() => console.log("error event occurred", this.errorEvent));
this.onClickFunction = () => {
console.log("click event occurred");
this.httpClient.get('extract/' + this.formatRegistry, {
responseType: 'blob',
observe: 'response'

5
frontend/src/ts/ervu/component/container/LoadForm.ts
View file

@ -18,7 +18,7 @@ export class LoadForm extends Container {
private ervuDataService: ErvuDataService;
private subscription: Subscription;
private fields: any[];
private fieldDataList: FieldData[] = [];
private fieldDataList: FieldData[];
constructor(el: ElementRef, cd: ChangeDetectorRef) {
super(el, cd);
@ -30,7 +30,7 @@ export class LoadForm extends Container {
}
protected loadContainer(): Promise<any> {
return Promise.resolve(this.loadData());
return this.fieldDataList ? this.loadData() : Promise.resolve();
}
initialize() {
@ -39,6 +39,7 @@ export class LoadForm extends Container {
this.ervuDataService = this.injector.get(ErvuDataService);
this.subscription = this.ervuDataService.message.subscribe(value => {
if (value) {
this.fieldDataList = [];
this.fields.forEach(field => {
let fieldData: FieldData = new FieldData();
fieldData.componentGuid = field.objectId;

5
frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
View file

@ -35,7 +35,10 @@ export class InMemoryStaticGrid extends GridV2 {
protected initGrid() {
super.initGrid();
this.subscription = this.injector.get(ErvuDataService).message.subscribe(value => {
this.rowData = value ? value[this.dataList] : null;
this.rowData = value[this.dataList];
this.initDeferred.promise.then(() => {
this.refreshData();
});
});
}