Skip to content

Commit

Permalink
Merge branch 'bugfix/tutorial-groups/fix-global-configuration' into f…
Browse files Browse the repository at this point in the history
…eature/tutorialgroup-module-api
  • Loading branch information
ole-ve committed Feb 18, 2025
2 parents 9225cca + 4edfc21 commit f019f44
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive';
import { OwlDateTimeModule } from '@danielmoncada/angular-datetime-picker';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { ArtemisDateRangePipe } from 'app/shared/pipes/artemis-date-range.pipe';
import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';

export interface TutorialGroupsConfigurationFormData {
period?: Date[];
Expand All @@ -19,6 +20,7 @@ export interface TutorialGroupsConfigurationFormData {
styleUrls: ['./tutorial-groups-configuration-form.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [FormsModule, ReactiveFormsModule, TranslateDirective, OwlDateTimeModule, FaIconComponent, ArtemisDateRangePipe],
providers: [ArtemisDatePipe],
})
export class TutorialGroupsConfigurationFormComponent implements OnInit, OnChanges {
private fb = inject(FormBuilder);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export interface ScheduleFormData {
selector: 'jhi-schedule-form',
templateUrl: './schedule-form.component.html',
styleUrls: ['./schedule-form.component.scss'],
providers: [{ provide: NgbTimeAdapter, useClass: NgbTimeStringAdapter }],
providers: [{ provide: NgbTimeAdapter, useClass: NgbTimeStringAdapter }, ArtemisDatePipe],
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [FormsModule, ReactiveFormsModule, TranslateDirective, NgbTimepicker, OwlDateTimeModule, FaIconComponent, ArtemisDatePipe, ArtemisDateRangePipe, ArtemisTranslatePipe],
})
Expand Down

0 comments on commit f019f44

Please sign in to comment.