Skip to content

Commit a080d29

Browse files
Su-sang3Su-sang3
authored
Merge pull request #178 from geodes-sms/feature-98
Small bug fix for Feature 98
2 parents e6251ba + 9193d86 commit a080d29

File tree

6 files changed

+34
-21
lines changed

6 files changed

+34
-21
lines changed

‎relis_app/helpers/tests/data_extraction_ut_helper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ private function saveAssignment_5papers_1reviewer()
275275
$actual_assignement = "Not assigned";
276276

277277
$userId = getAdminUserId(); //reviewer user ID
278-
$postData = ["number_of_users" => 1, "percentage" => 100, "user_1" => $userId];
278+
$postData = ["number_of_users" => 1, "percentage" => 100, "user_1" => $userId, "assign_all_paper_checkbox" => "on"];
279279
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
280280

281281
if ($response['status_code'] >= 400) {
@@ -318,7 +318,7 @@ private function saveAssignment_6papers_3reviewers()
318318
//perform screening
319319
assignPapers_and_performScreening([getAdminUserId()], 'Title');
320320

321-
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId()];
321+
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId(), "assign_all_paper_checkbox" => "on"];
322322
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
323323

324324
if ($response['status_code'] >= 400) {
@@ -365,7 +365,7 @@ private function saveAssignment_5papers_3reviewers()
365365
//perform screening
366366
assignPapers_and_performScreening([getAdminUserId()], 'Title');
367367

368-
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId()];
368+
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId(), "assign_all_paper_checkbox" => "on"];
369369
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
370370

371371
if ($response['status_code'] >= 400) {
@@ -417,7 +417,7 @@ private function saveAssignment_5papers_2reviewers()
417417
//perform screening
418418
assignPapers_and_performScreening([getAdminUserId()], 'Title');
419419

420-
$postData = ["number_of_users" => 2, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId()];
420+
$postData = ["number_of_users" => 2, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "assign_all_paper_checkbox" => "on"];
421421
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
422422

423423
if ($response['status_code'] >= 400) {

‎relis_app/helpers/tests/quality_assessment_ut_helper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ private function saveAssignmentQA_4papers_1reviewer()
301301
$actual_assignement = "Not assigned";
302302

303303
$userId = getAdminUserId(); //reviewer user ID
304-
$postData = ["number_of_users" => 1, "percentage" => 100, "user_1" => $userId];
304+
$postData = ["number_of_users" => 1, "percentage" => 100, "user_1" => $userId, "assign_all_paper_checkbox" => "on"];
305305
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
306306

307307
if ($response['status_code'] >= 400) {
@@ -344,7 +344,7 @@ private function saveAssignmentQA_6papers_3reviewers()
344344
//perform screening
345345
assignPapers_and_performScreening([getAdminUserId()], 'Title');
346346

347-
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId()];
347+
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId(), "assign_all_paper_checkbox" => "on"];
348348
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
349349

350350
if ($response['status_code'] >= 400) {
@@ -393,7 +393,7 @@ private function saveAssignmentQA_5papers_3reviewers()
393393
//perform screening
394394
assignPapers_and_performScreening([getAdminUserId()], 'Title');
395395

396-
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId()];
396+
$postData = ["number_of_users" => 3, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "user_3" => getDemoUserId(), "assign_all_paper_checkbox" => "on"];
397397
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
398398

399399
if ($response['status_code'] >= 400) {
@@ -445,7 +445,7 @@ private function saveAssignmentQA_5papers_2reviewers()
445445
//perform screening
446446
assignPapers_and_performScreening([getAdminUserId()], 'Title');
447447

448-
$postData = ["number_of_users" => 2, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId()];
448+
$postData = ["number_of_users" => 2, "percentage" => 100, "user_1" => getAdminUserId(), "user_2" => getTestUserId(), "assign_all_paper_checkbox" => "on"];
449449
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
450450

451451
if ($response['status_code'] >= 400) {

‎relis_app/helpers/tests/screening_ut_helper.php

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ private function saveAssignmentScreen_withoutNumberOfUsers()
362362
"paper_source_status" => "all",
363363
"user_1" => $user_1,
364364
"user_2" => $user_2,
365-
"reviews_per_paper" => 1
365+
"reviews_per_paper" => 1,
366+
"assign_all_paper_checkbox" => "on"
366367
];
367368
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
368369

@@ -410,7 +411,8 @@ private function saveAssignmentScreen_withoutReviewsPerPaper()
410411
"paper_source_status" => "all",
411412
"user_1" => $user_1,
412413
"user_2" => $user_2,
413-
"reviews_per_paper" => ""
414+
"reviews_per_paper" => "",
415+
"assign_all_paper_checkbox" => "on"
414416
];
415417
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
416418

@@ -458,7 +460,8 @@ private function saveAssignmentScreen_ReviewPerPaper_moreThan_NbrOfUsers()
458460
"paper_source_status" => "all",
459461
"user_1" => $user_1,
460462
"user_2" => $user_2,
461-
"reviews_per_paper" => 3
463+
"reviews_per_paper" => 3,
464+
"assign_all_paper_checkbox" => "on"
462465
];
463466
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
464467

@@ -502,7 +505,8 @@ private function saveAssignmentScreen_emptyUsers()
502505
"screening_phase" => getScreeningPhaseId("Title"),
503506
"papers_sources" => "all",
504507
"paper_source_status" => "all",
505-
"reviews_per_paper" => 1
508+
"reviews_per_paper" => 1,
509+
"assign_all_paper_checkbox" => "on"
506510
];
507511
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
508512

