Skip to content

Commit d323880

Browse files
committed
fix(Global): Better imports
1 parent 43346ee commit d323880

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

src/common/core/item-list/item-list-base.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import { Observable } from 'rxjs/Observable';
1212
import { Subscription } from 'rxjs/Subscription';
1313
import { IGroupInfo } from '../grouping/group-infos';
1414
import { GroupingService } from '../grouping/grouping.service';
15-
import { ISortInfos, SortOrder } from '../sorting/sort-infos.model';
15+
import { ISortInfos } from '../sorting/sort-infos.model';
16+
import { SortOrder } from '../sorting/sort-order.model';
1617
import { SortingService } from '../sorting/sorting.service';
1718
import { IItemBase } from './item-base';
1819
import { IFindItemResult, IParentListInfoResult, ItemListService, IViewListResult } from './item-list.service';

src/common/core/sorting/sort-infos.model.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
* found in the LICENSE file at https://github.com/DSI-HUG/dejajs-components/blob/master/LICENSE
77
*/
88

9+
import { SortOrder } from './sort-order.model';
10+
911
/** Model de tri pour le SortingService */
1012
export interface ISortInfos {
1113
/* Nom du champ par lequel effectuer le tri ou fonction renvoyant le nom du champ */
@@ -15,12 +17,3 @@ export interface ISortInfos {
1517
/* Type de la donée de tri ('number', 'string', 'date') */
1618
type?: string;
1719
}
18-
19-
/** Ordres de tri possibles */
20-
export enum SortOrder {
21-
/** Ascendant */
22-
ascending,
23-
/** Descendant */
24-
descending,
25-
}
26-
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* @license
3+
* Copyright Hôpitaux Universitaires de Genève. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an Apache-2.0 license that can be
6+
* found in the LICENSE file at https://github.com/DSI-HUG/dejajs-components/blob/master/LICENSE
7+
*/
8+
9+
/** Ordres de tri possibles */
10+
export enum SortOrder {
11+
/** Ascendant */
12+
ascending,
13+
/** Descendant */
14+
descending,
15+
}

src/common/core/sorting/sorting.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'rxjs/add/operator/mergeMap';
1212
import 'rxjs/add/operator/switchMap';
1313
import { Observable } from 'rxjs/Observable';
1414
import { ISortInfos } from './sort-infos.model';
15-
import { SortOrder } from './sort-infos.model';
15+
import { SortOrder } from './sort-order.model';
1616

1717
/** Classe de tri d'une liste plate ou hierarchique */
1818
export class SortingService {

0 commit comments

Comments
 (0)