Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 29f032c

Browse files
skyhitskyhit
committed
Merge pull request #400 from flytoj2ee/dev
filter the round id is 0 record
2 parents c868f7f + fa05564 commit 29f032c

File tree

2 files changed

+50
-32
lines changed

2 files changed

+50
-32
lines changed

‎actions/rounds.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
271271
pageSize = helper.MAX_INT;
272272
}
273273

274-
filterCondition = ' 1=1 ';
274+
filterCondition = ' r.round_id > 0 ';
275275
if (_.isDefined(params.name)) {
276276
// set name filter
277277
filterCondition = filterCondition + ' AND LOWER(name) LIKE LOWER("%' + decodeURIComponent(params.name) + '%")';

‎test/test_files/rounds/expected_pagination_parameters.json‎

Lines changed: 49 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,112 @@
11
{
2-
"total": 13,
2+
"total": 12,
33
"pageIndex": 2,
44
"pageSize": 2,
55
"data": [
66
{
7-
"id": 12005,
8-
"name": "test round 12005",
9-
"shortName": "short name 12005",
10-
"type": "Marathon Match",
7+
"id": 12004,
8+
"name": "test round 12004",
9+
"shortName": "short name 12004",
10+
"type": "Screening Tool Problem Sets",
1111
"status": "Active",
1212
"registrationLimit": 1000,
1313
"invitationalType": "Not",
1414
"region": "Alpha",
1515
"roundSchedule": [
1616
{
1717
"phaseName": "Registration Phase",
18-
"startTime": "2011-11-02T05:50:51.000+05:00",
19-
"endTime": "2011-12-02T05:50:51.000+05:00",
18+
"startTime": "2013-01-02T05:50:51.000+05:00",
19+
"endTime": "2013-02-02T05:50:51.000+05:00",
2020
"status": "Past"
2121
},
2222
{
2323
"phaseName": "Coding Phase",
24-
"startTime": "2011-12-02T05:50:52.000+05:00",
25-
"endTime": "2011-12-05T05:50:51.000+05:00",
24+
"startTime": "2013-02-02T05:50:52.000+05:00",
25+
"endTime": "2013-02-05T05:50:51.000+05:00",
26+
"status": "Past"
27+
},
28+
{
29+
"phaseName": "Intermission Phase",
30+
"startTime": "2013-02-06T05:50:51.000+05:00",
31+
"endTime": "2013-02-07T05:50:51.000+05:00",
32+
"status": "Past"
33+
},
34+
{
35+
"phaseName": "Challenge Phase",
36+
"startTime": "2013-02-08T05:50:51.000+05:00",
37+
"endTime": "2013-02-09T05:50:51.000+05:00",
2638
"status": "Past"
2739
},
2840
{
2941
"phaseName": "System Test Phase",
30-
"startTime": "2011-12-10T05:50:51.000+05:00",
31-
"endTime": "2011-12-11T05:50:51.000+05:00",
42+
"startTime": "2013-02-10T05:50:51.000+05:00",
43+
"endTime": "2013-02-11T05:50:51.000+05:00",
3244
"status": "Active"
3345
},
46+
{
47+
"phaseName": "Moderated Chat Phase",
48+
"startTime": "2013-02-12T05:50:51.000+05:00",
49+
"endTime": "2013-02-13T05:50:51.000+05:00",
50+
"status": "Draft"
51+
},
3452
{
3553
"phaseName": "Room Assignment Phase",
36-
"startTime": "2011-12-14T05:50:51.000+05:00",
37-
"endTime": "2011-12-15T05:50:51.000+05:00",
54+
"startTime": "2013-02-14T05:50:51.000+05:00",
55+
"endTime": "2013-02-15T05:50:51.000+05:00",
3856
"status": "Draft"
3957
}
4058
]
4159
},
4260
{
43-
"id": 12004,
44-
"name": "test round 12004",
45-
"shortName": "short name 12004",
46-
"type": "Screening Tool Problem Sets",
61+
"id": 12003,
62+
"name": "test round 12003",
63+
"shortName": "short name 12003",
64+
"type": "Practice Round",
4765
"status": "Active",
4866
"registrationLimit": 1000,
4967
"invitationalType": "Not",
5068
"region": "Alpha",
5169
"roundSchedule": [
5270
{
5371
"phaseName": "Registration Phase",
54-
"startTime": "2013-01-02T05:50:51.000+05:00",
55-
"endTime": "2013-02-02T05:50:51.000+05:00",
72+
"startTime": "2013-08-02T04:50:51.000+05:00",
73+
"endTime": "2013-09-02T04:50:51.000+05:00",
5674
"status": "Past"
5775
},
5876
{
5977
"phaseName": "Coding Phase",
60-
"startTime": "2013-02-02T05:50:52.000+05:00",
61-
"endTime": "2013-02-05T05:50:51.000+05:00",
78+
"startTime": "2013-09-02T04:50:52.000+05:00",
79+
"endTime": "2013-09-05T04:50:51.000+05:00",
6280
"status": "Past"
6381
},
6482
{
6583
"phaseName": "Intermission Phase",
66-
"startTime": "2013-02-06T05:50:51.000+05:00",
67-
"endTime": "2013-02-07T05:50:51.000+05:00",
84+
"startTime": "2013-09-06T04:50:51.000+05:00",
85+
"endTime": "2013-09-07T04:50:51.000+05:00",
6886
"status": "Past"
6987
},
7088
{
7189
"phaseName": "Challenge Phase",
72-
"startTime": "2013-02-08T05:50:51.000+05:00",
73-
"endTime": "2013-02-09T05:50:51.000+05:00",
90+
"startTime": "2013-09-08T04:50:51.000+05:00",
91+
"endTime": "2013-09-09T04:50:51.000+05:00",
7492
"status": "Past"
7593
},
7694
{
7795
"phaseName": "System Test Phase",
78-
"startTime": "2013-02-10T05:50:51.000+05:00",
79-
"endTime": "2013-02-11T05:50:51.000+05:00",
96+
"startTime": "2013-09-10T04:50:51.000+05:00",
97+
"endTime": "2013-09-11T04:50:51.000+05:00",
8098
"status": "Active"
8199
},
82100
{
83101
"phaseName": "Moderated Chat Phase",
84-
"startTime": "2013-02-12T05:50:51.000+05:00",
85-
"endTime": "2013-02-13T05:50:51.000+05:00",
102+
"startTime": "2013-09-12T04:50:51.000+05:00",
103+
"endTime": "2013-09-13T04:50:51.000+05:00",
86104
"status": "Draft"
87105
},
88106
{
89107
"phaseName": "Room Assignment Phase",
90-
"startTime": "2013-02-14T05:50:51.000+05:00",
91-
"endTime": "2013-02-15T05:50:51.000+05:00",
108+
"startTime": "2013-09-14T04:50:51.000+05:00",
109+
"endTime": "2013-09-15T04:50:51.000+05:00",
92110
"status": "Draft"
93111
}
94112
]

0 commit comments

Comments
 (0)