Merge branch 'develop' into f9805-optionalJump

68dcccb0 · Carsten Rose · 46a816f5 · 981b45f7 · 68dcccb0 · 68dcccb0
Commit 68dcccb0 authored Dec 20, 2019 by Carsten Rose
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
 stages:
  - before
  - build
-  - selenium
+#   - selenium
 documentation:
  stage: before
@@ -48,29 +48,29 @@ release:
    - scp qfq_${VERSION}_*.zip w16:qfq/releases/
    - mv qfq_${VERSION}_*.zip build/qfq.zip
-selenium:
+# selenium:
-  stage: selenium
+#   stage: selenium
-  script:
+#   script:
-    - unzip -q build/qfq.zip -d qfq
+#     - unzip -q build/qfq.zip -d qfq
-    - cd docker/
+#     - cd docker/
-    - ./run_qfq_docker.sh -no-deploy
+#     - ./run_qfq_docker.sh -no-deploy
-    - ./deploy_to_container.sh ../qfq
+#     - ./deploy_to_container.sh ../qfq
-    - ./run_selenium_tests_docker.sh
+#     - ./run_selenium_tests_docker.sh
-    - echo "hello"
+#     - echo "hello"
-  after_script:
+#   after_script:
-#   remove containers and move logs to persistent location
+# #   remove containers and move logs to persistent location
-    - cd docker; ./remove-containers.sh <<< "y"
+#     - cd docker; ./remove-containers.sh <<< "y"
-    - cd ..
+#     - cd ..
-    - umask 002
+#     - umask 002
-    - mkdir "$SELENIUM_LOGS_PATH/$CI_COMMIT_SHORT_SHA"
+#     - mkdir "$SELENIUM_LOGS_PATH/$CI_COMMIT_SHORT_SHA"
-    - cp extension/Tests/selenium/selenium_logs/* "$SELENIUM_LOGS_PATH/$CI_COMMIT_SHORT_SHA/"
+#     - cp extension/Tests/selenium/selenium_logs/* "$SELENIUM_LOGS_PATH/$CI_COMMIT_SHORT_SHA/"
-    - echo "Selenium Logs copied to $SELENIUM_LOGS_PATH/$CI_COMMIT_SHORT_SHA/"
+#     - echo "Selenium Logs copied to $SELENIUM_LOGS_PATH/$CI_COMMIT_SHORT_SHA/"
-    - echo "Or download result (log/screenshot) in gitlab under CI/CD > Pipelines  <job> > right side 'Artifacts'"
+#     - echo "Or download result (log/screenshot) in gitlab under CI/CD > Pipelines  <job> > right side 'Artifacts'"
-  artifacts:
+#   artifacts:
-    expire_in: 1 week
+#     expire_in: 1 week
-    paths:
+#     paths:
-      - extension/Tests/selenium/selenium_logs/
+#       - extension/Tests/selenium/selenium_logs/
--- a/extension/Classes/Controller/QfqController.php
+++ b/extension/Classes/Controller/QfqController.php
@@ -31,6 +31,7 @@ class QfqController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
     */
    public function showAction() {
+        $html = '';
        $origErrorReporting = '';
        $flagOk = false;

--- a/extension/Classes/Core/Database/Database.php
+++ b/extension/Classes/Core/Database/Database.php
@@ -74,7 +74,7 @@ class Database {
        $this->store = Store::getInstance();
        $storeSystem = $this->store->getStore(STORE_SYSTEM);
-        $this->sqlLog = $storeSystem[SYSTEM_SQL_LOG];
+        $this->sqlLog = $storeSystem[SYSTEM_SITE_PATH] . '/' . $storeSystem[SYSTEM_SQL_LOG];
        $dbInit = $storeSystem[SYSTEM_DB_INIT];
        $config = $this->getConnectionDetails($dbIndex, $storeSystem);

--- a/extension/Classes/Core/Save.php
+++ b/extension/Classes/Core/Save.php
@@ -71,7 +71,7 @@ class Save {
        $this->evaluate = new Evaluate($this->store, $this->db);
        $this->formAction = new FormAction($formSpec, $this->db);
-        $this->qfqLogFilename = $this->store->getVar(SYSTEM_QFQ_LOG, STORE_SYSTEM);
+        $this->qfqLogFilename = $this->store->getVar(SYSTEM_SITE_PATH, STORE_SYSTEM) . '/' . $this->store->getVar(SYSTEM_QFQ_LOG, STORE_SYSTEM);
    }

--- a/extension/Classes/Sql/formEditor.sql
+++ b/extension/Classes/Sql/formEditor.sql
@@ -405,10 +405,11 @@ VALUES (2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120,
        '{{SELECT IF("{{formLanguageDId:YE}}"="","hidden","show" ) }}', '', 'none'),
       (2, 'encode', 'Encode', 'show', 'radio', 'all', 'native', 300, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#field-encode">Info</a>', '', '', '', 'buttonClass=btn-default', 101,
+        '<a href="{{documentation:Y}}#field-encode">Info</a> {{SELECT IF(''{{encode:FRE:alnumx}}'' = ''specialchar'' AND ''{{checkType:FRE:alnumx}}'' = ''allbut'', "<br><span class=''text-danger''> <span class=''glyphicon glyphicon-warning-sign''></span> <span>Encode ''specialchar'' is not completely compatible with Check Type ''allbut'': certain user input will be converted to its HTML representation (e.g. &amp;quot;), which makes use of a non-supported character (&amp;)</span></span>", '''') }}',
-        '', 'no', '',
+        '', '', '', 'buttonClass=btn-default',
-        '',
+        101, '', 'yes', '', '', '', '', '', 'specialchar'),
-        '', '', '', 'specialchar'),
       (2, 'checkType', 'Check Type', 'show', 'radio', 'all', 'native', 310, 0, 0,
        '<a tabindex="-1" href="{{documentation:Y}}#field-checktype">Info</a>', '', '', '', 'buttonClass=btn-default',
        101, '', 'yes',

--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -1147,12 +1147,18 @@ input.qfq-clear-me {
 }
 legend {
-  margin-bottom: 0;
+  margin-bottom: 25px;
-  margin-top: 15px;
  padding-bottom: 5px;
  font-size: 17px;
 }
+.qfq-fieldset {
+  margin-top: 38px;
+}
+.qfq-fieldset:first-child {
+  margin-top: 15px;
+}
 /* glyphicon functions */
 .icon-flipped {
  transform: scaleX(-1);

--- a/mockup/error.html
+++ b/mockup/error.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="stylesheet" href="../css/bootstrap.min.css">
+    <link rel="stylesheet" href="../css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="../css/jqx.base.css">
+    <link rel="stylesheet" href="../css/jqx.bootstrap.css">
+    <link rel="stylesheet" href="../extension/Resources/Public/Css/qfq-bs.css">
+    <title>Input Mode Switcher</title>
+    <link rel="stylesheet" href="../less/qfq-bs.css.less">
+</head>
+<body>
+<div>
+    <div class="blockscreenQfq"
+         style="position: fixed; left: 0px; right: 0px; top: 0px; z-index: 998; background: rgba(0, 0, 0, 0.5); width: 100%; height: 953px;"></div>
+    <div class="border-error alert-interactive removeMe" role="alert" style="z-index: 1000;"><p class="body">
+        <p><em>2018.12.10 16:44:59 +0100, Reference: 5c0e89fbb48d2</em></p>
+        <p>Missing parameter 'expectRecords'</p>
+        <div class="well well-sm" style="max-height: 380px; width: 920px; color: black; overflow-y: scroll; overflow-x: hidden;">
+        <div class="row" style="margin-bottom: 10px;">
+            <div class="col-md-2">
+                <span style="color: grey;">Form</span><br>
+                Form Title
+            </div>
+            <div class="col-md-2">
+                <span style="color: grey;">Form Element</span><br>
+                <span style="color: silver;">100</span> Full Name
+            </div>
+            <div class="col-md-1">
+                <span style="color: grey;">pid</span><br>
+                1
+            </div>
+            <div class="col-md-2">
+                <span style="color: grey;">Content Id</span><br>
+                1600
+            </div>
+            <div class="col-md-2">
+                <span style="color: grey;">FE User</span><br>
+                Cool User
+            </div>
+            <div class="col-md-3" style="text-align: right;">
+                <a href="index.php?id=form&amp;s=5c0e89f66783c" class="btn btn-default">Form</a>&nbsp;
+                <a href="index.php?id=form&amp;s=5c0e89fbb5a7c" class="btn btn-default">Form Element</a>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-4">
+                <span style="color: grey;">Type</span><br>
+                User Form Exception
+            </div>
+            <div class="col-md-8">
+                <span style="color: grey;">To User</span><br>
+                Missing parameter 'expectRecords'
+            </div>
+        </div>
+        <div style="margin-top: 25px; margin-bottom: 10px; text-align: center;">
+            <button class="btn btn-default" onclick="$('#detail-1').toggle(600);">Show more details</button>
+        </div>
+        <table id="detail-1" class="table qfq-table-80" style="display: none;">
+            <thead>
+            <tr>
+                <th colspan="2">Details</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>File</td>
+                <td>/var/www/html/crose/qfq/typo3conf/ext/qfq/qfq/qfq/form/FormAction.php</td>
+            </tr>
+            <tr>
+                <td>Line</td>
+                <td>299</td>
+            </tr>
+            <tr>
+                <td>IP Address</td>
+                <td>192.168.133.205</td>
+            </tr>
+            <tr>
+                <td>HTTP User Agent</td>
+                <td>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.67
+                    Safari/537.36
+                </td>
+            </tr>
+            <tr>
+                <td>QFQ Cookie</td>
+                <td>6grhl8dd78ujq24r7d4uk604kl</td>
+            </tr>
+            </tbody>
+        </table>
+        </div>
+        <p class="buttons">
+            <button type="button" class="btn btn-default">Ok</button>
+        </p>
+    </div>
+</div>
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-md-10 ">
+            <div class="btn-toolbar pull-right" role="toolbar">
+                <div class="btn-group" role="group">
+                    <button id="save-button" type="button" class="btn btn-default navbar-btn"><span
+                            class="glyphicon glyphicon-ok"></span></button>
+                    <button id="close-button" type="button" class="btn btn-default navbar-btn"><span
+                            class="glyphicon glyphicon-remove"></span></button>
+                </div>
+                <div class="btn-group" role="group">
+                    <button id="delete-button" type="button" class="btn btn-default navbar-btn"><span
+                            class="glyphicon glyphicon-trash"></span></button>
+                </div>
+                <div class="btn-group" role="group">
+                    <a id="form-new-button" href="personmock.html?s=badcaffe1" class="btn btn-default navbar-btn"><span
+                            class="glyphicon glyphicon-plus"></span></a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-4">
+            <div class="fabric"
+                 data-buttons="mockData/fabric.buttons.json"
+                 data-emojis="mockData/qfq.emoji.json"
+                 data-control-name='fabric-output'
+                 data-background-image="mockData/Scan2a.jpeg"
+                 data-fabric-color='{"red": 255, "blue": 128, "green": 0}'>
+            </div>
+            <input id="fabric-output" name="fabric-data" type="hidden">
+        </div>
+    </div>
+</div>
+<script src="../js/jquery.min.js"></script>
+<script src="../js/bootstrap.min.js"></script>
+<script src="../js/fabric.min.js"></script>
+<script src="../js/validator.min.js"></script>
+<script src="../js/jqx-all.js"></script>
+<script src="../js/EventEmitter.min.js"></script>
+<script src="../js/qfq.debug.js"></script>
+<script src="../javascript/src/Plugins/qfq.fabric.js"></script>
+<script type="text/javascript">
+    $(function () {
+        var qfqPage = new QfqNS.QfqPage({
+            tabsId: 'myTabs',
+            formId: 'myForm',
+            submitTo: 'api/' + $("#submitTo").val(),
+            deleteUrl: 'api/' + $("#deleteUrl").val(),
+            fileUploadTo: 'api/' + $("#uploadTo").val(),
+            fileDeleteUrl: 'api/' + $("#fileDeleteUrl").val()
+        });
+        QfqNS.Log.level = 0;
+        // Just for mockup, init() function called from new QfqNS.Plugin class maybe.
+    });
+</script>
+</body>
+</html>
\ No newline at end of file