Merge branch 'B10505DndBrokenOnMultiDb' into 'develop'

B10505 dnd broken on multi db

See merge request !340

Documentation-develop/DRAGANDDROP.md

@@ -18,5 +18,10 @@ Request will be sent containing following GET variables:
 * hoverId = `data-dnd-id` id of the element the dragged element is now hovering, meaning before or after.
 * hoverPosition = client internal position of currently hovered element.
 
-
 Example: http://something/bla?dragId=uno&dragPosition=1&setTo=before&hoverId=tre&hoverPosition=3
+
+## Drag'n'drop in forms
+
+* For FormElement.typ=subrecord DND is automatically detected. 
+* The encoded SIP contains: dnd-subrecord-form-id, dnd-subrecord-form-table, dnd-subrecord-id, dndTable, oderColumn, 
+  oderInterval, dnd-db-index. 

Documentation/Form.rst

@@ -1901,18 +1901,25 @@ include a column `id` (or `_id`) and a column `ord` (or `_ord`). E.g.::
 
   FE.sql1 = {{!SELECT p.id AS _id, p.ord AS _ord, p.name FROM Person WHERE p.email!='' ORDER BY p.ord}}
 
-Tips:
+In case the modified ord value should be shown without reloading the page, add html id `qfq-dnd-ord-id-...`::
 
-* If you want to deactivate a drag-and-drop that QFQ automatically renders, set the `orderColumn` to a non-existing column.
+  FE.sql1 = {{!SELECT p.id AS _id, p.ord AS _ord, p.name
+                      , CONCAT('<span id="qfq-dnd-ord-id-', p.id,'">', p.ord, '</span>') AS 'Ord|nostrip'
+                 FROM Person WHERE p.email!='' ORDER BY p.ord}}
+
+
+.. tip::
+
+    * If you want to deactivate a drag-and-drop that QFQ automatically renders, set the `orderColumn` to a non-existing column.
       E.g., `orderColumn = nonExistingColumn`. This will deactivate drag-and-drop.
-* In order to evaluate the `sql1` query dynamically during a drag-and-drop event, the STORE_RECORD (with the current subrecord)
+    * In order to evaluate the `sql1` query dynamically during a drag-and-drop event, the STORE_RECORD (with the current subrecord)
       is loaded.
-* The stores STORE_RECORD, STORE_SIP and STORE_SYSTEM are supported during a drag-and-drop event and can be used in FE.sql1 query.
+    * The stores STORE_RECORD, STORE_SIP and STORE_SYSTEM are supported during a drag-and-drop event and can be used in FE.sql1 query.
 
       * STORE_SIP: SIP values on form load
       * STORE_RECORD: values of the current record loaded in the form.
 
-* If the subrecord is rendered with drag-and-drop active, but the order is not affected upon reload, there is
+    * If the subrecord is rendered with drag-and-drop active, but the order is not affected upon reload, there is
       most likely a problem with evaluating the `sql1` query at runtime.
 
 Type: time

extension/Classes/Core/AbstractBuildForm.php

