Behavioural post-reactification

aces · Jan 4, 2021 · 0fc9ebe · 0fc9ebe
1 parent a7b757f
commit 0fc9ebe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/modules/behavioural_qc/php/behavioural.class.inc b/modules/behavioural_qc/php/behavioural.class.inc
@@ -63,7 +63,7 @@ class Behavioural extends \NDB_Page implements ETagCalculator
             ->toArray($user);
         $body        = [
             'data'         => $data,
-            'fieldOptions' => $this->_getFieldOptions($request),
+            'fieldOptions' => $this->_getFieldOptions(),
             'subprojects'  => \Utility::getSubprojectList(),
         ];
         return new \LORIS\Http\Response\JsonResponse($body);
@@ -72,13 +72,10 @@ class Behavioural extends \NDB_Page implements ETagCalculator
     /**
      * Provide the field options for the behavioural form.
      *
-     * @param ServerRequestInterface $request The incoming PSR7 request.
-     *
      * @return array Dynamic field options
      */
-    private function _getFieldOptions(
-        ServerRequestInterface $request
-    ) : array {
+    private function _getFieldOptions() : array
+    {
         return (new \LORIS\behavioural_qc\Views\Behavioural(
             \Utility::getVisitList(),
             \Utility::getAllInstruments(),

diff --git a/modules/behavioural_qc/php/conflicts.class.inc b/modules/behavioural_qc/php/conflicts.class.inc
@@ -65,7 +65,7 @@ class Conflicts extends \NDB_Page implements ETagCalculator
             ->toArray($user);
         $body = [
             'data'         => $data,
-            'fieldOptions' => $this->_getFieldOptions($request),
+            'fieldOptions' => $this->_getFieldOptions(),
             'subprojects'  => \Utility::getSubprojectList(),
         ];
         return new \LORIS\Http\Response\JsonResponse($body);
@@ -74,13 +74,10 @@ class Conflicts extends \NDB_Page implements ETagCalculator
     /**
      * Provide the field options for the Conflicts form.
      *
-     * @param ServerRequestInterface $request The incoming PSR7 request.
-     *
      * @return array Dynamic field options
      */
-    private function _getFieldOptions(
-        ServerRequestInterface $request
-    ) : array {
+    private function _getFieldOptions() : array
+    {
         return (new \LORIS\behavioural_qc\Views\Conflicts(
             \Utility::getVisitList(),
             \Utility::getAllInstruments(),

diff --git a/modules/behavioural_qc/php/incomplete.class.inc b/modules/behavioural_qc/php/incomplete.class.inc
@@ -65,7 +65,7 @@ class Incomplete extends \NDB_Page implements ETagCalculator
             ->toArray($user);
         $body = [
             'data'         => $data,
-            'fieldOptions' => $this->_getFieldOptions($request),
+            'fieldOptions' => $this->_getFieldOptions(),
             'subprojects'  => \Utility::getSubprojectList(),
         ];
         return new \LORIS\Http\Response\JsonResponse($body);
@@ -74,13 +74,10 @@ class Incomplete extends \NDB_Page implements ETagCalculator
     /**
      * Provide the field options for the incomplete form.
      *
-     * @param ServerRequestInterface $request The incoming PSR7 request.
-     *
      * @return array Dynamic field options
      */
-    private function _getFieldOptions(
-        ServerRequestInterface $request
-    ) : array {
+    private function _getFieldOptions() : array
+    {
         return (new \LORIS\behavioural_qc\Views\Incomplete(
             \Utility::getVisitList(),
             \Utility::getAllInstruments(),

diff --git a/...vioural_qc/php/views/behavioral.class.inc → ...ioural_qc/php/views/behavioural.class.inc b/...vioural_qc/php/views/behavioral.class.inc → ...ioural_qc/php/views/behavioural.class.inc
@@ -12,7 +12,7 @@ namespace LORIS\behavioural_qc\Views;
  * @link     https://www.github.com/aces/Loris/
  */
 
-class Behavioral
+class Behavioural
 {
     /**
      * The formElement