Change order of result elements

api/ui/Rearranger.php

@@ -0,0 +1,100 @@
+<?php
+/*
+The MIT License (MIT)
+
+Copyright (c) 2018 Databases and Information Systems Research Group,
+University of Basel, Switzerland
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+
+class Rearranger
+{
+    public function seekAndSwap($array, $goal, $direction, $resultId)
+    {
+        if (gettype($array) == 'array') {
+            foreach ($array as $key => $subarray) {
+                if ($key == $resultId) { // Check if we're in the right result config
+                    foreach ($subarray as $jobtype => $jobs) {
+                        if (gettype($jobs) == 'array') {
+                            foreach ($jobs as $number => $job) {
+                                // Check if this is the job we want to move
+                                $found = $this->isInside($job, $goal);
+                                if ($found) {
+                                    $array[$key][$jobtype] = $this->swap($jobs, $number, $direction);
+                                    return $array;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return $array;
+    }
+
+    public function isInside($subarray, $goal)
+    {
+        if (gettype($subarray) == 'array') {
+            foreach ($subarray as $key => $element) {
+                if (gettype($element) == 'string' && $element == $goal) {
+                    echo "Found " . $element . "\n";
+                    return true;
+                }
+            }
+            return false;
+        }
+        return false;
+    }
+
+    public function swap($jobs, $goalkey, $direction)
+    {
+        $temp = '';
+        $tempkey = 0;
+        $counter = 0;
+        if ($direction == 'up') {
+            foreach ($jobs as $number => $job) {
+                if ($number == $goalkey && $counter > 0) {
+                    $jobs[$tempkey] = $job;
+                    $jobs[$goalkey] = $temp;
+                    return $jobs;
+                } else if ($number == $goalkey && $counter == 0) {
+                    //found, but already at head
+                    return $jobs;
+                }
+                $counter++;
+                $temp = $job;
+                $tempkey = $number;
+            }
+        } else if ($direction == 'down') {
+            $tempjob = '';
+            foreach ($jobs as $number => $job) {
+                if ($tempjob != '') {
+                    $jobs[$goalkey] = $job;
+                    $jobs[$number] = $tempjob;
+                    return $jobs;
+                } // if element is at last position, $temp will be set but nothing is swapped, foreach is over
+                else if ($number == $goalkey) {
+                    $tempjob = $job;
+                }
+            }
+        }
+        return $jobs;
+    }
+}

api/ui/results.php

@@ -25,6 +25,8 @@
 SOFTWARE.
  */
 
+include "Rearranger.php";
+
 class Results_API extends API {
 
     public $patch_access = Auth_Library::A_LOGGEDIN;
@@ -68,9 +70,29 @@ public function get() {
                         throw new Exception("Not enough data provided for action 'newplot'!");
                     }
                     break;
+                case 'up':
+                    $system = new System($this->get['systemId']);
+                    $arr = $system->getResultsAll();
+                    $id = $this->get['uid'];
+                    $resultId = $this->get['resultId'];
+                    $arr = json_decode($arr, true);
+                    $rearranger = new Rearranger();
+                    $arr['elements'] = $rearranger->seekAndSwap($arr['elements'], $id, 'up', $resultId);
+                    $system->setResultsAll(json_encode($arr));
+                    break;
+                case 'down':
+                    $system = new System($this->get['systemId']);
+                    $arr = $system->getResultsAll();
+                    $id = $this->get['uid'];
+                    $resultId = $this->get['resultId'];
+                    $arr = json_decode($arr, true);
+                    $rearranger = new Rearranger();
+                    $arr['elements'] = $rearranger->seekAndSwap($arr['elements'], $id, 'down', $resultId);
+                    $system->setResultsAll(json_encode($arr));
+                    break;
                 default:
                     throw new Exception("Unknown action!");
             }
         }
     }
-}
+}

core/api.php

