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

Don't allow the date picker to exceed the maximum start or end date for an access option.

Browse Source
This commit is contained in:
Mark H. Wood
2023-03-06 11:19:49 -05:00
parent 1d58910d70
commit 1e7ede015b
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
View File

@@ -1,4 +1,4 @@
import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { import {
@@ -66,7 +66,8 @@ import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynami
styleUrls: ['./section-upload-file-edit.component.scss'], styleUrls: ['./section-upload-file-edit.component.scss'],
templateUrl: './section-upload-file-edit.component.html', templateUrl: './section-upload-file-edit.component.html',
}) })
export class SubmissionSectionUploadFileEditComponent implements OnInit { export class SubmissionSectionUploadFileEditComponent
implements OnInit, OnDestroy {
/** /**
* The FormComponent reference * The FormComponent reference
@@ -435,13 +436,31 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
delete currentAccessCondition.startDate; delete currentAccessCondition.startDate;
} else if (accessCondition.startDate) { } else if (accessCondition.startDate) {
const startDate = this.retrieveValueFromField(accessCondition.startDate); const startDate = this.retrieveValueFromField(accessCondition.startDate);
currentAccessCondition.startDate = dateToISOFormat(startDate); // Clamp the start date to the maximum, if any, since the
// datepicker sometimes exceeds it.
let startDateDate = new Date(startDate);
if (accessConditionOpt.maxStartDate) {
const maxStartDateDate = new Date(accessConditionOpt.maxStartDate);
if (startDateDate > maxStartDateDate) {
startDateDate = maxStartDateDate;
}
}
currentAccessCondition.startDate = dateToISOFormat(startDateDate);
} }
if (!accessConditionOpt.hasEndDate) { if (!accessConditionOpt.hasEndDate) {
delete currentAccessCondition.endDate; delete currentAccessCondition.endDate;
} else if (accessCondition.endDate) { } else if (accessCondition.endDate) {
const endDate = this.retrieveValueFromField(accessCondition.endDate); const endDate = this.retrieveValueFromField(accessCondition.endDate);
currentAccessCondition.endDate = dateToISOFormat(endDate); // Clamp the end date to the maximum, if any, since the
// datepicker sometimes exceeds it.
let endDateDate = new Date(endDate);
if (accessConditionOpt.maxEndDate) {
const maxEndDateDate = new Date(accessConditionOpt.maxEndDate);
if (endDateDate > maxEndDateDate) {
endDateDate = maxEndDateDate;
}
}
currentAccessCondition.endDate = dateToISOFormat(endDateDate);
} }
accessConditionsToSave.push(currentAccessCondition); accessConditionsToSave.push(currentAccessCondition);
} }