@@ -596,7 +600,8 @@ private function saveAssignment_5papers_1reviewer()
596600
"papers_sources" => "all",
597601
"paper_source_status" => "all",
598602
"user_1" => $userId,
599-
"reviews_per_paper" => 1
603+
"reviews_per_paper" => 1,
604+
"assign_all_paper_checkbox" => "on"
600605
];
601606

602607
$response = $this->http_client->response($this->controller, $action, $postData, "POST");
@@ -649,7 +654,8 @@ private function saveAssignment_6papers_3reviewers()
649654
"user_1" => getAdminUserId(),
650655
"user_2" => getTestUserId(),
651656
"user_3" => getDemoUserId(),
652-
"reviews_per_paper" => 1
657+
"reviews_per_paper" => 1,
658+
"assign_all_paper_checkbox" => "on"
653659
];
654660
//Select screening phase
655661
$this->http_client->response($this->controller, "select_screen_phase" . "/" . getScreeningPhaseId("Title"));
@@ -710,7 +716,8 @@ private function saveAssignment_5papers_3reviewers()
710716
"user_1" => getAdminUserId(),
711717
"user_2" => getTestUserId(),
712718
"user_3" => getDemoUserId(),
713-
"reviews_per_paper" => 1
719+
"reviews_per_paper" => 1,
720+
"assign_all_paper_checkbox" => "on"
714721
];
715722
//Select screening phase
716723
$this->http_client->response($this->controller, "select_screen_phase" . "/" . getScreeningPhaseId("Title"));
@@ -773,7 +780,8 @@ private function saveAssignment_5papers_2reviewers()
773780
"paper_source_status" => "all",
774781
"user_1" => getAdminUserId(),
775782
"user_2" => getTestUserId(),
776-
"reviews_per_paper" => 1
783+
"reviews_per_paper" => 1,
784+
"assign_all_paper_checkbox" => "on"
777785
];
778786
//Select screening phase
779787
$this->http_client->response($this->controller, "select_screen_phase" . "/" . getScreeningPhaseId("Title"));
@@ -855,7 +863,8 @@ private function saveAssignment_5papers_2reviewers_2reviewsPerPaper()
855863
"paper_source_status" => "all",
856864
"user_1" => getAdminUserId(),
857865
"user_2" => getTestUserId(),
858-
"reviews_per_paper" => 2
866+
"reviews_per_paper" => 2,
867+
"assign_all_paper_checkbox" => "on"
859868
];
860869
//Select screening phase
861870
$this->http_client->response($this->controller, "select_screen_phase" . "/" . getScreeningPhaseId("Title"));
@@ -1827,7 +1836,8 @@ private function saveAssignmentValidation_assignToNotScreenedUser()
18271836
"papers_sources" => "all",
18281837
"paper_source_status" => "all",
18291838
"user_1" => $AdminUserId,
1830-
"reviews_per_paper" => 1
1839+
"reviews_per_paper" => 1,
1840+
"assign_all_paper_checkbox" => "on"
18311841
];
18321842
save_assignment_screen($data);
18331843
for ($i = 1; $i <= 2; $i++) {

‎relis_app/views/data_extraction/assign_papers_class.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
echo '<div class="form-group">';
7474
echo form_label($label, $name, array('class' => 'control-label col-md-3 col-sm-3 col-xs-12'));
7575
echo '<div class="col-md-6 col-sm-6 col-xs-12">';
76-
echo '<input type="checkbox" id="' . $id . '" name="' . $name . '" class="js-switch" onchange="toggleNumberPapersField()" checked />';
76+
echo '<input type="hidden" name="' . $name . '" value="off">';
77+
echo '<input type="checkbox" id="' . $id . '" name="' . $name . '" class="js-switch" onchange="toggleNumberPapersField()" value="on" checked />';
7778
echo '</div></div>';
7879

7980
echo '<div id="number_of_papers_field" style="display: none;">';

‎relis_app/views/quality_assessment/assign_papers_qa.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
echo '<div class="form-group">';
7474
echo form_label($label, $name, array('class' => 'control-label col-md-3 col-sm-3 col-xs-12'));
7575
echo '<div class="col-md-6 col-sm-6 col-xs-12">';
76-
echo '<input type="checkbox" id="' . $id . '" name="' . $name . '" class="js-switch" onchange="toggleNumberPapersField()" checked />';
76+
echo '<input type="hidden" name="' . $name . '" value="off">';
77+
echo '<input type="checkbox" id="' . $id . '" name="' . $name . '" class="js-switch" onchange="toggleNumberPapersField()" value="on" checked />';
7778
echo '</div></div>';
7879

7980
echo '<div id="number_of_papers_field" style="display: none;">';

‎relis_app/views/screening/assign_papers_screen_auto.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
echo '<div class="form-group">';
8484
echo form_label($label, $name, array('class' => 'control-label col-md-3 col-sm-3 col-xs-12'));
8585
echo '<div class="col-md-6 col-sm-6 col-xs-12">';
86-
echo '<input type="checkbox" id="' . $id . '" name="' . $name . '" class="js-switch" onchange="toggleNumberPapersField()" checked />';
86+
echo '<input type="hidden" name="' . $name . '" value="off">';
87+
echo '<input type="checkbox" id="' . $id . '" name="' . $name . '" class="js-switch" onchange="toggleNumberPapersField()" value="on" checked />';
8788
echo '</div></div>';
8889

8990
echo '<div id="number_of_papers_field" style="display: none;">';

0 commit comments

Comments
 (0)