File tree 5 files changed +21
-29
lines changed
5 files changed +21
-29
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ export class OrderCockpitComponent implements OnInit {
24
24
private pageable : Pageable = {
25
25
pageSize : 8 ,
26
26
pageNumber : 0 ,
27
- //total: 1,
27
+ // total: 1,
28
28
} ;
29
29
private sorting : any [ ] = [ ] ;
30
30
@@ -69,10 +69,9 @@ export class OrderCockpitComponent implements OnInit {
69
69
applyFilters ( ) : void {
70
70
this . waiterCockpitService . getOrders ( this . pageable , this . sorting , this . filters )
71
71
. subscribe ( ( data : any ) => {
72
- if ( data == null ) {
72
+ if ( ! data ) {
73
73
this . orders = [ ] ;
74
- }
75
- else {
74
+ } else {
76
75
this . orders = data . content ;
77
76
}
78
77
this . totalOrders = data . totalElements ;
@@ -89,7 +88,6 @@ export class OrderCockpitComponent implements OnInit {
89
88
pageSize : pagingEvent . pageSize ,
90
89
pageNumber : pagingEvent . page - 1 ,
91
90
sort : this . pageable . sort ,
92
- //total: 1,
93
91
} ;
94
92
this . applyFilters ( ) ;
95
93
}
@@ -100,7 +98,7 @@ export class OrderCockpitComponent implements OnInit {
100
98
property : sortEvent . name ,
101
99
direction : '' + sortEvent . order ,
102
100
} ) ;
103
- this . applyFilters ( ) ;
101
+ this . applyFilters ( ) ;
104
102
}
105
103
106
104
selected ( selection : ITdDataTableSelectAllEvent ) : void {
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ export class ReservationCockpitComponent implements OnInit {
27
27
pageable : Pageable = {
28
28
pageSize : 8 ,
29
29
pageNumber : 0 ,
30
- //total: 1,
30
+ // total: 1,
31
31
} ;
32
32
33
33
reservations : ReservationView [ ] ;
@@ -74,9 +74,9 @@ export class ReservationCockpitComponent implements OnInit {
74
74
applyFilters ( ) : void {
75
75
this . waiterCockpitService . getReservations ( this . pageable , this . sorting , this . filters )
76
76
. subscribe ( ( data : any ) => {
77
- if ( data == null ) {
77
+ if ( ! data ) {
78
78
this . reservations = [ ] ;
79
- } else {
79
+ } else {
80
80
this . reservations = data . content ;
81
81
}
82
82
this . totalReservations = data . totalElements ;
@@ -93,7 +93,7 @@ export class ReservationCockpitComponent implements OnInit {
93
93
pageSize : pagingEvent . pageSize ,
94
94
pageNumber : pagingEvent . page - 1 ,
95
95
sort : this . pageable . sort ,
96
- //total: 1,
96
+ // total: 1,
97
97
} ;
98
98
this . applyFilters ( ) ;
99
99
}
Original file line number Diff line number Diff line change @@ -24,11 +24,6 @@ export class MenuComponent {
24
24
25
25
dishes$ : Observable < DishView [ ] > ;
26
26
27
- /*pageable: Pageable = {
28
- pageSize: 8,
29
- pageNumber: 0,
30
- };*/
31
-
32
27
constructor (
33
28
private menuService : MenuService ,
34
29
) { }
@@ -39,16 +34,15 @@ export class MenuComponent {
39
34
pageNumber : 0 ,
40
35
sort : [ {
41
36
property : filters . sort . property ,
42
- direction : filters . sort . direction
43
- } ]
44
- } ;
45
- const composedFilters : Filter = this . menuService . composeFilters ( pageable , filters ) ;
37
+ direction : filters . sort . direction ,
38
+ } ] ,
39
+ } ;
40
+ const composedFilters : Filter = this . menuService . composeFilters ( pageable , filters ) ;
46
41
this . dishes$ = this . menuService . getDishes ( composedFilters ) . pipe (
47
- map ( ( res ) =>
48
- {
49
- if ( res == null ) {
42
+ map ( ( res ) => {
43
+ if ( ! res ) {
50
44
return [ ] ;
51
- } else {
45
+ } else {
52
46
return res . content ;
53
47
}
54
48
} ) ,
Original file line number Diff line number Diff line change @@ -36,14 +36,14 @@ export class MenuService {
36
36
} ;
37
37
}
38
38
39
- composeFilters ( pageable : Pageable , filters : FilterFormData ) : Filter {
39
+ composeFilters ( pageable : Pageable , filters : FilterFormData ) : Filter {
40
40
const categories : { id : string } [ ] = Object . keys ( filters . categories )
41
41
. filter ( ( categoryKey : string ) => filters . categories [ categoryKey ] )
42
42
. map ( ( categoryKey : string ) => ( { id : categoryNameToServerId [ categoryKey ] . toString ( ) } ) ) ;
43
- if ( filters . sort . property == null ) {
44
- filters . sort = null ;
45
- pageable . sort = null ;
46
- }
43
+ if ( ! filters . sort . property ) {
44
+ filters . sort = undefined ;
45
+ pageable . sort = undefined ;
46
+ }
47
47
48
48
return {
49
49
categories,
Original file line number Diff line number Diff line change 12
12
13
13
<properties >
14
14
<spring .boot.version>2.0.4.RELEASE</spring .boot.version>
15
- <devon4j .version>3.0.0-alpha.1 </devon4j .version>
15
+ <devon4j .version>3.0.0</devon4j .version>
16
16
<java .version>1.8</java .version>
17
17
<devon .port.range>81</devon .port.range>
18
18
<devon .http.port>${devon.port.range} 81</devon .http.port>
You can’t perform that action at this time.
0 commit comments