@@ -2261,6 +2261,7 @@ abstract class AbstractBuildForm {
             $dataDndApi .= '&' . FE_ORDER_INTERVAL . '=' . $orderInterval;
             $dataDndApi .= '&' . FE_ORDER_COLUMN . '=' . $orderColumn;
             $dataDndApi .= '&' . FE_DND_TABLE . '=' . $dndTable;
+            $dataDndApi .= '&' . DND_DB_INDEX . '=' . $this->formSpec[F_DB_INDEX];
 
             $dndAttributes = Support::doAttribute('class', 'qfq-dnd-sort');
             $dndAttributes .= $this->evaluate->parse("{{ '$dataDndApi' AS _data-dnd-api }}") . ' ';

extension/Classes/Core/Constants.php

@@ -1986,6 +1986,7 @@ const DND_SUBRECORD_FORM_ID = 'dnd-subrecord-form-id';
 const DND_SUBRECORD_FORM_TABLE = 'dnd-subrecord-form-table';
 const DND_ORD_HTML_ID_PREFIX = 'qfq-dnd-ord-id-';
 const DND_FORM_SIP_VALUES = '_sipForm';
+const DND_DB_INDEX = 'dnd-db-index';
 
 // Application Test: SELENIUM
 const ATTRIBUTE_DATA_REFERENCE = 'data-reference';

extension/Classes/Core/Form/DragAndDrop.php

@@ -8,10 +8,9 @@
 
 namespace IMATHUZH\Qfq\Core\Form;
 
-use IMATHUZH\Qfq\Core\Store\Store;
 use IMATHUZH\Qfq\Core\Database\Database;
 use IMATHUZH\Qfq\Core\Evaluate;
- 
+use IMATHUZH\Qfq\Core\Store\Store;
 
 
 /**
@@ -54,7 +53,7 @@ class DragAndDrop {
         #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->formSpec = $formSpec;
 
-        $dbIndex = DB_INDEX_DEFAULT;  //Hier muss noch die aktuelle DB ermittelt werden (kann im Form angegeben sein) - Gerade im Formular FORM Editor genau testen!
+        $dbIndex = $formSpec[F_DB_INDEX];  //Hier muss noch die aktuelle DB ermittelt werden (kann im Form angegeben sein) - Gerade im Formular FORM Editor genau testen!
         $this->db = new Database($dbIndex);
 
         $this->store = Store::getInstance('', $phpUnit);

extension/Classes/Core/QuickFormQuery.php

@@ -195,7 +195,7 @@ class QuickFormQuery {
         // Set dbIndex, evaluate any
         $dbIndex = $this->store->getVar(TOKEN_DB_INDEX, STORE_TYPO3 . STORE_EMPTY);
         $dbIndex = $this->evaluate->parse($dbIndex);
-        $dbIndex = ($dbIndex == '') ? DB_INDEX_DEFAULT : $dbIndex;
+        $dbIndex = ($dbIndex == '') ? $this->dbIndexData : $dbIndex;
         $this->store->setVar(TOKEN_DB_INDEX, $dbIndex, STORE_TYPO3);
 
         // Create report file if file keyword not found (and auto export is enabled in qfq settings)
@@ -1889,21 +1889,36 @@ class QuickFormQuery {
 
         $dndSubrecordId = $this->store::getVar(DND_SUBRECORD_ID, STORE_SIP . STORE_CLIENT . STORE_ZERO);
         if ($dndSubrecordId > 0) {
-            // Subrecord DragAndDrop
-            $subrecord = $this->dbArray[$this->dbIndexQfq]->sql(SQL_FORM_ELEMENT_BY_ID, ROW_REGULAR, [$dndSubrecordId]);
+
+            // Save dbIndex
+            $dbIndex = $this->store::getVar(DND_DB_INDEX, STORE_SIP . STORE_ZERO);
+
+            // Get FormElement of current 'Subrecord' DragAndDrop
+            $feSubrecord = $this->dbArray[$this->dbIndexQfq]->sql(SQL_FORM_ELEMENT_BY_ID, ROW_REGULAR, [$dndSubrecordId]);
             $recordId = $this->store::getVar(DND_SUBRECORD_FORM_ID, STORE_SIP . STORE_ZERO);
 
             $tableName = $this->store::getVar(DND_SUBRECORD_FORM_TABLE, STORE_SIP);
-//            $this->store->fillStoreWithRecord('form', $recordId, $this->dbArray[$this->dbIndexQfq]);
-            $this->store->fillStoreWithRecord($tableName, $recordId, $this->dbArray[$this->dbIndexQfq]);
+//            $this->store->fillStoreWithRecord($tableName, $recordId, $this->dbArray[$this->dbIndexQfq]);
+            $this->store->fillStoreWithRecord($tableName, $recordId, $this->dbArray[$dbIndex]);
 
             $formSip = $this->store::getVar(DND_FORM_SIP_VALUES, STORE_SIP);
             // Backup STORE_SIP
             $save = $this->store::getStore(STORE_SIP);
             // Fake STORE_SIP
             $this->store::fillStoreSip($formSip);
+
             // Fire query, which might use SIP Vars
-            $dndOrderSql = $this->evaluate->parse($subrecord[0][FE_SQL1]);
+            $sql = $feSubrecord[0][FE_SQL1];
+            $sqlSelect = str_replace(' ', '', substr($sql, 0, 9));
+            $sqlRest = substr($sql, 9);
+
+            // In case there is already a dbIndex given: change nothing '{{[123]!SELECT'. Else set the one defined by the SIP
+            if ($sqlSelect[2] != '[') {
+                $sqlSelect = str_replace('{{', '{{[' . $dbIndex . ']', $sqlSelect);
+                $sql = $sqlSelect . $sqlRest;
+            }
+
+            $dndOrderSql = $this->evaluate->parse($sql);
 
             // Restore STORE_SIP
             $this->store::setStore($save, STORE_SIP, true);
@@ -1921,6 +1936,7 @@ class QuickFormQuery {
                 F_ORDER_INTERVAL => $this->store->getVar(FE_ORDER_INTERVAL, STORE_SIP . STORE_ZERO),
                 F_ORDER_COLUMN => $this->store->getVar(FE_ORDER_COLUMN, STORE_SIP . STORE_ZERO),
                 F_DRAG_AND_DROP_ORDER_SQL => $dndOrderSql,
+                F_DB_INDEX => $dbIndex,
                 F_TABLE_NAME => $this->store->getVar(FE_DND_TABLE, STORE_SIP . STORE_ZERO)
             ];
 

extension/Classes/Sql/formEditor.sql

@@ -264,6 +264,7 @@ CREATE TABLE IF NOT EXISTS `Split`
     AUTO_INCREMENT = 0
     DEFAULT CHARSET = utf8;
 
+# Used to save tablesorter.js column selection settings. Free to use for other settings as well.
 CREATE TABLE IF NOT EXISTS `Setting`
 (
     `id`       INT(11)                  NOT NULL AUTO_INCREMENT,