Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion actions/rounds.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
pageSize = helper.MAX_INT;
}

filterCondition = ' 1=1 ';
filterCondition = ' r.round_id > 0 ';
if (_.isDefined(params.name)) {
// set name filter
filterCondition = filterCondition + ' AND LOWER(name) LIKE LOWER("%' + decodeURIComponent(params.name) + '%")';
Expand Down
80 changes: 49 additions & 31 deletions test/test_files/rounds/expected_pagination_parameters.json
Original file line number Diff line number Diff line change
@@ -1,94 +1,112 @@
{
"total": 13,
"total": 12,
"pageIndex": 2,
"pageSize": 2,
"data": [
{
"id": 12005,
"name": "test round 12005",
"shortName": "short name 12005",
"type": "Marathon Match",
"id": 12004,
"name": "test round 12004",
"shortName": "short name 12004",
"type": "Screening Tool Problem Sets",
"status": "Active",
"registrationLimit": 1000,
"invitationalType": "Not",
"region": "Alpha",
"roundSchedule": [
{
"phaseName": "Registration Phase",
"startTime": "2011-11-02T05:50:51.000+05:00",
"endTime": "2011-12-02T05:50:51.000+05:00",
"startTime": "2013-01-02T05:50:51.000+05:00",
"endTime": "2013-02-02T05:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "Coding Phase",
"startTime": "2011-12-02T05:50:52.000+05:00",
"endTime": "2011-12-05T05:50:51.000+05:00",
"startTime": "2013-02-02T05:50:52.000+05:00",
"endTime": "2013-02-05T05:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "Intermission Phase",
"startTime": "2013-02-06T05:50:51.000+05:00",
"endTime": "2013-02-07T05:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "Challenge Phase",
"startTime": "2013-02-08T05:50:51.000+05:00",
"endTime": "2013-02-09T05:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "System Test Phase",
"startTime": "2011-12-10T05:50:51.000+05:00",
"endTime": "2011-12-11T05:50:51.000+05:00",
"startTime": "2013-02-10T05:50:51.000+05:00",
"endTime": "2013-02-11T05:50:51.000+05:00",
"status": "Active"
},
{
"phaseName": "Moderated Chat Phase",
"startTime": "2013-02-12T05:50:51.000+05:00",
"endTime": "2013-02-13T05:50:51.000+05:00",
"status": "Draft"
},
{
"phaseName": "Room Assignment Phase",
"startTime": "2011-12-14T05:50:51.000+05:00",
"endTime": "2011-12-15T05:50:51.000+05:00",
"startTime": "2013-02-14T05:50:51.000+05:00",
"endTime": "2013-02-15T05:50:51.000+05:00",
"status": "Draft"
}
]
},
{
"id": 12004,
"name": "test round 12004",
"shortName": "short name 12004",
"type": "Screening Tool Problem Sets",
"id": 12003,
"name": "test round 12003",
"shortName": "short name 12003",
"type": "Practice Round",
"status": "Active",
"registrationLimit": 1000,
"invitationalType": "Not",
"region": "Alpha",
"roundSchedule": [
{
"phaseName": "Registration Phase",
"startTime": "2013-01-02T05:50:51.000+05:00",
"endTime": "2013-02-02T05:50:51.000+05:00",
"startTime": "2013-08-02T04:50:51.000+05:00",
"endTime": "2013-09-02T04:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "Coding Phase",
"startTime": "2013-02-02T05:50:52.000+05:00",
"endTime": "2013-02-05T05:50:51.000+05:00",
"startTime": "2013-09-02T04:50:52.000+05:00",
"endTime": "2013-09-05T04:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "Intermission Phase",
"startTime": "2013-02-06T05:50:51.000+05:00",
"endTime": "2013-02-07T05:50:51.000+05:00",
"startTime": "2013-09-06T04:50:51.000+05:00",
"endTime": "2013-09-07T04:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "Challenge Phase",
"startTime": "2013-02-08T05:50:51.000+05:00",
"endTime": "2013-02-09T05:50:51.000+05:00",
"startTime": "2013-09-08T04:50:51.000+05:00",
"endTime": "2013-09-09T04:50:51.000+05:00",
"status": "Past"
},
{
"phaseName": "System Test Phase",
"startTime": "2013-02-10T05:50:51.000+05:00",
"endTime": "2013-02-11T05:50:51.000+05:00",
"startTime": "2013-09-10T04:50:51.000+05:00",
"endTime": "2013-09-11T04:50:51.000+05:00",
"status": "Active"
},
{
"phaseName": "Moderated Chat Phase",
"startTime": "2013-02-12T05:50:51.000+05:00",
"endTime": "2013-02-13T05:50:51.000+05:00",
"startTime": "2013-09-12T04:50:51.000+05:00",
"endTime": "2013-09-13T04:50:51.000+05:00",
"status": "Draft"
},
{
"phaseName": "Room Assignment Phase",
"startTime": "2013-02-14T05:50:51.000+05:00",
"endTime": "2013-02-15T05:50:51.000+05:00",
"startTime": "2013-09-14T04:50:51.000+05:00",
"endTime": "2013-09-15T04:50:51.000+05:00",
"status": "Draft"
}
]
Expand Down