Skip to content

Commit

Permalink
replace ng-datetime-picker package dependency (#858)
Browse files Browse the repository at this point in the history
* replace ng-datetime-picker package dependency

* remove ng-pick-datetime-ex and its imports

---------

Co-authored-by: danoswaltCL <[email protected]>
Co-authored-by: Dan Oswalt <[email protected]>
  • Loading branch information
3 people authored Jun 9, 2023
1 parent fcf2436 commit 94355f2
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 45 deletions.
62 changes: 24 additions & 38 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@angular/platform-browser": "^15.2.8",
"@angular/platform-browser-dynamic": "^15.2.8",
"@angular/router": "^15.2.8",
"@danielmoncada/angular-datetime-picker": "^16.0.1",
"@ngrx/effects": "^15.4.0",
"@ngrx/entity": "^15.4.0",
"@ngrx/router-store": "^15.4.0",
Expand All @@ -62,7 +63,6 @@
"lodash.find": "^4.6.0",
"lodash.groupby": "^4.6.0",
"lodash.isequal": "^4.5.0",
"ng-pick-datetime-ex": "^15.0.0",
"ngx-skeleton-loader": "^7.0.0",
"rxjs": "7.8.0",
"tslib": "^2.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { ExperimentScheduleComponent } from './experiment-schedule.component';
import { TestingModule } from '../../../../../../testing/testing.module';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';

xdescribe('ExperimentScheduleComponent', () => {
let component: ExperimentScheduleComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ExperimentEndCriteriaComponent } from './experiment-end-criteria.compon
import { TestingModule } from '../../../../../../../testing/testing.module';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { ExperimentService } from '../../../../../../core/experiments/experiments.service';
import { OwlNativeDateTimeModule, OwlDateTimeModule } from 'ng-pick-datetime-ex';
import { OwlNativeDateTimeModule, OwlDateTimeModule } from '@danielmoncada/angular-datetime-picker';
import { TestMockData } from '../../../../../../../testing/test.mock.data';

xdescribe('ExperimentEndCriteriaComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ExperimentStatusComponent } from './experiment-status.component';
import { TestingModule } from '../../../../../../../testing/testing.module';
import { ExperimentService } from '../../../../../../core/experiments/experiments.service';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { TestMockData } from '../../../../../../../testing/test.mock.data';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ExperimentOverviewComponent } from '../../experiment-overview/experimen
import { ExperimentDesignComponent } from '../../experiment-design/experiment-design.component';
import { ExperimentScheduleComponent } from '../../experiment-schedule/experiment-schedule.component';
import { ExperimentPostConditionComponent } from '../../experiment-post-condition/experiment-post-condition.component';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';

xdescribe('NewExperimentComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { EnrollmentOverTimeComponent } from './components/enrollment-over-time/e
import { EnrollmentConditionTableComponent } from './components/enrollment-condition-table/enrollment-condition-table.component';
import { EnrollmentPointPartitionTableComponent } from './components/enrollment-point-partition-table/enrollment-point-partition-table.component';
import { NgxChartsModule } from '@swimlane/ngx-charts';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
import { ExperimentPostConditionComponent } from './components/experiment-post-condition/experiment-post-condition.component';
import { TableRowComponent } from './components/table-row/table-row.component';
import { QueriesModalComponent } from './components/modal/queries-modal/queries-modal.component';
Expand Down
3 changes: 2 additions & 1 deletion frontend/projects/upgrade/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use '@angular/material' as mat;
@use 'node_modules/ng-pick-datetime-ex/assets/style/picker.min.css';

@import '@danielmoncada/angular-datetime-picker/assets/style/picker.min.css';
@import url('https://fonts.googleapis.com/css?family=Roboto:400,700|Material+Icons');
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700,800&display=swap');

Expand Down

0 comments on commit 94355f2

Please sign in to comment.