hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 15:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2620 from atmire/w2p-108045_repeatable-date-fields-label-fix_contribute-main

Browse Source 
Fix for repeatable date field labels
This commit is contained in:
Tim Donohue
2023-11-10 16:38:13 -06:00
committed by GitHub
parent dfb0bbd694 0d39fe4cbc
commit 497ab09cfa
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
View File

@@ -169,7 +169,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
metadataFields: [], metadataFields: [],
hasSelectableMetadata: false hasSelectableMetadata: false
}), }),
new DynamicDsDatePickerModel({ id: 'datepicker' }), new DynamicDsDatePickerModel({ id: 'datepicker', repeatable: false }),
new DynamicLookupModel({ new DynamicLookupModel({
id: 'lookup', id: 'lookup',
metadataFields: [], metadataFields: [],

2
src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
View File

@@ -1,6 +1,6 @@
<div> <div>
<fieldset class="d-flex"> <fieldset class="d-flex">
<legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"> <legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
{{model.placeholder}} <span *ngIf="model.required">*</span> {{model.placeholder}} <span *ngIf="model.required">*</span>
</legend> </legend>
<ds-number-picker <ds-number-picker

1
src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
View File

@@ -29,6 +29,7 @@ export const DATE_TEST_MODEL_CONFIG = {
placeholder: 'Date', placeholder: 'Date',
readOnly: false, readOnly: false,
required: true, required: true,
repeatable: false,
toggleIcon: 'fas fa-calendar' toggleIcon: 'fas fa-calendar'
}; };

3
src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
View File

@@ -15,6 +15,7 @@ export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig { export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
legend?: string; legend?: string;
typeBindRelations?: DynamicFormControlRelation[]; typeBindRelations?: DynamicFormControlRelation[];
repeatable: boolean;
} }
/** /**
@@ -37,7 +38,7 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
this.metadataValue = (config as any).metadataValue; this.metadataValue = (config as any).metadataValue;
this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : []; this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden); this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
this.repeatable = config.repeatable;
// This was a subscription, then an async setTimeout, but it seems unnecessary // This was a subscription, then an async setTimeout, but it seems unnecessary
const parentModel = this.getRootParent(this); const parentModel = this.getRootParent(this);
if (parentModel && isNotUndefined(parentModel.hidden)) { if (parentModel && isNotUndefined(parentModel.hidden)) {

2
src/app/shared/form/builder/form-builder.service.spec.ts
View File

@@ -290,7 +290,7 @@ describe('FormBuilderService test suite', () => {
hasSelectableMetadata: true hasSelectableMetadata: true
}), }),
new DynamicDsDatePickerModel({ id: 'testDate' }), new DynamicDsDatePickerModel({ id: 'testDate', repeatable: false}),
new DynamicLookupModel({ new DynamicLookupModel({
id: 'testLookup', id: 'testLookup',