@@ -61,7 +61,14 @@ public function __construct($getVars) {
     public function get() {
         throw new Exception('The action GET is not defined!');
     }
-
+
+    /**
+     * @throws Exception
+     */
+    public function set() {
+        throw new Exception('The action SET is not defined!');
+    }
+
     /**
      * @throws Exception
      */
@@ -174,7 +181,6 @@ private function buildJsonEnvelope() {
         echo json_encode($json);
     }
 
-
     /**
      * Destructor: Renders the output
      * (Has the same function than a view for non api)

libraries/graphs/bar-plot/build.template.html

@@ -1,6 +1,10 @@
 <div class="box box-default" id="[[id]]">
     <div class="box-header with-border">
         <h3 class="box-title">Bar Plot</h3>
+        <div class="btn group pull-right" role="group">
+            <button type="button" class="fas fa-arrow-up" onclick="movePlots('up', '[[id]]')"></button>
+            <button type="button" class="fas fa-arrow-down" onclick="movePlots('down', '[[id]]')"></button>
+        </div>
     </div>
     <div class="box-body">
         <div class="form-group">

libraries/graphs/boxplot/build.template.html

@@ -1,6 +1,10 @@
 <div class="box box-default" id="[[id]]">
     <div class="box-header with-border">
         <h3 class="box-title">Box Plot</h3>
+        <div class="btn group pull-right" role="group">
+            <button type="button" class="fas fa-arrow-up" onclick="movePlots('up', '[[id]]')"></button>
+            <button type="button" class="fas fa-arrow-down" onclick="movePlots('down', '[[id]]')"></button>
+        </div>
     </div>
     <div class="box-body">
         <div class="form-group">

libraries/graphs/line-plot-multi/build.template.html

@@ -1,6 +1,10 @@
 <div class="box box-default" id="[[id]]">
     <div class="box-header with-border">
         <h3 class="box-title">Line Plot (multiple parameters)</h3>
+        <div class="btn group pull-right" role="group">
+            <button type="button" class="fas fa-arrow-up" onclick="movePlots('up', '[[id]]')"></button>
+            <button type="button" class="fas fa-arrow-down" onclick="movePlots('down', '[[id]]')"></button>
+        </div>
     </div>
     <div class="box-body">
         <div class="form-group">

libraries/graphs/line-plot/build.template.html

@@ -1,6 +1,10 @@
 <div class="box box-default" id="[[id]]">
     <div class="box-header with-border">
         <h3 class="box-title">Line Plot</h3>
+        <div class="btn group pull-right" role="group">
+            <button type="button" class="fas fa-arrow-up" onclick="movePlots('up', '[[id]]')"></button>
+            <button type="button" class="fas fa-arrow-down" onclick="movePlots('down', '[[id]]')"></button>
+        </div>
     </div>
     <div class="box-body">
         <div class="form-group">

libraries/graphs/pie-plot/build.template.html

@@ -1,6 +1,10 @@
 <div class="box box-default" id="[[id]]">
     <div class="box-header with-border">
         <h3 class="box-title">Pie Plot</h3>
+        <div class="btn group pull-right" role="group">
+            <button type="button" class="fas fa-arrow-up" onclick="movePlots('up', '[[id]]')"></button>
+            <button type="button" class="fas fa-arrow-down" onclick="movePlots('down', '[[id]]')"></button>
+        </div>
     </div>
     <div class="box-body">
         <div class="form-group">

views/builder/create.php

@@ -152,7 +152,6 @@ function checkPercentageIntervals(dependency){
 ");
 
 ?>
-
 <div class="content-wrapper">
     <form id="form" action="/builder/create/" method="POST">
         <script type="text/javascript">$('#form').validate();</script>
@@ -166,7 +165,6 @@ function checkPercentageIntervals(dependency){
                     <li class="active">Create Experiment</li>
                 </ol>
             </section>
-
             <section class="content">
                 <div class="row">
                     <div class="col-md-6">
@@ -221,36 +219,33 @@ function checkPercentageIntervals(dependency){
                 </div>
             </section>
         </div>
-</div>
-<div class="modal fade" id="modal-deployment">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"
-                        onclick="document.getElementById('form').reset()">
-                    <span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">Select Deployment</h4>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label>Deployment</label>
-                    <select class="form-control" name="deployment" title="deployment" required>
-                        <?php if(!empty($data['deployments'])) { ?>
-                            <?php foreach ($data['deployments'] as $deployment) { ?>
-                                <option value="<?php echo $deployment->getItem(); ?>" <?php if($data['copyData']['deployment'] == $deployment->getItem()) echo 'selected'; ?>><?php echo $deployment->getItem(); ?></option>
-                            <?php } ?>
-                        <?php } ?>
-                    </select>
+        <div class="modal fade" id="modal-deployment">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"
+                                onclick="document.getElementById('form').reset()">
+                            <span aria-hidden="true">&times;</span></button>
+                        <h4 class="modal-title">Select Deployment</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form-group">
+                            <label>Deployment</label>
+                            <select class="form-control" name="deployment" title="deployment" required>
+                                <?php if(!empty($data['deployments'])) { ?>
+                                    <?php foreach ($data['deployments'] as $deployment) { ?>
+                                        <option value="<?php echo $deployment->getItem(); ?>" <?php if($data['copyData']['deployment'] == $deployment->getItem()) echo 'selected'; ?>><?php echo $deployment->getItem(); ?></option>
+                                    <?php } ?>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="document.getElementById('form').submit();">Confirm</button>
+                        <button type="button" class="btn btn-default pull-left" data-dismiss="modal" onclick="document.getElementById('form').reset()">Cancel</button>
+                    </div>
                 </div>
-
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="document.getElementById('form').submit();">Confirm</button>
-                <button type="button" class="btn btn-default pull-left" data-dismiss="modal"
-                        onclick="document.getElementById('form').reset()">Cancel
-                </button>
             </div>
         </div>
-    </div>
     </form>
 </div>

views/results/build.php

@@ -65,6 +65,22 @@ function u_btoa(buffer) {
         return btoa(binary.join(''));
     }
 
+    function movePlots(direction, id) {
+        var plotType = $('#plot-form').find('select[name=\"type\"]').val();
+        console.log(direction);
+        console.log(id);
+        $.ajax({
+            url : '/api/ui/results/uid=' + id + '/type=' + plotType +'/systemId=" . $data['system']->getId() . "/action=' + direction + '/resultId=" . $data['resultId'] . "/',
+            type: 'GET',
+            data: {
+                id: id
+            },
+            success: function(response) {
+                location.reload();
+            },
+        });
+    }
+
     function deletePlot(id){
         if(confirm('Do you really want to delete this plot?')){
             $(\"#\" + id).remove();