MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

added group id on public description template model

This commit is contained in:
CITE\spapacharalampous 2024-08-29 11:40:21 +03:00
parent b2bfade43e
commit 3dcc415d5e
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/core/src/main/java/org/opencdmp/model/PublicDescriptionTemplate.java
View File

@ -7,6 +7,9 @@ public class PublicDescriptionTemplate {
public final static String _id = "id"; public final static String _id = "id";
private UUID id; private UUID id;
public final static String _groupId = "groupId";
private UUID groupId;
public final static String _label = "label"; public final static String _label = "label";
private String label; private String label;
@ -21,6 +24,10 @@ public class PublicDescriptionTemplate {
this.id = id; this.id = id;
} }
public UUID getGroupId() { return this.groupId; }
public void setGroupId(UUID groupId) { this.groupId = groupId; }
public String getLabel() { public String getLabel() {
return label; return label;
} }

9
backend/core/src/main/java/org/opencdmp/model/builder/PublicDescriptionTemplateBuilder.java
View File

@ -1,17 +1,10 @@
package org.opencdmp.model.builder; package org.opencdmp.model.builder;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import org.opencdmp.commons.XmlHandlingService;
import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.data.DescriptionTemplateEntity; import org.opencdmp.data.DescriptionTemplateEntity;
import org.opencdmp.model.PublicDescriptionTemplate; import org.opencdmp.model.PublicDescriptionTemplate;
import org.opencdmp.query.DescriptionTemplateTypeQuery;
import org.opencdmp.query.UserDescriptionTemplateQuery;
import gr.cite.tools.data.builder.BuilderFactory;
import gr.cite.tools.data.query.QueryFactory;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;
import gr.cite.tools.fieldset.BaseFieldSet;
import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.fieldset.FieldSet;
import gr.cite.tools.logging.DataLogEntry; import gr.cite.tools.logging.DataLogEntry;
import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.LoggerService;
@ -22,7 +15,6 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Component @Component
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@ -50,6 +42,7 @@ public class PublicDescriptionTemplateBuilder extends BaseBuilder<PublicDescript
for (DescriptionTemplateEntity d : data) { for (DescriptionTemplateEntity d : data) {
PublicDescriptionTemplate m = new PublicDescriptionTemplate(); PublicDescriptionTemplate m = new PublicDescriptionTemplate();
if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._id))) m.setId(d.getId()); if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._id))) m.setId(d.getId());
if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._groupId))) m.setGroupId(d.getGroupId());
if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._label))) m.setLabel(d.getLabel()); if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._label))) m.setLabel(d.getLabel());
if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._description))) m.setDescription(d.getDescription()); if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._description))) m.setDescription(d.getDescription());
models.add(m); models.add(m);

4
frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.ts
View File

@ -1,8 +1,7 @@
import { map, filter } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { Component } from "@angular/core"; import { Component } from "@angular/core";
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
import { Observable } from "rxjs";
import { Inject } from "@angular/core"; import { Inject } from "@angular/core";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
@ -16,7 +15,6 @@ import { Guid } from '@common/types/guid';
import { PlanStatusEnum } from '@app/core/common/enum/plan-status'; import { PlanStatusEnum } from '@app/core/common/enum/plan-status';
import { nameof } from 'ts-simple-nameof'; import { nameof } from 'ts-simple-nameof';
import { FilterService } from '@common/modules/text-filter/filter-service'; import { FilterService } from '@common/modules/text-filter/filter-service';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { DescriptionTemplatesInSection, PlanBlueprint, PlanBlueprintDefinition, PlanBlueprintDefinitionSection } from '@app/core/model/plan-blueprint/plan-blueprint'; import { DescriptionTemplatesInSection, PlanBlueprint, PlanBlueprintDefinition, PlanBlueprintDefinitionSection } from '@app/core/model/plan-blueprint/plan-blueprint';
import { TenantLookup } from '@app/core/query/tenant.lookup'; import { TenantLookup } from '@app/core/query/tenant.lookup';
import { Tenant } from '@app/core/model/tenant/tenant'; import { Tenant } from '@app/core/model/tenant/tenant';