Merge branch 'dev' into CSCEXAM-1174-2

CSCfi · Aug 15, 2024 · 19cb4cb · 19cb4cb
2 parents a4116dc + 7e42d7c
commit 19cb4cb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/ui/src/app/exam/editor/events/examination-event-dialog.component.html b/ui/src/app/exam/editor/events/examination-event-dialog.component.html
@@ -35,6 +35,7 @@ <h1 class="xm-modal-title">
         [minuteStep]="15"
         [readonly]="true"
         [initialTime]="start()"
+        [minDate]="examMinDate"
         [maxDate]="examMaxDate"
         (updated)="onStartDateChange($event)"
         autofocus

diff --git a/ui/src/app/exam/editor/events/examination-event-dialog.component.ts b/ui/src/app/exam/editor/events/examination-event-dialog.component.ts
@@ -38,6 +38,7 @@ export class ExaminationEventDialogComponent implements OnInit {
     @Input() config?: ExaminationEventConfiguration;
     @Input() maintenancePeriods: MaintenancePeriod[] = [];
     @Input() requiresPassword = false;
+    @Input() examMinDate = '';
     @Input() examMaxDate = '';
     start = signal(new Date(new Date().getTime() + 60 * 1000));
     description = signal('');

diff --git a/ui/src/app/exam/editor/publication/exam-publication.component.ts b/ui/src/app/exam/editor/publication/exam-publication.component.ts
@@ -261,6 +261,7 @@ export class ExamPublicationComponent implements OnInit {
             size: 'lg',
         });
         modalRef.componentInstance.requiresPassword = this.exam.implementation === 'CLIENT_AUTH';
+        modalRef.componentInstance.examMinDate = this.exam.periodStart;
         modalRef.componentInstance.examMaxDate = this.exam.periodEnd;
         modalRef.componentInstance.maintenancePeriods = this.maintenancePeriods;
         modalRef.componentInstance.examId = this.exam.id;

diff --git a/ui/src/app/shared/date/date-time-picker.component.ts b/ui/src/app/shared/date/date-time-picker.component.ts
@@ -54,14 +54,14 @@ export class DateTimePickerComponent implements OnInit, OnChanges {
     @Input() minuteStep = 0;
     @Input() disabled = false;
     @Input() readonly = false;
+    @Input() minDate = new Date().toISOString();
     @Input() maxDate?: string;
     @Input() disableDate?: boolean = false;
     @Input() disableTime?: boolean = false;
     @Output() updated = new EventEmitter<{ date: Date }>();
 
     date: Date = new Date();
     time!: { hour: number; minute: number; second: number; millisecond?: number };
-    minDate?: string;
 
     ngOnInit() {
         const now = new Date();
@@ -70,7 +70,6 @@ export class DateTimePickerComponent implements OnInit, OnChanges {
         if (this.initialTime) {
             this.setDateTime(this.initialTime);
         }
-        this.minDate = now.toISOString();
     }
 
     ngOnChanges() {