Initial commit for the new Dataset Template Field (identifier
validation) part 2
This commit is contained in:
parent
da9872576e
commit
e061448830
|
@ -94,6 +94,7 @@ public class ModelBuilder {
|
||||||
if (type.equals("organizations")) return (FieldData<U>) new OrganizationsData().fromData(data);
|
if (type.equals("organizations")) return (FieldData<U>) new OrganizationsData().fromData(data);
|
||||||
if (type.equals("datasetIdentifier")) return (FieldData<U>) new DatasetIdentifierData().fromData(data);
|
if (type.equals("datasetIdentifier")) return (FieldData<U>) new DatasetIdentifierData().fromData(data);
|
||||||
if (type.equals("currency")) return (FieldData<U>) new CurrencyData().fromData(data);
|
if (type.equals("currency")) return (FieldData<U>) new CurrencyData().fromData(data);
|
||||||
|
if (type.equals("validation")) return (FieldData<U>) new ValidationData().fromData(data);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,6 +133,7 @@ public class ModelBuilder {
|
||||||
if (type.equals("organizations")) return (FieldData<U>) new OrganizationsData().fromData(data);
|
if (type.equals("organizations")) return (FieldData<U>) new OrganizationsData().fromData(data);
|
||||||
if (type.equals("datasetIdentifier")) return (FieldData<U>) new DatasetIdentifierData().fromData(data);
|
if (type.equals("datasetIdentifier")) return (FieldData<U>) new DatasetIdentifierData().fromData(data);
|
||||||
if (type.equals("currency")) return (FieldData<U>) new CurrencyData().fromData(data);
|
if (type.equals("currency")) return (FieldData<U>) new CurrencyData().fromData(data);
|
||||||
|
if (type.equals("validation")) return (FieldData<U>) new ValidationData().fromData(data);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
package eu.eudat.models.data.components.commons.datafield;
|
||||||
|
|
||||||
|
import org.w3c.dom.Document;
|
||||||
|
import org.w3c.dom.Element;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class ValidationData extends FieldData<ValidationData> {
|
||||||
|
@Override
|
||||||
|
public ValidationData fromData(Object data) {
|
||||||
|
if (data != null) {
|
||||||
|
this.setLabel((String) ((Map<String, Object>) data).get("label"));
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object toData() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Element toXml(Document doc) {
|
||||||
|
Element root = doc.createElement("data");
|
||||||
|
root.setAttribute("label", this.getLabel());
|
||||||
|
return root;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ValidationData fromXml(Element item) {
|
||||||
|
this.setLabel(item != null ? item.getAttribute("label") : "");
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, Object> toMap(Element item) {
|
||||||
|
HashMap dataMap = new HashMap();
|
||||||
|
dataMap.put("label", item != null ? item.getAttribute("label") : "");
|
||||||
|
return dataMap;
|
||||||
|
}
|
||||||
|
}
|
|
@ -105,3 +105,7 @@ export interface DatasetIdentifierFieldData extends FieldData {
|
||||||
export interface CurrencyFieldData extends FieldData {
|
export interface CurrencyFieldData extends FieldData {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ValidationFieldData extends FieldData {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -87,6 +87,7 @@ export class EnumUtils {
|
||||||
case DatasetProfileFieldViewStyle.Organizations: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.ORGANIZATIONS');
|
case DatasetProfileFieldViewStyle.Organizations: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.ORGANIZATIONS');
|
||||||
case DatasetProfileFieldViewStyle.DatasetIdentifier: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.DATASET-IDENTIFIER');
|
case DatasetProfileFieldViewStyle.DatasetIdentifier: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.DATASET-IDENTIFIER');
|
||||||
case DatasetProfileFieldViewStyle.Currency: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.CURRENCY');
|
case DatasetProfileFieldViewStyle.Currency: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.CURRENCY');
|
||||||
|
case DatasetProfileFieldViewStyle.Validation: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.VALIDATION');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
import { FormGroup } from '@angular/forms';
|
||||||
|
import { FieldDataEditorModel } from './field-data-editor-model';
|
||||||
|
import { ValidationFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data';
|
||||||
|
|
||||||
|
export class ValidationDataEditorModel extends FieldDataEditorModel<ValidationDataEditorModel> {
|
||||||
|
public label: string;
|
||||||
|
|
||||||
|
buildForm(disabled: boolean = false, skipDisable: Array<String> = []): FormGroup {
|
||||||
|
const formGroup = this.formBuilder.group({
|
||||||
|
label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ValidationDataEditorModel.label')) }]
|
||||||
|
});
|
||||||
|
return formGroup;
|
||||||
|
}
|
||||||
|
|
||||||
|
fromModel(item: ValidationFieldData): ValidationDataEditorModel {
|
||||||
|
this.label = item.label;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
|
@ -26,6 +26,7 @@ import { OrganizationsDataEditorModel } from '../../../admin/field-data/organiza
|
||||||
import { DatasetIdentifierDataEditorModel } from '../../../admin/field-data/dataset-identifier-data-editor-models';
|
import { DatasetIdentifierDataEditorModel } from '../../../admin/field-data/dataset-identifier-data-editor-models';
|
||||||
import { ExternalDatasetsDataEditorModel } from '../../../admin/field-data/external-datasets-data-editor-models';
|
import { ExternalDatasetsDataEditorModel } from '../../../admin/field-data/external-datasets-data-editor-models';
|
||||||
import { CurrencyDataEditorModel } from '../../../admin/field-data/currency-data-editor-models';
|
import { CurrencyDataEditorModel } from '../../../admin/field-data/currency-data-editor-models';
|
||||||
|
import { ValidationDataEditorModel } from '../../../admin/field-data/validation-data-editor-models';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dataset-profile-editor-field-component',
|
selector: 'app-dataset-profile-editor-field-component',
|
||||||
|
@ -113,6 +114,9 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
case DatasetProfileFieldViewStyle.Currency:
|
case DatasetProfileFieldViewStyle.Currency:
|
||||||
this.form.addControl('data', new CurrencyDataEditorModel().buildForm());
|
this.form.addControl('data', new CurrencyDataEditorModel().buildForm());
|
||||||
break;
|
break;
|
||||||
|
case DatasetProfileFieldViewStyle.Validation:
|
||||||
|
this.form.addControl('data', new ValidationDataEditorModel().buildForm());
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -138,6 +142,7 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements
|
||||||
case DatasetProfileFieldViewStyle.Organizations:
|
case DatasetProfileFieldViewStyle.Organizations:
|
||||||
case DatasetProfileFieldViewStyle.DatasetIdentifier:
|
case DatasetProfileFieldViewStyle.DatasetIdentifier:
|
||||||
case DatasetProfileFieldViewStyle.Currency:
|
case DatasetProfileFieldViewStyle.Currency:
|
||||||
|
case DatasetProfileFieldViewStyle.Validation:
|
||||||
return false;
|
return false;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -1143,7 +1143,8 @@
|
||||||
"RESEARCHERS": "Researchers",
|
"RESEARCHERS": "Researchers",
|
||||||
"ORGANIZATIONS": "Organizations",
|
"ORGANIZATIONS": "Organizations",
|
||||||
"DATASET-IDENTIFIER": "Dataset Identifier",
|
"DATASET-IDENTIFIER": "Dataset Identifier",
|
||||||
"CURRENCY": "Currency"
|
"CURRENCY": "Currency",
|
||||||
|
"VALIDATION": "Validator"
|
||||||
},
|
},
|
||||||
"DATASET-PROFILE-COMBO-BOX-TYPE": {
|
"DATASET-PROFILE-COMBO-BOX-TYPE": {
|
||||||
"WORD-LIST": "Word List",
|
"WORD-LIST": "Word List",
|
||||||
|
|
Loading…
Reference in New Issue